capistrano-rbenv 1.0.5 → 2.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f39b8c5a594ab8e97a35dcf1d70a98eacfe5357a
+  data.tar.gz: 9aa3a513e2733cc4326f668f02a0dabc9f38be28
+SHA512:
+  metadata.gz: a1a34c5d62e3631adc3c6b6996c7f7c6c4117b48a5b5f3e9a7ee8ecf03ed51dd264fa6676516e82855ea74db0604c170ec4bec489889e93d0767e990c8d87231
+  data.tar.gz: 11f77d78f691a1c32971d0efdee531af76af8bdd7c80d117f0935c1385be2c7dc11a75a61977eff9e7ba3f0707a1781719995fe3bb7a575fa5f89d6b8ebeed3c

data/.gitignore

@@ -1,17 +1,2 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
+Vagrantfile
+.vagrant/

data/CHANGELOG.md

@@ -0,0 +1,13 @@
+# 2.0.0
+
+* Added ability to setup custom `rbenv_prefix` variable.
+* prefix rails with rbenv by default
+* Switching to new command map (https://github.com/capistrano/sshkit/pull/45)
+  This gives us more flexible integration and command mapping.
+  Fixed bug when `cap some_task` didn't invoke rbenv hooks.
+
+Capistrano 3 -ready release.
+
+# 1.0.5
+
+Versions < 2.0 are located in another repo: https://github.com/yyuu/capistrano-rbenv

data/README.md

@@ -1,65 +1,44 @@
-# capistrano-rbenv
+# Capistrano::rbenv
 
-a capistrano recipe to manage rubies with [rbenv](https://github.com/sstephenson/rbenv).
+This gem provides idiomatic rbenv support for Capistrano 3.x (and 3.x
+*only*).
+
+## Please Note
+
+If you want to use this plugin with Cap 2.x, please use 1.x version of the gem.
+Source code and docs for older integration is available in [another repo](https://github.com/yyuu/capistrano-rbenv)
+
+Thanks a lot to [@yyuu](https://github.com/yyuu) for merging his gem with official one.
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
-    gem 'capistrano-rbenv'
+    gem 'capistrano', '~> 3.0'
+    gem 'capistrano-rbenv', github: "capistrano/rbenv"
 
 And then execute:
 
-    $ bundle
+    $ bundle install
 
-Or install it yourself as:
+## Usage
 
-    $ gem install capistrano-rbenv
+    # Capfile
+    require 'capistrano/rbenv'
 
-## Usage
 
-This recipe will install [rbenv](https://github.com/sstephenson/rbenv) and [ruby-build](https://github.com/sstephenson/ruby-build) during `deploy:setup` task.
-
-To setup rbenv for your application, add following in you `config/deploy.rb`.
-
-```ruby
-# config/deploy.rb
-require "capistrano-rbenv"
-set :rbenv_ruby_version, "1.9.3-p392"
-```
-
-Following options are available to manage your rbenv.
-
- * `:rbenv_branch` - the git branch to install `rbenv` from. use `master` by default.
- * `:rbenv_bundler_gem` - package name of `bundler`.
- * `:rbenv_bundler_version` -  version for `bundler` package.
- * `:rbenv_cmd` - the `rbenv` command.
- * `:rbenv_path` - the path where `rbenv` will be installed. use `$HOME/.rbenv` by default.
- * `:rbenv_plugins` - rbenv plugins to install. install `ruby-build` by default.
- * `:rbenv_repository` - repository URL of rbenv.
- * `:rbenv_ruby_dependencies` - dependency packages.
- * `:rbenv_ruby_version` - the ruby version to install. install `1.9.3-p392` by default.
- * `:rbenv_install_bundler` - controls whether installing bundler or not. `true` by default.
- * `:rbenv_install_dependencies` - controls whether installing dependencies or not. `true` if the required packages are missing.
- * `:rbenv_setup_shell` - setup rbenv in your shell config or not. `true` by default. users who are using Chef/Puppet may prefer setting this value `false`.
- * `:rbenv_setup_default_environment` - setup `RBENV_ROOT` and update `PATH` to use rbenv over capistrano. `true` by default.
- * `: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`.
+    # config/deploy.rb
+    set :rbenv_type, :user # or :system, depends on your rbenv setup
+    set :rbenv_ruby, '2.0.0-p247'
+    set :rbenv_prefix, "RBENV_ROOT=#{fetch(:rbenv_path)} RBENV_VERSION=#{fetch(:rbenv_ruby)} #{fetch(:rbenv_path)}/bin/rbenv exec"
+    set :rbenv_map_bins, %w{rake gem bundle ruby rails}
+
+If your rbenv is located in some custom path, you can use `rbenv_custom_path` to set it.
 
 ## Contributing
 
 1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Added some feature'`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
-
-## Author
-
-- YAMASHITA Yuu (https://github.com/yyuu)
-- Geisha Tokyo Entertainment Inc. (http://www.geishatokyo.com/)
-- Nico Schottelius (http://www.nico.schottelius.org/)
-
-## License
-
-MIT

data/Rakefile

@@ -1,2 +1 @@
-#!/usr/bin/env rake
 require "bundler/gem_tasks"

data/capistrano-rbenv.gemspec

@@ -1,20 +1,21 @@
 # -*- encoding: utf-8 -*-
-require File.expand_path('../lib/capistrano-rbenv/version', __FILE__)
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Yamashita Yuu"]
-  gem.email         = ["yamashita@geishatokyo.com"]
-  gem.description   = %q{a capistrano recipe to manage rubies with rbenv.}
-  gem.summary       = %q{a capistrano recipe to manage rubies with rbenv.}
-  gem.homepage      = "https://github.com/yyuu/capistrano-rbenv"
+  gem.name          = "capistrano-rbenv"
+  gem.version       = '2.0.0'
+  gem.authors       = ["Kir Shatrov", "Yamashita Yuu"]
+  gem.email         = ["shatrov@me.com", "yamashita@geishatokyo.com"]
+  gem.description   = %q{rbenv integration for Capistrano}
+  gem.summary       = %q{rbenv integration for Capistrano}
+  gem.homepage      = "https://github.com/capistrano/rbenv"
 
-  gem.files         = `git ls-files`.split($\)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.files         = `git ls-files`.split($/)
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.name          = "capistrano-rbenv"
   gem.require_paths = ["lib"]
-  gem.version       = Capistrano::RbEnv::VERSION
 
-  gem.add_dependency("capistrano", "< 3")
-  gem.add_dependency("capistrano-platform-resources", ">= 0.1.3")
+  gem.add_dependency 'capistrano', '~> 3.0'
+  gem.add_dependency 'sshkit', '~> 1.2.0'
+
 end

data/lib/capistrano-rbenv.rb

@@ -1,378 +0,0 @@
-require "capistrano-rbenv/version"
-require "capistrano/configuration"
-require "capistrano/configuration/resources/platform_resources"
-require "capistrano/recipes/deploy/scm"
-
-module Capistrano
-  module RbEnv
-    def self.extended(configuration)
-      configuration.load {
-        namespace(:rbenv) {
-          _cset(:rbenv_root, "$HOME/.rbenv")
-          _cset(:rbenv_path) {
-            # expand to actual path 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_bin_path, "rbenv")
-          }
-          def rbenv_command(options={})
-            environment = _merge_environment(rbenv_environment, options.fetch(:env, {}))
-            environment["RBENV_VERSION"] = options[:version] if options.key?(:version)
-            if environment.empty?
-              rbenv_bin
-            else
-              env = (["env"] + environment.map { |k, v| "#{k}=#{v.dump}" }).join(" ")
-              "#{env} #{rbenv_bin}"
-            end
-          end
-          _cset(:rbenv_cmd) { rbenv_command(:version => rbenv_ruby_version) } # this declares RBENV_VERSION.
-          _cset(:rbenv_environment) {{
-            "RBENV_ROOT" => rbenv_path,
-            "PATH" => [ rbenv_shims_path, rbenv_bin_path, "$PATH" ].join(":"),
-          }}
-          _cset(:rbenv_repository, 'git://github.com/sstephenson/rbenv.git')
-          _cset(:rbenv_branch, 'master')
-
-          _cset(:rbenv_plugins) {{
-            "ruby-build" => { :repository => "git://github.com/sstephenson/ruby-build.git", :branch => "master" },
-          }}
-          _cset(:rbenv_plugins_options, {}) # for backward compatibility. plugin options can be configured from :rbenv_plugins.
-          _cset(:rbenv_plugins_path) {
-            File.join(rbenv_path, 'plugins')
-          }
-          _cset(:rbenv_ruby_version, "1.9.3-p392")
-
-          _cset(:rbenv_install_bundler) {
-            if exists?(:rbenv_use_bundler)
-              logger.info(":rbenv_use_bundler has been deprecated. use :rbenv_install_bundler instead.")
-              fetch(:rbenv_use_bundler, true)
-            else
-              true
-            end
-          }
-          set(:bundle_cmd) { # override bundle_cmd in "bundler/capistrano"
-            rbenv_install_bundler ? "#{rbenv_cmd} exec bundle" : "bundle"
-          }
-
-          _cset(:rbenv_install_dependencies) {
-            if rbenv_ruby_dependencies.empty?
-              false
-            else
-              not(platform.packages.installed?(rbenv_ruby_dependencies))
-            end
-          }
-
-          desc("Setup rbenv.")
-          task(:setup, :except => { :no_release => true }) {
-            #
-            # skip installation if the requested version has been installed.
-            #
-            reset!(:rbenv_ruby_versions)
-            begin
-              installed = rbenv_ruby_versions.include?(rbenv_ruby_version)
-            rescue
-              installed = false
-            end
-            _setup unless installed
-            configure if rbenv_setup_shell
-            rbenv.global(rbenv_ruby_version) if fetch(:rbenv_setup_global_version, true)
-            setup_bundler if rbenv_install_bundler
-          }
-          after "deploy:setup", "rbenv:setup"
-
-          task(:_setup, :except => { :no_release => true }) {
-            dependencies if rbenv_install_dependencies
-            update
-            build
-          }
-
-          def _update_repository(destination, options={})
-            configuration = Capistrano::Configuration.new()
-            options = {
-              :source => proc { Capistrano::Deploy::SCM.new(configuration[:scm], configuration) },
-              :revision => proc { configuration[:source].head },
-              :real_revision => proc {
-                configuration[:source].local.query_revision(configuration[:revision]) { |cmd| with_env("LC_ALL", "C") { run_locally(cmd) } }
-              },
-            }.merge(options)
-            variables.merge(options).each do |key, val|
-              configuration.set(key, val)
-            end
-            source = configuration[:source]
-            revision = configuration[:real_revision]
-            #
-            # we cannot use source.sync since it cleans up untacked files in the repository.
-            # currently we are just calling git sub-commands directly to avoid the problems.
-            #
-            verbose = configuration[:scm_verbose] ? nil : "-q"
-            run((<<-EOS).gsub(/\s+/, ' ').strip)
-              if [ -d #{destination} ]; then
-                cd #{destination} &&
-                #{source.command} fetch #{verbose} #{source.origin} &&
-                #{source.command} fetch --tags #{verbose} #{source.origin} &&
-                #{source.command} reset #{verbose} --hard #{revision};
-              else
-                #{source.checkout(revision, destination)};
-              fi
-            EOS
-          end
-
-          desc("Update rbenv installation.")
-          task(:update, :except => { :no_release => true }) {
-            _update_repository(rbenv_path, :scm => :git, :repository => rbenv_repository, :branch => rbenv_branch)
-            plugins.update
-          }
-
-          _cset(:rbenv_setup_default_environment) {
-            if exists?(:rbenv_define_default_environment)
-              logger.info(":rbenv_define_default_environment has been deprecated. use :rbenv_setup_default_environment instead.")
-              fetch(:rbenv_define_default_environment, true)
-            else
-              true
-            end
-          }
-          # workaround for loading `capistrano-rbenv` later than `capistrano/ext/multistage`.
-          # https://github.com/yyuu/capistrano-rbenv/pull/5
-          if top.namespaces.key?(:multistage)
-            after "multistage:ensure", "rbenv:setup_default_environment"
-          else
-            on :load do
-              if top.namespaces.key?(:multistage)
-                # workaround for loading `capistrano-rbenv` earlier than `capistrano/ext/multistage`.
-                # https://github.com/yyuu/capistrano-rbenv/issues/7
-                after "multistage:ensure", "rbenv:setup_default_environment"
-              else
-                setup_default_environment
-              end
-            end
-          end
-
-          _cset(:rbenv_environment_join_keys, %w(DYLD_LIBRARY_PATH LD_LIBRARY_PATH MANPATH PATH))
-          def _merge_environment(x, y)
-            x.merge(y) { |key, x_val, y_val|
-              if rbenv_environment_join_keys.include?(key)
-                ( y_val.split(":") + x_val.split(":") ).uniq.join(":")
-              else
-                y_val
-              end
-            }
-          end
-
-          task(:setup_default_environment, :except => { :no_release => true }) {
-            if rbenv_setup_default_environment
-              set(:default_environment, _merge_environment(default_environment, rbenv_environment))
-            end
-          }
-
-          desc("Purge rbenv.")
-          task(:purge, :except => { :no_release => true }) {
-            run("rm -rf #{rbenv_path.dump}")
-          }
-
-          namespace(:plugins) {
-            desc("Update rbenv plugins.")
-            task(:update, :except => { :no_release => true }) {
-              rbenv_plugins.each do |name, repository|
-                # for backward compatibility, obtain plugin options from :rbenv_plugins_options first
-                options = rbenv_plugins_options.fetch(name, {})
-                options = options.merge(Hash === repository ? repository : {:repository => repository})
-                _update_repository(File.join(rbenv_plugins_path, name), options.merge(:scm => :git))
-              end
-            }
-          }
-
-          _cset(:rbenv_configure_home) { capture("echo $HOME").chomp }
-          _cset(:rbenv_configure_shell) { capture("echo $SHELL").chomp }
-          _cset(:rbenv_configure_files) {
-            if fetch(:rbenv_configure_basenames, nil)
-              [ rbenv_configure_basenames ].flatten.map { |basename|
-                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/
-                [ capture("test -f #{profile.dump} && echo #{profile.dump} || echo #{bash_profile.dump}").chomp ]
-              when /zsh/
-                [ File.join(rbenv_configure_home, '.zshenv') ]
-              else # other sh compatible shell such like dash
-                [ profile ]
-              end
-            end
-          }
-          _cset(:rbenv_configure_script) {
-            (<<-EOS).gsub(/^\s*/, '')
-              # Configured by capistrano-rbenv. Do not edit directly.
-              export PATH=#{[ rbenv_bin_path, "$PATH"].join(":").dump}
-              eval "$(rbenv init -)"
-            EOS
-          }
-
-          def _do_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
-              _do_update_config(script_file, file, tempfile)
-            ensure
-              run("rm -f #{tempfile.dump}") rescue nil
-            end
-          end
-
-          _cset(:rbenv_setup_shell) {
-            if exists?(:rbenv_use_configure)
-              logger.info(":rbenv_use_configure has been deprecated. please use :rbenv_setup_shell instead.")
-              fetch(:rbenv_use_configure, true)
-            else
-              true
-            end
-          }
-          _cset(:rbenv_configure_signature, '##rbenv:configure')
-          task(:configure, :except => { :no_release => true }) {
-            begin
-              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
-              run("rm -f #{script_file.dump}") rescue nil
-            end
-          }
-
-          _cset(:rbenv_platform) { fetch(:platform_identifier) }
-          _cset(:rbenv_ruby_dependencies) {
-            case rbenv_platform.to_sym
-            when :debian, :ubuntu
-              %w(git-core build-essential libreadline6-dev zlib1g-dev libssl-dev bison)
-            when :redhat, :fedora, :centos, :amazon, :amazonami
-              %w(git-core autoconf gcc-c++ glibc-devel patch readline readline-devel zlib zlib-devel openssl openssl-devel bison)
-            else
-              []
-            end
-          }
-          task(:dependencies, :except => { :no_release => true }) {
-            platform.packages.install(rbenv_ruby_dependencies)
-          }
-
-          _cset(:rbenv_ruby_versions) { rbenv.versions }
-          desc("Build ruby within rbenv.")
-          task(:build, :except => { :no_release => true }) {
-#           reset!(:rbenv_ruby_versions)
-            ruby = fetch(:rbenv_ruby_cmd, "ruby")
-            if rbenv_ruby_version != "system" and not rbenv_ruby_versions.include?(rbenv_ruby_version)
-              rbenv.install(rbenv_ruby_version)
-            end
-            rbenv.exec("#{ruby} --version") # check if ruby is executable
-          }
-
-          _cset(:rbenv_bundler_gem, 'bundler')
-          task(:setup_bundler, :except => { :no_release => true }) {
-            gem = "#{rbenv_cmd} exec gem"
-            if version = fetch(:rbenv_bundler_version, nil)
-              query_args = "-i -n #{rbenv_bundler_gem.dump} -v #{version.dump}"
-              install_args = "-v #{version.dump} #{rbenv_bundler_gem.dump}"
-            else
-              query_args = "-i -n #{rbenv_bundler_gem.dump}"
-              install_args = "#{rbenv_bundler_gem.dump}"
-            end
-            run("unset -v GEM_HOME; #{gem} query #{query_args} 2>/dev/null || #{gem} install -q #{install_args}")
-            rbenv.rehash
-            run("#{bundle_cmd} version")
-          }
-
-          # call `rbenv rehash` to update shims.
-          def rehash(options={})
-            invoke_command("#{rbenv_command} rehash", options)
-          end
-
-          def global(version, options={})
-            invoke_command("#{rbenv_command} global #{version.dump}", options)
-          end
-
-          def invoke_command_with_path(cmdline, options={})
-            path = options.delete(:path)
-            if path
-              chdir = "cd #{path.dump}"
-              via = options.delete(:via)
-              # as of Capistrano 2.14.2, `sudo()` cannot handle multiple command correctly.
-              if via == :sudo
-                invoke_command("#{chdir} && #{sudo} #{cmdline}", options)
-              else
-                invoke_command("#{chdir} && #{cmdline}", options.merge(:via => via))
-              end
-            else
-              invoke_command(cmdline, options)
-            end
-          end
-
-          def local(version, options={})
-            invoke_command_with_path("#{rbenv_command} local #{version.dump}", options)
-          end
-
-          def which(command, options={})
-            version = ( options.delete(:version) || rbenv_ruby_version )
-            invoke_command_with_path("#{rbenv_command(:version => version)} which #{command.dump}", options)
-          end
-
-          def exec(command, options={})
-            # users of rbenv.exec must sanitize their command line.
-            version = ( options.delete(:version) || rbenv_ruby_version )
-            invoke_command_with_path("#{rbenv_command(:version => version)} exec #{command}", options)
-          end
-
-          def versions(options={})
-            capture("#{rbenv_command} versions --bare", options).split(/(?:\r?\n)+/)
-          end
-
-          def available_versions(options={})
-            capture("#{rbenv_command} install --complete", options).split(/(?:\r?\n)+/)
-          end
-
-          _cset(:rbenv_install_ruby_threads) {
-            capture("cat /proc/cpuinfo | cut -f1 | grep processor | wc -l").to_i rescue 1
-          }
-          # create build processes as many as processor count
-          _cset(:rbenv_make_options) { "-j #{rbenv_install_ruby_threads}" }
-          _cset(:rbenv_configure_options, nil)
-          def install(version, options={})
-            environment = {}
-            environment["CONFIGURE_OPTS"] = rbenv_configure_options.to_s if rbenv_configure_options
-            environment["MAKE_OPTS"] = rbenv_make_options.to_s if rbenv_make_options
-            invoke_command("#{rbenv_command(:env => environment)} install #{version.dump}", options)
-          end
-
-          def uninstall(version, options={})
-            invoke_command("#{rbenv_command} uninstall -f #{version.dump}", options)
-          end
-        }
-      }
-    end
-  end
-end
-
-if Capistrano::Configuration.instance
-  Capistrano::Configuration.instance.extend(Capistrano::RbEnv)
-end
-
-# vim:set ft=ruby ts=2 sw=2 :

data/lib/capistrano/rbenv.rb

@@ -0,0 +1 @@
+load File.expand_path("../tasks/rbenv.rake", __FILE__)

data/lib/capistrano/tasks/rbenv.rake

@@ -0,0 +1,46 @@
+namespace :rbenv do
+  task :validate do
+    on roles(:all) do
+      rbenv_ruby = fetch(:rbenv_ruby)
+      if rbenv_ruby.nil?
+        error "rbenv: rbenv_ruby is not set"
+        exit 1
+      end
+
+      if test "[ ! -d #{fetch(:rbenv_ruby_dir)} ]"
+        error "rbenv: #{rbenv_ruby} is not installed or not found in #{fetch(:rbenv_ruby_dir)}"
+        exit 1
+      end
+    end
+  end
+
+  task :map_bins do
+    rbenv_prefix = fetch(:rbenv_prefix, proc { "RBENV_ROOT=#{fetch(:rbenv_path)} RBENV_VERSION=#{fetch(:rbenv_ruby)} #{fetch(:rbenv_path)}/bin/rbenv exec" })
+    SSHKit.config.command_map[:rbenv] = "#{fetch(:rbenv_path)}/bin/rbenv"
+
+    fetch(:rbenv_map_bins).each do |command|
+      SSHKit.config.command_map.prefix[command.to_sym].unshift(rbenv_prefix)
+    end
+  end
+end
+
+Capistrano::DSL.stages.each do |stage|
+  after stage, 'rbenv:validate'
+  after stage, 'rbenv:map_bins'
+end
+
+namespace :load do
+  task :defaults do
+    set :rbenv_path, -> {
+      rbenv_path = fetch(:rbenv_custom_path)
+      rbenv_path ||= if fetch(:rbenv_type, :user) == :system
+        "/usr/local/rbenv"
+      else
+        "~/.rbenv"
+      end
+    }
+
+    set :rbenv_ruby_dir, -> { "#{fetch(:rbenv_path)}/versions/#{fetch(:rbenv_ruby)}" }
+    set :rbenv_map_bins, %w{rake gem bundle ruby rails}
+  end
+end

metadata

@@ -1,108 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-rbenv
 version: !ruby/object:Gem::Version
-  version: 1.0.5
-  prerelease: 
+  version: 2.0.0
 platform: ruby
 authors:
+- Kir Shatrov
 - Yamashita Yuu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-09 00:00:00.000000000 Z
+date: 2013-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: capistrano-platform-resources
+  name: sshkit
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.3
-description: a capistrano recipe to manage rubies with rbenv.
+        version: 1.2.0
+description: rbenv integration for Capistrano
 email:
+- shatrov@me.com
 - yamashita@geishatokyo.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- CHANGES.md
+- CHANGELOG.md
 - Gemfile
-- LICENSE
 - README.md
 - Rakefile
 - capistrano-rbenv.gemspec
 - lib/capistrano-rbenv.rb
-- lib/capistrano-rbenv/version.rb
-- test/centos6-64/.gitignore
-- test/centos6-64/Capfile
-- test/centos6-64/Gemfile
-- test/centos6-64/Vagrantfile
-- test/centos6-64/run.sh
-- test/config/deploy.rb
-- test/precise64/.gitignore
-- test/precise64/Capfile
-- test/precise64/Gemfile
-- test/precise64/Vagrantfile
-- test/precise64/run.sh
-homepage: https://github.com/yyuu/capistrano-rbenv
+- lib/capistrano/rbenv.rb
+- lib/capistrano/tasks/rbenv.rake
+homepage: https://github.com/capistrano/rbenv
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
-summary: a capistrano recipe to manage rubies with rbenv.
-test_files:
-- test/centos6-64/.gitignore
-- test/centos6-64/Capfile
-- test/centos6-64/Gemfile
-- test/centos6-64/Vagrantfile
-- test/centos6-64/run.sh
-- test/config/deploy.rb
-- test/precise64/.gitignore
-- test/precise64/Capfile
-- test/precise64/Gemfile
-- test/precise64/Vagrantfile
-- test/precise64/run.sh
+specification_version: 4
+summary: rbenv integration for Capistrano
+test_files: []
+has_rdoc: 

data/CHANGES.md

@@ -1,34 +0,0 @@
-v1.0.0 (Yamashita, Yuu)
-
-* Rename some of options
-  * `:rbnev_use_bundler` -> `:rbenv_install_bundler`
-  * `:rbenv_use_configure` -> `:rbenv_setup_shell`
-  * `:rbenv_define_default_environment` -> `:rbenv_setup_default_environment`
-* Update default ruby version (1.9.3-p327 -> 1.9.3p392)
-* Add rbenv convenience methods such like `rbenv.global()` and `rbenv.exec()`.
-* Add `:rbenv_make_options` and `:rbenv_configure_options` to control `ruby-build`. By default, create `make` jobs as much as processor count.
-
-v1.0.1 (Yamashita, Yuu)
-
-* Use [capistrano-platform-resources](https://github.com/yyuu/capistrano-platform-resources) to manage platform packages.
-* Add `rbenv:setup_default_environment` task.
-* Join `PATH` variables with ':' on generating `:default_environment` to respect pre-defined values.
-* Fix a problem during invoking rbenv via sudo with path.
-
-v1.0.2 (Yamashita, Yuu)
-
-* Set up `:default_environment` after the loading of the recipes, not after the task start up.
-* Fix a problem on generating `:default_environment`.
-
-v1.0.3 (Yamashita, Yuu)
-
-* Add support for extra flavors of RedHat.
-* Remove useless gem dependencies.
-
-v1.0.4 (Yamashita, Yuu)
-
-* Fixed support for Amazon Linux. Thanks [@tk0miya](https://github.com/tk0miya).
-
-v1.0.5 (Yamashita, Yuu)
-
-* Install OpenSSL headers on RedHat. Thanks [@tk0miya](https://github.com/tk0miya).

data/LICENSE

@@ -1,22 +0,0 @@
-Copyright (c) 2012 Yamashita Yuu
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/capistrano-rbenv/version.rb

@@ -1,5 +0,0 @@
-module Capistrano
-  module RbEnv
-    VERSION = "1.0.5"
-  end
-end

data/test/centos6-64/.gitignore

@@ -1,5 +0,0 @@
-/.bundle
-/.vagrant*
-/known_hosts
-/tmp
-/vendor

data/test/centos6-64/Capfile

@@ -1,2 +0,0 @@
-load "deploy"
-load "../config/deploy"

data/test/centos6-64/Gemfile

@@ -1,2 +0,0 @@
-source "https://rubygems.org"
-gemspec(:path => "../..")

data/test/centos6-64/Vagrantfile

@@ -1,99 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-Vagrant::Config.run do |config|
-  # All Vagrant configuration is done here. The most common configuration
-  # options are documented and commented below. For a complete reference,
-  # please see the online documentation at vagrantup.com.
-
-  # Every Vagrant virtual environment requires a box to build off of.
-  config.vm.box = "centos6-64"
-
-  # The url from where the 'config.vm.box' box will be fetched if it
-  # doesn't already exist on the user's system.
-  config.vm.box_url = "http://developer.nrel.gov/downloads/vagrant-boxes/CentOS-6.3-x86_64-v20130101.box"
-
-  # Boot with a GUI so you can see the screen. (Default is headless)
-  # config.vm.boot_mode = :gui
-
-  # Assign this VM to a host-only network IP, allowing you to access it
-  # via the IP. Host-only networks can talk to the host machine as well as
-  # any other machines on the same network, but cannot be accessed (through this
-  # network interface) by any external networks.
-  config.vm.network :hostonly, "192.168.33.10"
-
-  # Assign this VM to a bridged network, allowing you to connect directly to a
-  # network using the host's network device. This makes the VM appear as another
-  # physical device on your network.
-  # config.vm.network :bridged
-
-  # Forward a port from the guest to the host, which allows for outside
-  # computers to access the VM, whereas host only networking does not.
-  # config.vm.forward_port 80, 8080
-
-  # Share an additional folder to the guest VM. The first argument is
-  # an identifier, the second is the path on the guest to mount the
-  # folder, and the third is the path on the host to the actual folder.
-  # config.vm.share_folder "v-data", "/vagrant_data", "../data"
-
-  # Enable provisioning with Puppet stand alone.  Puppet manifests
-  # are contained in a directory path relative to this Vagrantfile.
-  # You will need to create the manifests directory and a manifest in
-  # the file precise-amd64.pp in the manifests_path directory.
-  #
-  # An example Puppet manifest to provision the message of the day:
-  #
-  # # group { "puppet":
-  # #   ensure => "present",
-  # # }
-  # #
-  # # File { owner => 0, group => 0, mode => 0644 }
-  # #
-  # # file { '/etc/motd':
-  # #   content => "Welcome to your Vagrant-built virtual machine!
-  # #               Managed by Puppet.\n"
-  # # }
-  #
-  # config.vm.provision :puppet do |puppet|
-  #   puppet.manifests_path = "manifests"
-  #   puppet.manifest_file  = "precise-amd64.pp"
-  # end
-
-  # Enable provisioning with chef solo, specifying a cookbooks path, roles
-  # path, and data_bags path (all relative to this Vagrantfile), and adding 
-  # some recipes and/or roles.
-  #
-  # config.vm.provision :chef_solo do |chef|
-  #   chef.cookbooks_path = "../my-recipes/cookbooks"
-  #   chef.roles_path = "../my-recipes/roles"
-  #   chef.data_bags_path = "../my-recipes/data_bags"
-  #   chef.add_recipe "mysql"
-  #   chef.add_role "web"
-  #
-  #   # You may also specify custom JSON attributes:
-  #   chef.json = { :mysql_password => "foo" }
-  # end
-
-  # Enable provisioning with chef server, specifying the chef server URL,
-  # and the path to the validation key (relative to this Vagrantfile).
-  #
-  # The Opscode Platform uses HTTPS. Substitute your organization for
-  # ORGNAME in the URL and validation key.
-  #
-  # If you have your own Chef Server, use the appropriate URL, which may be
-  # HTTP instead of HTTPS depending on your configuration. Also change the
-  # validation key to validation.pem.
-  #
-  # config.vm.provision :chef_client do |chef|
-  #   chef.chef_server_url = "https://api.opscode.com/organizations/ORGNAME"
-  #   chef.validation_key_path = "ORGNAME-validator.pem"
-  # end
-  #
-  # If you're using the Opscode platform, your validator client is
-  # ORGNAME-validator, replacing ORGNAME with your organization name.
-  #
-  # IF you have your own Chef Server, the default validation client name is
-  # chef-validator, unless you changed the configuration.
-  #
-  #   chef.validation_client_name = "ORGNAME-validator"
-end

data/test/centos6-64/run.sh

@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-vagrant up
-bundle exec cap test_all
-vagrant halt
-
-# vim:set ft=sh :

data/test/config/deploy.rb

@@ -1,136 +0,0 @@
-set :application, "capistrano-rbenv"
-set :repository,  "."
-set :deploy_to do
-  File.join("/home", user, application)
-end
-set :deploy_via, :copy
-set :scm, :none
-set :use_sudo, false
-set :user, "vagrant"
-set :password, "vagrant"
-set :ssh_options, {
-  :auth_methods => %w(publickey password),
-  :keys => File.join(ENV["HOME"], ".vagrant.d", "insecure_private_key"),
-  :user_known_hosts_file => "/dev/null"
-}
-
-role :web, "192.168.33.10"
-role :app, "192.168.33.10"
-role :db,  "192.168.33.10", :primary => true
-
-$LOAD_PATH.push(File.expand_path("../../lib", File.dirname(__FILE__)))
-require "capistrano-rbenv"
-
-task(:test_all) {
-  find_and_execute_task("test_default")
-  find_and_execute_task("test_without_global")
-}
-
-namespace(:test_default) {
-  task(:default) {
-    methods.grep(/^test_/).each do |m|
-      send(m)
-    end
-  }
-  before "test_default", "test_default:setup"
-  after "test_default", "test_default:teardown"
-
-  task(:setup) {
-    find_and_execute_task("rbenv:setup")
-  }
-
-  task(:teardown) {
-  }
-
-  task(:test_rbenv) {
-    run("rbenv --version")
-  }
-
-## standard
-  task(:test_rbenv_exec) {
-    rbenv.exec("ruby --version")
-  }
-
-  task(:test_run_rbenv_exec) {
-    run("rbenv exec ruby --version")
-  }
-
-## with path
-  task(:test_rbenv_exec_with_path) {
-    rbenv.exec("ruby -e 'exit(Dir.pwd==%{/}?0:1)'", :path => "/")
-  }
-
-  task(:test_rbenv_exec_ruby_via_sudo_with_path) {
-    # capistrano does not provide safer way to invoke multiple commands via sudo.
-    rbenv.exec("ruby -e 'exit(Dir.pwd==%{/}&&Process.uid==0?0:1)'", :path => "/", :via => :sudo )
-  }
-
-## via sudo
-  task(:test_rbenv_exec_via_sudo) {
-    rbenv.exec("ruby -e 'exit(Process.uid==0?0:1)'", :via => :sudo)
-  }
-
-  task(:test_run_sudo_rbenv_exec) {
-    # we may not be able to invoke rbenv since sudo may reset $PATH.
-    # if you prefer to invoke rbenv via sudo, call it with absolute path.
-#   run("#{sudo} rbenv exec ruby -e 'exit(Process.uid==0?0:1)'")
-    run("#{sudo} #{rbenv_cmd} exec ruby -e 'exit(Process.uid==0?0:1)'")
-  }
-
-  task(:test_sudo_rbenv_exec) {
-    sudo("#{rbenv_cmd} exec ruby -e 'exit(Process.uid==0?0:1)'")
-  }
-
-## bundler
-  task(:test_run_bundle) {
-    run("#{bundle_cmd} version")
-  }
-
-  task(:test_run_sudo_bundle) {
-    run("#{sudo} #{bundle_cmd} version")
-  }
-
-  task(:test_sudo_bundle) {
-    sudo("#{bundle_cmd} version")
-  }
-}
-
-namespace(:test_without_global) {
-  task(:default) {
-    methods.grep(/^test_/).each do |m|
-      send(m)
-    end
-  }
-  before "test_without_global", "test_without_global:setup"
-  after "test_without_global", "test_without_global:teardown"
-
-  task(:setup) {
-    version_file = File.join(rbenv_path, "version")
-    run("mv -f #{version_file} #{version_file}.orig")
-    set(:rbenv_setup_global_version, false)
-    find_and_execute_task("rbenv:setup")
-    run("test \! -f #{version_file.dump}")
-  }
-
-  task(:teardown) {
-    version_file = File.join(rbenv_path, "version")
-    run("mv -f #{version_file}.orig #{version_file}")
-  }
-
-## standard
-  task(:test_rbenv_exec_ruby) {
-    rbenv.exec("ruby --version")
-  }
-
-## with path
-  task(:test_rbenv_exec_ruby_with_path) {
-    rbenv.exec("ruby -e 'exit(Dir.pwd==%{/}?0:1)'", :path => "/")
-  }
-
-## via sudo
-  task(:test_rbenv_exec_ruby_via_sudo) {
-    rbenv.exec("ruby -e 'exit(Process.uid==0?0:1)'", :via => :sudo)
-  }
-}
-
-# vim:set ft=ruby sw=2 ts=2 :

data/test/precise64/.gitignore

@@ -1,5 +0,0 @@
-/.bundle
-/.vagrant*
-/known_hosts
-/tmp
-/vendor

data/test/precise64/Capfile

@@ -1,2 +0,0 @@
-load "deploy"
-load "../config/deploy"

data/test/precise64/Gemfile

@@ -1,2 +0,0 @@
-source "https://rubygems.org"
-gemspec(:path => "../..")

data/test/precise64/Vagrantfile

@@ -1,99 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-Vagrant::Config.run do |config|
-  # All Vagrant configuration is done here. The most common configuration
-  # options are documented and commented below. For a complete reference,
-  # please see the online documentation at vagrantup.com.
-
-  # Every Vagrant virtual environment requires a box to build off of.
-  config.vm.box = "precise64"
-
-  # The url from where the 'config.vm.box' box will be fetched if it
-  # doesn't already exist on the user's system.
-  config.vm.box_url = "http://files.vagrantup.com/precise64.box"
-
-  # Boot with a GUI so you can see the screen. (Default is headless)
-  # config.vm.boot_mode = :gui
-
-  # Assign this VM to a host-only network IP, allowing you to access it
-  # via the IP. Host-only networks can talk to the host machine as well as
-  # any other machines on the same network, but cannot be accessed (through this
-  # network interface) by any external networks.
-  config.vm.network :hostonly, "192.168.33.10"
-
-  # Assign this VM to a bridged network, allowing you to connect directly to a
-  # network using the host's network device. This makes the VM appear as another
-  # physical device on your network.
-  # config.vm.network :bridged
-
-  # Forward a port from the guest to the host, which allows for outside
-  # computers to access the VM, whereas host only networking does not.
-  # config.vm.forward_port 80, 8080
-
-  # Share an additional folder to the guest VM. The first argument is
-  # an identifier, the second is the path on the guest to mount the
-  # folder, and the third is the path on the host to the actual folder.
-  # config.vm.share_folder "v-data", "/vagrant_data", "../data"
-
-  # Enable provisioning with Puppet stand alone.  Puppet manifests
-  # are contained in a directory path relative to this Vagrantfile.
-  # You will need to create the manifests directory and a manifest in
-  # the file precise-amd64.pp in the manifests_path directory.
-  #
-  # An example Puppet manifest to provision the message of the day:
-  #
-  # # group { "puppet":
-  # #   ensure => "present",
-  # # }
-  # #
-  # # File { owner => 0, group => 0, mode => 0644 }
-  # #
-  # # file { '/etc/motd':
-  # #   content => "Welcome to your Vagrant-built virtual machine!
-  # #               Managed by Puppet.\n"
-  # # }
-  #
-  # config.vm.provision :puppet do |puppet|
-  #   puppet.manifests_path = "manifests"
-  #   puppet.manifest_file  = "precise-amd64.pp"
-  # end
-
-  # Enable provisioning with chef solo, specifying a cookbooks path, roles
-  # path, and data_bags path (all relative to this Vagrantfile), and adding 
-  # some recipes and/or roles.
-  #
-  # config.vm.provision :chef_solo do |chef|
-  #   chef.cookbooks_path = "../my-recipes/cookbooks"
-  #   chef.roles_path = "../my-recipes/roles"
-  #   chef.data_bags_path = "../my-recipes/data_bags"
-  #   chef.add_recipe "mysql"
-  #   chef.add_role "web"
-  #
-  #   # You may also specify custom JSON attributes:
-  #   chef.json = { :mysql_password => "foo" }
-  # end
-
-  # Enable provisioning with chef server, specifying the chef server URL,
-  # and the path to the validation key (relative to this Vagrantfile).
-  #
-  # The Opscode Platform uses HTTPS. Substitute your organization for
-  # ORGNAME in the URL and validation key.
-  #
-  # If you have your own Chef Server, use the appropriate URL, which may be
-  # HTTP instead of HTTPS depending on your configuration. Also change the
-  # validation key to validation.pem.
-  #
-  # config.vm.provision :chef_client do |chef|
-  #   chef.chef_server_url = "https://api.opscode.com/organizations/ORGNAME"
-  #   chef.validation_key_path = "ORGNAME-validator.pem"
-  # end
-  #
-  # If you're using the Opscode platform, your validator client is
-  # ORGNAME-validator, replacing ORGNAME with your organization name.
-  #
-  # IF you have your own Chef Server, the default validation client name is
-  # chef-validator, unless you changed the configuration.
-  #
-  #   chef.validation_client_name = "ORGNAME-validator"
-end

data/test/precise64/run.sh

@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-vagrant up
-bundle exec cap test_all
-vagrant halt
-
-# vim:set ft=sh :