chef 14.14.29 → 14.15.6

data/spec/unit/guard_interpreter/resource_guard_interpreter_spec.rb

@@ -22,7 +22,7 @@ describe Chef::GuardInterpreter::ResourceGuardInterpreter do
   let(:node) do
     node = Chef::Node.new
 
-    node.default["kernel"] = Hash.new
+    node.default["kernel"] = {}
     node.default["kernel"][:machine] = :x86_64.to_s
     node.automatic[:os] = "windows"
     node

data/spec/unit/http/authenticator_spec.rb

@@ -23,7 +23,7 @@ describe Chef::HTTP::Authenticator do
   let(:class_instance) { Chef::HTTP::Authenticator.new(client_name: "test") }
   let(:method) { "GET" }
   let(:url) { URI("https://chef.example.com/organizations/test") }
-  let(:headers) { Hash.new }
+  let(:headers) { {} }
   let(:data) { "" }
 
   context "when handle_request is called" do
@@ -92,7 +92,8 @@ describe Chef::HTTP::Authenticator do
       it "calls authentication_headers with the proper input" do
         expect(class_instance).to receive(:authentication_headers).with(
           method, url, data,
-          { "X-Ops-Server-API-Version" => Chef::HTTP::Authenticator::DEFAULT_SERVER_API_VERSION }).and_return({})
+          { "X-Ops-Server-API-Version" => Chef::HTTP::Authenticator::DEFAULT_SERVER_API_VERSION }
+        ).and_return({})
         class_instance.handle_request(method, url, headers, data)
       end
     end
@@ -108,7 +109,7 @@ describe Chef::HTTP::Authenticator do
         wxpGV4dGtdcahwXNE4601aXPra+xPcRd2puCNoEDBzgVuTSsLYeKBDMSfs173W1Q
         YwIDAQAB
         -----END PUBLIC KEY-----
-EOH
+      EOH
 
       let(:class_instance) { Chef::HTTP::Authenticator.new(client_name: "test", raw_key: public_key, ssh_agent_signing: true) }
 

data/spec/unit/http/json_input_spec.rb

@@ -21,7 +21,7 @@ require "chef/http/json_input"
 
 describe Chef::HTTP::JSONInput do
 
-  let(:json_encoder) { described_class.new() }
+  let(:json_encoder) { described_class.new }
 
   let(:url) { URI.parse("http://example.com") }
   let(:headers) { {} }

data/spec/unit/http/socketless_chef_zero_client_spec.rb

@@ -38,13 +38,13 @@ describe Chef::HTTP::SocketlessChefZeroClient do
 
     let(:expected_rack_req) do
       {
-        "SCRIPT_NAME"     => "",
-        "SERVER_NAME"     => "localhost",
-        "REQUEST_METHOD"  => method.to_s.upcase,
-        "PATH_INFO"       => uri.path,
-        "QUERY_STRING"    => uri.query,
-        "SERVER_PORT"     => uri.port,
-        "HTTP_HOST"       => "localhost:#{uri.port}",
+        "SCRIPT_NAME" => "",
+        "SERVER_NAME" => "localhost",
+        "REQUEST_METHOD" => method.to_s.upcase,
+        "PATH_INFO" => uri.path,
+        "QUERY_STRING" => uri.query,
+        "SERVER_PORT" => uri.port,
+        "HTTP_HOST" => "localhost:#{uri.port}",
         "rack.url_scheme" => "chefzero",
       }
     end
