rvm-capistrano 1.3.3 → 1.3.4.rc1

data/README.md

@@ -33,14 +33,14 @@ The following code will:
 Example:
 
 ```ruby
+require "rvm/capistrano"
+
 set :rvm_ruby_string, :local              # use the same ruby as used locally for deployment
 set :rvm_autolibs_flag, "read-only"       # more info: rvm help autolibs
 
 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"
 ```
 
 ### Disabling `bundle --deployment` when using gemsets
@@ -57,12 +57,12 @@ set :bundle_flags, '--system --quiet'
 Update RVM and make sure Ruby is installed on every deploy:
 
 ```ruby
+require "rvm/capistrano"
+
 set :rvm_ruby_string, :local        # use the same ruby as used locally for deployment
 
 before 'deploy', 'rvm:install_rvm'  # update RVM
 before 'deploy', 'rvm:install_ruby' # install Ruby and create gemset (both if missing)
-
-require "rvm/capistrano"
 ```
 
 ### To use the ruby version currently active locally
@@ -80,7 +80,7 @@ set :rvm_require_role, :app
 require "rvm/capistrano"
 ```
 
-The order is important `:rvm_require_role` has to be `set` before `require "rvm/capistrano"`.
+It is important to `set :rvm_require_role` before `require "rvm/capistrano"`.
 
 ### To restrict rvm to only some servers
 
@@ -139,7 +139,7 @@ end
 
 - `:rvm_install_shell` - shell to be used for `rvm` operations, by default `bash`, most likely you do not need to change it
 - `:rvm_install_ruby` - a command used to install ruby, by default `install`, most likely you do not need to change it
-- `:rvm_install_ruby_threads` - number of threads to use for ruby compilation, by default it's number of CPU cores on Linux
+- `:rvm_install_ruby_threads` - number of threads to use for ruby compilation, rvm by default uses all CPU cores
 - `:rvm_install_ruby_params` - parameters for ruby, example `--patch railsexpress`
 - `:rvm_install_pkgs` - array of packages to install with `cap rvm:install_pkgs`
 - `:rvm_add_to_group` - user name to add to `rvm` group when RVM is installed with `:rvm_type` `:system`, by default it's the user name that runs deploy

data/lib/rvm/capistrano.rb

@@ -3,10 +3,12 @@
 module Capistrano
   Configuration.instance(true).load do
 
-    # Taken from the capistrano code.
-    def _cset(name, *args, &block)
-      unless exists?(name)
-        set(name, *args, &block)
+    unless methods.map(&:to_sym).include?(:_cset)
+      # Taken from the capistrano code.
+      def _cset(name, *args, &block)
+        unless exists?(name)
+          set(name, *args, &block)
+        end
       end
     end
 
@@ -16,26 +18,9 @@ module Capistrano
       end
     end
 
-    _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
-    if fetch(:rvm_require_role,nil).nil?
-      _cset :default_shell do
-        fetch(:rvm_shell)
-      end
-    else
+    # this is part of check, search for :rvm_require_role
+    unless fetch(:rvm_require_role,nil).nil?
+      set :rvm_require_role_was_set_before_require, true
       class << self
         def run(cmd, options={}, &block)
           if options[:eof].nil? && !cmd.include?(sudo)
@@ -61,74 +46,105 @@ module Capistrano
       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
+    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
-    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
+      # 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?
+        raise "
+
+ERROR: detected 'set :rvm_require_role, \"#{fetch(:rvm_require_role,nil)}\"' after 'require \"rvm/capistrano\"', please move it above for proper functioning.
+
+"
+      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
-    end
 
-    set :rvm_ruby_string_evaluated do
-      value = fetch(:rvm_ruby_string, :default)
-      if value.to_sym == :local
-        value = ENV['GEM_HOME'].gsub(/.*\//,"")
+      # 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
-      value.to_s
-    end
 
-    # Let users configure a path to export/import gemsets
-    _cset(:rvm_gemset_path, "#{rvm_path}/gemsets")
+      # 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)
+      # Use the default ruby on the server, by default :)
+      _cset(:rvm_ruby_string, :default)
 
-    # Default sudo state
-    _cset(:rvm_install_with_sudo, false)
+      # 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)
+      # Let users set the install type and shell of their choice.
+      _cset(:rvm_install_type, :stable)
+      _cset(:rvm_install_shell, :bash)
 
-    # Let users set the (re)install for ruby.
-    _cset(:rvm_install_ruby, :install)
-    _cset(:rvm_install_ruby_threads, "$(cat /proc/cpuinfo 2>/dev/null | (grep vendor_id || echo 'vendor_id : Other';) | wc -l)")
+      # Let users set the (re)install for ruby.
+      _cset(:rvm_install_ruby, :install)
 
-    # Pass no special params to the ruby build by default
-    _cset(:rvm_install_ruby_params, '')
+      # Pass no special params to the ruby build by default
+      _cset(:rvm_install_ruby_params, '')
 
-    # Additional rvm packages to install.
-    _cset(:rvm_install_pkgs, [])
+      # 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, fetch(:user,"$USER"))
+      # By default system installations add deploying user to rvm group. also try :all
+      _cset(:rvm_add_to_group, fetch(:user,"$USER"))
+
+    end
 
     namespace :rvm do
 
       def run_silent_curl(command)
-        run <<-EOF.gsub(/[\s\n]+/, ' '), :shell => "#{rvm_install_shell}"
+        run(<<-EOF.gsub(/[\s]+/, ' '), :shell => "#{rvm_install_shell}")
           __LAST_STATUS=0;
           export CURL_HOME="${TMPDIR:-${HOME}}/.rvm-curl-config.$$";
           mkdir ${CURL_HOME}/;
@@ -227,14 +243,14 @@ fi
 
         By default ruby is compiled using all CPU cores, change with:
 
-        set :rvm_install_ruby_threads, :reinstall
+        set :rvm_install_ruby_threads, 5
 
         By default BASH is used for installer, change with:
 
         set :rvm_install_shell, :zsh
       EOF
       rvm_task :install_ruby do
-        ruby, gemset = fetch(:rvm_ruby_string_evaluated).to_s.strip.split /@/
+        ruby, gemset = fetch(:rvm_ruby_string_evaluated).to_s.strip.split(/@/)
         if %w( release_path default ).include? "#{ruby}"
           raise "
 
@@ -251,12 +267,14 @@ ruby can not be installed when using :rvm_ruby_string => :#{ruby}
             2 fail    read-fail
           ).include?( autolibs_flag )
 
+          install_ruby_threads = fetch(:rvm_install_ruby_threads,nil).nil? ? '' : "-j #{rvm_install_ruby_threads}"
+
           if autolibs_flag_no_requirements
-            command_install << with_rvm_group("#{File.join(rvm_bin_path, "rvm")} --autolibs=#{autolibs_flag} #{rvm_install_ruby} #{ruby} -j #{rvm_install_ruby_threads} #{rvm_install_ruby_params}")
+            command_install << with_rvm_group("#{File.join(rvm_bin_path, "rvm")} --autolibs=#{autolibs_flag} #{rvm_install_ruby} #{ruby} #{install_ruby_threads} #{rvm_install_ruby_params}")
           else
             command_install << "#{rvm_if_sudo} #{File.join(rvm_bin_path, "rvm")} --autolibs=#{autolibs_flag} requirements #{ruby}"
             command_install << "; "
-            command_install << with_rvm_group("#{File.join(rvm_bin_path, "rvm")} --autolibs=1 #{rvm_install_ruby} #{ruby} -j #{rvm_install_ruby_threads} #{rvm_install_ruby_params}")
+            command_install << with_rvm_group("#{File.join(rvm_bin_path, "rvm")} --autolibs=1 #{rvm_install_ruby} #{ruby} #{install_ruby_threads} #{rvm_install_ruby_params}")
           end
 
           if gemset
@@ -287,7 +305,7 @@ ruby can not be installed when using :rvm_ruby_string => :#{ruby}
 
       desc "Create gemset"
       rvm_task :create_gemset do
-        ruby, gemset = fetch(:rvm_ruby_string_evaluated).to_s.strip.split /@/
+        ruby, gemset = fetch(:rvm_ruby_string_evaluated).to_s.strip.split(/@/)
         if %w( release_path default ).include? "#{ruby}"
           raise "
 
@@ -310,7 +328,7 @@ gemset can not be created when using :rvm_ruby_string => :#{ruby}
         The gemset can be created with 'cap rvm:gemset_export'.
       EOF
       rvm_task :import_gemset do
-        ruby, gemset = fetch(:rvm_ruby_string_evaluated).to_s.strip.split /@/
+        ruby, gemset = fetch(:rvm_ruby_string_evaluated).to_s.strip.split(/@/)
         if %w( release_path default ).include? "#{ruby}"
           raise "gemset can not be imported when using :rvm_ruby_string => :#{ruby}"
         else
@@ -329,7 +347,7 @@ gemset can not be created when using :rvm_ruby_string => :#{ruby}
         The gemset can be imported with 'cap rvm:gemset_import'.
       EOF
       rvm_task :export_gemset do
-        ruby, gemset = fetch(:rvm_ruby_string_evaluated).to_s.strip.split /@/
+        ruby, gemset = fetch(:rvm_ruby_string_evaluated).to_s.strip.split(/@/)
         if %w( release_path default ).include? "#{ruby}"
           raise "gemset can not be imported when using :rvm_ruby_string => :#{ruby}"
         else

data/lib/rvm/capistrano/version.rb

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

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rvm-capistrano
 version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: 
+  hash: -845565846
+  prerelease: 6
   segments: 
   - 1
   - 3
-  - 3
-  version: 1.3.3
+  - 4
+  - rc
+  - 1
+  version: 1.3.4.rc1
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -16,8 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-26 00:00:00 +02:00
-default_executable: 
+date: 2013-06-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: capistrano
@@ -82,7 +83,6 @@ files:
 - lib/rvm/capistrano.rb
 - lib/rvm/capistrano/version.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: https://github.com/wayneeseguin/rvm-capistrano
 licenses: 
 - MIT
@@ -103,16 +103,18 @@ 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: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: RVM / Capistrano Integration Gem