rvm-capistrano 1.1.0 → 1.2.0

data/History.md

@@ -1,3 +1,10 @@
+=== 1.2.0 / 2012-05-19
+
+* Add task to create gemset, fix #8
+* Add rvm_install_ruby_params, fix #9
+* Improved installing RVM with sudo, fix #10
+* Use the new RVM installer
+
 === 1.1.0 / 2012-04-29
 
 * Fix rvm installation task to use sudo and rvm_path when needed

data/README.md

@@ -17,14 +17,16 @@ RVM / Capistrano integration is now available as a separate gem
 The following code will:
 
 - detect `ruby@gemset` used for deployment
-- install RVM and Ruby on `cap deploy:detup`
+- install RVM and Ruby on `cap deploy:setup`
 
 Example:
 
     set :rvm_ruby_string, ENV['GEM_HOME'].gsub(/.*\//,"")
+    set :rvm_install_ruby_params, '--1.9'      # for jruby/rbx default to 1.9 mode
     
-    before 'deploy:setup', 'rvm:install_rvm'
-    before 'deploy:setup', 'rvm:install_ruby'
+    before 'deploy:setup', 'rvm:install_rvm'   # install RVM
+    before 'deploy:setup', 'rvm:install_ruby'  # install Ruby and create gemset, or:
+    before 'deploy:setup', 'rvm:create_gemset' # only create gemset
     
     require "rvm/capistrano"
 

data/lib/rvm/capistrano.rb

@@ -53,6 +53,9 @@ Capistrano::Configuration.instance(true).load do
   # Use the default ruby on the server, by default :)
   _cset(:rvm_ruby_string, "default")
 
+  # Default sudo state
+  _cset(:rvm_install_with_sudo, false)
+
   # Let users set the install type and shell of their choice.
   _cset(:rvm_install_type, :stable)
   _cset(:rvm_install_shell, :bash)
@@ -73,17 +76,17 @@ Capistrano::Configuration.instance(true).load do
       set :rvm_install_shell, :zsh
     EOF
     task :install_rvm do
-      command="curl https://raw.github.com/wayneeseguin/rvm/master/binscripts/rvm-installer | "
+      command_fetch="curl -L get.rvm.io | "
       case rvm_type
       when :root, :system
-        if use_sudo == false
-          raise ":use_sudo is set to 'false' but sudo is needed to install rvm_type: #{rvm_type}."
+        if use_sudo == false && rvm_install_with_sudo == false
+          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"
         else
-          command << "sudo "
+          command_install = "#{sudo} "
         end
       end
-      command << "#{rvm_install_shell} -s #{rvm_install_type} --path #{rvm_path}"
-      run "#{command}", :shell => "#{rvm_install_shell}"
+      command_install << "#{rvm_install_shell} -s #{rvm_install_type} --path #{rvm_path}"
+      run "#{command_fetch} #{command_install}", :shell => "#{rvm_install_shell}"
     end
 
     desc <<-EOF
@@ -105,12 +108,25 @@ Capistrano::Configuration.instance(true).load do
       if %w( release_path default ).include? "#{ruby}"
         raise "ruby can not be installed when using :rvm_ruby_string => :#{ruby}"
       else
-        run "#{File.join(rvm_bin_path, "rvm")} #{rvm_install_ruby} #{ruby} -j #{rvm_install_ruby_threads}", :shell => "#{rvm_install_shell}"
+        run "#{File.join(rvm_bin_path, "rvm")} #{rvm_install_ruby} #{ruby} -j #{rvm_install_ruby_threads} #{rvm_install_ruby_params}", :shell => "#{rvm_install_shell}"
         if gemset
           run "#{File.join(rvm_bin_path, "rvm")} #{ruby} do rvm gemset create #{gemset}", :shell => "#{rvm_install_shell}"
         end
       end
     end
+
+    desc "Create gemset"
+    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}"
+      else
+        if gemset
+          run "#{File.join(rvm_bin_path, "rvm")} #{ruby} do rvm gemset create #{gemset}", :shell => "#{rvm_install_shell}"
+        end
+      end
+    end
+
   end
 end
 

data/lib/rvm/capistrano/version.rb

@@ -1,5 +1,5 @@
 module RVM
   class Capistrano
-    VERSION="1.1.0"
+    VERSION="1.2.0"
   end
 end

metadata

@@ -1,73 +1,78 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: rvm-capistrano
-version: !ruby/object:Gem::Version
-  version: 1.1.0
+version: !ruby/object:Gem::Version 
+  hash: 31
   prerelease: 
+  segments: 
+  - 1
+  - 2
+  - 0
+  version: 1.2.0
 platform: ruby
-authors:
+authors: 
 - Wayne E. Seguin
 - Michal Papis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-17 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-05-19 00:00:00 Z
+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
@@ -77,27 +82,36 @@ files:
 - spec/spec_helper.rb
 homepage: https://rvm.beginrescueend.com/integration/capistrano
 licenses: []
+
 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
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: RVM / Capistrano Integration Gem
-test_files:
+test_files: 
 - spec/spec_helper.rb