chef 11.10.0 → 11.10.2

data/lib/chef/dsl/recipe.rb

@@ -55,12 +55,14 @@ class Chef
           # Otherwise, we're rocking the regular resource call route.
           declare_resource(method_symbol, args[0], caller[0], &block)
         else
-          super
+          begin
+            super
+          rescue NoMethodError
+            raise NoMethodError, "No resource or method named `#{method_symbol}' for #{describe_self_for_error}"
+          rescue NameError
+            raise NameError, "No resource, method, or local variable named `#{method_symbol}' for #{describe_self_for_error}"
+          end
         end
-      rescue NoMethodError
-        raise NoMethodError, "No resource or method named `#{method_symbol}' for #{describe_self_for_error}"
-      rescue NameError
-        raise NameError, "No resource, method, or local variable named `#{method_symbol}' for #{describe_self_for_error}"
       end
 
       def has_resource_definition?(name)

data/lib/chef/util/file_edit.rb

@@ -33,7 +33,7 @@ class Chef
         @file_edited = false
 
         raise ArgumentError, "File doesn't exist" unless File.exist? @original_pathname
-        @contents = File.new(@original_pathname){ |f| f.readlines }
+        @contents = File.open(@original_pathname) { |f| f.readlines }
       end
 
       #search the file line by line and match each line with the given regex

data/lib/chef/version.rb

@@ -1,4 +1,4 @@
-#
+#rc
 # Author:: Daniel DeLeo (<dan@opscode.com>)
 # Copyright:: Copyright (c) 2010-2011 Opscode, Inc.
 # License:: Apache License, Version 2.0
@@ -17,7 +17,7 @@
 
 class Chef
   CHEF_ROOT = File.dirname(File.expand_path(File.dirname(__FILE__)))
-  VERSION = '11.10.0'
+  VERSION = '11.10.2'
 end
 
 # NOTE: the Chef::Version class is defined in version_class.rb

data/spec/unit/provider/ifconfig/debian_spec.rb

@@ -20,70 +20,82 @@ require 'spec_helper'
 require 'chef/exceptions'
 
 describe Chef::Provider::Ifconfig::Debian do
-  before do
-    @node = Chef::Node.new
-    @cookbook_collection = Chef::CookbookCollection.new([])
-    @events = Chef::EventDispatch::Dispatcher.new
-    @run_context = Chef::RunContext.new(@node, @cookbook_collection, @events)
-    #This new_resource can be called anything --> it is not the same as in ifconfig.rb
-    @new_resource = Chef::Resource::Ifconfig.new("10.0.0.1", @run_context)
-    @new_resource.mask "255.255.254.0"
-    @new_resource.metric "1"
-    @new_resource.mtu "1500"
-    @new_resource.device "eth0"
-    @provider = Chef::Provider::Ifconfig::Debian.new(@new_resource, @run_context)
-    @current_resource = Chef::Resource::Ifconfig.new("10.0.0.1", @run_context)
 
-    status = double("Status", :exitstatus => 0)
-    @provider.instance_variable_set("@status", status)
-    @provider.current_resource = @current_resource
-    @provider.stub(:load_current_resource)
-    @provider.stub(:run_command)
+  let(:run_context) do
+    node = Chef::Node.new
+    cookbook_collection = Chef::CookbookCollection.new([])
+    events = Chef::EventDispatch::Dispatcher.new
+    Chef::RunContext.new(node, cookbook_collection, events)
+  end
 
-    @config_filename_ifaces = "/etc/network/interfaces"
-    @config_filename_ifcfg = "/etc/network/interfaces.d/ifcfg-#{@new_resource.device}"
+  let(:new_resource) do
+    new_resource = Chef::Resource::Ifconfig.new("10.0.0.1", run_context)
+    new_resource.mask "255.255.254.0"
+    new_resource.metric "1"
+    new_resource.mtu "1500"
+    new_resource.device "eth0"
+    new_resource
   end
 
+  let(:current_resource) {  Chef::Resource::Ifconfig.new("10.0.0.1", run_context) }
+
+  let(:provider) do
+    status = double("Status", :exitstatus => 0)
+    provider = Chef::Provider::Ifconfig::Debian.new(new_resource, run_context)
+    provider.instance_variable_set("@status", status)
+    provider.current_resource = current_resource
+    allow(provider).to receive(:load_current_resource)
+    allow(provider).to receive(:run_command)
+    provider
+  end
+
+  let(:config_filename_ifaces) { "/etc/network/interfaces" }
+
+  let(:config_filename_ifcfg) { "/etc/network/interfaces.d/ifcfg-#{new_resource.device}" }
+
   describe "generate_config for action_add" do
-   before do
-    @config_file_ifaces = StringIO.new
-    @config_file_ifcfg = StringIO.new
-    FileUtils.should_receive(:cp)
-    File.should_receive(:new).with(@config_filename_ifaces).and_return(StringIO.new)
-    File.should_receive(:open).with(@config_filename_ifaces, "w").and_yield(@config_file_ifaces)
-    File.should_receive(:new).with(@config_filename_ifcfg, "w").and_return(@config_file_ifcfg)
-    File.should_receive(:exist?).with(@config_filename_ifaces).and_return(true)
-   end
-
-   it "should create network-scripts directory" do
-    File.should_receive(:directory?).with(File.dirname(@config_filename_ifcfg)).and_return(false)
-    Dir.should_receive(:mkdir).with(File.dirname(@config_filename_ifcfg))
-    @provider.run_action(:add)
-   end
-
-   it "should write configure network-scripts directory" do
-    File.should_receive(:directory?).with(File.dirname(@config_filename_ifcfg)).and_return(true)
-    @provider.run_action(:add)
-    @config_file_ifaces.string.should match(/^\s*source\s+\/etc\/network\/interfaces[.]d\/[*]\s*$/)
-   end
-
-   it "should write a network-script" do
-    File.should_receive(:directory?).with(File.dirname(@config_filename_ifcfg)).and_return(true)
-    @provider.run_action(:add)
-    @config_file_ifcfg.string.should match(/^iface eth0 inet static\s*$/)
-    @config_file_ifcfg.string.should match(/^\s+address 10\.0\.0\.1\s*$/)
-    @config_file_ifcfg.string.should match(/^\s+netmask 255\.255\.254\.0\s*$/)
-   end
+
+    let(:config_file_ifaces) { StringIO.new }
+
+    let(:config_file_ifcfg) { StringIO.new }
+
+    before do
+      expect(FileUtils).to receive(:cp)
+      expect(File).to receive(:open).with(config_filename_ifaces).and_return(StringIO.new)
+      expect(File).to receive(:open).with(config_filename_ifaces, "w").and_yield(config_file_ifaces)
+      expect(File).to receive(:new).with(config_filename_ifcfg, "w").and_return(config_file_ifcfg)
+      expect(File).to receive(:exist?).with(config_filename_ifaces).and_return(true)
+    end
+
+    it "should create network-scripts directory" do
+      expect(File).to receive(:directory?).with(File.dirname(config_filename_ifcfg)).and_return(false)
+      expect(Dir).to receive(:mkdir).with(File.dirname(config_filename_ifcfg))
+      provider.run_action(:add)
+    end
+
+    it "should write configure network-scripts directory" do
+      expect(File).to receive(:directory?).with(File.dirname(config_filename_ifcfg)).and_return(true)
+      provider.run_action(:add)
+      expect(config_file_ifaces.string).to match(/^\s*source\s+\/etc\/network\/interfaces[.]d\/[*]\s*$/)
+    end
+
+    it "should write a network-script" do
+      expect(File).to receive(:directory?).with(File.dirname(config_filename_ifcfg)).and_return(true)
+      provider.run_action(:add)
+      expect(config_file_ifcfg.string).to match(/^iface eth0 inet static\s*$/)
+      expect(config_file_ifcfg.string).to match(/^\s+address 10\.0\.0\.1\s*$/)
+      expect(config_file_ifcfg.string).to match(/^\s+netmask 255\.255\.254\.0\s*$/)
+    end
   end
 
   describe "delete_config for action_delete" do
 
     it "should delete network-script if it exists" do
-      @current_resource.device @new_resource.device
-      File.should_receive(:exist?).with(@config_filename_ifcfg).and_return(true)
-      FileUtils.should_receive(:rm_f).with(@config_filename_ifcfg, :verbose => false)
+      current_resource.device new_resource.device
+      expect(File).to receive(:exist?).with(config_filename_ifcfg).and_return(true)
+      expect(FileUtils).to receive(:rm_f).with(config_filename_ifcfg, :verbose => false)
 
-      @provider.run_action(:delete)
+      provider.run_action(:delete)
     end
   end
 end

data/spec/unit/recipe_spec.rb

@@ -202,6 +202,19 @@ describe Chef::Recipe do
 
     end
 
+    describe "when creating a resource that contains an error in the attributes block" do
+
+      it "does not obfuscate the error source" do
+        lambda do
+          @recipe.zen_master("klopp") do
+            this_method_doesnt_exist
+          end
+        end.should raise_error(NoMethodError, "undefined method `this_method_doesnt_exist' for Chef::Resource::ZenMaster")
+
+      end
+
+    end
+
     describe "resource definitions" do
       it "should execute defined resources" do
         crow_define = Chef::ResourceDefinition.new

data/spec/unit/util/file_edit_spec.rb

@@ -20,116 +20,169 @@ require 'spec_helper'
 
 describe Chef::Util::FileEdit do
 
-  before(:each) do
+  let(:starting_content) do
+    <<-EOF
+127.0.0.1       localhost
+255.255.255.255 broadcasthost
+::1             localhost
+fe80::1%lo0     localhost
+    EOF
+  end
+
+  let(:localhost_replaced) do
+    <<-EOF
+127.0.0.1       replacement
+255.255.255.255 broadcasthost
+::1             replacement
+fe80::1%lo0     replacement
+    EOF
+  end
+
+  let(:localhost_line_replaced) do
+    <<-EOF
+replacement line
+255.255.255.255 broadcasthost
+replacement line
+replacement line
+    EOF
+  end
+
+  let(:localhost_deleted) do
+    # sensitive to deliberate trailing whitespace
+    "127.0.0.1       \n255.255.255.255 broadcasthost\n::1             \nfe80::1%lo0     \n"
+  end
+
+  let(:localhost_line_deleted) do
+    <<-EOF
+255.255.255.255 broadcasthost
+    EOF
+  end
+
+  let(:append_after_all_localhost) do
+    <<-EOF
+127.0.0.1       localhost
+new line inserted
+255.255.255.255 broadcasthost
+::1             localhost
+new line inserted
+fe80::1%lo0     localhost
+new line inserted
+    EOF
+  end
 
-    @hosts_content=<<-HOSTS
+  let(:append_after_content) do
+    <<-EOF
 127.0.0.1       localhost
 255.255.255.255 broadcasthost
 ::1             localhost
 fe80::1%lo0     localhost
-HOSTS
+new line inserted
+    EOF
+  end
 
-    @tempfile = Tempfile.open('file_edit_spec')
-    @tempfile.write(@hosts_content)
-    @tempfile.close
-    @fedit = Chef::Util::FileEdit.new(@tempfile.path)
+  let(:target_file) do
+    f = Tempfile.open('file_edit_spec')
+    f.write(starting_content)
+    f.close
+    f
   end
 
+  let(:fedit) { Chef::Util::FileEdit.new(target_file.path) }
+
   after(:each) do
-    @tempfile && @tempfile.close!
+    target_file.close!
   end
 
   describe "initialiize" do
     it "should create a new Chef::Util::FileEdit object" do
-      Chef::Util::FileEdit.new(@tempfile.path).should be_kind_of(Chef::Util::FileEdit)
+      expect(fedit).to be_instance_of(Chef::Util::FileEdit)
     end
 
     it "should throw an exception if the input file does not exist" do
-      lambda{Chef::Util::FileEdit.new("nonexistfile")}.should raise_error
+      expect{Chef::Util::FileEdit.new("nonexistfile")}.to raise_error(ArgumentError)
     end
 
-    it "should throw an exception if the input file is blank" do
-      lambda do
-        Chef::Util::FileEdit.new(File.join(CHEF_SPEC_DATA, "filedit", "blank"))
-      end.should raise_error
+    # CHEF-5018: people have monkey patched this and it has accidentally been broken
+    it "should read the contents into memory as an array" do
+      expect(fedit.send(:contents)).to be_instance_of(Array)
     end
   end
 
+  describe "when the file is blank" do
+    let(:hosts_content) { "" }
+
+    it "should not throw an exception" do
+      expect{ fedit }.not_to raise_error
+    end
+  end
+
+  def edited_file_contents
+    IO.read(target_file.path)
+  end
+
   describe "search_file_replace" do
     it "should accept regex passed in as a string (not Regexp object) and replace the match if there is one" do
