chef 14.14.29 → 14.15.6

data/spec/unit/audit/control_group_data_spec.rb

@@ -66,7 +66,7 @@ describe Chef::Audit::AuditData do
     end
 
     it "describes a Chef::Audit::AuditData object" do
-      keys = [:node_name, :run_id, :start_time, :end_time, :control_groups]
+      keys = %i{node_name run_id start_time end_time control_groups}
       expect(audit_data_hash.keys).to match_array(keys)
     end
 
@@ -125,7 +125,8 @@ describe Chef::Audit::ControlData do
   let(:control_data) do
     described_class.new(name: name,
                         resource_type: resource_type, resource_name: resource_name,
-                        context: context, line_number: line_number) end
+                        context: context, line_number: line_number)
+  end
 
   describe "#to_h" do
 
@@ -136,7 +137,7 @@ describe Chef::Audit::ControlData do
     end
 
     it "describes a Chef::Audit::ControlData object" do
-      keys = [:name, :resource_type, :resource_name, :context, :status, :details]
+      keys = %i{name resource_type resource_name context status details}
       expect(control_data_hash.keys).to match_array(keys)
     end
 
@@ -190,7 +191,8 @@ describe Chef::Audit::ControlGroupData do
     let(:control) do
       Chef::Audit::ControlData.new(name: name,
                                    resource_type: resource_type, resource_name: resource_name,
-                                   context: context, line_number: line_number) end
+                                   context: context, line_number: line_number)
+    end
 
     before do
       allow(Chef::Audit::ControlData).to receive(:new)
@@ -394,8 +396,8 @@ describe Chef::Audit::ControlGroupData do
     end
 
     it "describes a Chef::Audit::ControlGroupData object" do
-      keys = [:name, :status, :number_succeeded, :number_failed,
-        :controls, :id]
+      keys = %i{name status number_succeeded number_failed
+        controls id}
       expect(control_group_data_hash.keys).to match_array(keys)
     end
 
@@ -440,16 +442,19 @@ describe Chef::Audit::ControlGroupData do
 
         let(:control_1) do
           double("control 1",
-          line_number: control_hash_1[:line_number],
-          to_h: control_hash_1) end
+            line_number: control_hash_1[:line_number],
+            to_h: control_hash_1)
+        end
         let(:control_2) do
           double("control 2",
-          line_number: control_hash_2[:line_number],
-          to_h: control_hash_2) end
+            line_number: control_hash_2[:line_number],
+            to_h: control_hash_2)
+        end
         let(:control_3) do
           double("control 3",
-          line_number: control_hash_3[:line_number],
-          to_h: control_hash_3) end
+            line_number: control_hash_3[:line_number],
+            to_h: control_hash_3)
+        end
 
         let(:control_list) { [control_1, control_2, control_3] }
         let(:ordered_control_hashes) { [control_hash_2, control_hash_1, control_hash_3] }

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

@@ -445,7 +445,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

@@ -412,7 +412,7 @@ describe Chef::Client do
     let(:required_recipe) do
       <<~EOM
         fake_recipe_variable = "for reals"
-EOM
+      EOM
     end
 
     context "when required_recipe is configured" do
@@ -431,10 +431,10 @@ EOM
         let(:required_recipe) do
           <<~EOM
             this is not a recipe
-EOM
+          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,11 +26,11 @@ 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, :attributes, :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 attributes recipes version
+                  source_url issues_url privacy ohai_versions chef_versions
+                  gems}
     end
 
     it "does not depend on object identity for equality" do
@@ -438,7 +438,7 @@ describe Chef::Cookbook::Metadata do
         metadata.attribute("db/mysql/databases", display_name: "foo")
       end.not_to raise_error
       expect do
-        metadata.attribute("db/mysql/databases", display_name: Hash.new)
+        metadata.attribute("db/mysql/databases", display_name: {})
       end.to raise_error(ArgumentError)
     end
 
@@ -447,7 +447,7 @@ describe Chef::Cookbook::Metadata do
         metadata.attribute("db/mysql/databases", description: "foo")
       end.not_to raise_error
       expect do
-        metadata.attribute("db/mysql/databases", description: Hash.new)
+        metadata.attribute("db/mysql/databases", description: {})
       end.to raise_error(ArgumentError)
     end
 
@@ -456,7 +456,7 @@ describe Chef::Cookbook::Metadata do
         metadata.attribute("db/mysql/databases", source_url: "foo")
       end.not_to raise_error
       expect do
-        metadata.attribute("db/mysql/databases", source_url: Hash.new)
+        metadata.attribute("db/mysql/databases", source_url: {})
       end.to raise_error(ArgumentError)
     end
 
@@ -465,7 +465,7 @@ describe Chef::Cookbook::Metadata do
         metadata.attribute("db/mysql/databases", issues_url: "foo")
       end.not_to raise_error
       expect do
-        metadata.attribute("db/mysql/databases", issues_url: Hash.new)
+        metadata.attribute("db/mysql/databases", issues_url: {})
       end.to raise_error(ArgumentError)
     end
 
@@ -489,7 +489,7 @@ describe Chef::Cookbook::Metadata do
         metadata.attribute("db/mysql/databases", choice: [10, "shared"])
       end.to raise_error(ArgumentError)
       expect do
-        metadata.attribute("db/mysql/databases", choice: Hash.new)
+        metadata.attribute("db/mysql/databases", choice: {})
       end.to raise_error(ArgumentError)
     end
 
@@ -506,7 +506,7 @@ describe Chef::Cookbook::Metadata do
         metadata.attribute("db/mysql/databases", calculated: false)
       end.not_to raise_error
       expect do
-        metadata.attribute("db/mysql/databases", calculated: Hash.new)
+        metadata.attribute("db/mysql/databases", calculated: {})
       end.to raise_error(ArgumentError)
     end
 
@@ -526,7 +526,7 @@ describe Chef::Cookbook::Metadata do
         metadata.attribute("db/mysql/databases", type: "array")
       end.not_to raise_error
       expect do
-        metadata.attribute("db/mysql/databases", type: Array.new)
+        metadata.attribute("db/mysql/databases", type: [])
       end.to raise_error(ArgumentError)
     end
 
@@ -578,7 +578,7 @@ describe Chef::Cookbook::Metadata do
         metadata.attribute("db/mysql/databases", recipes: [])
       end.not_to raise_error
       expect do
-        metadata.attribute("db/mysql/databases", required: Hash.new)
+        metadata.attribute("db/mysql/databases", required: {})
       end.to raise_error(ArgumentError)
     end
 

data/spec/unit/cookbook/synchronizer_spec.rb

@@ -63,7 +63,7 @@ describe Chef::CookbookSynchronizer do
     {
       "path" => "recipes/default.rb",
       "name" => "recipes/default.rb",
-      "url"  => "http://chef.example.com/abc123",
+      "url" => "http://chef.example.com/abc123",
       "checksum" => "abc123",
     }
   end
@@ -72,7 +72,7 @@ describe Chef::CookbookSynchronizer do
     {
       "path" => "attributes/default.rb",
       "name" => "attributes/default.rb",
-      "url"  => "http://chef.example.com/abc456",
+      "url" => "http://chef.example.com/abc456",
       "checksum" => "abc456",
     }
   end
@@ -198,22 +198,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

@@ -91,7 +91,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
@@ -100,7 +100,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
@@ -116,52 +116,52 @@ describe Chef::CookbookLoader do
 
       it "should allow you to override an attribute file via cookbook_path" do
         expect(full_paths_for_part(:openldap, "attributes").detect do |f|
-          f =~ /cookbooks\/openldap\/attributes\/default.rb/
+          f =~ %r{cookbooks/openldap/attributes/default.rb}
         end).not_to eql(nil)
         expect(full_paths_for_part(:openldap, "attributes").detect do |f|
-          f =~ /kitchen\/openldap\/attributes\/default.rb/
+          f =~ %r{kitchen/openldap/attributes/default.rb}
         end).to eql(nil)
       end
 
       it "should load different attribute files from deeper paths" do
         expect(full_paths_for_part(:openldap, "attributes").detect do |f|
-          f =~ /kitchen\/openldap\/attributes\/robinson.rb/
+          f =~ %r{kitchen/openldap/attributes/robinson.rb}
         end).not_to eql(nil)
       end
 
       it "should allow you to override a definition file via cookbook_path" do
         expect(full_paths_for_part(:openldap, "definitions").detect do |f|
-          f =~ /cookbooks\/openldap\/definitions\/client.rb/
+          f =~ %r{cookbooks/openldap/definitions/client.rb}
         end).not_to eql(nil)
         expect(full_paths_for_part(:openldap, "definitions").detect do |f|
-          f =~ /kitchen\/openldap\/definitions\/client.rb/
+          f =~ %r{kitchen/openldap/definitions/client.rb}
         end).to eql(nil)
       end
 
       it "should load definition files from deeper paths" do
         expect(full_paths_for_part(:openldap, "definitions").detect do |f|
-          f =~ /kitchen\/openldap\/definitions\/drewbarrymore.rb/
+          f =~ %r{kitchen/openldap/definitions/drewbarrymore.rb}
         end).not_to eql(nil)
       end
 
       it "should allow you to override a recipe file via cookbook_path" do
         expect(full_paths_for_part(:openldap, "recipes").detect do |f|
-          f =~ /cookbooks\/openldap\/recipes\/gigantor.rb/
+          f =~ %r{cookbooks/openldap/recipes/gigantor.rb}
         end).not_to eql(nil)
         expect(full_paths_for_part(:openldap, "recipes").detect do |f|
-          f =~ /kitchen\/openldap\/recipes\/gigantor.rb/
+          f =~ %r{kitchen/openldap/recipes/gigantor.rb}
         end).to eql(nil)
       end
 
       it "should load recipe files from deeper paths" do
         expect(full_paths_for_part(:openldap, "recipes").detect do |f|
-          f =~ /kitchen\/openldap\/recipes\/woot.rb/
+          f =~ %r{kitchen/openldap/recipes/woot.rb}
         end).not_to eql(nil)
       end
 
       it "should allow you to have an 'ignore' file, which skips loading files in later cookbooks" do
         expect(full_paths_for_part(:openldap, "recipes").detect do |f|
-          f =~ /kitchen\/openldap\/recipes\/ignoreme.rb/
+          f =~ %r{kitchen/openldap/recipes/ignoreme.rb}
         end).to eql(nil)
       end
 
@@ -170,8 +170,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
@@ -210,7 +210,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
@@ -238,7 +238,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
@@ -276,7 +276,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_manifest_spec.rb

@@ -89,10 +89,10 @@ describe Chef::CookbookManifest do
       {
         "chef_type" => "cookbook_version",
 
-        "name"          => "tatft-1.2.3",
-        "version"       => "1.2.3",
+        "name" => "tatft-1.2.3",
+        "version" => "1.2.3",
         "cookbook_name" => "tatft",
-        "metadata"      => metadata,
+        "metadata" => metadata,
 
         "frozen?" => false,
 
@@ -129,9 +129,9 @@ describe Chef::CookbookManifest do
                end
 
         {
-          "name"        => name,
-          "path"        => relative_path,
-          "checksum"    => Chef::Digester.generate_md5_checksum_for_file(path),
+          "name" => name,
+          "path" => relative_path,
+          "checksum" => Chef::Digester.generate_md5_checksum_for_file(path),
           "specificity" => "default",
         }.tap do |fp|
           if full
@@ -145,10 +145,10 @@ describe Chef::CookbookManifest do
       {
         "chef_type" => "cookbook_version",
 
-        "name"          => "tatft-1.2.3",
-        "version"       => "1.2.3",
+        "name" => "tatft-1.2.3",
+        "version" => "1.2.3",
         "cookbook_name" => "tatft",
-        "metadata"      => metadata,
+        "metadata" => metadata,
 
         "frozen?" => false,
 

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"