chef 11.6.0.rc.0 → 11.6.0.rc.1

data/spec/unit/cookbook_loader_spec.rb

@@ -68,8 +68,7 @@ describe Chef::CookbookLoader do
         seen[2].should == "borken"
         seen[3].should == "ignorken"
         seen[4].should == "java"
-        seen[5].should == "nginx"
-        seen[6].should == "openldap"
+        seen[5].should == "openldap"
       end
     end
   
@@ -156,26 +155,6 @@ describe Chef::CookbookLoader do
         end
         @cookbook_loader.load_cookbooks
       end
-
-      it "should index cookbooks by name, not pathname" do
-        @cookbook_loader.should_not have_key(:'not-nginx')
-        @cookbook_loader.should_not have_key(:'no-really-not-nginx')
-        @cookbook_loader.should have_key(:nginx)
-      end
-
-      it "should shadow cookbooks by name, not pathname" do
-        @cookbook_loader[:nginx].attribute_filenames.detect { |f|
-          f =~ /cookbooks\/not-nginx\/attributes\/default.rb/
-        }.should_not eql(nil)
-        @cookbook_loader[:nginx].attribute_filenames.detect { |f|
-          f =~ /kitchen\/no-really-not-nginx\/attributes\/default.rb/
-        }.should eql(nil)
-      end
-
-      it "should emit deprecation warning if name is not in metadata" do
-        Chef::Log.should_receive(:warn).at_least(:once).with(/Inferring cookbook name from directory name \([^)]+\) is deprecated, please set a name in the metadata./)
-        @cookbook_loader.load_cookbooks
-      end
     end # load_cookbooks
 
   end # loading all cookbooks

data/spec/unit/provider/package/yum_spec.rb

@@ -39,7 +39,6 @@ describe Chef::Provider::Package::Yum do
     )
     Chef::Provider::Package::Yum::YumCache.stub!(:instance).and_return(@yum_cache)
     @provider = Chef::Provider::Package::Yum.new(@new_resource, @run_context)
-    @stderr = StringIO.new
     @pid = mock("PID")
   end
 
@@ -542,7 +541,7 @@ describe Chef::Provider::Package::Yum do
     it "should call action_upgrade in the parent if the candidate version is nil" do
       @provider.load_current_resource
       @current_resource = Chef::Resource::Package.new('cups')
-      @provider.candidate_version = nil 
+      @provider.candidate_version = nil
       @provider.should_not_receive(:upgrade_package)
       @provider.action_upgrade
     end
@@ -1155,7 +1154,7 @@ describe Chef::Provider::Package::Yum::RPMDbPackage do
 
   describe "repoid" do
     it "should return the source repository repoid" do
-      @rpm_x.repoid.should be == "base" 
+      @rpm_x.repoid.should be == "base"
       @rpm_y.repoid.should be == "extras"
       @rpm_z.repoid.should be == "other"
     end
@@ -1544,7 +1543,10 @@ describe Chef::Provider::Package::Yum::YumCache do
   end
 
   before(:each) do
-    yum_dump_good_output = <<EOF
+    @stdin = mock("STDIN", :nil_object => true)
+    @stdout = mock("STDOUT", :nil_object => true)
+
+    @stdout_good = <<EOF
 [option installonlypkgs] kernel kernel-bigmem kernel-enterprise
 erlang-mochiweb 0 1.4.1 5.el5 x86_64 ['erlang-mochiweb = 1.4.1-5.el5', 'mochiweb = 1.4.1-5.el5'] i installed
 zip 0 2.31 2.el5 x86_64 ['zip = 2.31-2.el5'] r base
@@ -1560,9 +1562,16 @@ znc-extra 0 0.098 1.el5 x86_64 [] a base
 znc-modtcl 0 0.098 1.el5 x86_64 [] a base
 znc-test.beta1 0 0.098 1.el5 x86_64 [] a extras
 znc-test.test.beta1 0 0.098 1.el5 x86_64 [] a base
+EOF
+    @stdout_bad_type = <<EOF
+zip 0 2.31 2.el5 x86_64 ['zip = 2.31-2.el5'] r base
+zlib 0 1.2.3 3 x86_64 ['zlib = 1.2.3-3', 'libz.so.1()(64bit)'] c base
+zlib-devel 0 1.2.3 3 i386 [] a extras
+zlib-devel 0 1.2.3 3 x86_64 ['zlib-devel = 1.2.3-3'] bad installed
+znc-modtcl 0 0.098 1.el5 x86_64 [] a base
 EOF
 
-    yum_dump_bad_output_separators = <<EOF
+    @stdout_bad_separators = <<EOF
 zip 0 2.31 2.el5 x86_64 ['zip = 2.31-2.el5'] r base
 zlib 0 1.2.3 3 x86_64 ['zlib = 1.2.3-3', 'libz.so.1()(64bit)'] i base bad
 zlib-devel 0 1.2.3 3 i386 [] a extras
@@ -1570,41 +1579,13 @@ bad zlib-devel 0 1.2.3 3 x86_64 ['zlib-devel = 1.2.3-3'] i installed
 znc-modtcl 0 0.098 1.el5 x86_64 [] a base bad
 EOF
 
-    yum_dump_bad_output_type = <<EOF
-zip 0 2.31 2.el5 x86_64 ['zip = 2.31-2.el5'] r base
-zlib 0 1.2.3 3 x86_64 ['zlib = 1.2.3-3', 'libz.so.1()(64bit)'] c base
-zlib-devel 0 1.2.3 3 i386 [] a extras
-zlib-devel 0 1.2.3 3 x86_64 ['zlib-devel = 1.2.3-3'] bad installed
-znc-modtcl 0 0.098 1.el5 x86_64 [] a base
-EOF
+    @stdout_no_output = ""
 
-    yum_dump_error = <<EOF
+    @stderr = <<EOF
 yum-dump Config Error: File contains no section headers.
 file: file://///etc/yum.repos.d/CentOS-Base.repo, line: 12
 'qeqwewe\n'
 EOF
-
-    @stdin = mock("STDIN", :nil_object => true)
-    @stdout = mock("STDOUT", :nil_object => true)
-    @stdout_good = mock("STDOUT", :nil_object => true)
-    s = @stdout_good.stub!(:each_line)
-    yum_dump_good_output.split("\n").each do |line|
-      s.and_yield(line)
-    end
-    @stdout_bad_type = mock("STDOUT", :nil_object => true)
-    s = @stdout_bad_type.stub!(:each_line)
-    yum_dump_bad_output_type.split("\n").each do |line|
-      s.and_yield(line)
-    end
-    @stdout_bad_separators = mock("STDOUT", :nil_object => true)
-    s = @stdout_bad_separators.stub!(:each_line)
-    yum_dump_bad_output_separators.split("\n").each do |line|
-      s.and_yield(line)
-    end
-    @stdout_no_output = mock("STDOUT", :nil_object => true)
-    @stdout_no_output.stub!(:each_line).and_return(nil)
-    @stderr = mock("STDERR", :nil_object => true)
-    @stderr.stub!(:readlines).and_return(yum_dump_error.split("\n"))
     @status = mock("Status", :exitstatus => 0, :stdin => @stdin, :stdout => @stdout_good, :stderr => @stderr)
 
     # new singleton each time
@@ -1808,7 +1789,7 @@ EOF
     end
 
     it "should return nil when no match for package-version, no arch" do
-      @yc.package_repository("zisofs-tools", "pretend", nil).should be == nil 
+      @yc.package_repository("zisofs-tools", "pretend", nil).should be == nil
       @yc.package_repository("zisofs-tools", "pretend").should be == nil
       @yc.package_repository("pretend", "1.0.6-3.2.2").should be == nil
     end

data/spec/unit/scan_access_control_spec.rb

@@ -21,7 +21,8 @@ require 'chef/scan_access_control'
 describe Chef::ScanAccessControl do
 
   before do
-    @new_resource = Chef::Resource::File.new("/tmp/foo/bar/baz/qux")
+    @new_resource = Chef::Resource::File.new("/tmp/foo/bar/baz/link")
+    @real_file = "/tmp/foo/bar/real/file"
     @current_resource = Chef::Resource::File.new(@new_resource.path)
     @scanner = Chef::ScanAccessControl.new(@new_resource, @current_resource)
   end
@@ -49,7 +50,8 @@ describe Chef::ScanAccessControl do
 
     before do
       @stat = mock("File::Stat for #{@new_resource.path}", :uid => 0, :gid => 0, :mode => 00100644)
-      File.should_receive(:stat).with(@new_resource.path).and_return(@stat)
+      File.should_receive(:realpath).with(@new_resource.path).and_return(@real_file)
+      File.should_receive(:stat).with(@real_file).and_return(@stat)
       File.should_receive(:exist?).with(@new_resource.path).and_return(true)
     end
 

data/spec/unit/util/diff_spec.rb

@@ -34,6 +34,12 @@ describe Chef::Util::Diff, :uses_diff => true do
   let!(:old_file) { old_tempfile.path }
   let!(:new_file) { new_tempfile.path }
 
+  let(:plain_ascii) { "This is a text file.\nWith more than one line.\nAnd a \tTab.\nAnd lets make sure that other printable chars work too: ~!@\#$%^&*()`:\"<>?{}|_+,./;'[]\\-=\n" }
+  # these are all byte sequences that are illegal in the other encodings... (but they may legally transcode)
+  let(:utf_8) { "testing utf-8 unicode...\n\n\non a new line: \xE2\x80\x93\n" }  # unicode em-dash
+  let(:latin_1) { "It is more metal.\nif you have an \xFDmlaut.\n" } # NB: changed to y-with-diaresis, but i'm American so I don't know the difference
+  let(:shift_jis) { "I have no idea what this character is:\n \x83\x80.\n" } # seriously, no clue, but \x80 is nice and illegal in other encodings
+
   let(:differ) do  # subject
     differ = Chef::Util::Diff.new
     differ.diff(old_file, new_file)
@@ -114,6 +120,200 @@ describe Chef::Util::Diff, :uses_diff => true do
     end
   end
 
+  describe "when the default external encoding is UTF-8", :ruby_gte_19_only  do
+
+    before do
+      @saved_default_external = Encoding.default_external
+      Encoding.default_external = Encoding::UTF_8
+    end
+
+    after do
+      Encoding.default_external = @saved_default_external
+    end
+
+    describe "when a file has ASCII text" do
+      before do
+        new_tempfile.write(plain_ascii)
+        new_tempfile.close
+      end
+      it "calling for_output should return a valid diff" do
+        differ.for_output.join("\\n").should match(/\A--- .*\\n\+\+\+ .*\\n@@/m)
+      end
+      it "calling for_reporting should return a utf-8 string" do
+        expect(differ.for_reporting.encoding).to equal(Encoding::UTF_8)
+      end
+    end
+
+    describe "when a file has UTF-8 text" do
+      before do
+        new_tempfile.write(utf_8)
+        new_tempfile.close
+      end
+      it "calling for_output should return a valid diff" do
+        differ.for_output.join("\\n").should match(/\A--- .*\\n\+\+\+ .*\\n@@/m)
+      end
+      it "calling for_reporting should return a utf-8 string" do
+        expect(differ.for_reporting.encoding).to equal(Encoding::UTF_8)
+      end
+    end
+
+    describe "when a file has Latin-1 text" do
+      before do
+        new_tempfile.write(latin_1)
+        new_tempfile.close
+      end
+      it "calling for_output should complain that the content is binary" do
+        expect(differ.for_output).to eql( [ "(new content is binary, diff output suppressed)" ])
+      end
+      it "calling for_reporting should be nil" do
+        expect(differ.for_reporting).to be_nil
+      end
+    end
+
+    describe "when a file has Shift-JIS text" do
+      before do
+        new_tempfile.write(shift_jis)
+        new_tempfile.close
+      end
+      it "calling for_output should complain that the content is binary" do
+        expect(differ.for_output).to eql( [ "(new content is binary, diff output suppressed)" ])
+      end
+      it "calling for_reporting should be nil" do
+        expect(differ.for_reporting).to be_nil
+      end
+    end
+
+  end
+
+  describe "when the default external encoding is Latin-1", :ruby_gte_19_only  do
+
+    before do
+      @saved_default_external = Encoding.default_external
+      Encoding.default_external = Encoding::ISO_8859_1
+    end
+
+    after do
+      Encoding.default_external = @saved_default_external
+    end
+
+    describe "when a file has ASCII text" do
+      before do
+        new_tempfile.write(plain_ascii)
+        new_tempfile.close
+      end
+      it "calling for_output should return a valid diff" do
+        differ.for_output.join("\\n").should match(/\A--- .*\\n\+\+\+ .*\\n@@/m)
+      end
+      it "calling for_reporting should return a utf-8 string" do
+        expect(differ.for_reporting.encoding).to equal(Encoding::UTF_8)
+      end
+    end
+
+    describe "when a file has UTF-8 text" do
+      before do
+        new_tempfile.write(utf_8)
+        new_tempfile.close
+      end
+      it "calling for_output should complain that the content is binary" do
+        expect(differ.for_output).to eql( [ "(new content is binary, diff output suppressed)" ])
+      end
+      it "calling for_reporting should be nil" do
+        expect(differ.for_reporting).to be_nil
+      end
+    end
+
+    describe "when a file has Latin-1 text" do
+      before do
+        new_tempfile.write(latin_1)
+        new_tempfile.close
+      end
+      it "calling for_output should return a valid diff" do
+        differ.for_output.join("\\n").should match(/\A--- .*\\n\+\+\+ .*\\n@@/m)
+      end
+      it "calling for_reporting should return a utf-8 string" do
+        expect(differ.for_reporting.encoding).to equal(Encoding::UTF_8)
+      end
+    end
+
+    describe "when a file has Shift-JIS text" do
+      before do
+        new_tempfile.write(shift_jis)
+        new_tempfile.close
+      end
+      it "calling for_output should complain that the content is binary" do
+        expect(differ.for_output).to eql( [ "(new content is binary, diff output suppressed)" ])
+      end
+      it "calling for_reporting should be nil" do
+        expect(differ.for_reporting).to be_nil
+      end
+    end
+
+  end
+  describe "when the default external encoding is Shift_JIS", :ruby_gte_19_only  do
+
+    before do
+      @saved_default_external = Encoding.default_external
+      Encoding.default_external = Encoding::Shift_JIS
+    end
+
+    after do
+      Encoding.default_external = @saved_default_external
+    end
+
+    describe "when a file has ASCII text" do
+      before do
+        new_tempfile.write(plain_ascii)
+        new_tempfile.close
+      end
+      it "calling for_output should return a valid diff" do
+        differ.for_output.join("\\n").should match(/\A--- .*\\n\+\+\+ .*\\n@@/m)
+      end
+      it "calling for_reporting should return a utf-8 string" do
+        expect(differ.for_reporting.encoding).to equal(Encoding::UTF_8)
+      end
+    end
+
+    describe "when a file has UTF-8 text" do
+      before do
+        new_tempfile.write(utf_8)
+        new_tempfile.close
+      end
+      it "calling for_output should complain that the content is binary" do
+        expect(differ.for_output).to eql( [ "(new content is binary, diff output suppressed)" ])
+      end
+      it "calling for_reporting should be nil" do
+        expect(differ.for_reporting).to be_nil
+      end
+    end
+
+    describe "when a file has Latin-1 text" do
+      before do
+        new_tempfile.write(latin_1)
+        new_tempfile.close
+      end
+      it "calling for_output should complain that the content is binary" do
+        expect(differ.for_output).to eql( [ "(new content is binary, diff output suppressed)" ])
+      end
+      it "calling for_reporting should be nil" do
+        expect(differ.for_reporting).to be_nil
+      end
+    end
+
+    describe "when a file has Shift-JIS text" do
+      before do
+        new_tempfile.write(shift_jis)
+        new_tempfile.close
+      end
+      it "calling for_output should return a valid diff" do
+        differ.for_output.join("\\n").should match(/\A--- .*\\n\+\+\+ .*\\n@@/m)
+      end
+      it "calling for_reporting should return a utf-8 string" do
+        expect(differ.for_reporting.encoding).to equal(Encoding::UTF_8)
+      end
+    end
+
+  end
+
   describe "when testing the diff_filesize_threshold" do
     before do
       @diff_filesize_threshold_saved = Chef::Config[:diff_filesize_threshold]
@@ -165,11 +365,11 @@ describe Chef::Util::Diff, :uses_diff => true do
 
     it "calling for_output should return a unified diff" do
       differ.for_output.size.should eql(5)
-      differ.for_output.join("\\n").should match(/^--- .*\\n\+\+\+ .*\\n@@ .* @@\\n-foo\\n\+bar$/)
+      differ.for_output.join("\\n").should match(/\A--- .*\\n\+\+\+ .*\\n@@/m)
     end
 
     it "calling for_reporting should return a unified diff" do
-      differ.for_reporting.should match(/^--- .*\\n\+\+\+ .*\\n@@ .* @@\\n-foo\\n\+bar$/)
+      differ.for_reporting.should match(/\A--- .*\\n\+\+\+ .*\\n@@/m)
     end
 
     describe "when the diff output is too long" do
@@ -227,30 +427,170 @@ describe Chef::Util::Diff, :uses_diff => true do
   describe "when checking if files are binary or text" do
 
     it "should identify zero-length files as text" do
-      Tempfile.new("chef-util-diff-spec") do |file|
-        differ.is_binary?(file.path).should be_false
+      Tempfile.open("chef-util-diff-spec") do |file|
+        file.close
+        differ.send(:is_binary?, file.path).should be_false
       end
     end
 
     it "should identify text files as text" do
-      Tempfile.new("chef-util-diff-spec") do |file|
-        file.write("This is a text file.")
-        file.write("With more than one line.")
-        file.write("And lets make sure that other printable chars work too: ~!@\#$%^&*()`:\"<>?{}|_+,./;'[]\\-=")
+      Tempfile.open("chef-util-diff-spec") do |file|
+        file.write(plain_ascii)
         file.close
-        differ.is_binary?(file.path).should be_false
+        differ.send(:is_binary?, file.path).should be_false
       end
     end
 
     it "should identify a null-terminated string files as binary" do
-      Tempfile.new("chef-util-diff-spec") do |file|
+      Tempfile.open("chef-util-diff-spec") do |file|
         file.write("This is a binary file.\0")
         file.close
-        differ.is_binary?(file.path).should be_false
+        differ.send(:is_binary?, file.path).should be_true
+      end
+    end
+
+    it "should identify null-teriminated multi-line string files as binary" do
+      Tempfile.open("chef-util-diff-spec") do |file|
+        file.write("This is a binary file.\nNo Really\nit is\0")
+        file.close
+        differ.send(:is_binary?, file.path).should be_true
+      end
+    end
+
+    describe "when the default external encoding is UTF-8", :ruby_gte_19_only  do
+
+      before do
+        @saved_default_external = Encoding.default_external
+        Encoding.default_external = Encoding::UTF_8
+      end
+
+      after do
+        Encoding.default_external = @saved_default_external
+      end
+
+      it "should identify normal ASCII as text" do
+        Tempfile.open("chef-util-diff-spec") do |file|
+          file.write(plain_ascii)
+          file.close
+          differ.send(:is_binary?, file.path).should be_false
+        end
+      end
+
+      it "should identify UTF-8 as text" do
+        Tempfile.open("chef-util-diff-spec") do |file|
+          file.write(utf_8)
+          file.close
+          differ.send(:is_binary?, file.path).should be_false
+        end
+      end
+
+      it "should identify Latin-1 that is invalid UTF-8 as binary" do
+        Tempfile.open("chef-util-diff-spec") do |file|
+          file.write(latin_1)
+          file.close
+          differ.send(:is_binary?, file.path).should be_true
+        end
+      end
+
+      it "should identify Shift-JIS that is invalid UTF-8 as binary" do
+        Tempfile.open("chef-util-diff-spec") do |file|
+          file.write(shift_jis)
+          file.close
+          differ.send(:is_binary?, file.path).should be_true
+        end
+      end
+
+    end
+
+    describe "when the default external encoding is Latin-1", :ruby_gte_19_only do
+
+      before do
+        @saved_default_external = Encoding.default_external
+        Encoding.default_external = Encoding::ISO_8859_1
+      end
+
+      after do
+        Encoding.default_external = @saved_default_external
+      end
+
+      it "should identify normal ASCII as text" do
+        Tempfile.open("chef-util-diff-spec") do |file|
+          file.write(plain_ascii)
+          file.close
+          differ.send(:is_binary?, file.path).should be_false
+        end
+      end
+
+      it "should identify UTF-8 that is invalid Latin-1 as binary" do
+        Tempfile.open("chef-util-diff-spec") do |file|
+          file.write(utf_8)
+          file.close
+          differ.send(:is_binary?, file.path).should be_true
+        end
+      end
+
+      it "should identify Latin-1 as text" do
+        Tempfile.open("chef-util-diff-spec") do |file|
+          file.write(latin_1)
+          file.close
+          differ.send(:is_binary?, file.path).should be_false
+        end
+      end
+
+      it "should identify Shift-JIS that is invalid Latin-1 as binary" do
+        Tempfile.open("chef-util-diff-spec") do |file|
+          file.write(shift_jis)
+          file.close
+          differ.send(:is_binary?, file.path).should be_true
+        end
       end
     end
 
+    describe "when the default external encoding is Shift-JIS", :ruby_gte_19_only do
+
+      before do
+        @saved_default_external = Encoding.default_external
+        Encoding.default_external = Encoding::Shift_JIS
+      end
+
+      after do
+        Encoding.default_external = @saved_default_external
+      end
+
+      it "should identify normal ASCII as text" do
+        Tempfile.open("chef-util-diff-spec") do |file|
+          file.write(plain_ascii)
+          file.close
+          differ.send(:is_binary?, file.path).should be_false
+        end
+      end
+      it "should identify UTF-8 that is invalid Shift-JIS as binary" do
+        Tempfile.open("chef-util-diff-spec") do |file|
+          file.write(utf_8)
+          file.close
+          differ.send(:is_binary?, file.path).should be_true
+        end
+      end
+
+      it "should identify Latin-1 that is invalid Shift-JIS as binary" do
+        Tempfile.open("chef-util-diff-spec") do |file|
+          file.write(latin_1)
+          file.close
+          differ.send(:is_binary?, file.path).should be_true
+        end
+      end
+
+      it "should identify Shift-JIS as text" do
+        Tempfile.open("chef-util-diff-spec") do |file|
+          file.write(shift_jis)
+          file.close
+          differ.send(:is_binary?, file.path).should be_false
+        end
+      end
+
+    end
   end
 
 end
 
+