chef 15.1.36-universal-mingw32 → 15.2.20-universal-mingw32

data/spec/unit/api_client_v1_spec.rb

@@ -36,7 +36,7 @@ describe Chef::ApiClientV1 do
   end
 
   it "only allows string values for the name" do
-    expect { @client.name Hash.new }.to raise_error(ArgumentError)
+    expect { @client.name({}) }.to raise_error(ArgumentError)
   end
 
   it "has an admin flag attribute" do
@@ -50,7 +50,7 @@ describe Chef::ApiClientV1 do
 
   it "allows only boolean values for the admin flag" do
     expect { @client.admin(false) }.not_to raise_error
-    expect { @client.admin(Hash.new) }.to raise_error(ArgumentError)
+    expect { @client.admin({}) }.to raise_error(ArgumentError)
   end
 
   it "has an create_key flag attribute" do
@@ -64,7 +64,7 @@ describe Chef::ApiClientV1 do
 
   it "allows only boolean values for the create_key flag" do
     expect { @client.create_key(false) }.not_to raise_error
-    expect { @client.create_key(Hash.new) }.to raise_error(ArgumentError)
+    expect { @client.create_key({}) }.to raise_error(ArgumentError)
   end
 
   it "has a 'validator' flag attribute" do
@@ -78,7 +78,7 @@ describe Chef::ApiClientV1 do
 
   it "allows only boolean values for the 'validator' flag" do
     expect { @client.validator(false) }.not_to raise_error
-    expect { @client.validator(Hash.new) }.to raise_error(ArgumentError)
+    expect { @client.validator({}) }.to raise_error(ArgumentError)
   end
 
   it "has a public key attribute" do
@@ -88,7 +88,7 @@ describe Chef::ApiClientV1 do
 
   it "accepts only String values for the public key" do
     expect { @client.public_key "" }.not_to raise_error
-    expect { @client.public_key Hash.new }.to raise_error(ArgumentError)
+    expect { @client.public_key({}) }.to raise_error(ArgumentError)
   end
 
   it "has a private key attribute" do
@@ -98,7 +98,7 @@ describe Chef::ApiClientV1 do
 
   it "accepts only String values for the private key" do
     expect { @client.private_key "" }.not_to raise_error
-    expect { @client.private_key Hash.new }.to raise_error(ArgumentError)
+    expect { @client.private_key({}) }.to raise_error(ArgumentError)
   end
 
   describe "when serializing to JSON" do

data/spec/unit/application/client_spec.rb

@@ -120,8 +120,8 @@ describe Chef::Application::Client, "reconfigure" do
 
     describe "--named-run-list" do
       it_behaves_like "sets the configuration",
-                      "--named-run-list arglebargle-example",
-                      named_run_list: "arglebargle-example"
+        "--named-run-list arglebargle-example",
+        named_run_list: "arglebargle-example"
     end
 
     describe "--no-listen" do
@@ -131,17 +131,17 @@ describe Chef::Application::Client, "reconfigure" do
     describe "--daemonize", :unix_only do
       context "with no value" do
         it_behaves_like "sets the configuration", "--daemonize",
-                        daemonize: true
+          daemonize: true
       end
 
       context "with an integer value" do
         it_behaves_like "sets the configuration", "--daemonize 5",
-                        daemonize: 5
+          daemonize: 5
       end
 
       context "with a non-integer value" do
         it_behaves_like "sets the configuration", "--daemonize foo",
-                        daemonize: true
+          daemonize: true
       end
     end
 
@@ -178,17 +178,17 @@ describe Chef::Application::Client, "reconfigure" do
     describe "--config-option" do
       context "with a single value" do
         it_behaves_like "sets the configuration", "--config-option chef_server_url=http://example",
-                        chef_server_url: "http://example"
+          chef_server_url: "http://example"
       end
 
       context "with two values" do
         it_behaves_like "sets the configuration", "--config-option chef_server_url=http://example --config-option policy_name=web",
-                        chef_server_url: "http://example", policy_name: "web"
+          chef_server_url: "http://example", policy_name: "web"
       end
 
       context "with a boolean value" do
         it_behaves_like "sets the configuration", "--config-option minimal_ohai=true",
-                        minimal_ohai: true
+          minimal_ohai: true
       end
 
       context "with an empty value" do

data/spec/unit/application/exit_code_spec.rb

@@ -70,7 +70,8 @@ describe Chef::Application::ExitCode do
 
     it "does write a warning on non-standard exit codes" do
       expect(Chef::Log).to receive(:warn).with(
-        /attempted to exit with a non-standard exit code of 151/)
+        /attempted to exit with a non-standard exit code of 151/
+      )
       expect(exit_codes.normalize_exit_code(151)).to eq(1)
     end
 
@@ -79,7 +80,7 @@ describe Chef::Application::ExitCode do
     end
 
     it "returns GENERIC_FAILURE when no exit code is specified" do
-      expect(exit_codes.normalize_exit_code()).to eq(1)
+      expect(exit_codes.normalize_exit_code).to eq(1)
     end
 
     it "returns SIGINT_RECEIVED when a SIGINT is received" do

data/spec/unit/application/knife_spec.rb

@@ -28,8 +28,7 @@ describe Chef::Application::Knife do
         long: "-optwithdefault VALUE",
         default: "default-value"
 
-      def run
-      end
+      def run; end
     end
   end
 

data/spec/unit/chef_fs/config_spec.rb

@@ -23,7 +23,7 @@ require "lib/chef/chef_fs/config.rb"
 describe Chef::ChefFS::Config do
   describe "initialize" do
     it "warns when hosted setups use 'everything'" do
-      base_config = Hash.new()
+      base_config = {}
       base_config[:repo_mode] = "everything"
       base_config[:chef_server_url] = "http://foo.com/organizations/fake_org/"
 
@@ -34,7 +34,7 @@ describe Chef::ChefFS::Config do
     end
 
     it "doesn't warn when hosted setups use 'hosted_everything'" do
-      base_config = Hash.new()
+      base_config = {}
       base_config[:repo_mode] = "hosted_everything"
       base_config[:chef_server_url] = "http://foo.com/organizations/fake_org/"
 
@@ -45,7 +45,7 @@ describe Chef::ChefFS::Config do
     end
 
     it "doesn't warn when non-hosted setups use 'everything'" do
-      base_config = Hash.new()
+      base_config = {}
       base_config[:repo_mode] = "everything"
       base_config[:chef_server_url] = "http://foo.com/"
 

data/spec/unit/chef_fs/file_system/repository/directory_spec.rb

@@ -106,7 +106,7 @@ describe Chef::ChefFS::FileSystem::Repository::Directory do
     end
 
     it "filters invalid names" do
-      expect(test_directory.children.map { |c| c.name }).to eql %w{ test1.json test2.json test3.json }
+      expect(test_directory.children.map(&:name)).to eql %w{ test1.json test2.json test3.json }
     end
   end
 

data/spec/unit/chef_fs/parallelizer.rb

@@ -443,7 +443,7 @@ describe Chef::ChefFS::Parallelizer do
       threads = 0.upto(99).map do |i|
         Thread.new { outputs[i] = parallelizers[i].to_a }
       end
-      threads.each { |thread| thread.join }
+      threads.each(&:join)
       outputs.each { |output| expect(output.sort).to eq(2.upto(501).to_a) }
     end
   end

data/spec/unit/client_spec.rb

@@ -647,7 +647,7 @@ describe Chef::Client do
           EOM
         end
         it "should not raise an error" do
-          expect { client.load_required_recipe(rest, run_context) }.not_to raise_error()
+          expect { client.load_required_recipe(rest, run_context) }.not_to raise_error
         end
       end
     end

data/spec/unit/config_fetcher_spec.rb

@@ -7,7 +7,7 @@ describe Chef::ConfigFetcher do
   let(:http) { double("Chef::HTTP::Simple") }
 
   let(:config_location_regex) { Regexp.escape(config_location) }
-  let(:invalid_json_error_regex) { %r{Could not parse the provided JSON file \(#{config_location_regex}\)} }
+  let(:invalid_json_error_regex) { /Could not parse the provided JSON file \(#{config_location_regex}\)/ }
 
   let(:fetcher) { Chef::ConfigFetcher.new(config_location) }
 

data/spec/unit/cookbook/metadata_spec.rb

@@ -26,10 +26,10 @@ describe Chef::Cookbook::Metadata do
 
   describe "when comparing for equality" do
     before do
-      @fields = [ :name, :description, :long_description, :maintainer,
-                  :maintainer_email, :license, :platforms, :dependencies,
-                  :providing, :recipes, :version, :source_url, :issues_url,
-                  :privacy, :ohai_versions, :chef_versions, :gems ]
+      @fields = %i{name description long_description maintainer
+                  maintainer_email license platforms dependencies
+                  providing recipes version source_url issues_url
+                  privacy ohai_versions chef_versions gems}
     end
 
     it "does not depend on object identity for equality" do

data/spec/unit/cookbook/synchronizer_spec.rb

@@ -199,22 +199,22 @@ describe Chef::CookbookSynchronizer do
 
   let(:cookbook_a_default_recipe_tempfile) do
     double("Tempfile for cookbook_a default.rb recipe",
-           path: "/tmp/cookbook_a_recipes_default_rb")
+      path: "/tmp/cookbook_a_recipes_default_rb")
   end
 
   let(:cookbook_a_default_attribute_tempfile) do
     double("Tempfile for cookbook_a default.rb attr file",
-           path: "/tmp/cookbook_a_attributes_default_rb")
+      path: "/tmp/cookbook_a_attributes_default_rb")
   end
 
   let(:cookbook_a_file_default_tempfile) do
     double("Tempfile for cookbook_a megaman.conf file",
-           path: "/tmp/cookbook_a_file_default_tempfile")
+      path: "/tmp/cookbook_a_file_default_tempfile")
   end
 
   let(:cookbook_a_template_default_tempfile) do
     double("Tempfile for cookbook_a apache.conf.erb template",
-           path: "/tmp/cookbook_a_template_default_tempfile")
+      path: "/tmp/cookbook_a_template_default_tempfile")
   end
 
   def setup_common_files_missing_expectations

data/spec/unit/cookbook_loader_spec.rb

@@ -88,7 +88,7 @@ describe Chef::CookbookLoader do
 
     describe "each" do
       it "should allow you to iterate over cookbooks with each" do
-        seen = Hash.new
+        seen = {}
         cookbook_loader.each_key do |cookbook_name|
           seen[cookbook_name] = true
         end
@@ -97,7 +97,7 @@ describe Chef::CookbookLoader do
       end
 
       it "should iterate in alphabetical order" do
-        seen = Array.new
+        seen = []
         cookbook_loader.each_key do |cookbook_name|
           seen << cookbook_name
         end
@@ -113,19 +113,19 @@ describe Chef::CookbookLoader do
 
       it "should load different attribute files from deeper paths" do
         expect(full_paths_for_part(:openldap, "attributes").detect do |f|
-          f =~ /cookbooks\/openldap\/attributes\/smokey.rb/
+          f =~ %r{cookbooks/openldap/attributes/smokey.rb}
         end).not_to eql(nil)
       end
 
       it "should load definition files from deeper paths" do
         expect(full_paths_for_part(:openldap, "definitions").detect do |f|
-          f =~ /cookbooks\/openldap\/definitions\/server.rb/
+          f =~ %r{cookbooks/openldap/definitions/server.rb}
         end).not_to eql(nil)
       end
 
       it "should load recipe files from deeper paths" do
         expect(full_paths_for_part(:openldap, "recipes").detect do |f|
-          f =~ /cookbooks\/openldap\/recipes\/one.rb/
+          f =~ %r{cookbooks/openldap/recipes/one.rb}
         end).not_to eql(nil)
       end
 
@@ -134,8 +134,8 @@ describe Chef::CookbookLoader do
           f =~ /\.dotfile$/
         end).to match(/\.dotfile$/)
         expect(full_paths_for_part(:openldap, "files").detect do |f|
-          f =~ /\.ssh\/id_rsa$/
-        end).to match(/\.ssh\/id_rsa$/)
+          f =~ %r{\.ssh/id_rsa$}
+        end).to match(%r{\.ssh/id_rsa$})
       end
 
       it "should load the metadata for the cookbook" do
@@ -173,7 +173,7 @@ describe Chef::CookbookLoader do
     end
 
     it "should have loaded the correct cookbook" do
-      seen = Hash.new
+      seen = {}
       cookbook_loader.each_key do |cookbook_name|
         seen[cookbook_name] = true
       end
@@ -203,7 +203,7 @@ describe Chef::CookbookLoader do
     end
 
     it "should not load the other cookbooks" do
-      seen = Hash.new
+      seen = {}
       cookbook_loader.each_key do |cookbook_name|
         seen[cookbook_name] = true
       end
@@ -239,7 +239,7 @@ describe Chef::CookbookLoader do
       end
 
       it "should load all cookbooks" do
-        seen = Hash.new
+        seen = {}
         cookbook_loader.each_key do |cookbook_name|
           seen[cookbook_name] = true
         end

data/spec/unit/cookbook_site_streaming_uploader_spec.rb

@@ -25,8 +25,7 @@ class FakeTempfile
     @basename = basename
   end
 
-  def close
-  end
+  def close; end
 
   def path
     "#{@basename}.ZZZ"

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/data_bag_item_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
-# Copyright:: Copyright 2008-2018, Chef Software Inc.
+# Copyright:: Copyright 2008-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -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|