chef 11.6.0.rc.1 → 11.6.0.rc.2

data/lib/chef/knife/cookbook_test.rb

@@ -25,6 +25,7 @@ class Chef
     class CookbookTest < Knife
 
       deps do
+        require 'chef/cookbook_loader'
         require 'chef/cookbook/syntax_check'
       end
 

data/lib/chef/provider/remote_file/cache_control_data.rb

@@ -87,11 +87,12 @@ class Chef
         end
 
         def load
-          previous_cc_data = load_data
-          apply(previous_cc_data)
-          self
-        rescue Chef::Exceptions::FileNotFound
-          false
+          if previous_cc_data = load_data
+            apply(previous_cc_data)
+            self
+          else
+            false
+          end
         end
 
         def validate!(current_copy_checksum)
@@ -139,6 +140,8 @@ class Chef
 
         def load_data
           Chef::JSONCompat.from_json(load_json_data)
+        rescue Chef::Exceptions::FileNotFound, Yajl::ParseError
+          false
         end
 
         def load_json_data

data/lib/chef/resource_reporter.rb

@@ -64,8 +64,11 @@ class Chef
         else
           #as_hash["result"] = "failed"
         end
-        as_hash["cookbook_name"] = new_resource.cookbook_name
-        as_hash["cookbook_version"] = new_resource.cookbook_version.version
+        if new_resource.cookbook_name
+          as_hash["cookbook_name"] = new_resource.cookbook_name
+          as_hash["cookbook_version"] = new_resource.cookbook_version.version
+        end
+
         as_hash
       end
 

data/lib/chef/version.rb

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

data/spec/unit/provider/remote_file/cache_control_data_spec.rb

@@ -108,6 +108,15 @@ describe Chef::Provider::RemoteFile::CacheControlData do
         cache_control_data.mtime.should == mtime
       end
     end
+
+    context "and the cached checksum data is corrupted" do
+      let(:cache_json_data) { '{"foo",,"bar" []}' }
+
+      it "returns empty cache control data" do
+        cache_control_data.etag.should be_nil
+        cache_control_data.mtime.should be_nil
+      end
+    end
   end
 
   describe "when saving to disk" do

data/spec/unit/resource_reporter_spec.rb

@@ -413,6 +413,57 @@ describe Chef::ResourceReporter do
 
     end
 
+    context "when new_resource does not have a cookbook_name" do
+      before do
+        @bad_resource = Chef::Resource::File.new("/tmp/a-file.txt")
+        @bad_resource.cookbook_name = nil
+
+        @resource_reporter.resource_action_start(@bad_resource, :create)
+        @resource_reporter.resource_current_state_loaded(@bad_resource, :create, @current_resource)
+        @resource_reporter.resource_updated(@bad_resource, :create)
+        @resource_reporter.resource_completed(@bad_resource)
+        @run_status.stop_clock
+        @report = @resource_reporter.prepare_run_data
+        @first_update_report = @report["resources"].first
+      end
+
+      it "includes an updated resource's initial state" do
+        @first_update_report["before"].should == @current_resource.state
+      end
+
+      it "includes an updated resource's final state" do
+        @first_update_report["after"].should == @new_resource.state
+      end
+
+      it "includes the resource's name" do
+        @first_update_report["name"].should == @new_resource.name
+      end
+
+      it "includes the resource's id attribute" do
+        @first_update_report["id"].should == @new_resource.identity
+      end
+
+      it "includes the elapsed time for the resource to converge" do
+        # TODO: API takes integer number of milliseconds as a string. This
+        # should be an int.
+        @first_update_report.should have_key("duration")
+        @first_update_report["duration"].to_i.should be_within(100).of(0)
+      end
+
+      it "includes the action executed by the resource" do
+        # TODO: rename as "action"
+        @first_update_report["result"].should == "create"
+      end
+
+      it "does not include a cookbook name for the resource" do
+        @first_update_report.should_not have_key("cookbook_name")
+      end
+
+      it "does not include a cookbook version for the resource" do
+        @first_update_report.should_not have_key("cookbook_version")
+      end
+    end
+
   end
 
   describe "when updating resource history on the server" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 11.6.0.rc.1
+  version: 11.6.0.rc.2
   prerelease: 7
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-03 00:00:00.000000000 Z
+date: 2013-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-config