@@ -137,16 +137,16 @@ describe Chef::HTTP::SocketlessChefZeroClient do
 
     let(:expected_rack_req) do
       {
-        "SCRIPT_NAME"     => "",
-        "SERVER_NAME"     => "localhost",
-        "REQUEST_METHOD"  => method.to_s.upcase,
-        "PATH_INFO"       => uri.path,
-        "QUERY_STRING"    => uri.query,
-        "SERVER_PORT"     => uri.port,
-        "HTTP_HOST"       => "localhost:#{uri.port}",
+        "SCRIPT_NAME" => "",
+        "SERVER_NAME" => "localhost",
+        "REQUEST_METHOD" => method.to_s.upcase,
+        "PATH_INFO" => uri.path,
+        "QUERY_STRING" => uri.query,
+        "SERVER_PORT" => uri.port,
+        "HTTP_HOST" => "localhost:#{uri.port}",
         "HTTP_X_OPS_SERVER_API_VERSION" => "2",
         "rack.url_scheme" => "chefzero",
-        "rack.input"      => an_instance_of(StringIO),
+        "rack.input" => an_instance_of(StringIO),
       }
     end
 

data/spec/unit/key_spec.rb

@@ -34,7 +34,7 @@ describe Chef::Key do
       Tfuc9dUYsFjptWYrV6pfEQ+bgo1OGBXORBFcFL+2D7u9JYquKrMgosznHoEkQNLo
       0wIDAQAB
       -----END PUBLIC KEY-----
-EOS
+    EOS
   end
 
   shared_examples_for "fields with username type validation" do
@@ -66,7 +66,7 @@ EOS
 
     context "when you feed it anything but a string" do
       it "should raise an ArgumentError" do
-        expect { key.send(field, Hash.new) }.to raise_error(ArgumentError)
+        expect { key.send(field, {}) }.to raise_error(ArgumentError)
       end
     end
   end
@@ -406,9 +406,9 @@ EOS
 
           it "creates a new key via the API with the fingerprint as the name" do
             expect(rest).to receive(:post).with(url,
-                                                     { "name" => "12:3e:33:73:0b:f4:ec:72:dc:f0:4c:51:62:27:08:76:96:24:f4:4a",
-                                                       "public_key" => key.public_key,
-                                                       "expiration_date" => key.expiration_date }).and_return({})
+              { "name" => "12:3e:33:73:0b:f4:ec:72:dc:f0:4c:51:62:27:08:76:96:24:f4:4a",
+                "public_key" => key.public_key,
+                "expiration_date" => key.expiration_date }).and_return({})
             key.create
           end
         end
@@ -424,9 +424,9 @@ EOS
           context "when create_key is false" do
             it "creates a new key via the API" do
               expect(rest).to receive(:post).with(url,
-                                                       { "name" => key.name,
-                                                         "public_key" => key.public_key,
-                                                         "expiration_date" => key.expiration_date }).and_return({})
+                { "name" => key.name,
+                  "public_key" => key.public_key,
+                  "expiration_date" => key.expiration_date }).and_return({})
               key.create
             end
           end

data/spec/unit/knife/bootstrap_spec.rb

@@ -72,7 +72,7 @@ describe Chef::Knife::Bootstrap do
         expect(knife).to receive(:read_secret).and_return("secrets")
         expect(rendered_template).to match("cat > /etc/chef/encrypted_data_bag_secret <<'EOP'")
         expect(rendered_template).to match('{"run_list":\[\]}')
-        expect(rendered_template).to match(%r{secrets})
+        expect(rendered_template).to match(/secrets/)
       end
     end
   end
@@ -92,7 +92,7 @@ describe Chef::Knife::Bootstrap do
       knife.render_template
     end
     it "configures the preinstall command in the bootstrap template correctly" do
-      expect(rendered_template).to match(%r{command})
+      expect(rendered_template).to match(/command/)
     end
   end
 
@@ -103,7 +103,7 @@ describe Chef::Knife::Bootstrap do
       knife.render_template
     end
     it "configures the https_proxy environment variable in the bootstrap template correctly" do
-      expect(rendered_template).to match(%r{https_proxy="1.1.1.1" export https_proxy})
+      expect(rendered_template).to match(/https_proxy="1.1.1.1" export https_proxy/)
     end
   end
 
@@ -114,7 +114,7 @@ describe Chef::Knife::Bootstrap do
       knife.render_template
     end
     it "configures the https_proxy environment variable in the bootstrap template correctly" do
