rvm-capistrano 1.4.3 → 1.4.4

data/History.md

@@ -1,3 +1,7 @@
+### 1.4.4 / 2013-08-14
+
+* cleaning, merge #83
+
 ### 1.4.3 / 2013-08-09
 
 * move command_with_shell to common code, fix #82

data/README.md

@@ -173,6 +173,7 @@ end
 - `:rvm_type` - how to detect rvm, default `:user`
  - `:user` - RVM installed in `$HOME`, user installation (default)
  - `:system` - RVM installed in `/usr/local`, multiuser installation
+ - (some other values permitted for backwards compatability only)
 
 - `:rvm_autolibs_flag` - control autolibs, read more `rvm help autolibs`
  - `:disable` - fully disable autolibs, limit automated tasks

data/lib/rvm/capistrano/base.rb

@@ -3,7 +3,7 @@ require 'rvm/capistrano/helpers/rvm_methods'
 
 rvm_with_capistrano do
 
-  deffered_load do
+  deferred_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
 
-  deffered_load do
+  deferred_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
 
-  deffered_load do
+  deferred_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,6 +1,6 @@
 module Capistrano
   class Configuration
-    def deffered_load(&block)
+    def deferred_load(&block)
       if current_task
         instance_eval(&block)
       else

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

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

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

@@ -23,11 +23,9 @@ module Capistrano
     # - use :with_rvm_group => true - to wrap it all in `with_rvm_group(...)` call
     # - use :with_ruby => 'with_ruby' - to extend to `.../bin/rvm #{with_ruby} do`
     def run_rvm(command, options={})
-      if options[:with_rvm_group]
-        run_without_rvm("#{path_to_bin_rvm(options)} #{command}")
-      else
-        run_without_rvm(with_rvm_group("#{path_to_bin_rvm(options)} #{command}"))
-      end
+      cmd = "#{path_to_bin_rvm(options)} #{command}"
+      cmd = with_rvm_group(cmd) if options[:with_rvm_group]
+      run_without_rvm(cmd)
     end
 
     # helper to find path to rvm binary

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'."
 
-  deffered_load do
+  deferred_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
 
-  deffered_load do
+  deferred_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
 
-  deffered_load do
+  deferred_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
-  deffered_load do
+  deferred_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.3"
+    VERSION="1.4.4"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rvm-capistrano
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 15
   prerelease: 
   segments: 
   - 1
   - 4
-  - 3
-  version: 1.4.3
+  - 4
+  version: 1.4.4
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-08-09 00:00:00 Z
+date: 2013-08-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: capistrano