chef_cap 0.3.22 → 0.3.23

data/lib/chef_cap/version.rb

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

data/recipes/lib/chef_cap_helper.rb

@@ -30,15 +30,15 @@ class ChefCapHelper
       when "Hash_Hash"
         hash[key].merge!(value) do |k, oldvalue, newvalue|
           case "#{oldvalue.class}_#{newvalue.class}"
-            when "Hash_Hash"
-              if oldvalue.has_key?(oldvalue) && newvalue.has_key?(newvalue)
-                recursive_merge(oldvalue, k, newvalue)
-              else
-                oldvalue.merge(newvalue)
-              end
+          when "Hash_Hash"
+            if oldvalue.has_key?(oldvalue) && newvalue.has_key?(newvalue)
+              recursive_merge(oldvalue, k, newvalue)
             else
-              newvalue
+              oldvalue.merge(newvalue)
             end
+          else
+            newvalue
+          end
         end
       else
         hash[key] = value
@@ -94,8 +94,7 @@ class ChefCapHelper
       return nil if json_hash["run_list"].nil?
       new_run_list = json_hash["run_list"].dup
       if json_hash.has_key? "deploy_recipe"
-        deploy_recipe = new_run_list.delete(json_hash["deploy_recipe"])
-        new_run_list << deploy_recipe if deploy_recipe && !should_not_deploy
+        new_run_list.delete(json_hash["deploy_recipe"]) if should_not_deploy
       end
       new_run_list
     end

data/spec/chef_cap_helper_spec.rb

@@ -169,15 +169,6 @@ describe ChefCapHelper do
   end
 
   describe ".rewrite_run_list_for_deploy" do
-    it "should move the deploy recipe to the end of the run list if it is specified" do
-      json_with_run_list = {
-        "run_list" => ["something", "something", "deployrecipe", "darkside"],
-        "deploy_recipe" => "deployrecipe"
-      }
-
-      ChefCapHelper.rewrite_run_list_for_deploy(json_with_run_list).should == ["something", "something", "darkside", "deployrecipe"]
-    end
-
     it "should do nothing if the run list does not contain the deploy recipe" do
       json_with_run_list = {
         "run_list" => ["something", "something", "darkside"],

data/spec/chef_cap_spec.rb

@@ -902,25 +902,6 @@ describe "chef_cap" do
         JS
         chef_cap.stub(:system).and_return(true)
       end
-
-      it "puts the specified deploy_recipe at the very end of the run list" do
-        chef_cap.stub!(:put => "stubbed")
-        chef_cap.stub!(:upload => "stubbed")
-        chef_cap.stub!(:sudo => "stubbed")
-
-        chef_cap.cap_task[:some_env].call
-
-        chef_cap.parallel_mocks << proc { |server_session|
-          server_session.stub!(:put => "stubbed")
-          server_session.stub!(:sudo => "stubbed")
-        }
-
-        chef_cap.cap_task["chef:deploy"].call
-
-        chef_cap.parallel_sessions.each do |server_session|
-          server_session.things_that_were_set["node_hash_for_localhost"]["run_list"].should == ["role1", "roleshared", "something", "darkside", "my_deploy_recipe"]
-        end
-      end
     end
 
     describe "node[:environment]" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef_cap
 version: !ruby/object:Gem::Version
-  version: 0.3.22
+  version: 0.3.23
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-10 00:00:00.000000000 Z
+date: 2012-09-21 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: -1470809278621786492
+      hash: -3750775212043426267
 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: -1470809278621786492
+      hash: -3750775212043426267
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.19