salt/ci/cruisecontrolrb.sls in salted-rails-0.0.6 vs salt/ci/cruisecontrolrb.sls in salted-rails-0.0.7

@@ -7,22 +7,28 @@
     - user: {{ pillar['username'] }}
     - group: {{ pillar['username'] }}
 
 cruisecontrolrb-install:
   git.latest:
-    - name: https://github.com/thoughtworks/cruisecontrol.rb
+    - name: git://github.com/thoughtworks/cruisecontrol.rb
     - target: {{ pillar['homedir'] }}/local/cruisecontrol.rb
     - runas: {{ pillar['username'] }}
     - group: {{ pillar['username'] }}
     - require:
       - file.directory: {{ pillar['homedir'] }}/local
+  file.managed:
+    - name: {{ pillar['homedir'] }}/local/cruisecontrol.rb/.ruby-version
+    - user: {{ pillar['username'] }}
+    - group: {{ pillar['username'] }}
+    - contents: system
   cmd.run:
     # Run twice if first fails (weirdness with installing ruby-debug)
-    - name: {{ pillar['homedir'] }}/.rbenv/shims/bundle install || {{ pillar['homedir'] }}/.rbenv/shims/bundle install
+    - name: bundle install --binstubs || bundle install
     - cwd: {{ pillar['homedir'] }}/local/cruisecontrol.rb
-    - user: {{ pillar['username'] }}
-    - group: {{ pillar['username'] }}
+    - require:
+      - sls: lang.ruby
+      - file: cruisecontrolrb-install:
     - watch:
       - git: cruisecontrolrb-install
 
 cruisecontrolrb-create-service:
   cmd.run:
@@ -46,16 +52,16 @@
     - after: CRUISE_HOME='{{ pillar['homedir'] }}/local/cruisecontrol.rb'
     - limit: CRUISE_HOME =
     - watch:
       - cmd: cruisecontrolrb-create-service
     
-cruisecontrolrb-fix-shebang:
-  file.sed:
-    - name: /etc/init.d/cruise
-    - before: '#!/usr/bin/env.*'
-    - after: '#!{{ pillar['homedir'] }}/.rbenv/shims/ruby'
-    - watch:
-      - cmd: cruisecontrolrb-create-service
+#cruisecontrolrb-fix-shebang:
+#  file.sed:
+#    - name: /etc/init.d/cruise
+#    - before: '#!/usr/bin/env.*'
+#    - after: '#!{{ pillar['homedir'] }}/.rbenv/shims/ruby'
+#    - watch:
+#      - cmd: cruisecontrolrb-create-service
     
 cruisecontrolrb-register-service:
   cmd.run:
     - name: update-rc.d cruise defaults
     - watch: