rvm-capistrano 1.5.1 → 1.5.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c5481c544e68713327cb9876595473ca73acc555
+  data.tar.gz: 81b564c17658ea1d4bf279401603fc1e62261ae0
+SHA512:
+  metadata.gz: 61cb7d4bb5ef3d81efa23b13a24ab726b7c148761d93f07c827042f7a3b60dbc186df1470ce79f35858ad7b6ce5c4dd5a9d8368f7adf33b61a97d91781c748f1
+  data.tar.gz: cd4b6a1d7610263303bcdc34f3d7b13ccd560077b6367637b128d34e7069dde24ca11bb4cbd94f7274faeb16353014db1a2a943da314bf98047153bc50158293

data/History.md

@@ -1,3 +1,24 @@
+### 1.5.6 / 2015-01-26
+
+* Fix setting of RVM autolibs flag so that 'packages' and 'enable' options work
+
+### 1.5.4 / 2014-09-09
+
+* Revert "Using environment variable RUBY_VERSION if it exists, and failing back to GEM_HOME.", fix #100, update #99
+
+### 1.5.3 / 2014-06-27
+
+* Fix defined? check on ENV, merged #101 by @themilkman
+
+### 1.5.2 / 2014-05-31
+
+* Documentation updates #96, #98
+* Use RUBY_VERSION when available for autodetecting the version, merged #99 by @naemono
+
+### 1.5.1 / 2013-10-08
+
+* Fix curl silencing #91 by @aspiers
+
 ### 1.5.0 / 2013-09-04
 
 * Add rvm:info & rvm:list for easier debugging

data/README.md

@@ -6,7 +6,8 @@ RVM / Capistrano Integration Gem
 
 ## Compatibility
 
