rvm-capistrano 1.3.0.rc4 → 1.3.0.rc5

data/lib/rvm/capistrano/version.rb

@@ -1,5 +1,5 @@
 module RVM
   class Capistrano
-    VERSION="1.3.0.rc4"
+    VERSION="1.3.0.rc5"
   end
 end

data/lib/rvm/capistrano.rb

@@ -10,7 +10,7 @@ module Capistrano
       end
     end
 
-    set :default_shell do
+    set :rvm_shell do
       shell = File.join(rvm_bin_path, "rvm-shell")
       ruby = rvm_ruby_string.to_s.strip
       case ruby
@@ -25,6 +25,33 @@ module Capistrano
       end
       shell
     end
+    if fetch(:rvm_require_role,nil).nil?
+      set :default_shell, fetch(:rvm_shell)
+    else
+      class << self
+        def run(cmd, options={}, &block)
+          if options[:eof].nil? && !cmd.include?(sudo)
+            options = options.merge(:eof => !block_given?)
+          end
+          shell = options[:shell]
+          options[:shell] = false
+
+          parallel(options) do |session|
+            if shell.nil?
+              session.when "in?(:#{fetch(:rvm_require_role,nil)})", command_with_shell(cmd, fetch(:rvm_shell)), &block
+            end
+            session.else command_with_shell(cmd, shell), &block
+          end
+        end
+        def command_with_shell(cmd, shell=nil)
+          if shell == false
+            cmd
+          else
+            "#{shell || "sh"} -c '#{cmd.gsub(/'/) { |m| "'\\''" }}'"
+          end
+        end
+      end
+    end
 
     # Let users set the type of their rvm install.
     _cset(:rvm_type, :user)
@@ -111,9 +138,9 @@ module Capistrano
 
       def rvm_task(name,&block)
         if fetch(:rvm_require_role,nil).nil?
-          task name, block
+          task name, &block
         else
-          task name, :roles => fetch(:rvm_require_role), block
+          task name, :roles => fetch(:rvm_require_role), &block
         end
       end
 
@@ -127,7 +154,7 @@ module Capistrano
 
         set :rvm_install_shell, :zsh
       EOF
-      rvm_task :install_rvm, :roles => :rvm do
+      rvm_task :install_rvm do
         command_fetch    = "curl -L get.rvm.io"
         command_install  = case rvm_type
           when :root, :system
@@ -161,7 +188,7 @@ module Capistrano
 
         set :rvm_install_shell, :zsh
       EOF
-      rvm_task :install_ruby, :roles => :rvm do
+      rvm_task :install_ruby do
         ruby, gemset = rvm_ruby_string.to_s.strip.split /@/
         if %w( release_path default ).include? "#{ruby}"
           raise "ruby can not be installed when using :rvm_ruby_string => :#{ruby}"
@@ -186,14 +213,14 @@ module Capistrano
 
         Full list of packages available at https://rvm.io/packages/ or by running 'rvm pkg'.
       EOF
-      rvm_task :install_pkgs, :roles => :rvm do
+      rvm_task :install_pkgs do
         rvm_install_pkgs.each do |pkg|
           run "#{File.join(rvm_bin_path, "rvm")} pkg install #{pkg}", :shell => "#{rvm_install_shell}"
         end
       end
 
       desc "Create gemset"
-      rvm_task :create_gemset, :roles => :rvm do
+      rvm_task :create_gemset do
         ruby, gemset = rvm_ruby_string.to_s.strip.split /@/
         if %w( release_path default ).include? "#{ruby}"
           raise "gemset can not be created when using :rvm_ruby_string => :#{ruby}"
@@ -212,7 +239,7 @@ module Capistrano
 
         The gemset can be created with 'cap rvm:gemset_export'.
       EOF
-      rvm_task :import_gemset, :roles => :rvm do
+      rvm_task :import_gemset do
         ruby, gemset = rvm_ruby_string.to_s.strip.split /@/
         if %w( release_path default ).include? "#{ruby}"
           raise "gemset can not be imported when using :rvm_ruby_string => :#{ruby}"
@@ -231,7 +258,7 @@ module Capistrano
 
         The gemset can be imported with 'cap rvm:gemset_import'.
       EOF
-      rvm_task :export_gemset, :roles => :rvm do
+      rvm_task :export_gemset do
         ruby, gemset = rvm_ruby_string.to_s.strip.split /@/
         if %w( release_path default ).include? "#{ruby}"
           raise "gemset can not be imported when using :rvm_ruby_string => :#{ruby}"
@@ -243,12 +270,12 @@ module Capistrano
       end
 
       desc "Install a gem, 'cap rvm:install_gem GEM=my_gem'."
-      rvm_task :install_gem, :roles => :rvm do
+      rvm_task :install_gem do
         run "#{File.join(rvm_bin_path, "rvm")} #{rvm_ruby_string} do gem install #{ENV['GEM']}", :shell => "#{rvm_install_shell}"
       end
 
       desc "Uninstall a gem, 'cap rvm:uninstall_gem GEM=my_gem'."
-      rvm_task :uninstall_gem, :roles => :rvm do
+      rvm_task :uninstall_gem do
         run "#{File.join(rvm_bin_path, "rvm")} #{rvm_ruby_string} do gem uninstall --no-executables #{ENV['GEM']}", :shell => "#{rvm_install_shell}"
       end
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rvm-capistrano
 version: !ruby/object:Gem::Version 
-  hash: -765880092
+  hash: -711357732
   prerelease: 6
   segments: 
   - 1
   - 3
   - 0
   - rc
-  - 4
-  version: 1.3.0.rc4
+  - 5
+  version: 1.3.0.rc5
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -18,8 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-16 00:00:00 +01:00
-default_executable: 
+date: 2013-02-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: capistrano
@@ -84,7 +83,6 @@ files:
 - lib/rvm/capistrano.rb
 - lib/rvm/capistrano/version.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: https://rvm.beginrescueend.com/integration/capistrano
 licenses: 
 - MIT
@@ -116,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: RVM / Capistrano Integration Gem