chef_cap 0.2.5 → 0.2.6

data/lib/chef_cap/version.rb

@@ -1,3 +1,3 @@
 module ChefCap
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/recipes/chef_cap.rb

@@ -32,7 +32,12 @@ if ChefDnaParser.parsed["environments"]
     task environment.to_sym do
       set :environment_settings, environment_hash
       set :rails_env, environment_hash["rails_env"] || environment
-      set :role_order, environment_hash["role_order"] || {}
+      if environment_hash["role_order"]
+        set :role_order, environment_hash["role_order"]
+      else
+        set(:role_order, {}) unless defined?(role_order)
+      end
+
       default_environment["RAILS_ENV"] = rails_env
 
       ChefCapHelper.parse_hash(environment_hash)
@@ -203,13 +208,20 @@ namespace :chef 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)
-        dependent_hosts = find_servers(:roles => dependent_roles.map(&:to_sym)).map(&:host) - role_hosts
+        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
 
-        sudo(run_chef_solo, :hosts => role_hosts) if role_hosts.any?
-        sudo(run_chef_solo, :hosts => dependent_hosts) if dependent_hosts.any?
+        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
+        end
       end
     else
       sudo(run_chef_solo)

data/recipes/lib/chef_cap_helper.rb

@@ -6,17 +6,18 @@ class ChefCapHelper
 
     def parse_hash(hash, prefix = nil)
       hash.each do |key, value|
+        key = [prefix, key].compact.join("_").to_sym
         if value.is_a? Hash
-          parse_hash(value, [prefix, key].compact.join("_"))
+          parse_hash(value, key)
+        end
+        next if key == :ssh_options # skip restricted variables
+
+        unless value.nil?
+          debug("Setting #{key.inspect} => #{value.inspect}")
+          ChefCapConfiguration.configuration.set key, value
         else
-          key = [prefix, key].compact.join("_").to_sym
-          unless value.nil?
-            debug("Setting #{key.inspect} => #{value.inspect}")
-            ChefCapConfiguration.configuration.set key, value
-          else
-            debug("Unsetting #{key.inspect} => #{value.inspect}")
-            ChefCapConfiguration.configuration.unset key
-          end
+          debug("Unsetting #{key.inspect} => #{value.inspect}")
+          ChefCapConfiguration.configuration.unset key
         end
       end
     end

data/spec/chef_cap_helper_spec.rb

@@ -12,6 +12,7 @@ describe ChefCapHelper do
 
       context "given a prefix" do
         it "should call itself recursively" do
+          @configuration.should_receive(:set).with(:prefix_somehash, {"somekey" => "somevalue"})
           @configuration.should_receive(:set).with(:prefix_somehash_somekey, "somevalue")
           ChefCapHelper.parse_hash({"somehash" => {"somekey" => "somevalue"}}, "prefix")
         end
@@ -19,6 +20,7 @@ describe ChefCapHelper do
 
       context "given no prefix" do
         it "should call itself recursively" do
+          @configuration.should_receive(:set).with(:somehash, {"somekey" => "somevalue"})
           @configuration.should_receive(:set).with(:somehash_somekey, "somevalue")
           ChefCapHelper.parse_hash({"somehash" => {"somekey" => "somevalue"}})
         end

data/spec/chef_cap_mock_cap.rb

@@ -17,8 +17,6 @@ def find_servers(options = {})
       @servers[role][:servers].each do |server|
         servers << TestCapServer.new(server)
       end
-    else
-      raise ArgumentError, "unknown role `#{role}'" unless roles.include?(role)
     end
   end
   servers
@@ -67,7 +65,7 @@ def roles
         role_klass.instance_eval(<<-EOS)
           def servers
             role_servers = []
-            #{cap_role[key.to_sym][:servers].inspect}.each do |server_hostname|
+            #{(cap_role[key.to_sym] || {})[:servers].inspect}.each do |server_hostname|
               host = TestCapServer.new
               host.instance_eval(<<-EOH)
                 def host

data/spec/chef_cap_spec.rb

