capistrano-pyenv 0.0.10 → 0.0.11

data/README.md

@@ -37,6 +37,8 @@ Following options are available to manage your pyenv.
  * `:pyenv_use_virtualenv` - create new virtualenv from `:pyenv_virtualenv_python_version`. `false` by default. `:pyenv_python_version` will be treated as the name of the virtualenv if this is turned `true`.
  * `:pyenv_virtualenv_python_version` - the python version to create virtualenv. `2.7.3` by default.
  * `:pyenv_virtualenv_options` - command-line options for virtualenv.
+ * `:pyenv_install_dependencies` - controls whether installing dependencies or not. `true` by default.
+ * `:pyenv_define_default_environment` - define `PYENV_ROOT` and update `PATH` to use pyenv over capistrano. `true` by default.
 
 ## Contributing
 

data/lib/capistrano-pyenv.rb

@@ -7,13 +7,17 @@ module Capistrano
     def self.extended(configuration)
       configuration.load {
         namespace(:pyenv) {
+          _cset(:pyenv_root, "$HOME/.pyenv")
           _cset(:pyenv_path) {
-            capture("echo $HOME/.pyenv").chomp()
+            # expand to actual path to use this value since pyenv may be executed by users other than `:user`.
+            capture("echo #{pyenv_root.dump}").strip
           }
+          _cset(:pyenv_bin_path) { File.join(pyenv_path, "bin") }
+          _cset(:pyenv_shims_path) { File.join(pyenv_path, "shims") }
           _cset(:pyenv_bin) {
-            File.join(pyenv_path, 'bin', 'pyenv')
+            File.join(pyenv_bin_path, "pyenv")
           }
-          _cset(:pyenv_cmd) { # to use custom pyenv_path, we use `env` instead of cap's default_environment.
+          _cset(:pyenv_cmd) {
             "env PYENV_VERSION=#{pyenv_python_version.dump} #{pyenv_bin}"
           }
           _cset(:pyenv_repository, 'git://github.com/yyuu/pyenv.git')
@@ -32,9 +36,11 @@ module Capistrano
           _cset(:pyenv_virtualenv_python_version, '2.7.3')
           _cset(:pyenv_virtualenv_options, %w(--distribute --quiet --system-site-packages))
 
+          _cset(:pyenv_install_dependencies, true)
+
           desc("Setup pyenv.")
           task(:setup, :except => { :no_release => true }) {
-            dependencies
+            dependencies if pyenv_install_dependencies
             update
             configure
             build
@@ -78,9 +84,29 @@ module Capistrano
             plugins.update
           }
 
+          def setup_default_environment
+            env = fetch(:default_environment, {}).dup
+            env["PYENV_ROOT"] = pyenv_path
+            env["PATH"] = [ pyenv_shims_path, pyenv_bin_path, env.fetch("PATH", "$PATH") ].join(":")
+            set(:default_environment, env)
+          end
+
+          _cset(:pyenv_define_default_environment, true)
+          # workaround for `multistage` of capistrano-ext.
+          # https://github.com/yyuu/capistrano-rbenv/pull/5
+          if top.namespaces.key?(:multistage)
+            after "multistage:ensure" do
+              setup_default_environment if pyenv_define_default_environment
+            end
+          else
+            on :start do
+              setup_default_environment if pyenv_define_default_environment
+            end
+          end
+
           desc("Purge pyenv.")
           task(:purge, :except => { :no_release => true }) {
-            run("rm -rf #{pyenv_path}")
+            run("rm -rf #{pyenv_path.dump}")
           }
 
           namespace(:plugins) {
@@ -118,35 +144,49 @@ module Capistrano
           _cset(:pyenv_configure_script) {
             (<<-EOS).gsub(/^\s*/, '')
               # Configured by capistrano-pyenv. Do not edit directly.
-              export PATH="#{pyenv_path}/bin:$PATH"
+              export PATH=#{[ pyenv_bin_path, "$PATH"].join(":").dump}
               eval "$(pyenv init -)"
             EOS
           }
+
+          def _update_config(script_file, file, tempfile)
+            execute = []
+            ## (1) ensure copy source file exists
+            execute << "( test -f #{file.dump} || touch #{file.dump} )"
+            ## (2) copy originao config to temporary file
+            execute << "rm -f #{tempfile.dump}" # remove tempfile to preserve permissions of original file
+            execute << "cp -fp #{file.dump} #{tempfile.dump}" 
+            ## (3) modify temporary file
+            execute << "sed -i -e '/^#{Regexp.escape(pyenv_configure_signature)}/,/^#{Regexp.escape(pyenv_configure_signature)}/d' #{tempfile.dump}"
+            execute << "echo #{pyenv_configure_signature.dump} >> #{tempfile.dump}"
+            execute << "cat #{script_file.dump} >> #{tempfile.dump}"
+            execute << "echo #{pyenv_configure_signature.dump} >> #{tempfile.dump}"
+            ## (4) update config only if it is needed
+            execute << "cp -fp #{file.dump} #{(file + ".orig").dump}"
+            execute << "( diff -u #{file.dump} #{tempfile.dump} || mv -f #{tempfile.dump} #{file.dump} )"
+            run(execute.join(" && "))
+          end
+
+          def update_config(script_file, file)
+            begin
+              tempfile = capture("mktemp /tmp/pyenv.XXXXXXXXXX").strip
+              _update_config(script_file, file, tempfile)
+            ensure
+              run("rm -f #{tempfile.dump}") rescue nil
+            end
+          end
+
           _cset(:pyenv_configure_signature, '##pyenv:configure')
           task(:configure, :except => { :no_release => true }) {
             if fetch(:pyenv_use_configure, true)
-              script = File.join('/tmp', "pyenv.#{$$}")
-              config = [ pyenv_configure_files ].flatten
-              config_map = Hash[ config.map { |f| [f, File.join('/tmp', "#{File.basename(f)}.#{$$}")] } ]
               begin
-                execute = []
-                put(pyenv_configure_script, script)
-                config_map.each { |file, temp|
-                  ## (1) copy original config to temporaly file and then modify
-                  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}"
-                  execute << "echo #{pyenv_configure_signature.dump} >> #{temp}"
-                  ## (2) update config only if it is needed
-                  execute << "cp -fp #{file} #{file}.orig"
-                  execute << "( diff -u #{file} #{temp} || mv -f #{temp} #{file} )"
-                }
-                run(execute.join(' && '))
+                script_file = capture("mktemp /tmp/pyenv.XXXXXXXXXX").strip
+                top.put(pyenv_configure_script, script_file)
+                [ pyenv_configure_files ].flatten.each do |file|
+                  update_config(script_file, file)
+                end
               ensure
-                remove = [ script ] + config_map.values
-                run("rm -f #{remove.join(' ')}") rescue nil
+                run("rm -f #{script_file.dump}") rescue nil
               end
             end
           }
@@ -219,6 +259,11 @@ module Capistrano
 
             run("#{pyenv_cmd} exec #{python} --version && #{pyenv_cmd} global #{pyenv_python_version}")
           }
+
+          # call `pyenv rehash` to update shims.
+          def rehash()
+            run("#{pyenv_cmd} rehash")
+          end
         }
       }
     end

data/lib/capistrano-pyenv/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module PyEnv
-    VERSION = "0.0.10"
+    VERSION = "0.0.11"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-pyenv
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-28 00:00:00.000000000 Z
+date: 2013-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano