capistrano_chef_solo 0.0.5 → 0.1.0

data/.rvmrc

@@ -4,7 +4,7 @@
 # development environment upon cd'ing into the directory
 
 # First we specify our desired <ruby>[@<gemset>], the @gemset name is optional.
-environment_id="ruby-1.9.2-p290@capistrano_chef_solo"
+environment_id="ruby-1.9.3-p362@capistrano_chef_solo"
 
 #
 # Uncomment following line if you want options to be set only for given project.

data/capistrano_chef_solo.gemspec

@@ -20,5 +20,5 @@ Gem::Specification.new do |s|
 
   # specify any dependencies here; for example:
   # s.add_development_dependency "rspec"
-  s.add_runtime_dependency "capistrano", "~> 2.8.0"
+  s.add_runtime_dependency "capistrano", "~> 2.8"
 end

data/lib/capistrano_chef_solo.rb

@@ -163,6 +163,26 @@ Capistrano::Configuration.instance(:must_exist).load do
         end
       end
 
+      desc <<-DESC
+        Installs Ruby using ruby-build by default.
+
+        You can set the version by setting :ruby_version. For example:
+
+        set :ruby_version, "ree-1.8.7-2011.03"
+
+        If you are using Ruby 1.9.2, and want to have some speed improvements, \
+        capistrano_chef_solo also provides a patched Ruby compiled from source. \
+        To use this, set :use_ruby_build, false. See the the documentation of \
+        chef:install:ruby_from_source for more information.
+      DESC
+      task :ruby, :except => { :no_release => true } do
+        if fetch :use_ruby_build, true
+          ruby_build
+        else
+          ruby_from_source
+        end
+      end
+
       desc <<-DESC
         Compiles Ruby from source and applies 1.9.2 patches to speed it up.
 
@@ -208,7 +228,7 @@ Capistrano::Configuration.instance(:must_exist).load do
         See more on GC tuning here:
         http://www.rubyenterpriseedition.com/documentation.html#_garbage_collector_performance_tuning
       DESC
-      task :ruby, :except => { :no_release => true } do
+      task :ruby_from_source, :except => { :no_release => true } do
         ruby_version = fetch :ruby_version, "ruby-1.9.2-p290"
         ruby_url     = fetch :ruby_url, "http://ftp.ruby-lang.org/pub/ruby/1.9/#{ruby_version}.tar.gz"
         ruby_dir     = fetch :ruby_dir, ruby_version
@@ -265,6 +285,21 @@ Capistrano::Configuration.instance(:must_exist).load do
         run "#{sudo} #{sudo_opts} gem install ruby-shadow --no-ri --no-rdoc"
       end
 
+      desc "Installs ruby with ruby-build. Use :ruby_version to specify a version."
+      task :ruby_build, :except => { :no_release => true } do
+        version = fetch(:ruby_version) { "1.9.3-p0" }
+        script = <<-BASH
+          set -e
+          cd /tmp
+          test -d ruby-build || git clone git://github.com/sstephenson/ruby-build.git
+          cd ruby-build
+          #{sudo} #{sudo_opts} ./install.sh
+          #{sudo} #{sudo_opts} ruby-build #{version} /usr/local/
+        BASH
+        put script, "/tmp/install-ruby-build.sh", :via => :scp
+        run "bash /tmp/install-ruby-build.sh > /tmp/install-ruby-build.log"
+      end
+
     end
 
     def solo(*run_list)

data/lib/capistrano_chef_solo/version.rb

@@ -1,3 +1,3 @@
 module CapistranoChefSolo
-  VERSION = "0.0.5"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano_chef_solo
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,19 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-17 00:00:00.000000000Z
+date: 2013-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &2173526080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: '2.8'
   type: :runtime
   prerelease: false
-  version_requirements: *2173526080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.8'
 description: This gem provides Capistrano tasks to run chef-solo with Capistrano,
   with hardly any configuration needed.
 email:
@@ -58,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: capistrano_chef_solo
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Combining the awesome powers of Capistrano and chef-solo