rvm-capistrano 1.2.0 → 1.2.1

data/History.md

@@ -1,26 +1,31 @@
-=== 1.2.0 / 2012-05-19
+### 1.2.1 / 2012-05-22
+
+* Add `set :rvm_ruby_string, :local`, merged #4
+* Fix `command_install` edge cases, merged #12, closes #13
+
+## 1.2.0 / 2012-05-19
 
 * Add task to create gemset, fix #8
-* Add rvm_install_ruby_params, fix #9
+* 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
+## 1.1.0 / 2012-04-29
 
-* Fix rvm installation task to use sudo and rvm_path when needed
+* Fix rvm installation task to use sudo and `rvm_path` when needed
 
-=== 1.0.2 / 2012-03-28
+### 1.0.2 / 2012-03-28
 
 * Fix the bundler auto require problem
 
-=== 1.0.1 / 2012-03-26
+### 1.0.1 / 2012-03-26
 
 * Updated to latest integration code for installing rvm/ruby
 * Cleaning code, improving gemification
 * Switch the default rvm installation type to user - as we discourage system installations
 * Improved README.md
 
-=== 1.0.0 / 2012-03-26
+# 1.0.0 / 2012-03-26
 
 * Ported RVM /Capistrano Gem Library into it's own repository from the main RVM
   repostitory. ( https://github.com/wayneeseguin/rvm-capistrano )

data/README.md

@@ -23,13 +23,16 @@ 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'   # 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"
 
+## To use the ruby version currently active locally
+
+    set :rvm_ruby_string, :local
 
 ## Development
 

data/lib/rvm/capistrano/version.rb

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

data/lib/rvm/capistrano.rb

@@ -12,8 +12,13 @@ Capistrano::Configuration.instance(true).load do
   set :default_shell do
     shell = File.join(rvm_bin_path, "rvm-shell")
     ruby = rvm_ruby_string.to_s.strip
-    if "#{ruby}" == "release_path"
+    case ruby
+    when "release_path"
       shell = "rvm_path=#{rvm_path} #{shell} --path '#{release_path}'"
+    when "local"
+      ruby = (ENV['GEM_HOME'] || "").gsub(/.*\//, "")
+      raise "Failed to get ruby version from GEM_HOME. Please make sure rvm is loaded!" if ruby.empty?
+      shell = "rvm_path=#{rvm_path} #{shell} '#{ruby}'"
     else
       shell = "rvm_path=#{rvm_path} #{shell} '#{ruby}'" unless ruby.empty?
     end
@@ -84,6 +89,8 @@ Capistrano::Configuration.instance(true).load do
         else
           command_install = "#{sudo} "
         end
+      else
+        command_install = ''
       end
       command_install << "#{rvm_install_shell} -s #{rvm_install_type} --path #{rvm_path}"
       run "#{command_fetch} #{command_install}", :shell => "#{rvm_install_shell}"

metadata

@@ -1,78 +1,73 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rvm-capistrano
-version: !ruby/object:Gem::Version 
-  hash: 31
+version: !ruby/object:Gem::Version
+  version: 1.2.1
   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-05-19 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-05-22 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: capistrano
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  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
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 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
@@ -82,36 +77,27 @@ 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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: RVM / Capistrano Integration Gem
-test_files: 
+test_files:
 - spec/spec_helper.rb