move to sshkit prefixes to fix compatibility with capistrano-bundler, update rvm#7

Author: mpapis

README.md

@@ -28,11 +28,6 @@ It will automatically:
 - detect Gemfile and use `bundle exec`
 - create the gemset if not existing already
 
-**Warning**, `capistrano-bundler` was reported to break this gem,
-it is not needed, use this instead:
-
-    before 'deploy:updated', 'rvm:install:gems'
-
 ## Install RVM 1.x
 
 This task will install stable version of rvm in `$HOME/.rvm`:
@@ -65,7 +60,9 @@ it's not recommended to involve this option unless you really understand implica
 
 ## Install Gems
 
-This task will install gems from the project `Gemfile`:
+This task replaces `capistrano-bundler` gem use only one at time
+
+This will install gems from the project `Gemfile`:
 ```bash
 cap rvm1:install:gems
 ```
@@ -80,6 +77,10 @@ Right now all gems in Gemfile will be installed into gemset.
 Support for `Gemfile` installation in Rubygems is still young,
 we will improve it with new RG releases.
 
+- RG 2.0-2.1 - support for gem + version in `Gemfile`
+- RG 2.2 - limited support for `Gemfile.lock` - work still in progress,
+  test with `rvm rubygems head`
+
 ## Configuration
 
 Well if you really need to there are available ways:

lib/rvm1/tasks/capistrano3.rake

@@ -1,19 +1,17 @@
-SSHKit.config.command_map = Hash.new do |hash, key|
-  if fetch(:rvm1_map_bins).include?(key.to_s)
-    hash[key] = "#{fetch(:tmp_dir)}/#{fetch(:application)}/rvm-auto.sh #{fetch(:rvm1_ruby_version)} #{key}"
-  elsif key.to_s == "rvm"
-    hash[key] = "#{fetch(:tmp_dir)}/#{fetch(:application)}/rvm-auto.sh #{key}"
-  else
-    hash[key] = key
-  end
-end
-
 namespace :rvm1 do
   desc "Runs the RVM1 hook - use it before any custom tasks if necessary"
   task :hook do
-    unless fetch(:rvm1_hooked)
-      invoke :'rvm1:init'
-      set :rvm1_hooked, true
+    on roles(:all) do
+      execute :mkdir, "-p", "#{fetch(:tmp_dir)}/#{fetch(:application)}/"
+      upload! File.expand_path("../../../../script/rvm-auto.sh", __FILE__), "#{fetch(:tmp_dir)}/#{fetch(:application)}/rvm-auto.sh"
+      execute :chmod, "+x", "#{fetch(:tmp_dir)}/#{fetch(:application)}/rvm-auto.sh"
+    end
+
+    SSHKit.config.command_map[:rvm] = "#{fetch(:tmp_dir)}/#{fetch(:application)}/rvm-auto.sh"
+
+    rvm_prefix = "#{fetch(:tmp_dir)}/#{fetch(:application)}/rvm-auto.sh #{fetch(:rvm1_ruby_version)}"
+    fetch(:rvm1_map_bins).each do |command|
+      SSHKit.config.command_map.prefix[command.to_sym].unshift(rvm_prefix)
     end
   end
 
@@ -31,14 +29,6 @@ namespace :rvm1 do
   before :check, "deploy:updating"
   before :check, 'rvm1:hook'
 
-  task :init do
-    on roles(:all) do
-      execute :mkdir, "-p", "#{fetch(:tmp_dir)}/#{fetch(:application)}/"
-      upload! File.expand_path("../../../../script/rvm-auto.sh", __FILE__), "#{fetch(:tmp_dir)}/#{fetch(:application)}/rvm-auto.sh"
-      execute :chmod, "+x", "#{fetch(:tmp_dir)}/#{fetch(:application)}/rvm-auto.sh"
-    end
-  end
-
 end
 
 namespace :load do
@@ -48,6 +38,6 @@ namespace :load do
   end
 end
 
-namespace :deploy do
-  after :starting, 'rvm1:hook'
+Capistrano::DSL.stages.each do |stage|
+  after stage, 'rvm1:hook'
 end

rvm1-capistrano3.gemspec

@@ -15,6 +15,7 @@ Gem::Specification.new do |spec|
   spec.license     = 'Apache 2'
 
   spec.add_dependency 'capistrano', '~>3.0'
+  spec.add_dependency 'sshkit', '>=1.2'
   spec.add_development_dependency 'tf', '~>0.4.3'
 
   spec.files        = Dir.glob('{lib,script}/**/*.{rb,rake,sh}')