-`rvm-capistrano` `1.3.0` with Autolibs requires at least RVM `1.19.0`.
+- `rvm-capistrano` `1.3.0` with Autolibs requires at least RVM `1.19.0`.
+- `capistrano` `3.0.0` is a rewrite and does not work with this gem, use [`rvm1/capistrano3`](https://github.com/rvm/rvm1-capistrano3#readme) it will be extended to match this gem functionality.
 
 ## Installation
 
@@ -16,7 +17,7 @@ RVM / Capistrano integration is available as a separate gem
 $ gem install rvm-capistrano
 ```
 
-Or, if the **capistrano** gem is aleady in your `Gemfile`, then add **rvm-capistrano**:
+Or, if the **capistrano** gem is already in your `Gemfile`, then add **rvm-capistrano**:
 
 ```bash
 $ echo "gem 'rvm-capistrano'" >> Gemfile
@@ -47,6 +48,16 @@ By default `rvm/capistrano` loads: `selector`, `info_list`, `install_rvm`, `inst
 
 Warning: `selector` and `selector_mixed` are to be used separately they can not be used both at the same time.
 
+## Requiring
+
+Minimal code to load this gem is:
+
+```ruby
+require "rvm/capistrano"
+```
+
+Usually it's placed in `config/deploy.rb`.
+
 ## Example
 
 The following code will:
@@ -116,7 +127,7 @@ This will allow to use clean scripts where proper RVM settings are automatically
 from the aliased wrappers. For example configuring
 [PassengerRuby](http://www.modrails.com/documentation/Users%20guide%20Apache.html#PassengerRuby)
 with `/home/ad/.rvm//wrappers/ad/ruby`, this way there is no need for changing scripts
-when the application ruby changes. In the seem spirit you can use wrapper for `bundle`
+when the application ruby changes. In the same spirit you can use wrapper for `bundle`
 in **cron** or **init.d** scripts with `/home/ad/.rvm//wrappers/ad/bundle exec [command]` -
 it will automatically load proper configuration for the application, no need for any tricks.
 

data/lib/rvm/capistrano/base.rb

@@ -77,7 +77,12 @@ rvm_with_capistrano do
     set :rvm_ruby_string_evaluated do
       value = fetch(:rvm_ruby_string, :default)
       if value.to_sym == :local
-        value = ENV['GEM_HOME'].gsub(/.*\//,"")
+        if ENV['RBENV_VERSION']
+          gem_set = ENV['GEM_HOME'].to_s.match(/(?:\/gemsets\/(.*))$/).to_a[1]
+          value = [ENV['RBENV_VERSION'], gem_set].compact.join("@")
+        else
+          value = ENV['GEM_HOME'].gsub(/.*\//,"")
+        end
       end
       value.to_s
     end

data/lib/rvm/capistrano/install_ruby.rb

@@ -48,7 +48,6 @@ ruby can not be installed when using :rvm_ruby_string => :#{ruby}
           1 read    read-only
           2 fail    read-fail
         ).include?( autolibs_flag )
-        autolibs_flag = "1" unless autolibs_flag_no_requirements
 
         install_ruby_threads = fetch(:rvm_install_ruby_threads,nil).nil? ? '' : "-j #{rvm_install_ruby_threads}"
         unless autolibs_flag_no_requirements

data/lib/rvm/capistrano/version.rb

@@ -1,5 +1,5 @@
 module RVM
   class Capistrano
-    VERSION="1.5.1"
+    VERSION="1.5.6"
   end
 end

data/spec/create_gemset_spec.rb

@@ -12,7 +12,7 @@ describe "rvm:create_gemset task" do
   it "should create a gemset in $HOME" do
     @configuration.trigger :load
     expected = "$HOME/.rvm/bin/rvm 2.0.0 do rvm gemset create #{@gemset}"
-    @task.namespace.should_receive(:run_without_rvm).with(expected)
+    expect(@task.namespace).to receive(:run_without_rvm).with(expected)
     @configuration.execute_task @task
   end
 
@@ -25,7 +25,7 @@ describe "rvm:create_gemset task" do
       else sudo -p 'sudo password: '  sg rvm -c '/usr/local/rvm/bin/rvm 2.0.0 do rvm gemset create #{@gemset}' ;
       fi
     EOSHELL
-    @task.namespace.should_receive(:run_without_rvm).with(expected)
+    expect(@task.namespace).to receive(:run_without_rvm).with(expected)
     @configuration.execute_task @task
   end
 
@@ -38,7 +38,7 @@ describe "rvm:create_gemset task" do
     expected = \
       "/usr/local/rvm/bin/rvm 2.0.0 do rvm user gemsets ; " +
       "/usr/local/rvm/bin/rvm 2.0.0 do rvm gemset create #{@gemset}"
-    task.namespace.should_receive(:run_without_rvm).with(expected)
+    expect(task.namespace).to receive(:run_without_rvm).with(expected)
     @configuration.execute_task task
   end
 end

data/spec/empty_gemset_spec.rb

@@ -13,7 +13,7 @@ describe "rvm:create_gemset task" do
   it "should empty a gemset in $HOME" do
     @configuration.trigger :load
     expected = "$HOME/.rvm/bin/rvm 2.0.0 do rvm --force gemset empty #{@gemset}"
-    @task.namespace.should_receive(:run_without_rvm).with(expected)
+    expect(@task.namespace).to receive(:run_without_rvm).with(expected)
     @configuration.execute_task @task
   end
 
@@ -26,7 +26,7 @@ describe "rvm:create_gemset task" do
       else sudo -p 'sudo password: '  sg rvm -c '/usr/local/rvm/bin/rvm 2.0.0 do rvm --force gemset empty #{@gemset}' ;
       fi
     EOSHELL
-    @task.namespace.should_receive(:run_without_rvm).with(expected)
+    expect(@task.namespace).to receive(:run_without_rvm).with(expected)
     @configuration.execute_task @task
   end
 end

data/spec/install_ruby_spec.rb

@@ -25,7 +25,7 @@ describe "rvm:install_ruby task" do
       rm -rf $CURL_HOME;
       exit ${__LAST_STATUS}
     EOSHELL
-    @configuration.should_receive(:run_without_rvm).with(expected)
+    expect(@configuration).to receive(:run_without_rvm).with(expected)
     @configuration.execute_task @task
   end
 
@@ -54,7 +54,7 @@ describe "rvm:install_ruby task" do
       rm -rf $CURL_HOME;
       exit ${__LAST_STATUS}
     EOSHELL
-    @configuration.should_receive(:run_without_rvm).with(expected)
+    expect(@configuration).to receive(:run_without_rvm).with(expected)
     @configuration.execute_task @task
   end
 
@@ -85,7 +85,7 @@ describe "rvm:install_ruby task" do
         rm -rf $CURL_HOME;
         exit ${__LAST_STATUS}
       EOSHELL
-      @configuration.should_receive(:run_without_rvm).with(expected)
+      expect(@configuration).to receive(:run_without_rvm).with(expected)
       @configuration.execute_task @task
     end
   end
@@ -113,7 +113,7 @@ describe "rvm:install_ruby task" do
         rm -rf $CURL_HOME;
         exit ${__LAST_STATUS}
       EOSHELL
-      @configuration.should_receive(:run_without_rvm).with(expected)
+      expect(@configuration).to receive(:run_without_rvm).with(expected)
       @configuration.execute_task @task
     end
   end

data/spec/rvm_paths_spec.rb

@@ -7,27 +7,27 @@ describe "rvm paths" do
     before { @configuration.trigger(:load) }
 
     it "should return default system path" do
-      @configuration.fetch(:rvm_system_path).should == '/usr/local/rvm'
+      expect(@configuration.fetch(:rvm_system_path)).to eq('/usr/local/rvm')
     end
 
     it "should return default user path" do
-      @configuration.fetch(:rvm_user_path).should == '$HOME/.rvm'
+      expect(@configuration.fetch(:rvm_user_path)).to eq('$HOME/.rvm')
     end
 
     it "should return default installation mode" do
-      @configuration.fetch(:rvm_type).should == :user
+      expect(@configuration.fetch(:rvm_type)).to eq(:user)
     end
 
     it "should return default path" do
-      @configuration.fetch(:rvm_path).should == '$HOME/.rvm'
+      expect(@configuration.fetch(:rvm_path)).to eq('$HOME/.rvm')
     end
 
     it "should return default bin path" do
-      @configuration.fetch(:rvm_bin_path).should == '$HOME/.rvm/bin'
+      expect(@configuration.fetch(:rvm_bin_path)).to eq('$HOME/.rvm/bin')
     end
 
     it "should return default gemset path" do
-      @configuration.fetch(:rvm_gemset_path).should == '$HOME/.rvm/gemsets'
+      expect(@configuration.fetch(:rvm_gemset_path)).to eq('$HOME/.rvm/gemsets')
     end
   end
 
@@ -38,15 +38,15 @@ describe "rvm paths" do
     end
 
     it "should return default path" do
-      @configuration.fetch(:rvm_path).should == '/usr/local/rvm'
+      expect(@configuration.fetch(:rvm_path)).to eq('/usr/local/rvm')
     end
 
     it "should return system bin path" do
-      @configuration.fetch(:rvm_bin_path).should == '/usr/local/rvm/bin'
+      expect(@configuration.fetch(:rvm_bin_path)).to eq('/usr/local/rvm/bin')
     end
 
     it "should return system gemset path" do
-      @configuration.fetch(:rvm_gemset_path).should == '/usr/local/rvm/gemsets'
+      expect(@configuration.fetch(:rvm_gemset_path)).to eq('/usr/local/rvm/gemsets')
     end
   end
 
@@ -56,38 +56,38 @@ describe "rvm paths" do
 
       it "should abort if rvm_type is :mixed and rvm_user empty" do
         expect { @configuration.trigger(:load) }.to \
-          abort_with_error(/When rvm_type is :mixed, you must also set rvm_user/)
+          raise_error(/When rvm_type is :mixed, you must also set rvm_user/)
       end
 
       it "should abort if rvm_user isn't an Array" do
         @configuration.set(:rvm_user, "a string")
         expect { @configuration.trigger(:load) }.to \
-          abort_with_error(/rvm_user must be an Array/)
+          raise_error(/rvm_user must be an Array/)
       end
 
       it "should abort if rvm_user contains an invalid value" do
         @configuration.set(:rvm_user, [ :invalid_value ])
         expect { @configuration.trigger(:load) }.to \
-          abort_with_error(/Invalid value\(s\) in rvm_user: invalid_value/)
+          raise_error(/Invalid value\(s\) in rvm_user: invalid_value/)
       end
 
       it "should abort if rvm_user mixes :none with other values" do
         @configuration.set(:rvm_user, [ :none, :gemsets ])
         expect { @configuration.trigger(:load) }.to \
-          abort_with_error(/rvm_user cannot mix :none with other values/)
+          raise_error(/rvm_user cannot mix :none with other values/)
       end
 
       it "should abort if rvm_user mixes :all with other values" do
         @configuration.set(:rvm_user, [ :gemsets, :all ])
         expect { @configuration.trigger(:load) }.to \
-          abort_with_error(/rvm_user cannot mix :all with other values/)
+          raise_error(/rvm_user cannot mix :all with other values/)
       end
     end
 
     it "should abort if rvm_user is set and rvm_type isn't :mixed" do
       @configuration.set(:rvm_user, [ :gemsets ])
       expect { @configuration.trigger(:load) }.to \
-        abort_with_error(/rvm_user must not be set unless rvm_type is :mixed/)
+        raise_error(/rvm_user must not be set unless rvm_type is :mixed/)
     end
   end
 end

metadata

@@ -1,120 +1,108 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rvm-capistrano
-version: !ruby/object:Gem::Version 
-  hash: 1
-  prerelease: 
-  segments: 
-  - 1
-  - 5
-  - 1
-  version: 1.5.1
+version: !ruby/object:Gem::Version
+  version: 1.5.6
 platform: ruby
-authors: 
+authors:
 - Wayne E. Seguin
 - Michal Papis
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-10-08 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2015-01-26 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: capistrano
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 59
-        segments: 
-        - 2
-        - 15
-        - 4
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
         version: 2.15.4
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.15.4
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: capistrano-spec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: capistrano-spec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: guard-rspec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: guard-bundler
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    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
@@ -141,51 +129,43 @@ files:
 - lib/rvm/capistrano/helpers/rvm_if_sudo.rb
 - lib/rvm/capistrano/helpers/rvm_methods.rb
 - lib/rvm/capistrano/helpers/with_rvm_group.rb
+- spec/support/abort_matcher.rb
+- spec/support/capistrano.rb
 - spec/spec_helper.rb
 - spec/create_gemset_spec.rb
-- spec/install_ruby_spec.rb
 - spec/empty_gemset_spec.rb
-- spec/support/capistrano.rb
-- spec/support/abort_matcher.rb
+- spec/install_ruby_spec.rb
 - spec/rvm_paths_spec.rb
 homepage: https://github.com/wayneeseguin/rvm-capistrano
-licenses: 
+licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_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'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.27
+rubygems_version: 2.0.15
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: RVM / Capistrano Integration Gem
-test_files: 
+test_files:
+- spec/support/abort_matcher.rb
+- spec/support/capistrano.rb
 - spec/spec_helper.rb
 - spec/create_gemset_spec.rb
-- spec/install_ruby_spec.rb
 - spec/empty_gemset_spec.rb
-- spec/support/capistrano.rb
-- spec/support/abort_matcher.rb
+- spec/install_ruby_spec.rb
 - spec/rvm_paths_spec.rb
+has_rdoc: