rvm-capistrano 1.3.0.rc1 → 1.3.0.rc2

data/lib/rvm/capistrano/version.rb

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

data/lib/rvm/capistrano.rb

@@ -79,6 +79,9 @@ module Capistrano
     # Additional rvm packages to install.
     _cset(:rvm_install_pkgs, '')
 
+    # By default system installations add deploying user to rvm group. also try :all
+    _cset(:rvm_add_to_group, "#{user}")
+
     namespace :rvm do
 
       command_curl_start = <<-EOF.gsub(/^\s*/, '')
@@ -115,6 +118,10 @@ module Capistrano
             ''
           end
         command_install << "#{rvm_install_shell} -s #{rvm_install_type} --path #{rvm_path}"
+        case rvm_type
+        when :root, :system
+          command_install << " --add-to-rvm-group #{[rvm_add_to_group].flatten.map(&:to_s).join(",")}"
+        end
         _command = <<-EOF
           #{command_curl_start};
           #{command_fetch} | #{command_install};
@@ -123,6 +130,15 @@ module Capistrano
         run "#{_command}".gsub(/[\s\n]+/, ' '), :shell => "#{rvm_install_shell}"
       end
 
+      def with_rvm_group(command)
+        case rvm_type
+        when :root, :system
+          "sg rvm -c \"#{command}\""
+        else
+          command
+        end
+      end
+
       desc <<-EOF
         Install RVM ruby to the server, create gemset if needed.
         By default ruby is installed, you can reinstall with:
@@ -142,9 +158,10 @@ module Capistrano
         if %w( release_path default ).include? "#{ruby}"
           raise "ruby can not be installed when using :rvm_ruby_string => :#{ruby}"
         else
-          command_install = "#{File.join(rvm_bin_path, "rvm")} #{rvm_install_ruby} #{ruby} -j #{rvm_install_ruby_threads} #{rvm_install_ruby_params}"
+          command_install = with_rvm_group("#{File.join(rvm_bin_path, "rvm")} #{rvm_install_ruby} #{ruby} -j #{rvm_install_ruby_threads} #{rvm_install_ruby_params}")
           if gemset
-            command_install << "; #{File.join(rvm_bin_path, "rvm")} #{ruby} do rvm gemset create #{gemset}"
+            command_install << "; "
+            command_install << with_rvm_group("#{File.join(rvm_bin_path, "rvm")} #{ruby} do rvm gemset create #{gemset}")
           end
           _command = <<-EOF
             #{command_curl_start};
@@ -155,11 +172,11 @@ module Capistrano
         end
       end
 
-      desc <<-EOF   
+      desc <<-EOF
         Install RVM packages to the server.
 
         This must come before the 'rvm:install_ruby' task is called.
-        
+
         The package list is empty by default.  Specifiy the packages to install with:
 
         set :rvm_install_pkgs, %w[libyaml curl]
@@ -179,7 +196,7 @@ module Capistrano
           raise "gemset can not be created when using :rvm_ruby_string => :#{ruby}"
         else
           if gemset
-            run "#{File.join(rvm_bin_path, "rvm")} #{ruby} do rvm gemset create #{gemset}", :shell => "#{rvm_install_shell}"
+            run with_rvm_group("#{File.join(rvm_bin_path, "rvm")} #{ruby} do rvm gemset create #{gemset}", :shell => "#{rvm_install_shell}")
           end
         end
       end

metadata

@@ -1,73 +1,81 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: rvm-capistrano
-version: !ruby/object:Gem::Version
-  version: 1.3.0.rc1
+version: !ruby/object:Gem::Version 
+  hash: 3168375813
   prerelease: 6
+  segments: 
+  - 1
+  - 3
+  - 0
+  - rc
+  - 2
+  version: 1.3.0.rc2
 platform: ruby
-authors:
+authors: 
 - Wayne E. Seguin
 - Michal Papis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-04 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-12-16 00:00:00 +01:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: capistrano
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 0
+        - 0
         version: 2.0.0
-- !ruby/object:Gem::Dependency
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: minitest
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
 description: RVM / Capistrano Integration Gem
-email:
+email: 
 - wayneeseguin@gmail.com
 - mpapis@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - History.md
 - Manifest.yml
 - README.md
@@ -76,30 +84,41 @@ 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:
+licenses: 
 - MIT
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>'
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: RVM / Capistrano Integration Gem
-test_files:
+test_files: 
 - spec/spec_helper.rb