rvm-capistrano 1.3.4 → 1.4.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84cf4a96a89541fa0459934b8800757ec420c098
-  data.tar.gz: 36eb5328e15b877fa0c95d5cb00acea09640a06a
+  metadata.gz: 67171efbb1be95f398a8e0d60b0f75b64e53d983
+  data.tar.gz: f86de38a275c25f83ca86b1b701545d53d5da392
 SHA512:
-  metadata.gz: 8a39f3b8e1c56227438dba8220d84bb63e104a500e80f6818ff7360a63cd255ffbb6fc3e861ace698e00c89d6b53b4c6947c7a66e785f5cb5b136dad4cf05250
-  data.tar.gz: 76f3d6847586cdb21499e5eac86e7c24e8dccc775255e068c1f5550bc79d4cef1e70121a3dce752ba55589e62194bec97768f7075f82dd61c3b61a78507a7ed0
+  metadata.gz: 6abd4c7ac08bdf41280248502dce2d406cc55a57c6b70062a3cd5a1ab97371d787b42895856d65a08dab8684b3bb741f08305a20648d3fcc8151eedb4db93df5
+  data.tar.gz: c1b5f9c83a83949c98d1a4bb0348307ec7f63bb5600f5731e93e713b97a7f8789d1c9c3cdafb8236c2448c978bc318fc6dea441a4f60dcfd0697eae2b9fe5524

data/Manifest.yml

@@ -5,3 +5,4 @@
 - LICENSE
 - lib/rvm/capistrano.rb
 - lib/rvm/capistrano/version.rb
+- lib/rvm/capistrano/selector.rb

data/lib/rvm/capistrano.rb

@@ -1,5 +1,7 @@
 # Recipes for using RVM on a server with capistrano.
 
+require 'rvm/capistrano/selector'
+
 module Capistrano
   Configuration.instance(true).load do
 
@@ -47,28 +49,9 @@ module Capistrano
     end
 
     on :load do
-      _cset :rvm_shell do
-        shell = File.join(rvm_bin_path, "rvm-shell")
-        ruby = fetch(:rvm_ruby_string_evaluated).strip
-        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
-        shell
-      end
 
       # this is part of check, search for :rvm_require_role
-      if fetch(:rvm_require_role,nil).nil?
-        set :default_shell do
-          fetch(:rvm_shell)
-        end
-      elsif fetch(:rvm_require_role_was_set_before_require, nil).nil?
+      if ! fetch(:rvm_require_role,nil).nil? and fetch(:rvm_require_role_was_set_before_require, nil).nil?
         raise "
 
 ERROR: detected 'set :rvm_require_role, \"#{fetch(:rvm_require_role,nil)}\"' after 'require \"rvm/capistrano\"', please move it above for proper functioning.
@@ -76,50 +59,9 @@ ERROR: detected 'set :rvm_require_role, \"#{fetch(:rvm_require_role,nil)}\"' aft
 "
       end
 
-      # Let users set the type of their rvm install.
-      _cset(:rvm_type, :user)
-
-      # Define rvm_path
-      # This is used in the default_shell command to pass the required variable to rvm-shell, allowing
-      # rvm to boostrap using the proper path.  This is being lost in Capistrano due to the lack of a
-      # full environment.
-      _cset(:rvm_path) do
-        case rvm_type
-        when :root, :system
-          "/usr/local/rvm"
-        when :local, :user, :default
-          "$HOME/.rvm/"
-        else
-          rvm_type.to_s.empty? ?  "$HOME/.rvm" : rvm_type.to_s
-        end
-      end
-
-      # Let users override the rvm_bin_path
-      _cset(:rvm_bin_path) do
-        case rvm_type
-        when :root, :system
-          "/usr/local/rvm/bin"
-        when :local, :user, :default
-          "$HOME/.rvm/bin"
-        else
-          rvm_type.to_s.empty? ?  "#{rvm_path}/bin" : rvm_type.to_s
-        end
-      end
-
-      set :rvm_ruby_string_evaluated do
-        value = fetch(:rvm_ruby_string, :default)
-        if value.to_sym == :local
-          value = ENV['GEM_HOME'].gsub(/.*\//,"")
-        end
-        value.to_s
-      end
-
       # Let users configure a path to export/import gemsets
       _cset(:rvm_gemset_path, "#{rvm_path}/gemsets")
 
-      # Use the default ruby on the server, by default :)
-      _cset(:rvm_ruby_string, :default)
-
       # Default sudo state
       _cset(:rvm_install_with_sudo, false)
 

data/lib/rvm/capistrano/selector.rb

@@ -0,0 +1,71 @@
+module Capistrano
+  Configuration.instance(true).load do
+    on :load do
+      _cset :rvm_shell do
+        shell = File.join(rvm_bin_path, "rvm-shell")
+        ruby = fetch(:rvm_ruby_string_evaluated).strip
+        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
+        shell
+      end
+
+      # this is part of check, search for :rvm_require_role
+      if fetch(:rvm_require_role,nil).nil?
+        set :default_shell do
+          fetch(:rvm_shell)
+        end
+      end
+
+      # Let users set the type of their rvm install.
+      _cset(:rvm_type, :user)
+
+      # Define rvm_path
+      # This is used in the default_shell command to pass the required variable to rvm-shell, allowing
+      # rvm to boostrap using the proper path.  This is being lost in Capistrano due to the lack of a
+      # full environment.
+      _cset(:rvm_path) do
+        case rvm_type
+        when :root, :system
+          "/usr/local/rvm"
+        when :local, :user, :default
+          "$HOME/.rvm/"
+        else
+          rvm_type.to_s.empty? ?  "$HOME/.rvm" : rvm_type.to_s
+        end
+      end
+
+      # Let users override the rvm_bin_path
+      _cset(:rvm_bin_path) do
+        case rvm_type
+        when :root, :system
+          "/usr/local/rvm/bin"
+        when :local, :user, :default
+          "$HOME/.rvm/bin"
+        else
+          rvm_type.to_s.empty? ?  "#{rvm_path}/bin" : rvm_type.to_s
+        end
+      end
+
+      # evaluate :rvm_ruby_string => :local
+      set :rvm_ruby_string_evaluated do
+        value = fetch(:rvm_ruby_string, :default)
+        if value.to_sym == :local
+          value = ENV['GEM_HOME'].gsub(/.*\//,"")
+        end
+        value.to_s
+      end
+
+      # Use the default ruby on the server, by default :)
+      _cset(:rvm_ruby_string, :default)
+
+    end
+  end
+end

data/lib/rvm/capistrano/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rvm-capistrano
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.4.0.rc1
 platform: ruby
 authors:
 - Wayne E. Seguin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-28 00:00:00.000000000 Z
+date: 2013-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -68,6 +68,7 @@ files:
 - LICENSE
 - lib/rvm/capistrano.rb
 - lib/rvm/capistrano/version.rb
+- lib/rvm/capistrano/selector.rb
 - spec/spec_helper.rb
 homepage: https://github.com/wayneeseguin/rvm-capistrano
 licenses:
@@ -84,9 +85,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3