salt/editors/rubymine.sls in salted-rails-0.0.6 vs salt/editors/rubymine.sls in salted-rails-0.0.7

@@ -1,51 +1,51 @@
 include:
   - lang.java
 
-{{ pillar['homedir'] }}/local/tmp:
+
+rubymine-download:
   file.directory:
+    - name: {{ pillar['homedir'] }}/local/tmp/rubymine
     - makedirs: True
     - clean: True
     - user: {{ pillar['username'] }}
     - group: {{ pillar['username'] }}
-
-rubymine-download:
   cmd.run:
-    - name: wget -c http://download.jetbrains.com/ruby/RubyMine-{{ pillar['rubymine-version'] }}.tar.gz
+    - name: wget -nv -c http://download.jetbrains.com/ruby/RubyMine-{{ pillar['versions']['rubymine'] }}.tar.gz
     - cwd: {{ pillar['homedir'] }}/local
     - user: {{ pillar['username'] }}
     - group: {{ pillar['username'] }}
-    - unless: [ -d {{ pillar['homedir'] }}/local/RubyMine-{{ pillar['rubymine-version'] }} ]
+    - unless: test -d {{ pillar['homedir'] }}/local/RubyMine-{{ pillar['versions']['rubymine'] }}/bin
     - require:
-      - file.directory: {{ pillar['homedir'] }}/local/tmp
+      - file.directory: rubymine-download
 
 rubymine-extract:
   cmd.run:
-    - name: tar xfz ../RubyMine-{{ pillar['rubymine-version'] }}.tar.gz
-    - cwd: {{ pillar['homedir'] }}/local/tmp
+    - name: tar xfz ../RubyMine-{{ pillar['versions']['rubymine'] }}.tar.gz
+    - cwd: {{ pillar['homedir'] }}/local/tmp/rubymine
     - user: {{ pillar['username'] }}
     - group: {{ pillar['username'] }}
-    - unless: [ -d ../RubyMine-{{ pillar['rubymine-version'] }} ] 
+    - unless: test -d {{ pillar['homedir'] }}/local/RubyMine-{{ pillar['versions']['rubymine'] }}/bin
     - require:
       - cmd: rubymine-download
 
 # The tar file contains extra version numbers in its top directory
-rubymine-rename:
+rubymine-install:
   cmd.run:
-    - name: mv RubyMine-* ../RubyMine-{{ pillar['rubymine-version'] }}
-    - cwd: {{ pillar['homedir'] }}/local/tmp
+    - name: mv RubyMine-* ../../RubyMine-{{ pillar['versions']['rubymine'] }}
+    - cwd: {{ pillar['homedir'] }}/local/tmp/rubymine
     - user: {{ pillar['username'] }}
     - group: {{ pillar['username'] }}
-    - unless: [ -d ../RubyMine-{{ pillar['rubymine-version'] }} ] 
+    - unless: test -d {{ pillar['homedir'] }}/local/RubyMine-{{ pillar['versions']['rubymine'] }}/bin
     - require:
       - cmd: rubymine-extract
 
 rubymine-adjust_profile:
   file.append:
     - name: {{ pillar['homedir'] }}/.profile
     - user: {{ pillar['username'] }}
     - group: {{ pillar['username'] }}
     - text:
-      - export PATH="{{ pillar['homedir'] }}/RubyMine-{{ pillar['rubymine-version'] }}/bin:$PATH"
-    - require:
-      - cmd: rubymine-rename
+      - export PATH="{{ pillar['homedir'] }}/RubyMine-{{ pillar['versions']['rubymine'] }}/bin:$PATH"
+    #- require:
+    #  - cmd: rubymine-rename