fix configuration deffering for requiring rvm/capistrano from a task, f…

…ix #76
rvm · Jul 9, 2013 · 217b410 · 217b410
1 parent bacfd9c
commit 217b410
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 9 deletions.
diff --git a/lib/rvm/capistrano/base.rb b/lib/rvm/capistrano/base.rb
@@ -3,7 +3,7 @@
 
 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 @@
 
 ## 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

diff --git a/lib/rvm/capistrano/gemset_import_export.rb b/lib/rvm/capistrano/gemset_import_export.rb
@@ -2,7 +2,7 @@
 
 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")

diff --git a/lib/rvm/capistrano/helpers/base.rb b/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)

diff --git a/lib/rvm/capistrano/helpers/rvm_if_sudo.rb b/lib/rvm/capistrano/helpers/rvm_if_sudo.rb
@@ -2,7 +2,7 @@
 
 rvm_with_capistrano do
 
-  on :load do
+  deffered_load do
     # Default sudo state
     _cset(:rvm_install_with_sudo, false)
   end

diff --git a/lib/rvm/capistrano/install_pkgs.rb b/lib/rvm/capistrano/install_pkgs.rb
@@ -4,7 +4,7 @@
 
   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, [])

diff --git a/lib/rvm/capistrano/install_ruby.rb b/lib/rvm/capistrano/install_ruby.rb
@@ -5,7 +5,7 @@
 
 rvm_with_capistrano do
 
-  on :load do
+  deffered_load do
 
     # Let users set the (re)install for ruby.
     _cset(:rvm_install_ruby, :install)

diff --git a/lib/rvm/capistrano/install_rvm.rb b/lib/rvm/capistrano/install_rvm.rb
@@ -4,7 +4,7 @@
 
 rvm_with_capistrano do
 
-  on :load do
+  deffered_load do
 
     # Let users set the install type of their choice.
     _cset(:rvm_install_type, :stable)

diff --git a/lib/rvm/capistrano/selector.rb b/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?

diff --git a/lib/rvm/capistrano/version.rb b/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