capistrano-rbenv 0.0.10 → 0.0.11

data/README.md

@@ -40,6 +40,8 @@ Following options are available to manage your rbenv.
  * `:rbenv_use_configure` - configure rbenv in your shell config or not. `true` by default. users who are using Chef/Puppet may prefer setting this value `false`.
  * `:rbenv_configure_files` - list of shell configuration files to be configured for rbenv. by default, guessing from user's `$SHELL` and `$HOME`.
  * `:rbenv_configure_basenames` - advanced option for `:rbenv_configure_files`. list of filename of your shell configuration files if you don't like the default value of `:rbenv_configure_files`.
+ * `:rbenv_install_dependencies` - controls whether installing dependencies or not. `true` by default.
+ * `:rbenv_define_default_environment` - define `RBENV_ROOT` and update `PATH` to use rbenv over capistrano. `true` by default.
 
 ## Contributing
 
@@ -53,6 +55,7 @@ Following options are available to manage your rbenv.
 
 - YAMASHITA Yuu (https://github.com/yyuu)
 - Geisha Tokyo Entertainment Inc. (http://www.geishatokyo.com/)
+- Nico Schottelius (http://www.nico.schottelius.org/)
 
 ## License
 

data/lib/capistrano-rbenv.rb

@@ -7,13 +7,17 @@ module Capistrano
     def self.extended(configuration)
       configuration.load {
         namespace(:rbenv) {
+          _cset(:rbenv_root, "$HOME/.rbenv")
           _cset(:rbenv_path) {
-            capture("echo $HOME/.rbenv").chomp()
+            # expand to actual path to use this value since rbenv may be executed by users other than `:user`.
+            capture("echo #{rbenv_root.dump}").strip
           }
+          _cset(:rbenv_bin_path) { File.join(rbenv_path, "bin") }
+          _cset(:rbenv_shims_path) { File.join(rbenv_path, "shims") }
           _cset(:rbenv_bin) {
-            File.join(rbenv_path, 'bin', 'rbenv')
+            File.join(rbenv_bin_path, "rbenv")
           }
-          _cset(:rbenv_cmd) { # to use custom rbenv_path, we use `env` instead of cap's default_environment.
+          _cset(:rbenv_cmd) {
             "env RBENV_VERSION=#{rbenv_ruby_version.dump} #{rbenv_bin}"
           }
           _cset(:rbenv_repository, 'git://github.com/sstephenson/rbenv.git')
@@ -33,9 +37,11 @@ module Capistrano
             rbenv_use_bundler ? "#{rbenv_cmd} exec bundle" : 'bundle'
           }
 
+          _cset(:rbenv_install_dependencies, true)
+
           desc("Setup rbenv.")
           task(:setup, :except => { :no_release => true }) {
-            dependencies
+            dependencies if rbenv_install_dependencies
             update
             configure
             build
@@ -80,9 +86,29 @@ module Capistrano
             plugins.update
           }
 
+          def setup_default_environment
+            env = fetch(:default_environment, {}).dup
+            env["RBENV_ROOT"] = rbenv_path
+            env["PATH"] = [ rbenv_shims_path, rbenv_bin_path, env.fetch("PATH", "$PATH") ].join(":")
+            set(:default_environment, env)
+          end
+
+          _cset(:rbenv_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 rbenv_define_default_environment
+            end
+          else
+            on :start do
+              setup_default_environment if rbenv_define_default_environment
+            end
+          end
+
           desc("Purge rbenv.")
           task(:purge, :except => { :no_release => true }) {
-            run("rm -rf #{rbenv_path}")
+            run("rm -rf #{rbenv_path.dump}")
           }
 
           namespace(:plugins) {
@@ -120,35 +146,49 @@ module Capistrano
           _cset(:rbenv_configure_script) {
             (<<-EOS).gsub(/^\s*/, '')
               # Configured by capistrano-rbenv. Do not edit directly.
-              export PATH="#{rbenv_path}/bin:$PATH"
+              export PATH=#{[ rbenv_bin_path, "$PATH"].join(":").dump}
               eval "$(rbenv 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(rbenv_configure_signature)}/,/^#{Regexp.escape(rbenv_configure_signature)}/d' #{tempfile.dump}"
+            execute << "echo #{rbenv_configure_signature.dump} >> #{tempfile.dump}"
+            execute << "cat #{script_file.dump} >> #{tempfile.dump}"
+            execute << "echo #{rbenv_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/rbenv.XXXXXXXXXX").strip
+              _update_config(script_file, file, tempfile)
+            ensure
+              run("rm -f #{tempfile.dump}") rescue nil
+            end
+          end
+
           _cset(:rbenv_configure_signature, '##rbenv:configure')
           task(:configure, :except => { :no_release => true }) {
             if fetch(:rbenv_use_configure, true)
-              script = File.join('/tmp', "rbenv.#{$$}")
-              config = [ rbenv_configure_files ].flatten
-              config_map = Hash[ config.map { |f| [f, File.join('/tmp', "#{File.basename(f)}.#{$$}")] } ]
               begin
-                execute = []
-                put(rbenv_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(rbenv_configure_signature)}/,/^#{Regexp.escape(rbenv_configure_signature)}/d' #{temp}"
-                  execute << "echo #{rbenv_configure_signature.dump} >> #{temp}"
-                  execute << "cat #{script} >> #{temp}"
-                  execute << "echo #{rbenv_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/rbenv.XXXXXXXXXX").strip
+                top.put(rbenv_configure_script, script_file)
+                [ rbenv_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
           }
@@ -223,6 +263,11 @@ module Capistrano
             run("unset -v GEM_HOME; #{gem} query #{q} 2>/dev/null | #{f} || #{gem} install -q #{i}")
             run("#{rbenv_cmd} rehash && #{bundle_cmd} version")
           }
+
+          # call `rbenv rehash` to update shims.
+          def rehash()
+            run("#{rbenv_cmd} rehash")
+          end
         }
       }
     end

data/lib/capistrano-rbenv/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-rbenv
 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