chef_cap 0.3.11 → 0.3.12

data/lib/chef_cap/version.rb

@@ -1,3 +1,3 @@
 module ChefCap
-  VERSION = "0.3.11"
+  VERSION = "0.3.12"
 end

data/recipes/chef_cap.rb

@@ -159,16 +159,19 @@ set :debug_flag, ENV['DEBUG'] ? '-l debug' : ''
 
 namespace :chef do
   task :setup do
+    bundler_install_cmd = "gem install bundler --no-ri --no-rdoc"
     case ruby_version_switcher
     when 'rbenv'
       gem_check_for_chef_cmd = "gem specification --version '>=#{chef_version}' chef 2>&1 | awk 'BEGIN { s = 0 } /^name:/ { s = 1; exit }; END { if(s == 0) exit 1 }'"
       install_chef_cmd = "gem install chef --no-ri --no-rdoc"
       run "#{gem_check_for_chef_cmd} || #{install_chef_cmd} && echo 'Chef Solo already on this server.'"
+      run bundler_install_cmd
       run "rbenv rehash"
     else
       gem_check_for_chef_cmd = "gem specification --version '>=#{chef_version}' chef 2>&1 | awk 'BEGIN { s = 0 } /^name:/ { s = 1; exit }; END { if(s == 0) exit 1 }'"
       install_chef_cmd = "sudo `cat #{rvm_bin_path}` default exec gem install chef --no-ri --no-rdoc"
       sudo "`cat #{rvm_bin_path}` default exec #{gem_check_for_chef_cmd} || #{install_chef_cmd} && echo 'Chef Solo already on this server.'"
+      sudo "`cat #{rvm_bin_path}` default exec #{bundler_install_cmd}"
       sudo "`cat #{rvm_bin_path}` default exec which chef-solo"
     end
   end

data/recipes/rbenv.rb

@@ -1,8 +1,8 @@
 namespace :bootstrap do
   desc "Create a standalone rbenv installation with a default ruby to use with chef-solo"
   task :rbenv do
-    set :ruby_version, (ChefDnaParser.parsed["environment"]["ruby_version"] rescue "ruby-1.9.3-p0" || "ruby-1.9.3-p0")
-    set :rbenv_ruby_version, ruby_version.gsub(/^ruby\-/,'')
+    set :ruby_version, (ChefDnaParser.parsed["environment"]["ruby_version"] rescue "1.9.3-p0" || "1.9.3-p0")
+    ruby_version.gsub!(/^ruby\-/,'')
     standup_script = <<-SH
       #!/bin/bash
       #
@@ -32,14 +32,14 @@ namespace :bootstrap do
         cd $HOME
       fi;
 
-      # Install Ruby #{rbenv_ruby_version}
-      HAVE_CORRECT_VERSION=`rbenv versions | grep '#{rbenv_ruby_version}' | wc -l`
+      # Install Ruby #{ruby_version}
+      HAVE_CORRECT_VERSION=`rbenv versions | grep '#{ruby_version}' | wc -l`
       if [ $HAVE_CORRECT_VERSION -eq 0 ]; then
         echo "Installing Ruby dependencies..."
         sudo yum install -y automake gcc make libtool curl zlib zlib-devel patch readline readline-devel libffi-devel openssl openssl-devel
-        echo "Installing #{rbenv_ruby_version}..."
-        rbenv install #{rbenv_ruby_version}
-        rbenv global #{rbenv_ruby_version}
+        echo "Installing #{ruby_version}..."
+        rbenv install #{ruby_version}
+        rbenv global #{ruby_version}
         # Rehash!
         rbenv rehash
       fi;

data/recipes/rvm.rb

@@ -2,6 +2,9 @@ namespace :bootstrap do
   desc "Create a standalone rvm installation with a default ruby to use with chef-solo"
   task :rvm do
     set :ruby_version, (ChefDnaParser.parsed["environment"]["ruby_version"] rescue "ruby-1.9.3-p0" || "ruby-1.9.3-p0")
+    if ruby_version =~ /^[0-9]/
+      ruby_version = "ruby-#{ruby_version}"
+    end
     rvm_standup_script = <<-SH
       #!/bin/bash
       #

data/spec/chef_cap_spec.rb

@@ -485,6 +485,7 @@ describe "chef_cap" do
         it "sets up chef gem" do
           chef_cap.cap_servers.should_not be_empty
           chef_cap.should_receive(:sudo).ordered.with("`cat /tmp/.chef_cap_rvm_path` default exec gem specification --version '>=0.1982.1234' chef 2>&1 | awk 'BEGIN { s = 0 } /^name:/ { s = 1; exit }; END { if(s == 0) exit 1 }' || sudo `cat /tmp/.chef_cap_rvm_path` default exec gem install chef --no-ri --no-rdoc && echo 'Chef Solo already on this server.'").and_return("mocked")
+          chef_cap.should_receive(:sudo).ordered.with("`cat /tmp/.chef_cap_rvm_path` default exec gem install bundler --no-ri --no-rdoc").and_return("mocked")
           chef_cap.should_receive(:sudo).ordered.with("`cat /tmp/.chef_cap_rvm_path` default exec which chef-solo").and_return("mocked")
 
           chef_cap.cap_task["bootstrap:ruby"].call
@@ -536,6 +537,7 @@ describe "chef_cap" do
           chef_cap.cap_servers.should_not be_empty
           chef_cap.stub!(:put => "stubbed")
           chef_cap.should_receive(:run).ordered.with("gem specification --version '>=0.1982.1234' chef 2>&1 | awk 'BEGIN { s = 0 } /^name:/ { s = 1; exit }; END { if(s == 0) exit 1 }' || gem install chef --no-ri --no-rdoc && echo 'Chef Solo already on this server.'").and_return("mocked")
+          chef_cap.should_receive(:run).ordered.with("gem install bundler --no-ri --no-rdoc").and_return("mocked")
           chef_cap.should_receive(:run).ordered.with("rbenv rehash").and_return("mocked")
 
           chef_cap.cap_task["bootstrap:ruby"].call

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef_cap
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.3.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-28 00:00:00.000000000 Z
+date: 2012-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &2239810400 !ruby/object:Gem::Requirement
+  requirement: &2240072540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.5.5
   type: :runtime
   prerelease: false
-  version_requirements: *2239810400
+  version_requirements: *2240072540
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2239809900 !ruby/object:Gem::Requirement
+  requirement: &2240072040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '2.1'
   type: :development
   prerelease: false
-  version_requirements: *2239809900
+  version_requirements: *2240072040
 description: chef_cap uses chef"s JSON config format to drive both capistrano and
   chef-solo"
 email:
@@ -93,7 +93,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2890703575138462946
+      hash: -3829800426709448034
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -102,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2890703575138462946
+      hash: -3829800426709448034
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15