Fixes CHEF-162. Delayed notifications now properly collapse

Author: adamhjk

chef/lib/chef/runner.rb

@@ -58,7 +58,7 @@ def build_provider(resource)
 
     def converge
 
-      delayed_actions = Array.new
+      delayed_actions = Hash.new
 
       @collection.each do |resource|
         begin
@@ -95,10 +95,11 @@ def converge
                 end
                 if resource.actions[action].has_key?(:delayed)
                   resource.actions[action][:delayed].each do |r|
-                    delayed_actions << lambda {
+                    delayed_actions[r] = Hash.new unless delayed_actions.has_key?(r)
+                    delayed_actions[r][action] = Array.new unless delayed_actions[r].has_key?(action)
+                    delayed_actions[r][action] << lambda {
                       Chef::Log.info("#{resource} sending #{action} action to #{r} (delayed)")
-                      build_provider(r).send("action_#{action}") 
-                    }
+                    } 
                   end
                 end
               end
@@ -111,7 +112,12 @@ def converge
       end
 
       # Run all our :delayed actions
-      delayed_actions.each { |da| da.call }
+      delayed_actions.each do |resource, action_hash| 
+        action_hash.each do |action, log_array|
+          log_array.each { |l| l.call } # Call each log message
+          build_provider(resource).send("action_#{action}") 
+        end
+      end
 
       true
     end

chef/spec/unit/runner_spec.rb

@@ -140,5 +140,17 @@ def new_runner
     @runner.converge
   end
 
+  it "should collapse delayed actions on changed resources" do
+    Chef::Platform.stub!(:find_provider_for_node).and_return(Chef::Provider::SnakeOil)
+    provider = Chef::Provider::SnakeOil.new(@node, @collection[0])
+    Chef::Provider::SnakeOil.stub!(:new).and_return(provider)   
+    cat = Chef::Resource::Cat.new("peanut", @collection)
+    cat.notifies :buy, @collection[0], :delayed
+    cat.updated = true
+    @collection << cat
+    @collection << cat
+    provider.should_receive(:action_buy).once.and_return(true)
+    @runner.converge
+  end
 
 end

features/data/cookbooks/delayed_notifications/recipes/notify_a_resource_from_a_single_source.rb

@@ -21,6 +21,6 @@
   action :nothing
 end
 
-exec "echo foo" do
+execute "echo foo" do
   notifies :create, resources("file[#{node[:tmpdir]}/notified_file.txt]"), :delayed
 end

features/data/cookbooks/delayed_notifications/recipes/notify_a_resource_from_multiple_sources.rb

@@ -0,0 +1,31 @@
+#
+# Cookbook Name:: delayed_notifications
+# Recipe:: notify_a_resource_from_multiple_sources
+#
+# Copyright 2009, Opscode
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+execute "bob dylan" do
+  command "echo 'bob dylan' >> #{node[:tmpdir]}/notified_file.txt"
+  action :nothing
+end
+
+execute "echo foo" do
+  notifies :run, resources("execute[bob dylan]"), :delayed
+end
+
+execute "echo bar" do
+  notifies :run, resources("execute[bob dylan]"), :delayed
+end

features/delayed_notifications.feature

@@ -9,6 +9,13 @@ Feature: Delayed Notifications
      When I run the chef-client
      Then the run should exit '0'
       And a file named 'notified_file.txt' should exist
+      
+  Scenario: Notify a resource from multiple sources
+    Given a validated node
+      And it includes the recipe 'delayed_notifications::notify_a_resource_from_multiple_sources'
+     When I run the chef-client
+     Then the run should exit '0'
+      And a file named 'notified_file.txt' should contain 'bob dylan' only '1' time
 
 
 

features/steps/files.rb

@@ -63,3 +63,14 @@
   file.should == "#{specificity}\n"
 end
 
+Then /^a file named '(.+)' should contain '(.+)' only '(.+)' time$/ do |filename, string, count|
+  seen_count = 0
+  IO.foreach(File.join(tmpdir, filename)) do |line|
+    if line =~ /#{string}/
+      seen_count += 1
+    end
+  end
+  seen_count.should == count.to_i
+end
+
+

features/steps/run_client.rb

@@ -37,11 +37,17 @@
   begin
     @status.exitstatus.should eql(exit_code.to_i)
   rescue 
-    puts "--- run stdout: #{@stdout}"
-    puts @stdout
-    puts "--- run stderr: #{@stderr}"
+    print_output
     raise
   end
+  print_output if ENV["LOG_LEVEL"] == "debug"
+end
+
+def print_output
+  puts "--- run stdout:"
+  puts @stdout
+  puts "--- run stderr"
+  puts @stderr
 end
 
 Then /^stdout should have '(.+)'$/ do |to_match|