rvm-capistrano 1.5.0.rc1 → 1.5.0

data/History.md

@@ -1,3 +1,7 @@
+### 1.5.0 / 2013-09-04
+
+* Add rvm:info & rvm:list for easier debugging
+
 ### 1.5.0.rc1 / 2013-08-18
 
 * Thanks to @aspiers for the great work:

data/Manifest.yml

@@ -10,6 +10,7 @@
 - lib/rvm/capistrano/empty_gemset.rb
 - lib/rvm/capistrano/gem_install_uninstall.rb
 - lib/rvm/capistrano/gemset_import_export.rb
+- lib/rvm/capistrano/info_list.rb
 - lib/rvm/capistrano/install_pkgs.rb
 - lib/rvm/capistrano/install_ruby.rb
 - lib/rvm/capistrano/install_rvm.rb

data/README.md

@@ -33,7 +33,8 @@ modules which allow selecting which parts of it should be included.
 - `base`     - minimal code, does not change behaviors, only provides definitions like `:rvm_shell`
 - `selector` - extends `base` to automatically `set :default_shell`
 - `selector_mixed` - alternative version of `selector` allowing to select which servers should be RVM aware
-- `install_rvm`    - adds task `rvm:install_rvm`
+- `info_list`      - adds tasks `rvm:info`, `rvm:list` and `rvm:info_list`
+- `install_rvm`    - adds task `rvm:install_rvm` - it also updates rvm if already installed
 - `install_ruby`   - adds task `rvm:install_ruby`
 - `create_gemset`  - adds task `rvm:create_gemset`
 - `empty_gemset`   - adds task `rvm:empty_gemset`
@@ -42,7 +43,7 @@ modules which allow selecting which parts of it should be included.
 - `gemset_import_export`  - adds tasks `rvm:import_gemset` / `rvm:export_gemset`
 - `alias_and_wrapp`       - adds tasks `rvm:create_alias`  / `rvm:create_wrappers` / `rvm:show_alias_path`
 
-By default `rvm/capistrano` loads: `selector`, `install_rvm`, `install_ruby`, `create_gemset`.
+By default `rvm/capistrano` loads: `selector`, `info_list`, `install_rvm`, `install_ruby`, `create_gemset`.
 
 Warning: `selector` and `selector_mixed` are to be used separately they can not be used both at the same time.
 
@@ -61,7 +62,7 @@ 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_rvm'  # install/update RVM
 before 'deploy:setup', 'rvm:install_ruby' # install Ruby and create gemset, OR:
 # before 'deploy:setup', 'rvm:create_gemset' # only create gemset
 ```
@@ -84,7 +85,7 @@ 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_rvm'  # install/update RVM
 before 'deploy', 'rvm:install_ruby' # install Ruby and create gemset (both if missing)
 ```
 
