rvm-capistrano 1.0.0 → 1.0.1

data/History.md

@@ -1,5 +1,11 @@
-=== 1.0 / 2012-03-26
+=== 1.0.1 / 2012-03-26
+
+* Updated to latest integration code for installing rvm/ruby
+* Cleaning code, improving gemification
+* Switch the default rvm installation type to user - as we discourage system installations
+* Improved README.md
+
+=== 1.0.0 / 2012-03-26
 
 * Ported RVM /Capistrano Gem Library into it's own repository from the main RVM
   repostitory. ( https://github.com/wayneeseguin/rvm-capistrano )
-

data/Manifest.yml

@@ -2,5 +2,6 @@
 - Manifest.yml
 - README.md
 - Rakefile
+- lib/rvm-capistrano.rb
 - lib/rvm/capistrano.rb
 - lib/rvm/capistrano/version.rb

data/README.md

@@ -1,6 +1,6 @@
-# rvm
+# rvm-capistrano
 
-https://rvm.beginrescueend.com/
+https://rvm.beginrescueend.com/integration/capistrano
 
 ## Description
 
@@ -8,9 +8,25 @@ RVM / Capistrano Integration Gem
 
 ## Installation
 
-* gem install rvm-capistrano
+RVM / Capistrano integration is now available as a separate gem
+
+    $ gem install rvm-capistrano
+
+## Example
+
+The following code will:
+
+- detect `ruby@gemset` used for deployment
+- install RVM and Ruby on `cap deploy:detup`
+
+    set :rvm_ruby_string, ENV['GEM_HOME'].gsub(/.*\//,"")
+    
+    before 'deploy:setup', 'rvm:install_rvm'
+    before 'deploy:setup', 'rvm:install_ruby'
+    
+    require "rvm-capistrano"
+
 
 ## Development
 
     $ rake spec
-

data/lib/rvm-capistrano.rb

@@ -0,0 +1 @@
+require 'rvm/capistrano'

data/lib/rvm/capistrano.rb

@@ -1,7 +1,4 @@
 # Recipes for using RVM on a server with capistrano.
-unless Capistrano::Configuration.respond_to?(:instance)
-  abort "rvm/capistrano requires Capistrano >= 2."
-end
 
 Capistrano::Configuration.instance(true).load do
 
@@ -15,12 +12,16 @@ Capistrano::Configuration.instance(true).load do
   set :default_shell do
     shell = File.join(rvm_bin_path, "rvm-shell")
     ruby = rvm_ruby_string.to_s.strip
-    shell = "rvm_path=#{rvm_path} #{shell} '#{ruby}'" unless ruby.empty?
+    if "#{ruby}" == "release_path"
+      shell = "rvm_path=#{rvm_path} #{shell} --path '#{release_path}'"
+    else
+      shell = "rvm_path=#{rvm_path} #{shell} '#{ruby}'" unless ruby.empty?
+    end
     shell
   end
 
   # Let users set the type of their rvm install.
-  _cset(:rvm_type, :system)
+  _cset(:rvm_type, :user)
 
   # Define rvm_path
   # This is used in the default_shell command to pass the required variable to rvm-shell, allowing
@@ -51,12 +52,61 @@ Capistrano::Configuration.instance(true).load do
 
   # Use the default ruby on the server, by default :)
   _cset(:rvm_ruby_string, "default")
+
+  # 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 | grep vendor_id | wc -l)")
+
+  namespace :rvm do
+    desc <<-EOF
+      Install RVM of the given choice to the server.
+      By default RVM "stable" is installed, change with:
+
+      set :rvm_install_type, :head
+
+      By default BASH is used for installer, change with:
+
+      set :rvm_install_shell, :zsh
+    EOF
+    task :install_rvm do
+      run "#{rvm_install_shell} -s #{rvm_install_type} \
+< <(curl -s https://raw.github.com/wayneeseguin/rvm/master/binscripts/rvm-installer)", :shell => "#{rvm_install_shell}"
+    end
+
+    desc <<-EOF
+      Install RVM ruby to the server, create gemset if needed.
+      By default ruby is installed, you can reinstall with:
+
+      set :rvm_install_ruby, :reinstall
+
+      By default ruby is compiled using all CPU cores, change with:
+
+      set :rvm_install_ruby_threads, :reinstall
+
+      By default BASH is used for installer, change with:
+
+      set :rvm_install_shell, :zsh
+    EOF
+    task :install_ruby do
+      ruby, gemset = rvm_ruby_string.to_s.strip.split /@/
+      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}", :shell => "#{rvm_install_shell}"
+        if gemset
+          run "#{File.join(rvm_bin_path, "rvm")} #{ruby} do rvm gemset create #{gemset}", :shell => "#{rvm_install_shell}"
+        end
+      end
+    end
+  end
 end
 
 # E.g, to use ree and rails 3:
 #
-#   require 'rvm/capistrano'
+#   require 'rvm-capistrano'
 #   set :rvm_ruby_string, "ree@rails3"
 #
-
-

data/lib/rvm/capistrano/version.rb

@@ -1,5 +1,5 @@
 module RVM
-  module Capistrano
-    Version = "1.0.0"
+  class Capistrano
+    VERSION="1.0.1"
   end
 end

metadata

@@ -1,88 +1,118 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: rvm-capistrano
-version: !ruby/object:Gem::Version
-  version: 1.0.0
+version: !ruby/object:Gem::Version 
+  hash: 21
   prerelease: 
+  segments: 
+  - 1
+  - 0
+  - 1
+  version: 1.0.1
 platform: ruby
-authors:
+authors: 
 - Wayne E. Seguin
-- ! '"Michał Papis, '
+- "Micha\xC5\x82 Papis"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-26 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-03-26 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: capistrano
-  requirement: &70319515786340 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 0
+        - 0
+        version: 2.0.0
   type: :runtime
-  prerelease: false
-  version_requirements: *70319515786340
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &70319515785840 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70319515785840
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: minitest
-  requirement: &70319515785360 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70319515785360
+  version_requirements: *id003
 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
 - Rakefile
+- lib/rvm-capistrano.rb
 - lib/rvm/capistrano.rb
 - lib/rvm/capistrano/version.rb
 - spec/spec_helper.rb
-homepage: https://rvm.beginrescueend.com/
+homepage: https://rvm.beginrescueend.com/integration/capistrano
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_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"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: RVM / Capistrano Integration Gem
-test_files:
+test_files: 
 - spec/spec_helper.rb