rvm-capistrano 1.4.0.rc2 → 1.4.0.rc3

data/lib/rvm/capistrano/base.rb

@@ -3,7 +3,7 @@ require 'rvm/capistrano/helpers/rvm_methods'
 
 rvm_with_capistrano do
 
-  on :load do
+  deffered_load do
     _cset :rvm_shell do
       shell = File.join(rvm_bin_path, "rvm-shell")
       ruby = fetch(:rvm_ruby_string_evaluated).strip
@@ -66,7 +66,7 @@ rvm_with_capistrano do
 
 ## not needed in base but are used in many extensions
 
-  on :load do
+  deffered_load do
     # Let users set the install shell of their choice
     _cset(:rvm_install_shell, :bash)
   end

data/lib/rvm/capistrano/gemset_import_export.rb

@@ -2,7 +2,7 @@ require 'rvm/capistrano/base'
 
 rvm_with_capistrano do
 
-  on :load do
+  deffered_load do
 
     # Let users configure a path to export/import gemsets
     _cset(:rvm_gemset_path, "#{rvm_path}/gemsets")

data/lib/rvm/capistrano/helpers/base.rb

@@ -1,4 +1,13 @@
 module Capistrano
+  class Configuration
+    def deffered_load(&block)
+      if current_task
+        instance_eval(&block)
+      else
+        on(:load, &block)
+      end
+    end
+  end
 end
 
 def rvm_with_capistrano(&block)

data/lib/rvm/capistrano/helpers/rvm_if_sudo.rb

@@ -2,7 +2,7 @@ require 'rvm/capistrano/base'
 
 rvm_with_capistrano do
 
-  on :load do
+  deffered_load do
     # Default sudo state
     _cset(:rvm_install_with_sudo, false)
   end

data/lib/rvm/capistrano/install_pkgs.rb

@@ -4,7 +4,7 @@ rvm_with_capistrano do
 
   warn "task 'rvm:install_pkgs' is deprecated, please read about autolibs => http://rvm.io/rvm/autolibs especially check the autolibs mode 'rvm_pkg'."
 
-  on :load do
+  deffered_load do
 
     # Additional rvm packages to install.
     _cset(:rvm_install_pkgs, [])

data/lib/rvm/capistrano/install_ruby.rb

@@ -5,7 +5,7 @@ require 'rvm/capistrano/helpers/with_rvm_group'
 
 rvm_with_capistrano do
 
-  on :load do
+  deffered_load do
 
     # Let users set the (re)install for ruby.
     _cset(:rvm_install_ruby, :install)

data/lib/rvm/capistrano/install_rvm.rb

@@ -4,7 +4,7 @@ require 'rvm/capistrano/helpers/rvm_if_sudo'
 
 rvm_with_capistrano do
 
-  on :load do
+  deffered_load do
 
     # Let users set the install type of their choice.
     _cset(:rvm_install_type, :stable)

data/lib/rvm/capistrano/selector.rb

@@ -1,7 +1,7 @@
 require 'rvm/capistrano/base'
 
 rvm_with_capistrano do
-  on :load do
+  deffered_load do
 
     # conflicts with rvm/capistrano/selector_mixed
     unless fetch(:rvm_require_role,nil).nil?

data/lib/rvm/capistrano/version.rb

@@ -1,5 +1,5 @@
 module RVM
   class Capistrano
-    VERSION="1.4.0.rc2"
+    VERSION="1.4.0.rc3"
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rvm-capistrano
 version: !ruby/object:Gem::Version 
-  hash: 2304346973
+  hash: -1093037706
   prerelease: 6
   segments: 
   - 1
   - 4
   - 0
   - rc
-  - 2
-  version: 1.4.0.rc2
+  - 3
+  version: 1.4.0.rc3
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-07-01 00:00:00 Z
+date: 2013-07-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: capistrano