chef 10.14.0.beta.1 → 10.14.0.beta.2

data/lib/chef/run_context.rb

@@ -35,7 +35,7 @@ class Chef
 
     # Needs to be settable so deploy can run a resource_collection independent
     # of any cookbooks.
-    attr_accessor :resource_collection
+    attr_accessor :resource_collection, :immediate_notification_collection, :delayed_notification_collection
 
     attr_reader :events
 
@@ -48,6 +48,8 @@ class Chef
       @node = node
       @cookbook_collection = cookbook_collection
       @resource_collection = Chef::ResourceCollection.new
+      @immediate_notification_collection = Hash.new {|h,k| h[k] = []}
+      @delayed_notification_collection = Hash.new {|h,k| h[k] = []}
       @definitions = Hash.new
       @events = events
 
@@ -90,6 +92,40 @@ class Chef
       cookbook.recipe_filenames_by_name[recipe_short_name]
     end
 
+    def notifies_immediately(notification)
+      nr = notification.notifying_resource
+      if nr.instance_of?(Chef::Resource)
+        @immediate_notification_collection[nr.name] << notification
+      else
+        @immediate_notification_collection[nr.to_s] << notification
+      end
+    end
+
+    def notifies_delayed(notification)
+      nr = notification.notifying_resource
+      if nr.instance_of?(Chef::Resource)
+        @delayed_notification_collection[nr.name] << notification
+      else
+        @delayed_notification_collection[nr.to_s] << notification
+      end
+    end
+
+    def immediate_notifications(resource)
+      if resource.instance_of?(Chef::Resource)
+        return @immediate_notification_collection[resource.name]
+      else
+        return @immediate_notification_collection[resource.to_s]
+      end
+    end
+
+    def delayed_notifications(resource)
+      if resource.instance_of?(Chef::Resource)
+        return @delayed_notification_collection[resource.name]
+      else
+        return @delayed_notification_collection[resource.to_s]
+      end
+    end
+
     private
 
     def load_libraries

data/lib/chef/runner.rb

@@ -52,12 +52,12 @@ class Chef
       # associated with the resource, but only if it was updated *this time*
       # we ran an action on it.
       if resource.updated_by_last_action?
-        resource.immediate_notifications.each do |notification|
+        run_context.immediate_notifications(resource).each do |notification|
           Chef::Log.info("#{resource} sending #{notification.action} action to #{notification.resource} (immediate)")
           run_action(notification.resource, notification.action, :immediate, resource)
         end
 
-        resource.delayed_notifications.each do |notification|
+        run_context.delayed_notifications(resource).each do |notification|
           if delayed_actions.any? { |existing_notification| existing_notification.duplicates?(notification) }
             Chef::Log.info( "#{resource} not queuing delayed action #{notification.action} on #{notification.resource}"\
                             " (delayed), as it's already been queued")

data/lib/chef/version.rb

@@ -17,7 +17,7 @@
 
 class Chef
   CHEF_ROOT = File.dirname(File.expand_path(File.dirname(__FILE__)))
-  VERSION = '10.14.0.beta.1'
+  VERSION = '10.14.0.beta.2'
 end
 
 # NOTE: the Chef::Version class is defined in version_class.rb

data/spec/unit/provider/deploy/revision_spec.rb

@@ -21,7 +21,8 @@ require 'spec_helper'
 describe Chef::Provider::Deploy::Revision do
 
   before do
-    Chef::Config[:file_cache_path] = '/tmp/foo'
+    @temp_dir = Dir.mktmpdir
+    Chef::Config[:file_cache_path] = @temp_dir
     @resource = Chef::Resource::Deploy.new("/my/deploy/dir")
     @resource.revision("8a3195bf3efa246f743c5dfa83683201880f935c")
     @node = Chef::Node.new
@@ -37,7 +38,7 @@ describe Chef::Provider::Deploy::Revision do
   after do
     # Make sure we don't keep any state in our tests
     FileUtils.rspec_reset
-    FileUtils.rm_rf '/tmp/foo' if File.directory?("/tmp/foo")
+    FileUtils.rm_rf @temp_dir if File.directory?( @temp_dir )
   end
 
 

data/spec/unit/resource_reporter_spec.rb

@@ -1,6 +1,7 @@
 #
 # Author:: Daniel DeLeo (<dan@opscode.com>)
-# Author:: Prajakta Purohit (prajakta@opscode.com>)
+# Author:: Prajakta Purohit (<prajakta@opscode.com>)
+# Author:: Tyler Cloke (<tyler@opscode.com>)
 #
 # Copyright:: Copyright (c) 2012 Opscode, Inc.
 # License:: Apache License, Version 2.0
@@ -47,6 +48,12 @@ describe Chef::ResourceReporter do
       @resource_reporter.reporting_enabled?.should be_true
     end
 
+    it "should have no error_descriptions" do
+      @resource_reporter.error_descriptions.should be_nil
+      # @resource_reporter.error_descriptions.should be_empty
+      # @resource_reporter.should have(0).error_descriptions
+    end
+
   end
 
   context "after the chef run completes" do
@@ -65,8 +72,8 @@ describe Chef::ResourceReporter do
       @resource_reporter.run_failed(@exception)
     end
 
-    it "sets the run status to 'failed'" do
-      @resource_reporter.status.should == "failed"
+    it "sets the run status to 'failure'" do
+      @resource_reporter.status.should == "failure"
     end
 
     it "keeps the exception data" do
@@ -80,6 +87,7 @@ describe Chef::ResourceReporter do
       @exception = Exception.new
       @resource_reporter.resource_action_start(@new_resource, :create)
       @resource_reporter.resource_failed(@new_resource, :create, @exception)
+      @resource_reporter.resource_completed(@new_resource)
     end
 
     it "collects the resource as an updated resource" do
@@ -89,8 +97,8 @@ describe Chef::ResourceReporter do
     it "collects the desired state of the resource" do
       update_record = @resource_reporter.updated_resources.first
       update_record.new_resource.should == @new_resource
-    end
 
+    end
   end
 
   # TODO: make sure a resource that is skipped because of `not_if` doesn't
@@ -117,6 +125,7 @@ describe Chef::ResourceReporter do
         @new_resource.content("this is the old content")
         @current_resource.content("this is the new hotness")
         @resource_reporter.resource_updated(@new_resource, :create)
+        @resource_reporter.resource_completed(@new_resource)
       end
 
       it "collects the updated resource" do
@@ -140,6 +149,7 @@ describe Chef::ResourceReporter do
           @next_new_resource = Chef::Resource::Service.new("apache2")
           @exception = Exception.new
           @resource_reporter.resource_failed(@next_new_resource, :create, @exception)
+          @resource_reporter.resource_completed(@next_new_resource)
         end
 
         it "collects the desired state of the failed resource" do
@@ -164,7 +174,9 @@ describe Chef::ResourceReporter do
         @resource_reporter.resource_action_start(@implementation_resource , :create)
         @resource_reporter.resource_current_state_loaded(@implementation_resource, :create, @implementation_resource)
         @resource_reporter.resource_updated(@implementation_resource, :create)
+        @resource_reporter.resource_completed(@implementation_resource)
         @resource_reporter.resource_updated(@new_resource, :create)
+        @resource_reporter.resource_completed(@new_resource)
       end
 
       it "does not collect data about the nested resource" do
@@ -178,7 +190,9 @@ describe Chef::ResourceReporter do
         @resource_reporter.resource_action_start(@implementation_resource , :create)
         @resource_reporter.resource_current_state_loaded(@implementation_resource, :create, @implementation_resource)
         @resource_reporter.resource_up_to_date(@implementation_resource, :create)
+        @resource_reporter.resource_completed(@implementation_resource)
         @resource_reporter.resource_updated(@new_resource, :create)
+        @resource_reporter.resource_completed(@new_resource)
       end
 
       it "does not collect data about the nested resource" do
@@ -190,6 +204,7 @@ describe Chef::ResourceReporter do
       before do
         @exception = Exception.new
         @resource_reporter.resource_failed(@new_resource, :create, @exception)
+        @resource_reporter.resource_completed(@new_resource)
       end
 
       it "collects the resource as an updated resource" do
@@ -249,6 +264,7 @@ describe Chef::ResourceReporter do
         @resource_reporter.resource_action_start(@new_resource, :create)
         @resource_reporter.resource_current_state_loaded(@new_resource, :create, @current_resource)
         @resource_reporter.resource_updated(@new_resource, :create)
+        @resource_reporter.resource_completed(@new_resource)
         @report = @resource_reporter.report(@node)
         @first_update_report = @report["resources"].first
       end
@@ -322,40 +338,42 @@ describe Chef::ResourceReporter do
     context "for an unsuccessful run" do
 
       before do
+
         @backtrace = "foo.rb:1 in `foo!'\nbar.rb:2 in `bar!\n'baz.rb:3 in `baz!'"
         @node = Chef::Node.new
         @node.name("spitfire")
         @exception = mock("ArgumentError")
-        @exception.should_receive(:inspect).and_return("Net::HTTPServerException")
-        @exception.should_receive(:message).and_return("Object not found")
-        @exception.should_receive(:backtrace).and_return(@backtrace)
+        @exception.stub!(:inspect).and_return("Net::HTTPServerException")
+        @exception.stub!(:message).and_return("Object not found")
+        @exception.stub!(:backtrace).and_return(@backtrace)
         @resource_reporter.run_failed(@exception)
+        @resource_reporter.run_list_expand_failed(@node, @exception)
         @report = @resource_reporter.report(@node)
       end
 
       it "includes the exception type in the event data" do
-        @report.should have_key("exception")
-        @report["exception"].should have_key("class")
-        @report["exception"]["class"].should == "Net::HTTPServerException"
+        @report.should have_key("data")
+        @report["data"].should have_key("exception")
+        @report["data"]["exception"].should have_key("class")
+        @report["data"]["exception"]["class"].should == "Net::HTTPServerException"
       end
 
       it "includes the exception message in the event data" do
-        @report.should have_key("exception")
-        @report["exception"].should have_key("message")
-        @report["exception"]["message"].should == "Object not found"
+        @report["data"]["exception"].should have_key("message")
+        @report["data"]["exception"]["message"].should == "Object not found"
       end
 
       it "includes the exception trace in the event data" do
-        @report.should have_key("exception")
-        @report["exception"].should have_key("backtrace")
-        @report["exception"]["backtrace"].should == @backtrace
+        @report["data"]["exception"].should have_key("backtrace")
+        @report["data"]["exception"]["backtrace"].should == @backtrace
       end
 
       it "includes the error inspector output in the event data" do
-        @report.should have_key("exception")
-        @report["exception"].should have_key("description")
+        @report["data"]["exception"].should have_key("description")
+        @report["data"]["exception"]["description"].should include({"title"=>"Error expanding the run_list:", "sections"=>[["Unexpected Error:", "RSpec::Mocks::Mock: Object not found"]]})
       end
 
+
     end
 
   end

data/spec/unit/resource_spec.rb

@@ -304,9 +304,9 @@ describe Chef::Resource do
     it "should convert to a hash" do
       hash = @resource.to_hash
       expected_keys = [ :allowed_actions, :params, :provider, :updated,
-        :updated_by_last_action, :before, :supports, :delayed_notifications,
-        :immediate_notifications, :noop, :ignore_failure, :name, :source_line,
-        :action, :retries, :retry_delay , :elapsed_time]
+        :updated_by_last_action, :before, :supports,
+        :noop, :ignore_failure, :name, :source_line,
+        :action, :retries, :retry_delay, :elapsed_time]
       (hash.keys - expected_keys).should == []
       (expected_keys - hash.keys).should == []
       hash[:name].should eql("funk")
@@ -593,6 +593,8 @@ describe Chef::Resource::Notification do
   it "takes no action to resolve a resource reference that doesn't need to be resolved" do
     @keyboard_cat = Chef::Resource::Cat.new("keyboard_cat")
     @notification.resource = @keyboard_cat
+    @long_cat = Chef::Resource::Cat.new("long_cat")
+    @notification.notifying_resource = @long_cat
     @resource_collection = Chef::ResourceCollection.new
     # would raise an error since the resource is not in the collection
     @notification.resolve_resource_reference(@resource_collection)
@@ -604,8 +606,101 @@ describe Chef::Resource::Notification do
     @keyboard_cat = Chef::Resource::Cat.new("keyboard_cat")
     @resource_collection = Chef::ResourceCollection.new
     @resource_collection << @keyboard_cat
+    @long_cat = Chef::Resource::Cat.new("long_cat")
+    @notification.notifying_resource = @long_cat
     @notification.resolve_resource_reference(@resource_collection)
     @notification.resource.should == @keyboard_cat
   end
 
+  it "resolves a lazy reference to its notifying resource" do
+    @keyboard_cat = Chef::Resource::Cat.new("keyboard_cat")
+    @notification.resource = @keyboard_cat
+    @notification.notifying_resource = {:cat => "long_cat"}
+    @long_cat = Chef::Resource::Cat.new("long_cat")
+    @resource_collection = Chef::ResourceCollection.new
+    @resource_collection << @long_cat
+    @notification.resolve_resource_reference(@resource_collection)
+    @notification.notifying_resource.should == @long_cat
+  end
+
+  it "resolves lazy references to both its resource and its notifying resource" do
+    @notification.resource = {:cat => "keyboard_cat"}
+    @keyboard_cat = Chef::Resource::Cat.new("keyboard_cat")
+    @resource_collection = Chef::ResourceCollection.new
+    @resource_collection << @keyboard_cat
+    @notification.notifying_resource = {:cat => "long_cat"}
+    @long_cat = Chef::Resource::Cat.new("long_cat")
+    @resource_collection << @long_cat
+    @notification.resolve_resource_reference(@resource_collection)
+    @notification.resource.should == @keyboard_cat
+    @notification.notifying_resource.should == @long_cat
+  end
+
+  it "raises a RuntimeError if you try to reference multiple resources" do
+    @notification.resource = {:cat => ["keyboard_cat", "cheez_cat"]}
+    @keyboard_cat = Chef::Resource::Cat.new("keyboard_cat")
+    @cheez_cat = Chef::Resource::Cat.new("cheez_cat")
+    @resource_collection = Chef::ResourceCollection.new
+    @resource_collection << @keyboard_cat
+    @resource_collection << @cheez_cat
+    @long_cat = Chef::Resource::Cat.new("long_cat")
+    @notification.notifying_resource = @long_cat
+    lambda {@notification.resolve_resource_reference(@resource_collection)}.should raise_error(RuntimeError)
+  end
+
+  it "raises a RuntimeError if you try to reference multiple notifying resources" do
+    @notification.notifying_resource = {:cat => ["long_cat", "cheez_cat"]}
+    @long_cat = Chef::Resource::Cat.new("long_cat")
+    @cheez_cat = Chef::Resource::Cat.new("cheez_cat")
+    @resource_collection = Chef::ResourceCollection.new
+    @resource_collection << @long_cat
+    @resource_collection << @cheez_cat
+    @keyboard_cat = Chef::Resource::Cat.new("keyboard_cat")
+    @notification.resource = @keyboard_cat
+    lambda {@notification.resolve_resource_reference(@resource_collection)}.should raise_error(RuntimeError)
+  end
+
+  it "raises a RuntimeError if it can't find a resource in the resource collection when resolving a lazy reference" do
+    @notification.resource = {:cat => "keyboard_cat"}
+    @cheez_cat = Chef::Resource::Cat.new("cheez_cat")
+    @resource_collection = Chef::ResourceCollection.new
+    @resource_collection << @cheez_cat
+    @long_cat = Chef::Resource::Cat.new("long_cat")
+    @notification.notifying_resource = @long_cat
+    lambda {@notification.resolve_resource_reference(@resource_collection)}.should raise_error(RuntimeError)
+  end
+
+  it "raises a RuntimeError if it can't find a notifying resource in the resource collection when resolving a lazy reference" do
+    @notification.notifying_resource = {:cat => "long_cat"}
+    @cheez_cat = Chef::Resource::Cat.new("cheez_cat")
+    @resource_collection = Chef::ResourceCollection.new
+    @resource_collection << @cheez_cat
+    @keyboard_cat = Chef::Resource::Cat.new("keyboard_cat")
+    @notification.resource = @keyboard_cat
+    lambda {@notification.resolve_resource_reference(@resource_collection)}.should raise_error(RuntimeError)
+  end
+
+  it "raises an ArgumentError if improper syntax is used in the lazy reference to its resource" do
+    @notification.resource = "cat => keyboard_cat"
+    @keyboard_cat = Chef::Resource::Cat.new("keyboard_cat")
+    @resource_collection = Chef::ResourceCollection.new
+    @resource_collection << @keyboard_cat
+    @long_cat = Chef::Resource::Cat.new("long_cat")
+    @notification.notifying_resource = @long_cat
+    lambda {@notification.resolve_resource_reference(@resource_collection)}.should raise_error(ArgumentError)
+  end
+
+  it "raises an ArgumentError if improper syntax is used in the lazy reference to its notifying resource" do
+    @notification.notifying_resource = "cat => long_cat"
+    @long_cat = Chef::Resource::Cat.new("long_cat")
+    @resource_collection = Chef::ResourceCollection.new
+    @resource_collection << @long_cat
+    @keyboard_cat = Chef::Resource::Cat.new("keyboard_cat")
+    @notification.resource = @keyboard_cat
+    lambda {@notification.resolve_resource_reference(@resource_collection)}.should raise_error(ArgumentError)
+  end
+
+  # Create test to resolve lazy references to both notifying resource and dest. resource
+  # Create tests to check proper error raising
+
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: chef
 version: !ruby/object:Gem::Version 
-  hash: 2518967739
+  hash: -1445976474
   prerelease: 8
   segments: 
   - 10
   - 14
   - 0
   - beta
-  - 1
-  version: 10.14.0.beta.1
+  - 2
+  version: 10.14.0.beta.2
 platform: ruby
 authors: 
 - Adam Jacob
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-02 00:00:00 Z
+date: 2012-07-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mixlib-config
@@ -625,6 +625,8 @@ files:
 - lib/chef/formatters/error_inspectors/cookbook_sync_error_inspector.rb
 - lib/chef/formatters/error_inspectors/compile_error_inspector.rb
 - lib/chef/formatters/error_inspectors/node_load_error_inspector.rb
+- lib/chef/formatters/error_mapper.rb
+- lib/chef/formatters/error_descriptor.rb
 - lib/chef/formatters/error_inspectors.rb
 - lib/chef/run_list/run_list_item.rb
 - lib/chef/run_list/versioned_recipe_list.rb