chef 10.14.0.rc.0 → 10.14.0.rc.1

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.rc.0'
+  VERSION = '10.14.0.rc.1'
 end
 
 # NOTE: the Chef::Version class is defined in version_class.rb

data/spec/unit/formatters/error_inspectors/compile_error_inspector_spec.rb

@@ -40,20 +40,45 @@ describe Chef::Formatters::ErrorInspectors::CompileErrorInspector do
   before do
     @node_name = "test-node.example.com"
     @description = Chef::Formatters::ErrorDescription.new("Error Evaluating File:")
+    @exception = NoMethodError.new("undefined method `this_is_not_a_valid_method' for Chef::Resource::File")
+
     @outputter = Chef::Formatters::Outputter.new(StringIO.new, STDERR)
     #@outputter = Chef::Formatters::Outputter.new(STDOUT, STDERR)
+  end
+
+  describe "when scrubbing backtraces" do
+    it "shows backtrace lines from cookbook files" do
+      # Error inspector originally used file_cache_path which is incorrect on
+      # chef-solo. Using cookbook_path should do the right thing for client and
+      # solo.
+      Chef::Config.stub!(:cookbook_path).and_return([ "/home/someuser/dev-laptop/cookbooks" ])
+      @trace = [
+        "/home/someuser/dev-laptop/cookbooks/syntax-err/recipes/default.rb:14:in `from_file'",
+        "/home/someuser/dev-laptop/cookbooks/syntax-err/recipes/default.rb:11:in `from_file'",
+        "/home/someuser/.multiruby/gems/chef/lib/chef/client.rb:123:in `run'"
+      ]
+      @exception.set_backtrace(@trace)
+      @path = "/var/chef/cache/cookbooks/syntax-err/recipes/default.rb"
+      @inspector = described_class.new(@path, @exception)
 
-    Chef::Config.stub!(:file_cache_path).and_return("/var/chef/cache")
+      @expected_filtered_trace = [
+        "/home/someuser/dev-laptop/cookbooks/syntax-err/recipes/default.rb:14:in `from_file'",
+        "/home/someuser/dev-laptop/cookbooks/syntax-err/recipes/default.rb:11:in `from_file'",
+      ]
+      @inspector.filtered_bt.should == @expected_filtered_trace
+    end
   end
 
   describe "when explaining an error in the compile phase" do
     before do
-      IO.should_receive(:readlines).with("/var/chef/cache/cookbooks/syntax-err/recipes/default.rb").and_return(BAD_RECIPE.split("\n"))
+      Chef::Config.stub!(:cookbook_path).and_return([ "/var/chef/cache/cookbooks" ])
+      recipe_lines = BAD_RECIPE.split("\n").map {|l| l << "\n" }
+      IO.should_receive(:readlines).with("/var/chef/cache/cookbooks/syntax-err/recipes/default.rb").and_return(recipe_lines)
       @trace = [
         "/var/chef/cache/cookbooks/syntax-err/recipes/default.rb:14:in `from_file'",
-        "/var/chef/cache/cookbooks/syntax-err/recipes/default.rb:11:in `from_file'"
+        "/var/chef/cache/cookbooks/syntax-err/recipes/default.rb:11:in `from_file'",
+        "/usr/local/lib/ruby/gems/chef/lib/chef/client.rb:123:in `run'" # should not display
       ]
-      @exception = NoMethodError.new("undefined method `this_is_not_a_valid_method' for Chef::Resource::File")
       @exception.set_backtrace(@trace)
       @path = "/var/chef/cache/cookbooks/syntax-err/recipes/default.rb"
       @inspector = described_class.new(@path, @exception)

data/spec/unit/formatters/error_inspectors/resource_failure_inspector_spec.rb

@@ -36,7 +36,8 @@ describe Chef::Formatters::ErrorInspectors::ResourceFailureInspector do
     @description = Chef::Formatters::ErrorDescription.new("Error Converging Resource:")
     @outputter = Chef::Formatters::Outputter.new(StringIO.new, STDERR)
     #@outputter = Chef::Formatters::Outputter.new(STDOUT, STDERR)
-    Chef::Config.stub!(:file_cache_path).and_return("/var/chef/cache")
+
+    Chef::Config.stub!(:cookbook_path).and_return([ "/var/chef/cache" ])
   end
 
   describe "when explaining an error converging a resource" do
@@ -54,7 +55,8 @@ describe Chef::Formatters::ErrorInspectors::ResourceFailureInspector do
 
       @trace = [
         "/var/chef/cache/cookbooks/syntax-err/recipes/default.rb:14:in `from_file'",
-        "/var/chef/cache/cookbooks/syntax-err/recipes/default.rb:11:in `from_file'"
+        "/var/chef/cache/cookbooks/syntax-err/recipes/default.rb:11:in `from_file'",
+        "/usr/local/lib/ruby/gems/chef/lib/chef/client.rb:123:in `run'" # should not display
       ]
       @exception = Chef::Exceptions::Package.new("No such package 'non-existing-package'")
       @exception.set_backtrace(@trace)
@@ -62,6 +64,15 @@ describe Chef::Formatters::ErrorInspectors::ResourceFailureInspector do
       @inspector.add_explanation(@description)
     end
 
+    it "filters chef core code from the backtrace" do
+      @expected_filtered_trace = [
+        "/var/chef/cache/cookbooks/syntax-err/recipes/default.rb:14:in `from_file'",
+        "/var/chef/cache/cookbooks/syntax-err/recipes/default.rb:11:in `from_file'",
+      ]
+
+      @inspector.filtered_bt.should == @expected_filtered_trace
+    end
+
     it "prints a pretty message" do
       @description.display(@outputter)
     end

data/spec/unit/knife/cookbook_site_share_spec.rb

@@ -36,7 +36,7 @@ describe Chef::Knife::CookbookSiteShare do
 
     @cookbook_uploader = Chef::CookbookUploader.new('herpderp', File.join(CHEF_SPEC_DATA, 'cookbooks'), :rest => "norest")
     Chef::CookbookUploader.stub!(:new).and_return(@cookbook_uploader)
-    @cookbook_uploader.stub!(:validate_cookbook).and_return(true)
+    @cookbook_uploader.stub!(:validate_cookbooks).and_return(true)
     Chef::CookbookSiteStreamingUploader.stub!(:create_build_dir).and_return(Dir.mktmpdir)
 
     Chef::Mixin::Command.stub(:run_command).and_return(true)

data/spec/unit/provider/cookbook_file_spec.rb

@@ -180,6 +180,10 @@ EXPECTED
     before do
       Chef::FileAccessControl.any_instance.stub(:modified?).and_return(false)
       @tempfile = Tempfile.open('cookbook_file_spec')
+      # CHEF-2991: We handle CRLF very poorly and we don't know what line endings
+      # our source file is going to have, so we use binary mode to preserve CRLF if needed.
+      source_file = CHEF_SPEC_DATA + "/cookbooks/apache2/files/default/apache2_module_conf_generate.pl"
+      @tempfile.binmode unless File.open(source_file, "rb") { |f| f.read =~ /\r/ }
       @new_resource.path(@target_file = @tempfile.path)
       @tempfile.write(@file_content)
       @tempfile.close

data/spec/unit/resource_reporter_spec.rb

@@ -85,6 +85,7 @@ describe Chef::ResourceReporter do
   context "when a resource fails before loading current state" do
     before do
       @exception = Exception.new
+      @exception.set_backtrace(caller)
       @resource_reporter.resource_action_start(@new_resource, :create)
       @resource_reporter.resource_failed(@new_resource, :create, @exception)
       @resource_reporter.resource_completed(@new_resource)
@@ -148,6 +149,7 @@ describe Chef::ResourceReporter do
         before do
           @next_new_resource = Chef::Resource::Service.new("apache2")
           @exception = Exception.new
+          @exception.set_backtrace(caller)
           @resource_reporter.resource_failed(@next_new_resource, :create, @exception)
           @resource_reporter.resource_completed(@next_new_resource)
         end
@@ -203,6 +205,7 @@ describe Chef::ResourceReporter do
     context "and the resource failed to converge" do
       before do
         @exception = Exception.new
+        @exception.set_backtrace(caller)
         @resource_reporter.resource_failed(@new_resource, :create, @exception)
         @resource_reporter.resource_completed(@new_resource)
       end

data/spec/unit/scan_access_control_spec.rb

@@ -63,14 +63,25 @@ describe Chef::ScanAccessControl do
         @current_resource.mode.should == "644"
       end
 
-      it "sets the group of the current resource to the current group as a String" do
-        @current_resource.group.should == Etc.getgrgid(0).name
+      context "on unix", :unix_only do
+        it "sets the group of the current resource to the current group as a String" do
+          @current_resource.group.should == Etc.getgrgid(0).name
+        end
+  
+        it "sets the owner of the current resource to the current owner as a String" do
+          @current_resource.user.should == "root"
+        end
       end
 
-      it "sets the owner of the current resource to the current owner as a String" do
-        @current_resource.user.should == "root"
+      context "on windows", :windows_only do
+        it "sets the group of the current resource to the current group as a String" do
+          @current_resource.group.should == 0
+        end
+  
+        it "sets the owner of the current resource to the current owner as a String" do
+          @current_resource.user.should == 0
+        end
       end
-
     end
 
     describe "when new_resource specifies the mode with a string" do

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: chef
 version: !ruby/object:Gem::Version 
-  hash: 932825029
+  hash: 3088687561
   prerelease: 8
   segments: 
   - 10
   - 14
   - 0
   - rc
-  - 0
-  version: 10.14.0.rc.0
+  - 1
+  version: 10.14.0.rc.1
 platform: ruby
 authors: 
 - Adam Jacob
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-21 00:00:00 Z
+date: 2012-08-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mixlib-config