rvm-capistrano 1.2.7 → 1.3.0.rc1

data/README.md

@@ -29,10 +29,14 @@ Example:
 
     set :rvm_ruby_string, ENV['GEM_HOME'].gsub(/.*\//,"")
     set :rvm_install_ruby_params, '--1.9'      # for jruby/rbx default to 1.9 mode
+    set :rvm_install_pkgs, %w[libyaml openssl] # package list from https://rvm.io/packages
+    set :rvm_install_ruby_params, '--with-opt-dir=/usr/local/rvm/usr' # package support
 
     before 'deploy:setup', 'rvm:install_rvm'   # install RVM
+    before 'deploy:setup', 'rvm:install_pkgs'  # install RVM packages before Ruby
     before 'deploy:setup', 'rvm:install_ruby'  # install Ruby and create gemset, or:
     before 'deploy:setup', 'rvm:create_gemset' # only create gemset
+    before 'deploy:setup', 'rvm:import_gemset' # import gemset from file
 
     require "rvm/capistrano"
 
@@ -46,8 +50,11 @@ Example:
 ```bash
 $ 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: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_pkgs         # Install RVM packages to the server.
 cap rvm:install_gem   GEM=my_gem  # Install gem {my_gem} on the server using selected ruby.
 cap rvm:uninstall_gem GEM=my_gem  # Uninstall gem {my_gem} from the server selected ruby.
 ```

data/lib/rvm/capistrano.rb

@@ -56,6 +56,9 @@ module Capistrano
       end
     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")
 
@@ -73,7 +76,22 @@ module Capistrano
     # Pass no special params to the ruby build by default
     _cset(:rvm_install_ruby_params, '')
 
+    # Additional rvm packages to install.
+    _cset(:rvm_install_pkgs, '')
+
     namespace :rvm do
+
+      command_curl_start = <<-EOF.gsub(/^\s*/, '')
+        export CURL_HOME=${TMPDIR:-${HOME}}/.rvm-curl-config.$$;
+        mkdir ${CURL_HOME}/;
+        {
+          [[ -r ${HOME}/.curlrc ]] && cat ${HOME}/.curlrc;
+          echo "silent";
+          echo "show-error";
+        } > $CURL_HOME/.curlrc
+      EOF
+      command_curl_end = "rm -rf $CURL_HOME"
+
       desc <<-EOF
         Install RVM of the given choice to the server.
         By default RVM "stable" is installed, change with:
@@ -85,16 +103,6 @@ module Capistrano
         set :rvm_install_shell, :zsh
       EOF
       task :install_rvm do
-        command_curl_start = <<-EOF.gsub(/^\s*/, '')
-          export CURL_HOME=${TMPDIR:-${HOME}}/.rvm-curl-config;
-          mkdir ${CURL_HOME}/;
-          {
-            [[ -r ${HOME}/.curlrc ]] && cat ${HOME}/.curlrc;
-            echo "silent";
-            echo "show-error";
-          } > $CURL_HOME/.curlrc
-        EOF
-        command_curl_end = "rm -rf $CURL_HOME"
         command_fetch    = "curl -L get.rvm.io"
         command_install  = case rvm_type
           when :root, :system
@@ -134,10 +142,33 @@ module Capistrano
         if %w( release_path default ).include? "#{ruby}"
           raise "ruby can not be installed when using :rvm_ruby_string => :#{ruby}"
         else
-          run "#{File.join(rvm_bin_path, "rvm")} #{rvm_install_ruby} #{ruby} -j #{rvm_install_ruby_threads} #{rvm_install_ruby_params}", :shell => "#{rvm_install_shell}"
+          command_install = "#{File.join(rvm_bin_path, "rvm")} #{rvm_install_ruby} #{ruby} -j #{rvm_install_ruby_threads} #{rvm_install_ruby_params}"
           if gemset
-            run "#{File.join(rvm_bin_path, "rvm")} #{ruby} do rvm gemset create #{gemset}", :shell => "#{rvm_install_shell}"
+            command_install << "; #{File.join(rvm_bin_path, "rvm")} #{ruby} do rvm gemset create #{gemset}"
           end
+          _command = <<-EOF
+            #{command_curl_start};
+            #{command_install};
+            #{command_curl_end}
+          EOF
+          run "#{_command}".gsub(/[\s\n]+/, ' '), :shell => "#{rvm_install_shell}"
+        end
+      end
+
+      desc <<-EOF   
+        Install RVM packages to the server.
+
+        This must come before the 'rvm:install_ruby' task is called.
+        
+        The package list is empty by default.  Specifiy the packages to install with:
+
+        set :rvm_install_pkgs, %w[libyaml curl]
+
+        Full list of packages available at https://rvm.io/packages/ or by running 'rvm pkg'.
+      EOF
+      task :install_pkgs do
+        rvm_install_pkgs.each do |pkg|
+          run "#{File.join(rvm_bin_path, "rvm")} pkg install #{pkg}", :shell => "#{rvm_install_shell}"
         end
       end
 
@@ -153,6 +184,44 @@ module Capistrano
         end
       end
 
+      desc <<-EOF
+        Import file contents to the current RVM ruby gemset.
+
+        The gemset filename must match :rvm_ruby_string.gems and be located in :rvm_gemset_path.
+        :rvm_gemset_path defaults to :rvm_path/gemsets
+
+        The gemset can be created with 'cap rvm:gemset_export'.
+      EOF
+      task :import_gemset do
+        ruby, gemset = rvm_ruby_string.to_s.strip.split /@/
+        if %w( release_path default ).include? "#{ruby}"
+          raise "gemset can not be imported when using :rvm_ruby_string => :#{ruby}"
+        else
+          if gemset
+            run "#{File.join(rvm_bin_path, "rvm-shell")} #{rvm_ruby_string} rvm gemset import #{File.join(rvm_gemset_path, "#{rvm_ruby_string}.gems")}", :shell => "#{rvm_install_shell}"
+          end
+        end
+      end
+
+      desc <<-EOF
+        Export the current RVM ruby gemset contents to a file.
+
+        The gemset filename will match :rvm_ruby_string.gems and be located in :rvm_gemset_path.
+        :rvm_gemset_path defaults to :rvm_path/gemsets
+
+        The gemset can be imported with 'cap rvm:gemset_import'.
+      EOF
+      task :export_gemset do
+        ruby, gemset = rvm_ruby_string.to_s.strip.split /@/
+        if %w( release_path default ).include? "#{ruby}"
+          raise "gemset can not be imported when using :rvm_ruby_string => :#{ruby}"
+        else
+          if gemset
+            run "#{File.join(rvm_bin_path, "rvm-shell")} #{rvm_ruby_string} rvm gemset export > #{File.join(rvm_gemset_path, "#{rvm_ruby_string}.gems")}", :shell => "#{rvm_install_shell}"
+          end
+        end
+      end
+
       desc "Install a gem, 'cap rvm:install_gem GEM=my_gem'."
       task :install_gem do
         run "#{File.join(rvm_bin_path, "rvm")} #{rvm_ruby_string} do gem install #{ENV['GEM']}", :shell => "#{rvm_install_shell}"

data/lib/rvm/capistrano/version.rb

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

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: rvm-capistrano
 version: !ruby/object:Gem::Version
-  version: 1.2.7
-  prerelease: 
+  version: 1.3.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Wayne E. Seguin
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-09 00:00:00.000000000 Z
+date: 2012-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -92,12 +92,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.19
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: RVM / Capistrano Integration Gem