capistrano-rbenv 0.0.5 → 0.0.6

data/lib/capistrano-rbenv/deploy.rb

@@ -97,13 +97,15 @@ module Capistrano
                 File.join(rbenv_configure_home, basename)
               }
             else
+              bash_profile = File.join(rbenv_configure_home, '.bash_profile')
+              profile = File.join(rbenv_configure_home, '.profile')
               case File.basename(rbenv_configure_shell)
               when /bash/
-                [ File.join(rbenv_configure_home, '.bash_profile') ]
+                [ capture("test -f #{profile.dump} && echo #{profile.dump} || echo #{bash_profile.dump}") ]
               when /zsh/
                 [ File.join(rbenv_configure_home, '.zshenv') ]
               else # other sh compatible shell such like dash
-                [ File.join(rbenv_configure_home, '.profile') ]
+                [ profile ]
               end
             end
           }
@@ -125,7 +127,8 @@ module Capistrano
                 put(rbenv_configure_script, script)
                 config_map.each { |file, temp|
                   ## (1) copy original config to temporaly file and then modify
-                  execute << "( cp -fp #{file} #{temp} || touch #{temp} )" 
+                  execute << "( test -f #{file} || touch #{file} )"
+                  execute << "cp -fp #{file} #{temp}" 
                   execute << "sed -i -e '/^#{Regexp.escape(rbenv_configure_signature)}/,/^#{Regexp.escape(rbenv_configure_signature)}/d' #{temp}"
                   execute << "echo #{rbenv_configure_signature.dump} >> #{temp}"
                   execute << "cat #{script} >> #{temp}"
@@ -186,7 +189,7 @@ module Capistrano
             if rbenv_ruby_version != 'system'
               run("#{rbenv_cmd} whence #{ruby} | grep -q #{rbenv_ruby_version} || #{rbenv_cmd} install #{rbenv_ruby_version}")
             end
-            run("#{rbenv_cmd} exec #{ruby} --version")
+            run("#{rbenv_cmd} exec #{ruby} --version && #{rbenv_cmd} global #{rbenv_ruby_version}")
           }
 
           _cset(:rbenv_bundler_gem, 'bundler')

data/lib/capistrano-rbenv/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module RbEnv
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-rbenv
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-15 00:00:00.000000000 Z
+date: 2012-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano