chef_cap 0.3.12 → 0.3.13

data/lib/chef_cap/version.rb

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

data/recipes/chef_cap.rb

@@ -159,19 +159,24 @@ 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
+
+      gem_check_for_bundler_cmd = "gem specification --version '>0' bundler 2>&1 | awk 'BEGIN { s = 0 } /^name:/ { s = 1; exit }; END { if(s == 0) exit 1 }'"
+      install_bundler_cmd = "gem install bundler --no-ri --no-rdoc"
+      run "#{gem_check_for_bundler_cmd} || #{install_bundler_cmd} && echo 'Bundler already on this server.'"
       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}"
+
+      gem_check_for_bundler_cmd = "gem specification --version '>0' bundler 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 bundler --no-ri --no-rdoc"
+      sudo "`cat #{rvm_bin_path}` default exec #{gem_check_for_bundler_cmd} || #{install_bundler_cmd} && echo 'Bundler already on this server.'"
       sudo "`cat #{rvm_bin_path}` default exec which chef-solo"
     end
   end

data/spec/chef_cap_spec.rb

@@ -485,7 +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 gem specification --version '>0' bundler 2>&1 | awk 'BEGIN { s = 0 } /^name:/ { s = 1; exit }; END { if(s == 0) exit 1 }' ||  && echo 'Bundler already on this server.'").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
@@ -537,7 +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("gem specification --version '>0' bundler 2>&1 | awk 'BEGIN { s = 0 } /^name:/ { s = 1; exit }; END { if(s == 0) exit 1 }' || gem install bundler --no-ri --no-rdoc && echo 'Bundler already on this server.'").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.12
+  version: 0.3.13
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &2240072540 !ruby/object:Gem::Requirement
+  requirement: &2248518500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.5.5
   type: :runtime
   prerelease: false
-  version_requirements: *2240072540
+  version_requirements: *2248518500
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2240072040 !ruby/object:Gem::Requirement
+  requirement: &2248518000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '2.1'
   type: :development
   prerelease: false
-  version_requirements: *2240072040
+  version_requirements: *2248518000
 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: -3829800426709448034
+      hash: -2885690206937113614
 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: -3829800426709448034
+      hash: -2885690206937113614
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15