chef 14.14.29 → 14.15.6

data/spec/unit/cookbook_uploader_spec.rb

@@ -96,8 +96,8 @@ describe Chef::CookbookUploader do
 
         upload_headers = {
           "content-type" => "application/x-binary",
-          "content-md5"  => an_instance_of(String),
-          "accept"       => "application/json",
+          "content-md5" => an_instance_of(String),
+          "accept" => "application/json",
         }
 
         expect(http_client).to receive(:put)

data/spec/unit/cookbook_version_file_specificity_spec.rb

@@ -371,7 +371,7 @@ describe Chef::CookbookVersion, "file specificity" do
       expect(manifest_records.size).to eq(2)
 
       checksums = manifest_records.map { |manifest_record| manifest_record[:checksum] }
-      expect(checksums.sort).to eq(["csum-host-1", "csum-host-2"])
+      expect(checksums.sort).to eq(%w{csum-host-1 csum-host-2})
     end
 
     it "should return a directory of manifest records based on priority preference: platform & full version" do
@@ -385,7 +385,7 @@ describe Chef::CookbookVersion, "file specificity" do
       expect(manifest_records.size).to eq(2)
 
       checksums = manifest_records.map { |manifest_record| manifest_record[:checksum] }
-      expect(checksums.sort).to eq(["csum-platver-full-1", "csum-platver-full-2"])
+      expect(checksums.sort).to eq(%w{csum-platver-full-1 csum-platver-full-2})
     end
 
     it "should return a directory of manifest records based on priority preference: platform & partial version" do
@@ -399,7 +399,7 @@ describe Chef::CookbookVersion, "file specificity" do
       expect(manifest_records.size).to eq(2)
 
       checksums = manifest_records.map { |manifest_record| manifest_record[:checksum] }
-      expect(checksums.sort).to eq(["csum-platver-partial-1", "csum-platver-partial-2"])
+      expect(checksums.sort).to eq(%w{csum-platver-partial-1 csum-platver-partial-2})
     end
 
     it "should return a directory of manifest records based on priority preference: platform only" do
@@ -413,7 +413,7 @@ describe Chef::CookbookVersion, "file specificity" do
       expect(manifest_records.size).to eq(2)
 
       checksums = manifest_records.map { |manifest_record| manifest_record[:checksum] }
-      expect(checksums.sort).to eq(["csum-plat-1", "csum-plat-2"])
+      expect(checksums.sort).to eq(%w{csum-plat-1 csum-plat-2})
     end
 
     it "should return a directory of manifest records based on priority preference: default" do
@@ -427,7 +427,7 @@ describe Chef::CookbookVersion, "file specificity" do
       expect(manifest_records.size).to eq(2)
 
       checksums = manifest_records.map { |manifest_record| manifest_record[:checksum] }
-      expect(checksums.sort).to eq(["csum-default-1", "csum-default-2"])
+      expect(checksums.sort).to eq(%w{csum-default-1 csum-default-2})
     end
 
     it "should return a manifest record based on priority preference: platform & full version - platform_version variant 1" do
@@ -441,7 +441,7 @@ describe Chef::CookbookVersion, "file specificity" do
       expect(manifest_records.size).to eq(2)
 
       checksums = manifest_records.map { |manifest_record| manifest_record[:checksum] }
-      expect(checksums.sort).to eq(["csum2-platver-full-1", "csum2-platver-full-2"])
+      expect(checksums.sort).to eq(%w{csum2-platver-full-1 csum2-platver-full-2})
     end
 
     it "should return a manifest record based on priority preference: platform & partial version - platform_version variant 1" do
@@ -455,7 +455,7 @@ describe Chef::CookbookVersion, "file specificity" do
       expect(manifest_records.size).to eq(2)
 
       checksums = manifest_records.map { |manifest_record| manifest_record[:checksum] }
-      expect(checksums.sort).to eq(["csum2-platver-partial-1", "csum2-platver-partial-2"])
+      expect(checksums.sort).to eq(%w{csum2-platver-partial-1 csum2-platver-partial-2})
     end
 
     it "should return a manifest record based on priority preference: platform & full version - platform_version variant 2" do
@@ -469,7 +469,7 @@ describe Chef::CookbookVersion, "file specificity" do
       expect(manifest_records.size).to eq(2)
 
       checksums = manifest_records.map { |manifest_record| manifest_record[:checksum] }
-      expect(checksums.sort).to eq(["csum3-platver-full-1", "csum3-platver-full-2"])
+      expect(checksums.sort).to eq(%w{csum3-platver-full-1 csum3-platver-full-2})
     end
 
     it "should return a manifest record based on priority preference: platform & full version - platform_version variant 3" do
@@ -483,7 +483,7 @@ describe Chef::CookbookVersion, "file specificity" do
       expect(manifest_records.size).to eq(2)
 
       checksums = manifest_records.map { |manifest_record| manifest_record[:checksum] }
-      expect(checksums.sort).to eq(["csum4-platver-full-1", "csum4-platver-full-2"])
+      expect(checksums.sort).to eq(%w{csum4-platver-full-1 csum4-platver-full-2})
     end
   end
 

data/spec/unit/cookbook_version_spec.rb

@@ -50,7 +50,7 @@ describe Chef::CookbookVersion do
     let(:cookbook_paths_by_type) do
       {
         # Dunno if the paths here are representitive of what is set by CookbookLoader...
-        all_files:  Dir[File.join(cookbook_root, "**", "**")],
+        all_files: Dir[File.join(cookbook_root, "**", "**")],
       }
     end
 
@@ -117,7 +117,7 @@ describe Chef::CookbookVersion do
 
     let(:cookbook_paths_by_type) do
       {
-        all_files:  Dir[File.join(cookbook_root, "**", "**")],
+        all_files: Dir[File.join(cookbook_root, "**", "**")],
       }
     end
 

data/spec/unit/data_bag_item_spec.rb

@@ -43,7 +43,7 @@ describe Chef::DataBagItem do
     end
 
     it "should throw an ArgumentError if you feed it anything but a string" do
-      expect { data_bag_item.data_bag Hash.new }.to raise_error(ArgumentError)
+      expect { data_bag_item.data_bag({}) }.to raise_error(ArgumentError)
     end
   end
 
@@ -148,12 +148,12 @@ describe Chef::DataBagItem do
     end
 
     it "implements all the methods of Hash" do
-      methods = [:rehash, :to_hash, :[], :fetch, :[]=, :store, :default,
-      :default=, :default_proc, :index, :size, :length,
-      :empty?, :each_value, :each_key, :each_pair, :each, :keys, :values,
-      :values_at, :delete, :delete_if, :reject!, :clear,
-      :invert, :update, :replace, :merge!, :merge, :has_key?, :has_value?,
-      :key?, :value?]
+      methods = %i{rehash to_hash [] fetch []= store default
+      default= default_proc index size length
+      empty? each_value each_key each_pair each keys values
+      values_at delete delete_if reject! clear
+      invert update replace merge! merge has_key? has_value?
+      key? value?}
       methods.each do |m|
         expect(data_bag_item).to respond_to(m)
       end

data/spec/unit/data_bag_spec.rb

@@ -46,7 +46,7 @@ describe Chef::DataBag do
     end
 
     it "should throw an ArgumentError if you feed it anything but a string" do
-      expect { @data_bag.name Hash.new }.to raise_error(ArgumentError)
+      expect { @data_bag.name({}) }.to raise_error(ArgumentError)
     end
 
     [ ".", "-", "_", "1"].each do |char|

data/spec/unit/data_collector_spec.rb

@@ -401,11 +401,11 @@ describe Chef::DataCollector::Reporter do
 
     let(:run_status) do
       instance_double("Chef::RunStatus",
-                      run_id: "run_id",
-                      node: node,
-                      start_time: Time.new,
-                      end_time: Time.new,
-                      exception: exception)
+        run_id: "run_id",
+        node: node,
+        start_time: Time.new,
+        end_time: Time.new,
+        exception: exception)
     end
 
     before do
@@ -727,29 +727,29 @@ describe Chef::DataCollector::Reporter do
       Errno::ECONNREFUSED, EOFError, Net::HTTPBadResponse,
       Net::HTTPHeaderSyntaxError, Net::ProtocolError, OpenSSL::SSL::SSLError,
       Errno::EHOSTDOWN ].each do |exception_class|
-      context "when the block raises a #{exception_class} exception" do
-        it "disables the reporter" do
-          expect(reporter).to receive(:disable_data_collector_reporter)
-          reporter.send(:disable_reporter_on_error) { raise exception_class.new("bummer") }
-        end
+        context "when the block raises a #{exception_class} exception" do
+          it "disables the reporter" do
+            expect(reporter).to receive(:disable_data_collector_reporter)
+            reporter.send(:disable_reporter_on_error) { raise exception_class.new("bummer") }
+          end
 
-        context "when raise-on-failure is enabled" do
-          it "logs an error and raises" do
-            Chef::Config[:data_collector][:raise_on_failure] = true
-            expect(Chef::Log).to receive(:error)
-            expect { reporter.send(:disable_reporter_on_error) { raise exception_class.new("bummer") } }.to raise_error(exception_class)
+          context "when raise-on-failure is enabled" do
+            it "logs an error and raises" do
+              Chef::Config[:data_collector][:raise_on_failure] = true
+              expect(Chef::Log).to receive(:error)
+              expect { reporter.send(:disable_reporter_on_error) { raise exception_class.new("bummer") } }.to raise_error(exception_class)
+            end
           end
-        end
 
-        context "when raise-on-failure is disabled" do
-          it "logs an info message and does not raise an exception" do
-            Chef::Config[:data_collector][:raise_on_failure] = false
-            expect(Chef::Log).to receive(:info)
-            expect { reporter.send(:disable_reporter_on_error) { raise exception_class.new("bummer") } }.not_to raise_error
+          context "when raise-on-failure is disabled" do
+            it "logs an info message and does not raise an exception" do
+              Chef::Config[:data_collector][:raise_on_failure] = false
+              expect(Chef::Log).to receive(:info)
+              expect { reporter.send(:disable_reporter_on_error) { raise exception_class.new("bummer") } }.not_to raise_error
+            end
           end
         end
       end
-    end
   end
 
   describe "#validate_data_collector_server_url!" do
@@ -824,7 +824,7 @@ describe Chef::DataCollector::Reporter do
         resource_a  = Chef::Resource::Service.new("processed service")
         resource_b  = Chef::Resource::Service.new("unprocessed service")
 
-        resource_a.action = [ :enable, :start ]
+        resource_a.action = %i{enable start}
         resource_b.action = :start
 
         run_context = Chef::RunContext.new(Chef::Node.new, Chef::CookbookCollection.new, nil)

data/spec/unit/decorator_spec.rb

@@ -28,11 +28,11 @@ def impersonates_a(klass)
   end
 
   it "#kind_of?(#{klass}) is true" do
-    expect(decorator.kind_of?(klass)).to be true
+    expect(decorator.is_a?(klass)).to be true
   end
 
   it "#kind_of?(Chef::Decorator) is true" do
-    expect(decorator.kind_of?(Chef::Decorator)).to be true
+    expect(decorator.is_a?(Chef::Decorator)).to be true
   end
 
   it "#instance_of?(#{klass}) is false" do

data/spec/unit/deprecated_spec.rb

@@ -44,7 +44,7 @@ describe Chef::Deprecated do
     let(:location) { "the location" }
 
     it "displays the full URL" do
-      expect(TestDeprecation.new().url).to eql("https://docs.chef.io/deprecations_test.html")
+      expect(TestDeprecation.new.url).to eql("https://docs.chef.io/deprecations_test.html")
     end
 
     it "formats a complete deprecation message" do
@@ -59,7 +59,7 @@ describe Chef::Deprecated do
     end
     collisions = id_map.select { |k, v| v.size != 1 }
     unless collisions.empty?
-      raise "Found deprecation ID collisions:\n#{collisions.map { |k, v| "* #{k} #{v.map(&:name).join(', ')}" }.join("\n")}"
+      raise "Found deprecation ID collisions:\n#{collisions.map { |k, v| "* #{k} #{v.map(&:name).join(", ")}" }.join("\n")}"
     end
   end
 end

data/spec/unit/dsl/data_query_spec.rb

@@ -24,7 +24,7 @@ class DataQueryDSLTester
 end
 
 describe Chef::DSL::DataQuery do
-  let(:node) { Hash.new }
+  let(:node) { {} }
 
   let(:language) do
     language = DataQueryDSLTester.new
@@ -68,7 +68,8 @@ describe Chef::DSL::DataQuery do
         "a1" => [1, 2, 3],
         "a2" => { "b1" => true },
       },
-    } end
+    }
+    end
 
     let(:item) do
       item = Chef::DataBagItem.new

data/spec/unit/dsl/declare_resource_spec.rb

@@ -34,7 +34,7 @@ describe Chef::ResourceCollection do
 
   describe "mixed in correctly" do
     it "the resources() method winds up in the right classes" do
-      methods = [ :resources, :find_resource, :find_resource!, :edit_resource, :edit_resource!, :delete_resource, :delete_resource!, :declare_resource, :build_resource ]
+      methods = %i{resources find_resource find_resource! edit_resource edit_resource! delete_resource delete_resource! declare_resource build_resource}
       expect(Chef::Resource.instance_methods).to include(*methods)
       expect(Chef::Recipe.instance_methods).to include(*methods)
       expect(Chef::Provider.instance_methods).to include(*methods)

data/spec/unit/dsl/platform_introspection_spec.rb

@@ -40,7 +40,7 @@ describe Chef::DSL::PlatformIntrospection::PlatformDependentValue do
   before do
     platform_hash = {
       :openbsd => { default: "free, functional, secure" },
-      [:redhat, :centos, :fedora, :scientific] => { default: '"stable"' },
+      %i{redhat centos fedora scientific} => { default: '"stable"' },
       :ubuntu => { "10.04" => "using upstart more", :default => "using init more" },
       :default => "bork da bork",
     }
@@ -84,7 +84,7 @@ describe Chef::DSL::PlatformIntrospection::PlatformDependentValue do
 end
 describe Chef::DSL::PlatformIntrospection::PlatformFamilyDependentValue do
   before do
-    @array_values = [:stop, :start, :reload]
+    @array_values = %i{stop start reload}
 
     @platform_family_hash = {
       "debian" => "debian value",

data/spec/unit/encrypted_data_bag_item/check_encrypted_spec.rb

@@ -47,7 +47,8 @@ describe Chef::EncryptedDataBagItem::CheckEncrypted do
             "a1" => [1, 2, 3],
             "a2" => { "b1" => true },
         },
-    } end
+    }
+    end
 
     let(:version) { 1 }
     let(:encoded_data) do

data/spec/unit/encrypted_data_bag_item_spec.rb

@@ -325,7 +325,8 @@ describe Chef::EncryptedDataBagItem do
       "id" => "item_name",
       "greeting" => "hello",
       "nested" => { "a1" => [1, 2, 3], "a2" => { "b1" => true } },
-  } end
+  }
+  end
   let(:secret) { "abc123SECRET" }
   let(:encoded_data) { subject.encrypt_data_bag_item(plaintext_data, secret) }
 

data/spec/unit/environment_spec.rb

@@ -48,8 +48,8 @@ describe Chef::Environment do
     end
 
     it "should not accept anything but strings" do
-      expect { @environment.name(Array.new) }.to raise_error(ArgumentError)
-      expect { @environment.name(Hash.new) }.to raise_error(ArgumentError)
+      expect { @environment.name([]) }.to raise_error(ArgumentError)
+      expect { @environment.name({}) }.to raise_error(ArgumentError)
       expect { @environment.name(2) }.to raise_error(ArgumentError)
     end
   end
@@ -65,8 +65,8 @@ describe Chef::Environment do
     end
 
     it "should not accept anything but strings" do
-      expect { @environment.description(Array.new) }.to raise_error(ArgumentError)
-      expect { @environment.description(Hash.new) }.to raise_error(ArgumentError)
+      expect { @environment.description([]) }.to raise_error(ArgumentError)
+      expect { @environment.description({}) }.to raise_error(ArgumentError)
       expect { @environment.description(42) }.to raise_error(ArgumentError)
     end
   end
@@ -82,7 +82,7 @@ describe Chef::Environment do
     end
 
     it "should throw an ArgumentError if we aren't a kind of hash" do
-      expect { @environment.default_attributes(Array.new) }.to raise_error(ArgumentError)
+      expect { @environment.default_attributes([]) }.to raise_error(ArgumentError)
     end
   end
 
@@ -97,15 +97,15 @@ describe Chef::Environment do
     end
 
     it "should throw an ArgumentError if we aren't a kind of hash" do
-      expect { @environment.override_attributes(Array.new) }.to raise_error(ArgumentError)
+      expect { @environment.override_attributes([]) }.to raise_error(ArgumentError)
     end
   end
 
   describe "cookbook_versions" do
     before(:each) do
       @cookbook_versions = {
-        "apt"     => "= 1.0.0",
-        "god"     => "= 2.0.0",
+        "apt" => "= 1.0.0",
+        "god" => "= 2.0.0",
         "apache2" => "= 4.2.0",
       }
     end
@@ -121,7 +121,7 @@ describe Chef::Environment do
 
     it "should not accept anything but a hash" do
       expect { @environment.cookbook_versions("I am a string!") }.to raise_error(ArgumentError)
-      expect { @environment.cookbook_versions(Array.new) }.to raise_error(ArgumentError)
+      expect { @environment.cookbook_versions([]) }.to raise_error(ArgumentError)
       expect { @environment.cookbook_versions(42) }.to raise_error(ArgumentError)
     end
 
@@ -243,8 +243,8 @@ describe Chef::Environment do
   describe "self.validate_cookbook_versions" do
     before(:each) do
       @cookbook_versions = {
-        "apt"     => "= 1.0.0",
-        "god"     => "= 2.0.0",
+        "apt" => "= 1.0.0",
+        "god" => "= 2.0.0",
         "apache2" => "= 4.2.0",
       }
     end
@@ -257,7 +257,7 @@ describe Chef::Environment do
     end
 
     it "should return false if anything other than a hash is passed as the argument" do
-      expect(Chef::Environment.validate_cookbook_versions(Array.new)).to eq(false)
+      expect(Chef::Environment.validate_cookbook_versions([])).to eq(false)
       expect(Chef::Environment.validate_cookbook_versions(42)).to eq(false)
       expect(Chef::Environment.validate_cookbook_versions(Chef::CookbookVersion.new("meta"))).to eq(false)
       expect(Chef::Environment.validate_cookbook_versions("cookbook => 1.2.3")).to eq(false)
@@ -299,7 +299,7 @@ describe Chef::Environment do
         expect do
           Chef::Environment.validate_cookbook_version("= 1.2.3.4")
         end.to raise_error Chef::Exceptions::IllegalVersionConstraint,
-                             "Environment cookbook version constraints not allowed in chef-solo"
+          "Environment cookbook version constraints not allowed in chef-solo"
       end
     end
 

data/spec/unit/event_dispatch/dsl_spec.rb

@@ -63,7 +63,7 @@ describe Chef::EventDispatch::DSL do
     resource = Chef::Resource::RubyBlock.new("foo", run_context)
     resource.block {}
     resource.run_action(:run)
-    expect(calls).to eq([:started, :updated])
+    expect(calls).to eq(%i{started updated})
   end
 
   it "preserve instance variables across handler callbacks" do

data/spec/unit/file_content_management/deploy/mv_unix_spec.rb

@@ -38,9 +38,9 @@ describe Chef::FileContentManagement::Deploy::MvUnix do
     let(:target_file_mode) { 0644 }
     let(:target_file_stat) do
       double "File::Stat struct for target file",
-           mode: target_file_mode,
-           uid: target_file_uid,
-           gid: target_file_gid
+        mode: target_file_mode,
+        uid: target_file_uid,
+        gid: target_file_gid
     end
 
     before do

data/spec/unit/file_content_management/deploy/mv_windows_spec.rb

@@ -84,8 +84,8 @@ describe Chef::FileContentManagement::Deploy::MvWindows do
 
       let(:target_file_security_descriptor) do
         double "security descriptor for target file",
-             group: original_target_file_group,
-             owner: original_target_file_owner
+          group: original_target_file_group,
+          owner: original_target_file_owner
       end
 
       let(:updated_target_security_descriptor) do

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

@@ -60,7 +60,7 @@ 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'",
-        "/usr/local/lib/ruby/gems/chef/lib/chef/client.rb:123:in `run'" # should not display
+        "/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)
@@ -122,7 +122,7 @@ describe Chef::Formatters::ErrorInspectors::ResourceFailureInspector do
         source_line = "C:/Users/btm/chef/chef/spec/unit/fake_file.rb:2: undefined local variable or method `non_existent' for main:Object (NameError)"
         @resource.source_line = source_line
         @inspector = Chef::Formatters::ErrorInspectors::ResourceFailureInspector.new(@resource, :create, @exception)
-        expect(@inspector.recipe_snippet).to match(/^# In C:\/Users\/btm/)
+        expect(@inspector.recipe_snippet).to match(%r{^# In C:/Users/btm})
       end
 
       it "parses a Windows path" do
@@ -136,7 +136,7 @@ describe Chef::Formatters::ErrorInspectors::ResourceFailureInspector do
         source_line = "/home/btm/src/chef/chef/spec/unit/fake_file.rb:2: undefined local variable or method `non_existent' for main:Object (NameError)"
         @resource.source_line = source_line
         @inspector = Chef::Formatters::ErrorInspectors::ResourceFailureInspector.new(@resource, :create, @exception)
-        expect(@inspector.recipe_snippet).to match(/^# In \/home\/btm/)
+        expect(@inspector.recipe_snippet).to match(%r{^# In /home/btm})
       end
 
       context "when the recipe file does not exist" do