@@ -565,6 +565,109 @@ describe "chef_cap" do
           chef_cap.cap_task["chef:run_chef_solo"].call
         end
       end
+
+      context "with multiple dependent roles" do
+        before do
+          @test_dna = <<-JS
+        {
+          "chef": {
+            "root": "path_to_cookbooks"
+          },
+          "environments": {
+            "some_env": {
+              "rails_env": "myenv",
+              "role_order": { "dep0": ["dep1", "dep2"], "dep1": ["dep3"] },
+               "servers": [
+                {
+                  "hostname": "dep0host",
+                  "roles": ["dep0"]
+                },
+                {
+                  "hostname": "dep1host",
+                  "roles": ["dep1"]
+                },
+                {
+                  "hostname": "dep2host",
+                  "roles": ["dep2"]
+                },
+                {
+                  "hostname": "dep3host",
+                  "roles": ["dep3"]
+                }
+              ]
+            }
+          },
+          "roles": {
+            "dep0": { "run_list": [] },
+            "dep1": { "run_list": [] },
+            "dep2": { "run_list": [] },
+            "dep3": { "run_list": [] }
+          }
+        }
+          JS
+
+          chef_cap.cap_task[:some_env].should_not be_nil
+          chef_cap.cap_task[:some_env].call
+        end
+
+        it "invokes chef-solo on dep0 then dep1 and dep2 then finally dep3" do
+          chef_cap.cap_servers.should_not be_empty
+
+          chef_cap.should_receive(:sudo).ordered.with(anything, :hosts => ["dep0host"]).and_return("mocked")
+          chef_cap.should_receive(:sudo).ordered.with(anything, :hosts => ["dep1host", "dep2host"]).and_return("mocked")
+          chef_cap.should_receive(:sudo).ordered.with(anything, :hosts => ["dep3host"]).and_return("mocked")
+          chef_cap.cap_task["chef:run_chef_solo"].call
+        end
+
+      end
+
+      context "with multiple roles where some required role host is missing" do
+        before do
+          @test_dna = <<-JS
+        {
+          "chef": {
+            "root": "path_to_cookbooks"
+          },
+          "environments": {
+            "defaults": {
+              "role_order": { "dep0": ["dep1"], "dep1": ["dep2", "dep3"] }
+            },
+            "some_env": {
+              "rails_env": "myenv",
+               "servers": [
+                {
+                  "hostname": "dep0host",
+                  "roles": ["dep0"]
+                },
+                {
+                  "hostname": "dep2host",
+                  "roles": ["dep2", "dep3"]
+                }
+              ]
+            }
+          },
+          "roles": {
+            "dep0": { "run_list": [] },
+            "dep1": { "run_list": [] },
+            "dep2": { "run_list": [] },
+            "dep3": { "run_list": [] }
+          }
+        }
+          JS
+
+          chef_cap.cap_task[:some_env].should_not be_nil
+          chef_cap.cap_task[:some_env].call
+        end
+
+        it "invokes chef-solo on dep0 then dep1 and dep2 then finally dep3" do
+          chef_cap.cap_servers.should_not be_empty
+
+          chef_cap.should_receive(:sudo).ordered.with(anything, :hosts => ["dep0host"]).and_return("mocked")
+          chef_cap.should_receive(:sudo).ordered.with(anything, :hosts => ["dep2host"]).and_return("mocked")
+          chef_cap.cap_task["chef:run_chef_solo"].call
+        end
+
+      end
     end
 
     describe "merging roles with shared" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef_cap
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-17 00:00:00.000000000Z
+date: 2011-12-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &2153395380 !ruby/object:Gem::Requirement
+  requirement: &2151806800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.5.5
   type: :runtime
   prerelease: false
-  version_requirements: *2153395380
+  version_requirements: *2151806800
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2153394260 !ruby/object:Gem::Requirement
+  requirement: &2151804840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '2.1'
   type: :development
   prerelease: false
-  version_requirements: *2153394260
+  version_requirements: *2151804840
 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: 3095980632773080420
+      hash: -2863680832922122832
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3095980632773080420
+      hash: -2863680832922122832
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11