chef_cap 0.2.3 → 0.2.4

data/lib/chef_cap/version.rb

@@ -1,3 +1,3 @@
 module ChefCap
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/recipes/chef_cap.rb

@@ -146,13 +146,15 @@ else
   set :chef_version, default_chef_version
 end
 
+set :rvm_bin_path, "/tmp/.chef_cap_rvm_path"
+
 namespace :chef do
   desc "Setup chef solo on the server(s)"
   task :setup do
     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 rvm default exec gem install chef --no-ri --no-rdoc"
-    sudo "rvm default exec #{gem_check_for_chef_cmd} || #{install_chef_cmd} && echo 'Chef Solo already on this server.'"
-    sudo "rvm default exec which chef-solo"
+    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 which chef-solo"
   end
 
   desc "Run chef-solo on the server(s)"
@@ -198,7 +200,7 @@ namespace :chef do
 
   task :run_chef_solo do
     debug_flag = ENV['QUIET'] ? '' : '-l debug'
-    run_chef_solo = "env PATH=$PATH:/usr/sbin rvm default exec chef-solo -c /tmp/chef-cap-solo-#{rails_env}.rb -j /tmp/chef-cap-#{rails_env}-`hostname`.json #{debug_flag}"
+    run_chef_solo = "env PATH=$PATH:/usr/sbin `cat #{rvm_bin_path}` default exec chef-solo -c /tmp/chef-cap-solo-#{rails_env}.rb -j /tmp/chef-cap-#{rails_env}-`hostname`.json #{debug_flag}"
 
     unless role_order.empty?
       role_order.each do |role, dependent_roles|

data/recipes/rvm_bootstrap.rb

@@ -9,20 +9,26 @@ namespace :rvm do
     rvm_standup_script = <<-SH
       #!/bin/bash
       RVM_URL="https://rvm.beginrescueend.com/install/rvm"
-      export PATH=$PATH:/usr/local/rvm/bin
+      export PATH=$PATH:/usr/local/rvm/bin:~/.rvm/bin
       HAVE_RVM_ALREADY=`which rvm 2>/dev/null`
-      if [ ! -z $HAVE_RVM_ALREADY ]; then
-        echo "Looks like RVM is already on this machine. Skipping."
+      if [ $? -eq 0 ]; then
+        echo "Found RVM: " `which rvm`
+        echo "Looks like RVM is already on this machine. Recording to /tmp/.chef_cap_rvm_path"
+        which rvm > /tmp/.chef_cap_rvm_path
         exit 0
+      else
+        echo "Could not find RVM, PATH IS: ${PATH}"
+        echo "Going to attempt to attempt to download and install RVM from ${RVM_URL}"
       fi
 
       HAVE_CURL=`which curl 2>/dev/null`
-      if [ ! -z $HAVE_CURL ]; then
+      if [ $? -eq 0 ]; then
         RVM_TEMP_FILE=`mktemp /tmp/rvm_bootstrap.XXXXXX`
         curl $RVM_URL > $RVM_TEMP_FILE
         chmod u+rx $RVM_TEMP_FILE
         sh $RVM_TEMP_FILE
         rm -f $RVM_TEMP_FILE
+        which rvm > /tmp/.chef_cap_rvm_path
       else
         echo "FATAL ERROR: I have no idea how to download RVM without curl!"
         exit 1

data/spec/chef_cap_spec.rb

@@ -473,8 +473,8 @@ 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("rvm 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 rvm 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("rvm default exec which chef-solo").and_return("mocked")
+        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 which chef-solo").and_return("mocked")
         chef_cap.cap_task["chef:setup"].call
       end
 

metadata

@@ -2,7 +2,7 @@
 name: chef_cap
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Case Commons, LLC
@@ -10,7 +10,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-16 00:00:00 Z
+date: 2011-06-16 00:00:00 -04:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: capistrano
@@ -79,6 +80,7 @@ files:
 - spec/chef_cap_spec.rb
 - spec/chef_dna_parser_spec.rb
 - spec/spec_helper.rb
+has_rdoc: true
 homepage: https://github.com/Casecommons/chef_cap
 licenses: 
 - MIT
@@ -102,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: capistrano + chef-solo == chef_cap"