-      expect(rendered_template).to match(%r{no_proxy="localserver" export no_proxy})
+      expect(rendered_template).to match(/no_proxy="localserver" export no_proxy/)
     end
   end
 
@@ -324,7 +324,7 @@ describe Chef::Knife::Bootstrap do
     it "should create a hint file when told to" do
       knife.parse_options(["--hint", "openstack"])
       knife.merge_configs
-      expect(knife.render_template).to match(/\/etc\/chef\/ohai\/hints\/openstack.json/)
+      expect(knife.render_template).to match(%r{/etc/chef/ohai/hints/openstack.json})
     end
 
     it "should populate a hint file with JSON when given a file to read" do
@@ -354,7 +354,7 @@ describe Chef::Knife::Bootstrap do
       let(:setting) { "api.opscode.com" }
 
       it "renders the client.rb with a single FQDN no_proxy entry" do
-        expect(rendered_template).to match(%r{.*no_proxy\s*"api.opscode.com".*})
+        expect(rendered_template).to match(/.*no_proxy\s*"api.opscode.com".*/)
       end
     end
 
@@ -362,7 +362,7 @@ describe Chef::Knife::Bootstrap do
       let(:setting) { "api.opscode.com,172.16.10.*" }
 
       it "renders the client.rb with comma-separated FQDN and wildcard IP address no_proxy entries" do
-        expect(rendered_template).to match(%r{.*no_proxy\s*"api.opscode.com,172.16.10.\*".*})
+        expect(rendered_template).to match(/.*no_proxy\s*"api.opscode.com,172.16.10.\*".*/)
       end
     end
 
@@ -420,7 +420,7 @@ describe Chef::Knife::Bootstrap do
     it "creates a secret file" do
       expect(knife).to receive(:encryption_secret_provided_ignore_encrypt_flag?).and_return(true)
       expect(knife).to receive(:read_secret).and_return(secret)
-      expect(rendered_template).to match(%r{#{secret}})
+      expect(rendered_template).to match(/#{secret}/)
     end
 
     it "renders the client.rb with an encrypted_data_bag_secret entry" do
@@ -528,7 +528,9 @@ describe Chef::Knife::Bootstrap do
     context "when client_d_dir is set" do
       let(:client_d_dir) do
         Chef::Util::PathHelper.cleanpath(
-        File.join(File.dirname(__FILE__), "../../data/client.d_00")) end
+          File.join(File.dirname(__FILE__), "../../data/client.d_00")
+        )
+      end
 
       it "creates /etc/chef/client.d" do
         expect(rendered_template).to match("mkdir -p /etc/chef/client\.d")
@@ -553,7 +555,9 @@ describe Chef::Knife::Bootstrap do
       context "a nested directory structure" do
         let(:client_d_dir) do
           Chef::Util::PathHelper.cleanpath(
-          File.join(File.dirname(__FILE__), "../../data/client.d_01")) end
+            File.join(File.dirname(__FILE__), "../../data/client.d_01")
+          )
+        end
         it "creates a file foo/bar.rb" do
           expect(rendered_template).to match("cat > /etc/chef/client.d/foo/bar.rb <<'EOP'")
           expect(rendered_template).to match("1 / 0")

data/spec/unit/knife/client_bulk_delete_spec.rb

@@ -42,10 +42,10 @@ describe Chef::Knife::ClientBulkDelete do
 
   let(:nonvalidator_client_names) { %w{tim dan stephen} }
   let(:nonvalidator_clients) do
-    clients = Hash.new
+    clients = {}
 
     nonvalidator_client_names.each do |client_name|
-      client = Chef::ApiClientV1.new()
+      client = Chef::ApiClientV1.new
       client.name(client_name)
       allow(client).to receive(:destroy).and_return(true)
       clients[client_name] = client
@@ -56,10 +56,10 @@ describe Chef::Knife::ClientBulkDelete do
 
   let(:validator_client_names) { %w{myorg-validator} }
   let(:validator_clients) do
-    clients = Hash.new
+    clients = {}
 
     validator_client_names.each do |validator_client_name|
-      validator_client = Chef::ApiClientV1.new()
+      validator_client = Chef::ApiClientV1.new
       validator_client.name(validator_client_name)
       allow(validator_client).to receive(:validator).and_return(true)
       allow(validator_client).to receive(:destroy).and_return(true)

data/spec/unit/knife/configure_client_spec.rb

@@ -58,7 +58,7 @@ describe Chef::Knife::ConfigureClient do
       it "should write out the config file" do
         allow(FileUtils).to receive(:mkdir_p)
         @knife.run
-        expect(@client_file.string).to match /chef_server_url\s+'https\:\/\/chef\.example\.com'/
+        expect(@client_file.string).to match %r{chef_server_url\s+'https\://chef\.example\.com'}
         expect(@client_file.string).to match /validation_client_name\s+'chef-validator'/
       end
 

data/spec/unit/knife/configure_spec.rb

@@ -159,7 +159,7 @@ describe Chef::Knife::Configure do
     @knife.run
     expect(config_file.string).to match(/^client_name[\s]+=[\s]+'#{Etc.getlogin}'$/)
     expect(config_file.string).to match(%r{^client_key[\s]+=[\s]+'/home/you/.chef/#{Etc.getlogin}.pem'$})
-    expect(config_file.string).to match(%r{^chef_server_url\s+=[\s]+'#{default_server_url}'$})
+    expect(config_file.string).to match(/^chef_server_url\s+=[\s]+'#{default_server_url}'$/)
   end
 
   it "creates a new client when given the --initial option" do

data/spec/unit/knife/cookbook_bulk_delete_spec.rb

@@ -31,7 +31,7 @@ describe Chef::Knife::CookbookBulkDelete do
     allow(@knife.ui).to receive(:stdout).and_return(@stdout)
     allow(@knife.ui).to receive(:stderr).and_return(@stderr)
     allow(@knife.ui).to receive(:confirm).and_return(true)
-    @cookbooks = Hash.new
+    @cookbooks = {}
     %w{cheezburger pizza lasagna}.each do |cookbook_name|
       cookbook = Chef::CookbookVersion.new(cookbook_name)
       @cookbooks[cookbook_name] = cookbook

data/spec/unit/knife/cookbook_delete_spec.rb

@@ -76,8 +76,8 @@ describe Chef::Knife::CookbookDelete do
       @knife.cookbook_name = "foobar"
       @knife.version = "1.0.0"
       expect(@knife).to receive(:delete_object).with(Chef::CookbookVersion,
-                                                 "foobar version 1.0.0",
-                                                 "cookbook").and_yield()
+        "foobar version 1.0.0",
+        "cookbook").and_yield
       expect(@knife).to receive(:delete_request).with("cookbooks/foobar/1.0.0")
       @knife.delete_explicit_version
     end

data/spec/unit/knife/cookbook_download_spec.rb

@@ -112,7 +112,7 @@ describe Chef::Knife::CookbookDownload do
 
         it "should print an error and exit if the cookbook download directory already exists" do
           expect(File).to receive(:exists?).with("/var/tmp/chef/foobar-1.0.0").and_return(true)
-          expect(@knife.ui).to receive(:fatal).with(/\/var\/tmp\/chef\/foobar-1\.0\.0 exists/i)
+          expect(@knife.ui).to receive(:fatal).with(%r{/var/tmp/chef/foobar-1\.0\.0 exists}i)
           expect { @knife.run }.to raise_error(SystemExit)
         end
 
@@ -141,7 +141,7 @@ describe Chef::Knife::CookbookDownload do
               expect(@stderr.string).to match /downloading #{segment}/im
             end
             expect(@stderr.string).to match /downloading foobar cookbook version 1\.0\.0/im