-      @fedit.search_file_replace("localhost", "replacement")
-      @fedit.write_file
-      newfile = File.new(@tempfile.path).readlines
-      newfile[0].should match(/replacement/)
+      fedit.search_file_replace("localhost", "replacement")
+      fedit.write_file
+      expect(edited_file_contents).to eq(localhost_replaced)
     end
 
     it "should accept regex passed in as a Regexp object and replace the match if there is one" do
-      @fedit.search_file_replace(/localhost/, "replacement")
-      @fedit.write_file
-      newfile = File.new(@tempfile.path).readlines
-      newfile[0].should match(/replacement/)
+      fedit.search_file_replace(/localhost/, "replacement")
+      fedit.write_file
+      expect(edited_file_contents).to eq(localhost_replaced)
     end
 
     it "should do nothing if there isn't a match" do
-      @fedit.search_file_replace(/pattern/, "replacement")
-      @fedit.write_file
-      newfile = File.new(@tempfile.path).readlines
-      newfile[0].should_not match(/replacement/)
+      fedit.search_file_replace(/pattern/, "replacement")
+      fedit.write_file
+      expect(edited_file_contents).to eq(starting_content)
     end
   end
 
   describe "search_file_replace_line" do
     it "should search for match and replace the whole line" do
-      @fedit.search_file_replace_line(/localhost/, "replacement line")
-      @fedit.write_file
-      newfile = File.new(@tempfile.path).readlines
-      newfile[0].should match(/replacement/)
-      newfile[0].should_not match(/127/)
+      fedit.search_file_replace_line(/localhost/, "replacement line")
+      fedit.write_file
+      expect(edited_file_contents).to eq(localhost_line_replaced)
     end
   end
 
   describe "search_file_delete" do
     it "should search for match and delete the match" do
-      @fedit.search_file_delete(/localhost/)
-      @fedit.write_file
-      newfile = File.new(@tempfile.path).readlines
-      newfile[0].should_not match(/localhost/)
-      newfile[0].should match(/127/)
+      fedit.search_file_delete(/localhost/)
+      fedit.write_file
+      expect(edited_file_contents).to eq(localhost_deleted)
     end
   end
 
   describe "search_file_delete_line" do
     it "should search for match and delete the matching line" do
-      @fedit.search_file_delete_line(/localhost/)
-      @fedit.write_file
-      newfile = File.new(@tempfile.path).readlines
-      newfile[0].should_not match(/localhost/)
-      newfile[0].should match(/broadcasthost/)
+      fedit.search_file_delete_line(/localhost/)
+      fedit.write_file
+      expect(edited_file_contents).to eq(localhost_line_deleted)
     end
   end
 
   describe "insert_line_after_match" do
     it "should search for match and insert the given line after the matching line" do
-      @fedit.insert_line_after_match(/localhost/, "new line inserted")
-      @fedit.write_file
-      newfile = File.new(@tempfile.path).readlines
-      newfile[1].should match(/new/)
+      fedit.insert_line_after_match(/localhost/, "new line inserted")
+      fedit.write_file
+      expect(edited_file_contents).to eq(append_after_all_localhost)
     end
   end
 
   describe "insert_line_if_no_match" do
     it "should search for match and insert the given line if no line match" do
-      @fedit.insert_line_if_no_match(/pattern/, "new line inserted")
-      @fedit.write_file
-      newfile = File.new(@tempfile.path).readlines
-      newfile.last.should match(/new/)
+      fedit.insert_line_if_no_match(/pattern/, "new line inserted")
+      fedit.write_file
+      expect(edited_file_contents).to eq(append_after_content)
     end
 
     it "should do nothing if there is a match" do
-      @fedit.insert_line_if_no_match(/localhost/, "replacement")
-      @fedit.write_file
-      newfile = File.new(@tempfile.path).readlines
-      newfile[1].should_not match(/replacement/)
+      fedit.insert_line_if_no_match(/localhost/, "replacement")
+      fedit.write_file
+      expect(edited_file_contents).to eq(starting_content)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 11.10.0
+  version: 11.10.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-06 00:00:00.000000000 Z
+date: 2014-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-config