@@ -163,6 +164,12 @@ task :example do
 end
 ```
 
+### Show info on remote rvm and list rubies
+
+```bash
+cap rvm:info_list
+```
+
 ## Options
 
 - `:rvm_ruby_string` - which ruby should be loaded
@@ -212,8 +219,11 @@ $ cap -T rvm
 cap rvm:create_gemset        # Create gemset
 cap rvm:export_gemset        # Export the current RVM ruby gemset contents to a file.
 cap rvm:import_gemset        # Import file contents to the current RVM ruby gemset.
+cap rvm:info                 # Show rvm info
+cap rvm:info_list            # Show info and list rubies
+cap rvm:list                 # List rvm rubies
 cap rvm:install_ruby         # Install RVM ruby to the server, create gemset ...
-cap rvm:install_rvm          # Install RVM of the given choice to the server.
+cap rvm:install_rvm          # Install/update RVM of the given choice to the server.
 cap rvm:install_pkgs         # Install RVM packages to the server.
 cap rvm:install_gem   GEM=my_gem  # Install gem {my_gem} on the server using selected ruby.
                                   # Use `ENV['GEM'] = "bundler"` in script to specify gems.

data/Rakefile

@@ -1,9 +1,11 @@
 task :default => "spec:run"
 
+require "rspec/core/rake_task"
+
 namespace :spec do
   desc "Run the tests."
-  task :run do
-    # TODO: Port over the tests.
+  RSpec::Core::RakeTask.new(:run) do |spec|
+    spec.pattern = "spec/**/*_spec.rb"
   end
 end
 

data/lib/rvm/capistrano.rb

@@ -1,6 +1,7 @@
 # Recipes for using RVM on a server with capistrano.
 
 require 'rvm/capistrano/selector'
+require 'rvm/capistrano/info_list'
 require 'rvm/capistrano/install_rvm'
 require 'rvm/capistrano/install_ruby'
 require 'rvm/capistrano/create_gemset'

data/lib/rvm/capistrano/helpers/run_silent_curl.rb

@@ -2,7 +2,7 @@ require 'rvm/capistrano/base'
 
 rvm_with_capistrano do
   def run_silent_curl(command, options={})
-    run_without_rvm(<<-EOF.gsub(/[\s]+/, ' '), options)
+    run_without_rvm(<<-EOF.gsub(/[\s]+/, ' '))
       __LAST_STATUS=0;
       export CURL_HOME="${TMPDIR:-${HOME}}/.rvm-curl-config.$$";
       mkdir ${CURL_HOME}/;

data/lib/rvm/capistrano/info_list.rb

@@ -0,0 +1,23 @@
+require 'rvm/capistrano/base'
+require 'rvm/capistrano/helpers/with_rvm_group'
+
+rvm_with_capistrano do
+  namespace :rvm do
+
+    desc "Show rvm info"
+    rvm_task :info do
+      run_rvm("info")
+    end
+
+    desc "List rvm rubies"
+    rvm_task :list do
+      run_rvm("list")
+    end
+
+    desc "Show info and list rubies"
+    task :info_list do
+      info
+      list
+    end
+  end
+end

data/lib/rvm/capistrano/install_rvm.rb

@@ -9,6 +9,8 @@ rvm_with_capistrano do
     # Let users set the install type of their choice.
     _cset(:rvm_install_type, :stable)
 
+    _cset(:rvm_install_url, "https://get.rvm.io")
+
     # By default system installations add deploying user to rvm group. also try :all
     _cset(:rvm_add_to_group, fetch(:user,"$USER"))
 
@@ -27,7 +29,7 @@ rvm_with_capistrano do
       set :rvm_install_shell, :zsh
     EOF
     rvm_task :install_rvm do
-      command_fetch    = "curl -L get.rvm.io"
+      command_fetch    = "curl -L #{rvm_install_url}"
       command_install  = rvm_if_sudo(:subject_class => :rvm)
       command_install << "#{rvm_install_shell} -s #{rvm_install_type} --path #{rvm_path}"
       case rvm_type

data/lib/rvm/capistrano/version.rb

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

data/spec/install_ruby_spec.rb

@@ -25,8 +25,7 @@ describe "rvm:install_ruby task" do
       rm -rf $CURL_HOME;
       exit ${__LAST_STATUS}
     EOSHELL
-    @configuration.should_receive(:run_without_rvm) \
-      .with(expected, :subject_class => :rubies)
+    @configuration.should_receive(:run_without_rvm).with(expected)
     @configuration.execute_task @task
   end
 
@@ -55,8 +54,7 @@ describe "rvm:install_ruby task" do
       rm -rf $CURL_HOME;
       exit ${__LAST_STATUS}
     EOSHELL
-    @configuration.should_receive(:run_without_rvm) \
-      .with(expected, :subject_class => :rubies)
+    @configuration.should_receive(:run_without_rvm).with(expected)
     @configuration.execute_task @task
   end
 
@@ -87,8 +85,7 @@ describe "rvm:install_ruby task" do
         rm -rf $CURL_HOME;
         exit ${__LAST_STATUS}
       EOSHELL
-      @configuration.should_receive(:run_without_rvm) \
-        .with(expected, :subject_class => :rubies)
+      @configuration.should_receive(:run_without_rvm).with(expected)
       @configuration.execute_task @task
     end
   end
@@ -116,8 +113,7 @@ describe "rvm:install_ruby task" do
         rm -rf $CURL_HOME;
         exit ${__LAST_STATUS}
       EOSHELL
-      @configuration.should_receive(:run_without_rvm) \
-        .with(expected, :subject_class => :rubies)
+      @configuration.should_receive(:run_without_rvm).with(expected)
       @configuration.execute_task @task
     end
   end

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rvm-capistrano
 version: !ruby/object:Gem::Version 
-  hash: 1792655073
-  prerelease: 6
+  hash: 3
+  prerelease: 
   segments: 
   - 1
   - 5
   - 0
-  - rc
-  - 1
-  version: 1.5.0.rc1
+  version: 1.5.0
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -18,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-08-18 00:00:00 Z
+date: 2013-09-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: capistrano
@@ -129,6 +127,7 @@ files:
 - lib/rvm/capistrano/empty_gemset.rb
 - lib/rvm/capistrano/gem_install_uninstall.rb
 - lib/rvm/capistrano/gemset_import_export.rb
+- lib/rvm/capistrano/info_list.rb
 - lib/rvm/capistrano/install_pkgs.rb
 - lib/rvm/capistrano/install_ruby.rb
 - lib/rvm/capistrano/install_rvm.rb
@@ -169,14 +168,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: