capistrano-pyenv 0.0.4 → 0.0.5

data/lib/capistrano-pyenv/deploy.rb

@@ -15,8 +15,12 @@ module Capistrano
           _cset(:pyenv_repository, 'git://github.com/yyuu/pyenv.git')
           _cset(:pyenv_branch, 'master')
 
-          _cset(:pyenv_plugins, {})
-          _cset(:pyenv_plugins_options, {})
+          _cset(:pyenv_plugins, {
+            'python-virtualenv' => 'git://github.com/yyuu/python-virtualenv.git',
+          })
+          _cset(:pyenv_plugins_options, {
+            'python-virtualenv' => {:branch => 'master'},
+          })
           _cset(:pyenv_plugins_path) {
             File.join(pyenv_path, 'plugins')
           }
@@ -87,13 +91,15 @@ module Capistrano
                 File.join(pyenv_configure_home, basename)
               }
             else
+              bash_profile File.join(pyenv_configure_home, '.bash_profile')
+              profile = File.join(pyenv_configure_home, '.profile')
               case File.basename(pyenv_configure_shell)
               when /bash/
-                [ File.join(pyenv_configure_home, '.bash_profile') ]
+                [ capture("test -f #{profile.dump} && echo #{profile.dump} || echo #{bash_profile.dump}") ]
               when /zsh/
                 [ File.join(pyenv_configure_home, '.zshenv') ]
               else # other sh compatible shell such like dash
-                [ File.join(pyenv_configure_home, '.profile') ]
+                [ profile ]
               end
             end
           }
@@ -115,7 +121,8 @@ module Capistrano
                 put(pyenv_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(pyenv_configure_signature)}/,/^#{Regexp.escape(pyenv_configure_signature)}/d' #{temp}"
                   execute << "echo #{pyenv_configure_signature.dump} >> #{temp}"
                   execute << "cat #{script} >> #{temp}"
@@ -176,7 +183,7 @@ module Capistrano
             if pyenv_python_version != 'system'
               run("#{pyenv_cmd} whence #{python} | grep -q #{pyenv_python_version} || #{pyenv_cmd} install #{pyenv_python_version}")
             end
-            run("#{pyenv_cmd} exec #{python} --version")
+            run("#{pyenv_cmd} exec #{python} --version && #{pyenv_cmd} global #{pyenv_python_version}")
           }
         }
       }

data/lib/capistrano-pyenv/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module PyEnv
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-pyenv
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   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