-            expect(@stderr.string).to match /cookbook downloaded to \/var\/tmp\/chef\/foobar-1\.0\.0/im
+            expect(@stderr.string).to match %r{cookbook downloaded to /var/tmp/chef/foobar-1\.0\.0}im
           end
 
           describe "with -f or --force" do

data/spec/unit/knife/cookbook_metadata_spec.rb

@@ -98,8 +98,8 @@ describe Chef::Knife::CookbookMetadata do
       it "should generate the metadata for each cookbook" do
         expect(Chef::CookbookLoader).to receive(:new).with(cookbook_dir).and_call_original
         knife.run
-        expect(stderr.string).to match /generating metadata for foo from #{cookbook_dir}\/foo\/metadata\.rb/im
-        expect(stderr.string).to match /generating metadata for bar from #{cookbook_dir}\/bar\/metadata\.rb/im
+        expect(stderr.string).to match %r{generating metadata for foo from #{cookbook_dir}/foo/metadata\.rb}im
+        expect(stderr.string).to match %r{generating metadata for bar from #{cookbook_dir}/bar/metadata\.rb}im
       end
 
       it "with -o or --cookbook_path should look in the provided path and generate cookbook metadata" do
@@ -107,8 +107,8 @@ describe Chef::Knife::CookbookMetadata do
         knife.config[:cookbook_path] = cookbook_dir
         expect(Chef::CookbookLoader).to receive(:new).with(cookbook_dir).and_call_original
         knife.run
-        expect(stderr.string).to match /generating metadata for foo from #{cookbook_dir}\/foo\/metadata\.rb/im
-        expect(stderr.string).to match /generating metadata for bar from #{cookbook_dir}\/bar\/metadata\.rb/im
+        expect(stderr.string).to match %r{generating metadata for foo from #{cookbook_dir}/foo/metadata\.rb}im
+        expect(stderr.string).to match %r{generating metadata for bar from #{cookbook_dir}/bar/metadata\.rb}im
       end
     end
 

data/spec/unit/knife/cookbook_upload_spec.rb

@@ -122,7 +122,7 @@ describe Chef::Knife::CookbookUpload do
           test_cookbook:
             /path/one/test_cookbook
             /path/two/test_cookbook
-E
+        E
         expect(output.string).to include(expected_message)
       end
     end
@@ -198,7 +198,7 @@ E
       before(:each) do
         cookbook.metadata.depends("dependency")
         allow(cookbook_loader).to receive(:[]) do |ckbk|
-          { "test_cookbook" =>  cookbook,
+          { "test_cookbook" => cookbook,
             "dependency" => cookbook_dependency }[ckbk]
         end
         allow(knife).to receive(:cookbook_names).and_return(%w{cookbook_dependency test_cookbook})
@@ -225,7 +225,7 @@ E
         cookbook_dependency2 = Chef::CookbookVersion.new("dependency2")
         cookbook.metadata.depends("dependency2")
         allow(cookbook_loader).to receive(:[]) do |ckbk|
-          { "test_cookbook" =>  cookbook,
+          { "test_cookbook" => cookbook,
             "dependency" => cookbook_dependency,
             "dependency2" => cookbook_dependency2 }[ckbk]
         end
@@ -291,7 +291,8 @@ E
           it "should warn users that no cookbooks exist" do
             knife.config[:cookbook_path] = ["/chef-repo/cookbooks", "/home/user/cookbooks"]
             expect(knife.ui).to receive(:warn).with(
-              /Could not find any cookbooks in your cookbook path: #{knife.config[:cookbook_path].join(', ')}\. Use --cookbook-path to specify the desired path\./)
+              /Could not find any cookbooks in your cookbook path: #{knife.config[:cookbook_path].join(', ')}\. Use --cookbook-path to specify the desired path\./
+            )
             knife.run
           end
         end
@@ -300,7 +301,8 @@ E
           it "should warn users that no cookbooks exist" do
             knife.config[:cookbook_path] = "/chef-repo/cookbooks"
             expect(knife.ui).to receive(:warn).with(
-              /Could not find any cookbooks in your cookbook path: #{knife.config[:cookbook_path]}\. Use --cookbook-path to specify the desired path\./)
+              /Could not find any cookbooks in your cookbook path: #{knife.config[:cookbook_path]}\. Use --cookbook-path to specify the desired path\./
+            )
             knife.run
           end
         end

data/spec/unit/knife/core/bootstrap_context_spec.rb

@@ -75,7 +75,7 @@ describe Chef::Knife::Core::BootstrapContext do
       log_level   :info
       log_location   "/tmp/log"
       # Using default node name (fqdn)
-EXPECTED
+    EXPECTED
     expect(bootstrap_context.config_content).to eq expected
   end
 

data/spec/unit/knife/core/cookbook_scm_repo_spec.rb

@@ -35,7 +35,7 @@ describe Chef::Knife::CookbookSCMRepo do
   chef-vendor-graphite
   chef-vendor-python
   chef-vendor-absent-new
-BRANCHES
+    BRANCHES
   end
 
   it "has a path to the cookbook repo" do
@@ -84,7 +84,7 @@ BRANCHES
             @dirty_status = Mixlib::ShellOut.new
             @dirty_status.stdout.replace(<<-DIRTY)
  M chef/lib/chef/knife/cookbook_site_install.rb
-DIRTY
+            DIRTY
             expect(@cookbook_repo).to receive(:shell_out!).with("git status --porcelain", cwd: @repo_path).and_return(@dirty_status)
             expect { @cookbook_repo.sanity_check }.to raise_error(SystemExit)
           end

data/spec/unit/knife/core/gem_glob_loader_spec.rb

@@ -34,7 +34,7 @@ describe Chef::Knife::SubcommandLoader::GemGlobLoader do
   it "builds a list of the core subcommand file require paths" do
     expect(loader.subcommand_files).not_to be_empty
     loader.subcommand_files.each do |require_path|
-      expect(require_path).to match(/chef\/knife\/.*|plugins\/knife\/.*/)
+      expect(require_path).to match(%r{chef/knife/.*|plugins/knife/.*})
     end
   end
 
@@ -52,7 +52,7 @@ describe Chef::Knife::SubcommandLoader::GemGlobLoader do
     expect($LOAD_PATH).to receive(:map).and_return([])
     if Gem::Specification.respond_to? :latest_specs
       expect(Gem::Specification).to receive(:latest_specs).with(true).and_return(gems)
-      expect(gems[0]).to receive(:matches_for_glob).with(/chef\/knife\/\*\.rb\{(.*),\.rb,(.*)\}/).and_return(gem_files)
+      expect(gems[0]).to receive(:matches_for_glob).with(%r{chef/knife/\*\.rb\{(.*),\.rb,(.*)\}}).and_return(gem_files)
     else
       expect(Gem.source_index).to receive(:latest_specs).with(true).and_return(gems)
       expect(gems[0]).to receive(:require_paths).twice.and_return(["lib"])
@@ -185,7 +185,7 @@ describe Chef::Knife::SubcommandLoader::GemGlobLoader do
         expect(Gem.source_index).to receive(:latest_specs).and_call_original
       end
       loader.subcommand_files.each do |require_path|
-        expect(require_path).to match(/chef\/knife\/.*|plugins\/knife\/.*/)
+        expect(require_path).to match(%r{chef/knife/.*|plugins/knife/.*})
       end
     end
 
@@ -201,7 +201,7 @@ describe Chef::Knife::SubcommandLoader::GemGlobLoader do
           expect(Gem.source_index).to receive(:latest_specs).and_call_original
         end
         loader.subcommand_files.each do |require_path|
-          expect(require_path).to match(/chef\/knife\/.*|plugins\/knife\/.*/)
+          expect(require_path).to match(%r{chef/knife/.*|plugins/knife/.*})
         end
       end
     end