rvm1-capistrano3 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  metadata.gz: 1602b624aabc15402fff15cbe48c5debf0579e89
-  data.tar.gz: c649c754fb280fa7b784d6168bf75df9625861e5
+  metadata.gz: 670e99768ad754ae35e22ffeaaa3ad56f4befeab
+  data.tar.gz: 97908cf786d1a6d19a64613e37def3a26593f9db
 SHA512: 
-  metadata.gz: 46a5f4460875bf47947af2c3fa844005f29fdfd7ae7d4f45f0b16962d1e73b079bd9b506ee8120659a37e49f9632166a3a8d7e04c5e7c86371c1e8df7d546e53
-  data.tar.gz: 63057d626f9af19996c5a216ef0953551467f54955f397c134ae6d2a554a0188ddd81595d13eb886f709e16d896c3a6ad5548fc33056a37bfdf7f575321befa0
+  metadata.gz: 5562e2415edde30d0b603b270480fb6e2c70ce5879424dfc2553bce7bc53e00f63886aaad11115b23fe74650543a7c2d007f71766b84bfc45fb30cd708971d9c
+  data.tar.gz: abf20cd8f52de75aeca0060e4b0c9020996154d092ea32616cd205ba62b46a54ee47ff2d1119a6b5611bcf4a61b4ffaa075f2fdd391707dfca4d9c98a9398187

data/lib/rvm1/capistrano3/version.rb

@@ -1,5 +1,5 @@
 module RVM1
   class Capistrano3
-    VERSION="1.0.0"
+    VERSION="1.1.0"
   end
 end

data/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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvm1-capistrano3
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Michal Papis
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-12-02 00:00:00 Z
+date: 2013-12-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: capistrano
@@ -22,15 +22,25 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: tf
+  name: sshkit
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "1.2"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: tf
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: 0.4.3
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 description: RVM 1.x / Capistrano 3.x Integration Gem
 email: 
 - mpapis@gmail.com
@@ -60,13 +70,13 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - &id003 
+  - &id004 
     - ">="
     - !ruby/object:Gem::Version 
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - *id003
+  - *id004
 requirements: []
 
 rubyforge_project: