chef 12.7.2 → 12.8.1

data/spec/unit/deprecation_spec.rb

@@ -1,150 +1,150 @@
-#
-# Author:: Serdar Sutay (<serdar@chef.io>)
-# Copyright:: Copyright 2013-2016, Chef Software Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require "spec_helper"
-require "chef/deprecation/warnings"
-
-describe Chef::Deprecation do
-
-  # Support code for Chef::Deprecation
-
-  def self.class_from_string(str)
-    str.split("::").inject(Object) do |mod, class_name|
-      mod.const_get(class_name)
-    end
-  end
-
-  module DeprecatedMethods
-    def deprecated_method(value)
-      @value = value
-    end
-
-    def get_value
-      @value
-    end
-  end
-
-  class TestClass
-    extend Chef::Deprecation::Warnings
-    include DeprecatedMethods
-    add_deprecation_warnings_for(DeprecatedMethods.instance_methods)
-  end
-
-  method_snapshot_file = File.join(CHEF_SPEC_DATA, "file-providers-method-snapshot-chef-11-4.json")
-  method_snapshot = Chef::JSONCompat.parse(File.open(method_snapshot_file).read())
-
-  method_snapshot.each do |class_name, old_methods|
-    class_object = class_from_string(class_name)
-    current_methods = class_object.public_instance_methods.map(&:to_sym)
-
-    it "defines all methods on #{class_object} that were available in 11.0" do
-      old_methods.each do |old_method|
-        expect(current_methods).to include(old_method.to_sym)
-      end
-    end
-  end
-
-  context "when Chef::Config[:treat_deprecation_warnings_as_errors] is off" do
-    before do
-      Chef::Config[:treat_deprecation_warnings_as_errors] = false
-    end
-
-    context "deprecation warning messages" do
-      RSpec::Matchers.define_negated_matcher :a_non_empty_array, :be_empty
-
-      it "should be enabled for deprecated methods" do
-        expect(Chef::Log).to receive(:warn).with(a_non_empty_array)
-        TestClass.new.deprecated_method(10)
-      end
-
-      it "should contain stack trace" do
-        expect(Chef::Log).to receive(:warn).with(a_string_including(".rb"))
-        TestClass.new.deprecated_method(10)
-      end
-    end
-
-    it "deprecated methods should still be called" do
-      test_instance = TestClass.new
-      test_instance.deprecated_method(10)
-      expect(test_instance.get_value).to eq(10)
-    end
-  end
-
-  it "should raise when deprecation warnings are treated as errors" do
-    # rspec should set this
-    expect(Chef::Config[:treat_deprecation_warnings_as_errors]).to be true
-    test_instance = TestClass.new
-    expect { test_instance.deprecated_method(10) }.to raise_error(Chef::Exceptions::DeprecatedFeatureError)
-  end
-
-  context "When a class has deprecated_attr, _reader and _writer" do
-    before(:context) do
-      class DeprecatedAttrTest
-        extend Chef::Mixin::Deprecation
-        def initialize
-          @a = @r = @w = 1
-        end
-        deprecated_attr :a, "a"
-        deprecated_attr_reader :r, "r"
-        deprecated_attr_writer :w, "w"
-      end
-    end
-
-    it "The deprecated_attr emits warnings" do
-      test = DeprecatedAttrTest.new
-      expect { test.a = 10 }.to raise_error(Chef::Exceptions::DeprecatedFeatureError)
-      expect { test.a }.to raise_error(Chef::Exceptions::DeprecatedFeatureError)
-    end
-
-    it "The deprecated_attr_writer emits warnings, and does not create a reader" do
-      test = DeprecatedAttrTest.new
-      expect { test.w = 10 }.to raise_error(Chef::Exceptions::DeprecatedFeatureError)
-      expect { test.w }.to raise_error(NoMethodError)
-    end
-
-    it "The deprecated_attr_reader emits warnings, and does not create a writer" do
-      test = DeprecatedAttrTest.new
-      expect { test.r = 10 }.to raise_error(NoMethodError)
-      expect { test.r }.to raise_error(Chef::Exceptions::DeprecatedFeatureError)
-    end
-
-    context "With deprecation warnings not throwing exceptions" do
-      before do
-        Chef::Config[:treat_deprecation_warnings_as_errors] = false
-      end
-
-      it "The deprecated_attr can be written to and read from" do
-        test = DeprecatedAttrTest.new
-        test.a = 10
-        expect(test.a).to eq 10
-      end
-
-      it "The deprecated_attr_reader can be read from" do
-        test = DeprecatedAttrTest.new
-        expect(test.r).to eq 1
-      end
-
-      it "The deprecated_attr_writer can be written to" do
-        test = DeprecatedAttrTest.new
-        test.w = 10
-        expect(test.instance_eval { @w }).to eq 10
-      end
-    end
-  end
-
-end
+#
+# Author:: Serdar Sutay (<serdar@chef.io>)
+# Copyright:: Copyright 2013-2016, Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "spec_helper"
+require "chef/deprecation/warnings"
+
+describe Chef::Deprecation do
+
+  # Support code for Chef::Deprecation
+
+  def self.class_from_string(str)
+    str.split("::").inject(Object) do |mod, class_name|
+      mod.const_get(class_name)
+    end
+  end
+
+  module DeprecatedMethods
+    def deprecated_method(value)
+      @value = value
+    end
+
+    def get_value
+      @value
+    end
+  end
+
+  class TestClass
+    extend Chef::Deprecation::Warnings
+    include DeprecatedMethods
+    add_deprecation_warnings_for(DeprecatedMethods.instance_methods)
+  end
+
+  method_snapshot_file = File.join(CHEF_SPEC_DATA, "file-providers-method-snapshot-chef-11-4.json")
+  method_snapshot = Chef::JSONCompat.parse(File.open(method_snapshot_file).read())
+
+  method_snapshot.each do |class_name, old_methods|
+    class_object = class_from_string(class_name)
+    current_methods = class_object.public_instance_methods.map(&:to_sym)
+
+    it "defines all methods on #{class_object} that were available in 11.0" do
+      old_methods.each do |old_method|
+        expect(current_methods).to include(old_method.to_sym)
+      end
+    end
+  end
+
+  context "when Chef::Config[:treat_deprecation_warnings_as_errors] is off" do
+    before do
+      Chef::Config[:treat_deprecation_warnings_as_errors] = false
+    end
+
+    context "deprecation warning messages" do
+      RSpec::Matchers.define_negated_matcher :a_non_empty_array, :be_empty
+
+      it "should be enabled for deprecated methods" do
+        expect(Chef::Log).to receive(:warn).with(a_non_empty_array)
+        TestClass.new.deprecated_method(10)
+      end
+
+      it "should contain stack trace" do
+        expect(Chef::Log).to receive(:warn).with(a_string_including(".rb"))
+        TestClass.new.deprecated_method(10)
+      end
+    end
+
+    it "deprecated methods should still be called" do
+      test_instance = TestClass.new
+      test_instance.deprecated_method(10)
+      expect(test_instance.get_value).to eq(10)
+    end
+  end
+
+  it "should raise when deprecation warnings are treated as errors" do
+    # rspec should set this
+    expect(Chef::Config[:treat_deprecation_warnings_as_errors]).to be true
+    test_instance = TestClass.new
+    expect { test_instance.deprecated_method(10) }.to raise_error(Chef::Exceptions::DeprecatedFeatureError)
+  end
+
+  context "When a class has deprecated_attr, _reader and _writer" do
+    before(:context) do
+      class DeprecatedAttrTest
+        extend Chef::Mixin::Deprecation
+        def initialize
+          @a = @r = @w = 1
+        end
+        deprecated_attr :a, "a"
+        deprecated_attr_reader :r, "r"
+        deprecated_attr_writer :w, "w"
+      end
+    end
+
+    it "The deprecated_attr emits warnings" do
+      test = DeprecatedAttrTest.new
+      expect { test.a = 10 }.to raise_error(Chef::Exceptions::DeprecatedFeatureError)
+      expect { test.a }.to raise_error(Chef::Exceptions::DeprecatedFeatureError)
+    end
+
+    it "The deprecated_attr_writer emits warnings, and does not create a reader" do
+      test = DeprecatedAttrTest.new
+      expect { test.w = 10 }.to raise_error(Chef::Exceptions::DeprecatedFeatureError)
+      expect { test.w }.to raise_error(NoMethodError)
+    end
+
+    it "The deprecated_attr_reader emits warnings, and does not create a writer" do
+      test = DeprecatedAttrTest.new
+      expect { test.r = 10 }.to raise_error(NoMethodError)
+      expect { test.r }.to raise_error(Chef::Exceptions::DeprecatedFeatureError)
+    end
+
+    context "With deprecation warnings not throwing exceptions" do
+      before do
+        Chef::Config[:treat_deprecation_warnings_as_errors] = false
+      end
+
+      it "The deprecated_attr can be written to and read from" do
+        test = DeprecatedAttrTest.new
+        test.a = 10
+        expect(test.a).to eq 10
+      end
+
+      it "The deprecated_attr_reader can be read from" do
+        test = DeprecatedAttrTest.new
+        expect(test.r).to eq 1
+      end
+
+      it "The deprecated_attr_writer can be written to" do
+        test = DeprecatedAttrTest.new
+        test.w = 10
+        expect(test.instance_eval { @w }).to eq 10
+      end
+    end
+  end
+
+end

data/spec/unit/digester_spec.rb

@@ -1,49 +1,49 @@
-#
-# Author:: Adam Jacob (<adam@chef.io>)
-# Author:: Daniel DeLeo (<dan@kallistec.com>)
-# Copyright:: Copyright 2009-2016, Chef Software Inc.
-# Copyright:: Copyright 2009-2016, Daniel DeLeo
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require "spec_helper"
-
-describe Chef::Digester do
-  before(:each) do
-    @cache = Chef::Digester.instance
-  end
-
-  describe "when computing checksums of cookbook files and templates" do
-
-    it "proxies the class method checksum_for_file to the instance" do
-      expect(@cache).to receive(:checksum_for_file).with("a_file_or_a_fail")
-      Chef::Digester.checksum_for_file("a_file_or_a_fail")
-    end
-
-    it "computes a checksum of a file" do
-      fixture_file = CHEF_SPEC_DATA + "/checksum/random.txt"
-      expected = "09ee9c8cc70501763563bcf9c218d71b2fbf4186bf8e1e0da07f0f42c80a3394"
-      expect(@cache.checksum_for_file(fixture_file)).to eq(expected)
-    end
-
-    it "generates a checksum from a non-file IO object" do
-      io = StringIO.new("riseofthemachines\nriseofthechefs\n")
-      expected_md5 = "0e157ac1e2dd73191b76067fb6b4bceb"
-      expect(@cache.generate_md5_checksum(io)).to eq(expected_md5)
-    end
-
-  end
-
-end
+#
+# Author:: Adam Jacob (<adam@chef.io>)
+# Author:: Daniel DeLeo (<dan@kallistec.com>)
+# Copyright:: Copyright 2009-2016, Chef Software Inc.
+# Copyright:: Copyright 2009-2016, Daniel DeLeo
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "spec_helper"
+
+describe Chef::Digester do
+  before(:each) do
+    @cache = Chef::Digester.instance
+  end
+
+  describe "when computing checksums of cookbook files and templates" do
+
+    it "proxies the class method checksum_for_file to the instance" do
+      expect(@cache).to receive(:checksum_for_file).with("a_file_or_a_fail")
+      Chef::Digester.checksum_for_file("a_file_or_a_fail")
+    end
+
+    it "computes a checksum of a file" do
+      fixture_file = CHEF_SPEC_DATA + "/checksum/random.txt"
+      expected = "09ee9c8cc70501763563bcf9c218d71b2fbf4186bf8e1e0da07f0f42c80a3394"
+      expect(@cache.checksum_for_file(fixture_file)).to eq(expected)
+    end
+
+    it "generates a checksum from a non-file IO object" do
+      io = StringIO.new("riseofthemachines\nriseofthechefs\n")
+      expected_md5 = "0e157ac1e2dd73191b76067fb6b4bceb"
+      expect(@cache.generate_md5_checksum(io)).to eq(expected_md5)
+    end
+
+  end
+
+end

data/spec/unit/dsl/audit_spec.rb

@@ -1,43 +1,43 @@
-
-require "spec_helper"
-require "chef/dsl/audit"
-
-class AuditDSLTester < Chef::Recipe
-  include Chef::DSL::Audit
-end
-
-class BadAuditDSLTester
-  include Chef::DSL::Audit
-end
-
-describe Chef::DSL::Audit do
-  let(:auditor) { AuditDSLTester.new("cookbook_name", "recipe_name", run_context) }
-  let(:run_context) { instance_double(Chef::RunContext, :audits => audits, :cookbook_collection => cookbook_collection) }
-  let(:audits) { {} }
-  let(:cookbook_collection) { {} }
-
-  it "raises an error when a block of audits is not provided" do
-    expect { auditor.control_group "name" }.to raise_error(Chef::Exceptions::NoAuditsProvided)
-  end
-
-  it "raises an error when no audit name is given" do
-    expect { auditor.control_group do end }.to raise_error(Chef::Exceptions::AuditNameMissing)
-  end
-
-  context "audits already populated" do
-    let(:audits) { { "unique" => {} } }
-
-    it "raises an error if the audit name is a duplicate" do
-      expect { auditor.control_group "unique" do end }.to raise_error(Chef::Exceptions::AuditControlGroupDuplicate)
-    end
-  end
-
-  context "included in a class without recipe DSL" do
-    let(:auditor) { BadAuditDSLTester.new }
-
-    it "fails because it relies on the recipe DSL existing" do
-      expect { auditor.control_group "unique" do end }.to raise_error(NoMethodError, /undefined method `cookbook_name'/)
-    end
-  end
-
-end
+
+require "spec_helper"
+require "chef/dsl/audit"
+
+class AuditDSLTester < Chef::Recipe
+  include Chef::DSL::Audit
+end
+
+class BadAuditDSLTester
+  include Chef::DSL::Audit
+end
+
+describe Chef::DSL::Audit do
+  let(:auditor) { AuditDSLTester.new("cookbook_name", "recipe_name", run_context) }
+  let(:run_context) { instance_double(Chef::RunContext, :audits => audits, :cookbook_collection => cookbook_collection) }
+  let(:audits) { {} }
+  let(:cookbook_collection) { {} }
+
+  it "raises an error when a block of audits is not provided" do
+    expect { auditor.control_group "name" }.to raise_error(Chef::Exceptions::NoAuditsProvided)
+  end
+
+  it "raises an error when no audit name is given" do
+    expect { auditor.control_group do end }.to raise_error(Chef::Exceptions::AuditNameMissing)
+  end
+
+  context "audits already populated" do
+    let(:audits) { { "unique" => {} } }
+
+    it "raises an error if the audit name is a duplicate" do
+      expect { auditor.control_group "unique" do end }.to raise_error(Chef::Exceptions::AuditControlGroupDuplicate)
+    end
+  end
+
+  context "included in a class without recipe DSL" do
+    let(:auditor) { BadAuditDSLTester.new }
+
+    it "fails because it relies on the recipe DSL existing" do
+      expect { auditor.control_group "unique" do end }.to raise_error(NoMethodError, /undefined method `cookbook_name'/)
+    end
+  end
+
+end