chef_cap 0.3.9 → 0.3.10

data/lib/chef_cap/version.rb

@@ -1,3 +1,3 @@
 module ChefCap
-  VERSION = "0.3.9"
+  VERSION = "0.3.10"
 end

data/recipes/chef_cap.rb

@@ -9,6 +9,7 @@ ChefCapConfiguration.configuration = self
 ChefDnaParser.load_dna
 
 before "deploy", "chef:setup"
+before "chef:setup", "bootstrap:ruby"
 
 set :application, ChefDnaParser.parsed["application"]["name"] rescue nil
 set :repository, ChefDnaParser.parsed["application"]["repository"] rescue nil
@@ -154,15 +155,22 @@ else
   set :chef_version, default_chef_version
 end
 
-set :rvm_bin_path, "/tmp/.chef_cap_rvm_path"
+set :debug_flag, ENV['DEBUG'] ? '-l debug' : ''
 
 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 `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"
+    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 "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 which chef-solo"
+    end
   end
 
   desc "Run chef-solo on the server(s)"
@@ -218,8 +226,6 @@ namespace :chef do
   end
 
   task :setup_to_run_chef_solo do
-    set :debug_flag, ENV['DEBUG'] ? '-l debug' : ''
-    exec_chef_solo = "env PATH=$PATH:/usr/sbin `cat #{rvm_bin_path}` default exec chef-solo -c /tmp/chef-cap-solo-#{rails_env}.rb #{debug_flag}"
     set :run_chef_solo_deploy_command, "#{exec_chef_solo} -j /tmp/chef-cap-#{rails_env}-`hostname`.json"
     set :run_chef_solo_rollback_command, "#{exec_chef_solo} -j /tmp/chef-cap-#{rails_env}-`hostname`-rollback.json"
     set :run_chef_solo_block, { :block => lambda { |command_to_run|

data/recipes/rbenv.rb

@@ -0,0 +1,49 @@
+namespace :bootstrap do
+  desc "Create a standalone rbenv installation with a default ruby to use with chef-solo"
+  task :rbenv do
+    set :rvm_ruby_version, (ChefDnaParser.parsed["environment"]["rvm_ruby_version"] rescue "ruby-1.9.3-p0" || "ruby-1.9.3-p0")
+    set :rbenv_ruby_version, rvm_ruby_version.gsub(/^ruby\-/,'')
+    standup_script = <<-SH
+      #!/bin/bash
+      #
+      # And now install rbenv
+      export PATH=$HOME/bin:$HOME/.rbenv/bin:$HOME/.rbenv/shims:$PATH
+
+      HAVE_RBENV_ALREADY=`which rbenv 2>/dev/null`
+      if [ $? != 0 ]; then
+        ## Install rbenv dependencies
+        sudo yum install -y automake gcc make libtool curl zlib zlib-devel patch readline readline-devel libffi-devel openssl openssl-devel git
+
+        echo "Building rbenv..."
+        git clone git://github.com/sstephenson/rbenv.git ~/.rbenv
+        # Add rbenv to your path
+        echo 'export PATH="$HOME/.rbenv/bin:$HOME/.rbenv/shims:$PATH"' >> .bashrc
+        echo 'eval "$(rbenv init -)"' >> .bashrc
+        source ~/.bash_profile
+      fi;
+
+      # Install ruby-build
+      HAVE_RUBY_BUILD=`which ruby-build 2>/dev/null`
+      if [ $? != 0 ]; then
+        echo "Building ruby-build..."
+        cd /tmp
+        git clone git://github.com/sstephenson/ruby-build.git
+        cd ruby-build
+        PREFIX=$HOME ./install.sh
+        cd $HOME
+      fi;
+
+      # Install Ruby #{rbenv_ruby_version}
+      HAVE_CORRECT_VERSION=`rbenv versions | grep '#{rbenv_ruby_version}' | wc -l`
+      if [ $HAVE_CORRECT_VERSION -eq 0 ]; then
+        echo "Installing #{rbenv_ruby_version}..."
+        rbenv install #{rbenv_ruby_version}
+        rbenv global #{rbenv_ruby_version}
+        # Rehash!
+        rbenv rehash
+      fi;
+    SH
+    put standup_script, "/tmp/chef-cap-#{rails_env}-rbenv-standup.sh", :mode => "0700"
+    run "/tmp/chef-cap-#{rails_env}-rbenv-standup.sh"
+  end
+end

data/recipes/ruby.rb

@@ -0,0 +1,30 @@
+namespace :bootstrap do
+  desc "Create a standalone rbenv installation with a default ruby to use with chef-solo"
+  task :ruby do
+    local_rvs = ruby_version_switcher rescue 'rvm'
+    local_env = rails_env rescue 'unkown'
+
+    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}"
+    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
+
+    depend :remote, :command, ruby_version_switcher
+    depend :remote, :command, "chef-solo"
+
+    after "bootstrap:ruby", "bootstrap:#{ruby_version_switcher}"
+  end
+end

data/recipes/{rvm_bootstrap.rb → rvm.rb}

@@ -1,11 +1,6 @@
-depend :remote, :command, "rvm"
-depend :remote, :command, "chef-solo"
-
-before "chef:setup", "rvm:bootstrap"
-
-namespace :rvm do
+namespace :bootstrap do
   desc "Create a standalone rvm installation with a default ruby to use with chef-solo"
-  task :bootstrap do
+  task :rvm do
     set :rvm_ruby_version, (ChefDnaParser.parsed["environment"]["rvm_ruby_version"] rescue "ruby-1.9.3-p0" || "ruby-1.9.3-p0")
     rvm_standup_script = <<-SH
       #!/bin/bash

data/spec/chef_cap_spec.rb

@@ -302,7 +302,7 @@ describe "chef_cap" do
 
   end
 
-  describe "rvm bootstrap" do
+  describe "rbenv bootstrap" do
     it "uploads a shell script to the server and runs it as root" do
       @test_dna = <<-ERB
       {
@@ -311,6 +311,7 @@ describe "chef_cap" do
         },
         "environments": {
           "some_env": {
+              "ruby_version_switcher": "rbenv",
               "rails_env": "my_env"
             }
         }
@@ -318,17 +319,37 @@ describe "chef_cap" do
       ERB
 
       chef_cap.cap_task[:some_env].call
-      chef_cap.cap_namespace[:rvm].should_not be_nil
-      chef_cap.cap_task["rvm:bootstrap"].should_not be_nil
+      chef_cap.cap_namespace[:bootstrap].should_not be_nil
+      chef_cap.cap_task["bootstrap:rbenv"].should_not be_nil
 
       chef_cap.should_receive(:put)
-      chef_cap.should_receive(:sudo).with("/tmp/chef-cap-my_env-rvm-standup.sh")
-      chef_cap.cap_task["rvm:bootstrap"].call
+      chef_cap.should_receive(:run).with("/tmp/chef-cap-my_env-rbenv-standup.sh")
+      chef_cap.cap_task["bootstrap:rbenv"].call
     end
+  end
 
-    it "adds a dependency check on the rvm command" do
-      chef_cap.cap_depends["rvm"].should_not be_nil
-      chef_cap.cap_depends["rvm"].should == { :remote => :command }
+  describe "rvm bootstrap" do
+    it "uploads a shell script to the server and runs it as root" do
+      @test_dna = <<-ERB
+      {
+        "chef": {
+          "root": "path_to_cookbooks"
+        },
+        "environments": {
+          "some_env": {
+              "rails_env": "my_env"
+            }
+        }
+      }
+      ERB
+
+      chef_cap.cap_task[:some_env].call
+      chef_cap.cap_namespace[:bootstrap].should_not be_nil
+      chef_cap.cap_task["bootstrap:rvm"].should_not be_nil
+
+      chef_cap.should_receive(:put)
+      chef_cap.should_receive(:sudo).with("/tmp/chef-cap-my_env-rvm-standup.sh")
+      chef_cap.cap_task["bootstrap:rvm"].call
     end
   end
 
@@ -344,25 +365,19 @@ describe "chef_cap" do
 
   describe "namespace :chef" do
 
-    it "adds a remote dependency on chef-solo" do
-      chef_cap.cap_depends["chef-solo"].should_not be_nil
-      chef_cap.cap_depends["chef-solo"].should == { :remote => :command }
-    end
-
     it "runs chef:setup before chef:deploy" do
       chef_cap.cap_before["chef:deploy"].should_not be_nil
       chef_cap.cap_before["chef:deploy"].should include("chef:setup")
     end
 
-    it "runs rvm:bootstrap before chef:setup" do
+    it "runs bootstrap:ruby before chef:setup" do
       chef_cap.cap_before["chef:setup"].should_not be_nil
-      chef_cap.cap_before["chef:setup"].should include("rvm:bootstrap")
+      chef_cap.cap_before["chef:setup"].should include("bootstrap:ruby")
     end
 
     describe "task :deploy" do
-
-      before do
-        @test_dna = <<-JS
+      let(:test_dna) do
+        <<-JS
         {
           "chef": {
             "root": "path_to_cookbooks",
@@ -389,7 +404,10 @@ describe "chef_cap" do
           }
         }
         JS
+      end
 
+      before do
+        @test_dna = test_dna
         chef_cap.cap_task[:some_env].should_not be_nil
         chef_cap.cap_task[:some_env].call
         chef_cap.stub(:system).and_return(true)
@@ -459,23 +477,78 @@ describe "chef_cap" do
         chef_cap.cap_task["chef:deploy"].call
       end
 
-      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 which chef-solo").and_return("mocked")
-        chef_cap.cap_task["chef:setup"].call
-      end
+      context "using rvm" 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 which chef-solo").and_return("mocked")
 
-      it "installs rvm + ruby and run it if it does not exist" do
-        chef_cap.cap_servers.should_not be_empty
-        chef_cap.stub!(:put => "stubbed")
-        chef_cap.should_receive(:sudo).ordered.with("/tmp/chef-cap-myenv-rvm-standup.sh").and_return("mocked")
-        chef_cap.cap_task["rvm:bootstrap"].call
+          chef_cap.cap_task["bootstrap:ruby"].call
+          chef_cap.cap_task["chef:setup"].call
+        end
+
+        it "installs rvm + ruby and run it if it does not exist" do
+          chef_cap.cap_servers.should_not be_empty
+          chef_cap.stub!(:put => "stubbed")
+          chef_cap.should_receive(:sudo).ordered.with("/tmp/chef-cap-myenv-rvm-standup.sh").and_return("mocked")
+          chef_cap.cap_task["bootstrap:rvm"].call
+        end
       end
 
+      context "using rbenv" do
+
+        let(:test_dna) do
+          <<-JS
+        {
+          "chef": {
+            "root": "path_to_cookbooks",
+            "version": "0.1982.1234"
+          },
+          "environments": {
+            "some_env": {
+              "rails_env": "myenv",
+              "ruby_version_switcher": "rbenv",
+              "servers": [
+                {
+                  "hostname": "localhost",
+                  "roles": ["role1", "role2"]
+                },
+                {
+                  "hostname": "otherhost.com",
+                  "roles": ["role1"]
+                }
+              ]
+            }
+          },
+          "roles": {
+            "role1": { "run_list": ["foo"] },
+            "role2": { "run_list": ["foo", "bar"] }
+          }
+        }
+          JS
+        end
+
+        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 && echo 'Chef Solo 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
+          chef_cap.cap_task["chef:setup"].call
+        end
+
+        it "installs rbenv + ruby and run it if it does not exist" do
+          chef_cap.cap_servers.should_not be_empty
+          chef_cap.stub!(:put => "stubbed")
+          chef_cap.should_receive(:run).ordered.with("/tmp/chef-cap-myenv-rbenv-standup.sh").and_return("mocked")
+          chef_cap.cap_task["bootstrap:rbenv"].call
+        end
+      end
     end
 
     describe "task :run_chef_solo" do
+
       context "with a db role" do
         before do
           @test_dna = <<-JS
@@ -508,6 +581,7 @@ describe "chef_cap" do
 
           chef_cap.cap_task[:some_env].should_not be_nil
           chef_cap.cap_task[:some_env].call
+          chef_cap.cap_task["bootstrap:ruby"].call
           chef_cap.cap_task["chef:setup_to_run_chef_solo"].call
         end
 
@@ -516,6 +590,7 @@ describe "chef_cap" do
 
           chef_cap.should_receive(:sudo).ordered.with(/.*chef-solo.*/, :hosts => ["dbhost"]).and_return("mocked")
           chef_cap.should_receive(:sudo).ordered.with(/.*chef-solo.*/, :hosts => ["apphost"]).and_return("mocked")
+          chef_cap.cap_task["bootstrap:ruby"].call
           chef_cap.cap_task["chef:run_chef_solo"].call
         end
       end
@@ -546,6 +621,7 @@ describe "chef_cap" do
 
           chef_cap.cap_task[:some_env].should_not be_nil
           chef_cap.cap_task[:some_env].call
+          chef_cap.cap_task["bootstrap:ruby"].call
           chef_cap.cap_task["chef:setup_to_run_chef_solo"].call
         end
 
@@ -598,6 +674,7 @@ describe "chef_cap" do
 
           chef_cap.cap_task[:some_env].should_not be_nil
           chef_cap.cap_task[:some_env].call
+          chef_cap.cap_task["bootstrap:ruby"].call
           chef_cap.cap_task["chef:setup_to_run_chef_solo"].call
         end
 
@@ -649,6 +726,7 @@ describe "chef_cap" do
 
           chef_cap.cap_task[:some_env].should_not be_nil
           chef_cap.cap_task[:some_env].call
+          chef_cap.cap_task["bootstrap:ruby"].call
           chef_cap.cap_task["chef:setup_to_run_chef_solo"].call
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef_cap
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.3.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-07 00:00:00.000000000 Z
+date: 2012-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &70278612405080 !ruby/object:Gem::Requirement
+  requirement: &70167065111120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.5.5
   type: :runtime
   prerelease: false
-  version_requirements: *70278612405080
+  version_requirements: *70167065111120
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70278612404580 !ruby/object:Gem::Requirement
+  requirement: &70167065110620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '2.1'
   type: :development
   prerelease: false
-  version_requirements: *70278612404580
+  version_requirements: *70167065110620
 description: chef_cap uses chef"s JSON config format to drive both capistrano and
   chef-solo"
 email:
@@ -68,7 +68,9 @@ files:
 - recipes/lib/chef_cap_helper.rb
 - recipes/lib/chef_cap_initializer.rb
 - recipes/lib/chef_dna_parser.rb
-- recipes/rvm_bootstrap.rb
+- recipes/rbenv.rb
+- recipes/ruby.rb
+- recipes/rvm.rb
 - recipes/unset_default_deploy.rb
 - spec/chef_cap_configuration_spec.rb
 - spec/chef_cap_helper_spec.rb
@@ -91,7 +93,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4600452591196724743
+      hash: -2439517596644042865
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -100,10 +102,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4600452591196724743
+      hash: -2439517596644042865
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: capistrano + chef-solo == chef_cap"