rvm-capistrano 1.3.2 → 1.3.3.rc1

data/lib/rvm/capistrano.rb

@@ -10,6 +10,12 @@ module Capistrano
       end
     end
 
+    class << self
+      def quote_and_escape(text, quote = "'")
+        "#{quote}#{text.gsub(/#{quote}/) { |m| "#{quote}\\#{quote}#{quote}" }}#{quote}"
+      end
+    end
+
     _cset :rvm_shell do
       shell = File.join(rvm_bin_path, "rvm-shell")
       ruby = fetch(:rvm_ruby_string_evaluated).strip
@@ -49,7 +55,7 @@ module Capistrano
           if shell == false
             cmd
           else
-            "#{shell || "sh"} -c '#{cmd.gsub(/'/) { |m| "'\\''" }}'"
+            "#{shell || "sh"} -c #{quote_and_escape(cmd)}"
           end
         end
       end
@@ -137,16 +143,31 @@ module Capistrano
         EOF
       end
 
-      def rvm_if_sudo
+      def rvm_if_sudo(options = {})
         case rvm_type
         when :root, :system
           if fetch(:use_sudo, true) == false && rvm_install_with_sudo == false
-            raise "
+            explanation = <<-EXPLANATION
+You can enable use_sudo within rvm for use only by this install operation by adding to deploy.rb:
+
+    set :rvm_install_with_sudo, true
+
+            EXPLANATION
+            if options[:deferred]
+              <<-DEFERRED_ERROR.gsub(/\n/, " ; ")
+echo "
+Neither :use_sudo or :rvm_install_with_sudo was set and installation would ended up in using 'sudo'
+#{explanation}
+" >&2
+exit 1
+              DEFERRED_ERROR
+            else
+              raise "
 
 :use_sudo is set to 'false' but sudo is needed to install rvm_type: #{rvm_type}.
-You can enable use_sudo within rvm for use only by this install operation by adding to deploy.rb: set :rvm_install_with_sudo, true
-
+#{explanation}
 "
+            end
           else
             "#{sudo} "
           end
@@ -158,7 +179,12 @@ You can enable use_sudo within rvm for use only by this install operation by add
       def with_rvm_group(command)
         case rvm_type
         when :root, :system
-          "#{rvm_if_sudo} sg rvm -c \"#{command}\""
+          <<-CODE.gsub(/\n/, " ; ")
+if id | grep ' groups=.*(rvm)' >/dev/null
+then #{command}
+else #{rvm_if_sudo(:deferred=>true)} sg rvm -c #{quote_and_escape(command)}
+fi
+          CODE
         else
           command
         end

data/lib/rvm/capistrano/version.rb

@@ -1,5 +1,5 @@
 module RVM
   class Capistrano
-    VERSION="1.3.2"
+    VERSION="1.3.3.rc1"
   end
 end

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rvm-capistrano
 version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: 
+  hash: 3235495021
+  prerelease: 6
   segments: 
   - 1
   - 3
-  - 2
-  version: 1.3.2
+  - 3
+  - rc
+  - 1
+  version: 1.3.3.rc1
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -16,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-24 00:00:00 +02:00
+date: 2013-06-26 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -103,12 +105,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: