chef_cap 0.3.21 → 0.3.22

data/lib/chef_cap/version.rb

@@ -1,3 +1,3 @@
 module ChefCap
-  VERSION = "0.3.21"
+  VERSION = "0.3.22"
 end

data/recipes/chef_cap.rb

@@ -172,10 +172,10 @@ namespace :chef do
     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 --version=#{chef_version}"
-      run "#{gem_check_for_chef_cmd} || #{install_chef_cmd} && echo 'Chef Solo already on this server.'"
+      install_chef_cmd = "`cat #{rbenv_bin_path}` exec gem install chef --no-ri --no-rdoc --version=#{chef_version}"
+      run "`cat #{rbenv_bin_path}` exec #{gem_check_for_chef_cmd} || #{install_chef_cmd} && echo 'Chef Solo already on this server.'"
 
-      run "rbenv rehash"
+      run "`cat #{rbenv_bin_path}` 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 --version=#{chef_version}"

data/recipes/rbenv.rb

@@ -36,8 +36,8 @@ namespace :bootstrap do
       fi;
 
       # Install Ruby #{ruby_version}
-      HAVE_CORRECT_VERSION=`rbenv versions | grep '#{ruby_version}' | wc -l`
-      if [ $HAVE_CORRECT_VERSION -eq 0 ]; then
+      HAVE_CORRECT_VERSION=`rbenv versions | grep '#{ruby_version}'`
+      if [ $? != 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 #{ruby_version}..."
@@ -47,6 +47,7 @@ namespace :bootstrap do
         rbenv rehash
       fi;
 
+      echo "env RBENV_ROOT=`rbenv root` `which rbenv`" > /tmp/.chef_cap_rbenv_path
       rbenv versions | grep '#{ruby_version}'
     SH
     put standup_script, "/tmp/chef-cap-#{rails_env}-rbenv-standup.sh", :mode => "0700"

data/recipes/ruby.rb

@@ -6,22 +6,20 @@ namespace :bootstrap do
 
     case local_rvs
     when 'rbenv'
-
-      set :default_environment, {
-        'PATH' => "$HOME/.rbenv/bin:$HOME/.rbenv/shims:$PATH:/usr/sbin"
-      }
       set :ruby_version_switcher, "rbenv"
-      set :exec_chef_solo, "chef-solo -c /tmp/chef-cap-solo-#{local_env}.rb #{debug_flag}"
+      set :rbenv_bin_path, "/tmp/.chef_cap_rbenv_path"
+      set :exec_chef_solo, "`cat #{rbenv_bin_path}` exec chef-solo -c /tmp/chef-cap-solo-#{local_env}.rb #{debug_flag}"
     else
       ## rvm is the default
-      set :default_environment, {
-        'PATH' => "$PATH:/usr/sbin"
-      }
       set :ruby_version_switcher, "rvm"
       set :rvm_bin_path, "/tmp/.chef_cap_rvm_path"
       set :exec_chef_solo, "`cat #{rvm_bin_path}` default exec chef-solo -c /tmp/chef-cap-solo-#{local_env}.rb #{debug_flag}"
     end
 
+    set :default_environment, {
+      'PATH' => "$PATH:/usr/sbin"
+    }
+
     depend :remote, :command, ruby_version_switcher
     depend :remote, :command, "chef-solo"
 

data/spec/chef_cap_spec.rb

@@ -567,8 +567,8 @@ describe "chef_cap" do
         it "sets up chef gem" 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 --version=0.1982.1234 && echo 'Chef Solo already on this server.'").and_return("mocked")
-          chef_cap.should_receive(:run).ordered.with("rbenv rehash").and_return("mocked")
+          chef_cap.should_receive(:run).ordered.with("`cat /tmp/.chef_cap_rbenv_path` exec gem specification --version '>=0.1982.1234' chef 2>&1 | awk 'BEGIN { s = 0 } /^name:/ { s = 1; exit }; END { if(s == 0) exit 1 }' || `cat /tmp/.chef_cap_rbenv_path` exec gem install chef --no-ri --no-rdoc --version=0.1982.1234 && echo 'Chef Solo already on this server.'").and_return("mocked")
+          chef_cap.should_receive(:run).ordered.with("`cat /tmp/.chef_cap_rbenv_path` rehash").and_return("mocked")
 
           chef_cap.cap_task["bootstrap:ruby"].call
           chef_cap.cap_task["chef:setup"].call

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef_cap
 version: !ruby/object:Gem::Version
-  version: 0.3.21
+  version: 0.3.22
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-07 00:00:00.000000000 Z
+date: 2012-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -103,7 +103,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2284293794674895370
+      hash: -1470809278621786492
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -112,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2284293794674895370
+      hash: -1470809278621786492
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.19