chef_cap 0.3.2 → 0.3.3

data/Gemfile

@@ -6,4 +6,5 @@ group :development do
   gem "wirble"
   gem "gemcutter"
   gem "autotest"
+  gem "ruby-debug19"
 end

data/README.rdoc

@@ -72,6 +72,8 @@ Optional JSON keys:
 
   { "environments": { ENVIRONMENT: { "role_order": { FIRST_ROLE: [OTHER_ROLES] } } } }
   { "environments": { ENVIRONMENT: { "environment_settings": ENV_HASH } } }
+  { "rollback_run_list": [] }
+  { "deploy_recipe": "[some_cookbook]::[some_recipe]" }
 
 
 == REQUIREMENTS

data/lib/chef_cap/version.rb

@@ -1,3 +1,3 @@
 module ChefCap
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/recipes/chef_cap.rb

@@ -25,7 +25,6 @@ if ChefDnaParser.parsed["environments"]
   ChefDnaParser.parsed["environments"].each_key do |environment|
     next if environment == "default"
     environment_hash = ChefDnaParser.parsed["environments"][environment]
-
     set :environments, environments.merge(environment => environment_hash)
 
     desc "Set server roles for the #{environment} environment"
@@ -208,35 +207,56 @@ namespace :chef do
 
         set "node_hash_for_#{channel[:host].gsub(/\./, "_")}", json_to_modify
         put json_to_modify.to_json, "/tmp/chef-cap-#{rails_env}-#{channel[:host]}.json", :mode => "0600"
+
+        rollback_json = json_to_modify.dup
+        rollback_json["run_list"] = rollback_json["rollback_run_list"] || []
+        set "node_hash_for_#{channel[:host].gsub(/\./, "_")}_rollback", rollback_json
+        put rollback_json.to_json, "/tmp/chef-cap-#{rails_env}-#{channel[:host]}-rollback.json", :mode => "0600"
       end
     end
-
-    chef.run_chef_solo
+    transaction { chef.run_chef_solo }
   end
 
-  task :run_chef_solo do
-    debug_flag = ENV['QUIET'] ? '' : '-l debug'
-    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}"
-
-    hosts_that_have_run = []
-    unless role_order.empty?
-      role_order.each do |role, dependent_roles|
-        role_hosts = (find_servers(:roles => [role.to_sym]).map(&:host) - hosts_that_have_run).uniq
-        dependent_hosts = (find_servers(:roles => dependent_roles.map(&:to_sym)).map(&:host) - role_hosts - hosts_that_have_run).uniq
-
-        if role_hosts.any?
-          sudo(run_chef_solo, :hosts => role_hosts)
-          hosts_that_have_run += role_hosts
-        end
-        if dependent_hosts.any?
-          sudo(run_chef_solo, :hosts => dependent_hosts)
-          hosts_that_have_run += dependent_hosts
+  task :setup_to_run_chef_solo do
+    set :debug_flag, ENV['QUIET'] ? '' : '-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|
+      hosts_that_have_run = []
+      unless role_order.empty?
+        role_order.each do |role, dependent_roles|
+          role_hosts = (find_servers(:roles => [role.to_sym]).map(&:host) - hosts_that_have_run).uniq
+          dependent_hosts = (find_servers(:roles => dependent_roles.map(&:to_sym)).map(&:host) - role_hosts - hosts_that_have_run).uniq
+          if role_hosts.any?
+            sudo(command_to_run, :hosts => role_hosts)
+            hosts_that_have_run += role_hosts
+          end
+          if dependent_hosts.any?
+            sudo(command_to_run, :hosts => dependent_hosts)
+            hosts_that_have_run += dependent_hosts
+          end
         end
+      else
+        sudo(command_to_run)
       end
-    else
-      sudo(run_chef_solo)
-    end
+    } } # Because capistrano automatically calls lambdas on reference which means you can't pass it an argument.
+  end
+
+  task :rollback_pre_hook do
+  end
 
+  task :rollback_post_hook do
+  end
+
+  task :run_chef_solo do
+    chef.setup_to_run_chef_solo
+    on_rollback do
+      chef.rollback_pre_hook
+      run_chef_solo_block[:block].call(run_chef_solo_rollback_command)
+      chef.rollback_post_hook
+    end
+    run_chef_solo_block[:block].call(run_chef_solo_deploy_command)
   end
 
   desc "Remove all chef-cap files from /tmp"

data/spec/chef_cap_mock_cap.rb

@@ -98,14 +98,26 @@ def unset(key)
 end
 
 def set(key, value)
-  key.to_s.gsub!(/\.|-/, '_')
+  defined_key = key.to_s.gsub(/\.|-/, '_')
+  accessor_key = "key_#{defined_key}".to_sym
+  @variables ||= {}
+  @variables[accessor_key] = value
   self.instance_eval(<<-EOS)
-    def #{key}
-      #{value.inspect}
+    def #{defined_key.to_s}
+      @variables[#{accessor_key}]
     end
   EOS
+end
+
+def set(key, value)
+  key.to_s.gsub!(/\.|-/, '_')
   @variables ||= {}
-  @variables[key] = value
+  @variables[key.to_sym] = value
+  self.instance_eval(<<-EOS)
+    def #{key.to_s}
+      @variables['#{key}'.to_sym]
+    end
+  EOS
 end
 
 def cap_variable
@@ -129,6 +141,14 @@ def current_description
   @task_description
 end
 
+def transaction(&block)
+  yield
+end
+
+def on_rollback(&block)
+  # ignore for now
+end
+
 def namespace(name, &block)
   @namespaces ||= {}
   @namespaces[name] = true

data/spec/chef_cap_spec.rb

@@ -418,23 +418,11 @@ describe "chef_cap" do
 
         chef_cap.parallel_sessions.each do |server_session|
           if server_session.things_that_were_set.keys.include? "node_hash_for_localhost"
-            server_session.things_that_were_set["node_hash_for_localhost"].should == {
-              "environments" => {"some_env"=>{ "rails_env" => "myenv",
-                "servers"=>[ {"hostname"=>"localhost", "roles"=>["role1", "role2"] }, {"hostname"=>"otherhost.com", "roles"=>["role1"]}]}},
-                "chef" => {"root"=>"path_to_cookbooks", "version"=>"0.1982.1234"},
-                "run_list" => ["foo", "bar"],
-                "environment" => {"rails_env" => "myenv", "roles" => ["role1", "role2"], "servers"=>[ {"primary" => [], "hostname"=>"localhost", "roles"=>["role1", "role2"] },
-                  {"primary" => [], "hostname"=>"otherhost.com", "roles"=>["role1"]}]},
-                  "roles" => {"role1" => {"run_list"=>["foo"]}, "role2"=>{"run_list"=>["foo", "bar"]}}}
+            server_session.things_that_were_set["node_hash_for_localhost"]["environment"]["roles"].should == ["role1", "role2"]
+            server_session.things_that_were_set["node_hash_for_localhost"]["run_list"].should == ["foo", "bar"]
           elsif server_session.things_that_were_set.keys.include? "node_hash_for_otherhost"
-            server_session.things_that_were_set["node_hash_for_otherhost"].should == {
-              "environments" => {"some_env"=>{ "rails_env" => "myenv",
-                "servers"=>[{"hostname"=>"localhost", "roles"=>["role1", "role2"]}, {"hostname"=>"otherhost.com", "roles"=>["role1"]}]}},
-                "chef"=>{"root"=>"path_to_cookbooks"},
-                "run_list"=>["foo"],
-                "environment"=>{"rails_env" => "myenv", "roles" => ["role1"], "servers"=>[{"primary" => [], "hostname"=>"localhost", "roles"=>["role1", "role2"]},
-                  {"primary" => [], "hostname"=>"otherhost.com", "roles"=>["role1"]}]},
-                  "roles"=>{"role1"=>{"run_list"=>["foo"]}, "role2"=>{"run_list"=>["foo", "bar"]}}}
+            server_session.things_that_were_set["node_hash_for_otherhost"]["environment"]["roles"].should == ["role1"]
+            server_session.things_that_were_set["node_hash_for_otherhost"]["run_list"].should == ["foo"]
           end
         end
       end
@@ -520,6 +508,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["chef:setup_to_run_chef_solo"].call
         end
 
         it "invokes chef-solo on db hosts then app and web only hosts" do
@@ -557,6 +546,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["chef:setup_to_run_chef_solo"].call
         end
 
 
@@ -608,6 +598,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["chef:setup_to_run_chef_solo"].call
         end
 
         it "invokes chef-solo on dep0 then dep1 and dep2 then finally dep3" do
@@ -658,6 +649,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["chef:setup_to_run_chef_solo"].call
         end
 
         it "invokes chef-solo on dep0 then dep1 and dep2 then finally dep3" do
@@ -1004,6 +996,7 @@ describe "chef_cap" do
     it "shoves the value into the node json alongside branch" do
       ENV['rev'] = "123"
       ENV['branch'] = "somebranch"
+      chef_cap.stub(:system).and_return(true)
       chef_cap.stub!(:put => "stubbed")
       chef_cap.stub!(:upload => "stubbed")
       chef_cap.stub!(:sudo => "stubbed")
@@ -1012,19 +1005,10 @@ describe "chef_cap" do
       chef_cap.parallel_mocks << proc { |server_session|
         server_session.stub!(:put => "stubbed")
         server_session.stub!(:sudo => "stubbed")
-        server_session.should_receive(:set).with("node_hash_for_localhost",
-          {
-          "chef"=>{"root"=>"path_to_cookbooks"},
-          "environments" => { "some_env"=>{"servers"=>[{"hostname"=>"localhost", "roles"=>["role1", "role2"]}]}},
-          "shared"=>{"foo"=>"bar"},
-          "foo"=>"bar",
-          "something"=>"other",
-          "environment"=> {"revision"=>"123", "branch" => "somebranch",
-            "roles" => ["role1"],
-            "servers"=>[{"primary" => [], "hostname"=>"localhost", "roles"=>["role1", "role2"]}]},
-            "roles"=>{"role1"=>{"something"=>"other"}},
-          "run_list"=>nil
-        })
+        server_session.should_receive(:set) do |key, value|
+          value["environment"]["revision"].should == "123"
+          value["environment"]["branch"].should == "somebranch"
+        end.twice
       }
       chef_cap.cap_task["chef:deploy"].call
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef_cap
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-21 00:00:00.000000000Z
+date: 2011-12-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &2153316960 !ruby/object:Gem::Requirement
+  requirement: &2157107720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.5.5
   type: :runtime
   prerelease: false
-  version_requirements: *2153316960
+  version_requirements: *2157107720
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2153316420 !ruby/object:Gem::Requirement
+  requirement: &2157107140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '2.1'
   type: :development
   prerelease: false
-  version_requirements: *2153316420
+  version_requirements: *2157107140
 description: chef_cap uses chef"s JSON config format to drive both capistrano and
   chef-solo"
 email:
@@ -91,7 +91,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2180159314980717012
+      hash: -4226372811426833892
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -100,10 +100,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2180159314980717012
+      hash: -4226372811426833892
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: capistrano + chef-solo == chef_cap"