chef 15.1.36 → 15.2.20

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

@@ -264,7 +264,8 @@ describe Chef::Knife::CookbookUpload do
           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
@@ -273,7 +274,8 @@ describe Chef::Knife::CookbookUpload do
           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/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

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

@@ -43,8 +43,10 @@ describe Chef::Knife::SubcommandLoader::HashedCommandLoader do
 
   let(:loader) do
     Chef::Knife::SubcommandLoader::HashedCommandLoader.new(
-    File.join(CHEF_SPEC_DATA, "knife-site-subcommands"),
-    plugin_manifest) end
+      File.join(CHEF_SPEC_DATA, "knife-site-subcommands"),
+      plugin_manifest
+    )
+  end
 
   describe "#list_commands" do
     before do

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

@@ -44,13 +44,13 @@ describe Chef::Knife::NodeEditor do
   describe "#view" do
     it "returns a Hash with only the name, chef_environment, normal, " +
       "policy_name, policy_group, and run_list properties" do
-      expected = node_data.select do |key,|
-        %w{ name chef_environment normal
-            policy_name policy_group run_list }.include?(key)
-      end
+        expected = node_data.select do |key,|
+          %w{ name chef_environment normal
+              policy_name policy_group run_list }.include?(key)
+        end
 
-      expect(subject.view).to eq(expected)
-    end
+        expect(subject.view).to eq(expected)
+      end
 
     context "when config[:all_attributes] == true" do
       let(:config) { base_config.merge(all_attributes: true) }
@@ -190,8 +190,8 @@ describe Chef::Knife::NodeEditor do
 
           it "returns an array of property names that doesn't include " +
             "the non-editable properties" do
-            expect(subject.updated?).to eql %w{ chef_environment normal policy_name policy_group run_list }
-          end
+              expect(subject.updated?).to eql %w{ chef_environment normal policy_name policy_group run_list }
+            end
         end
       end
 

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

@@ -157,8 +157,7 @@ describe Chef::Knife::Core::WindowsBootstrapContext do
         validation_client_name: "chef-validator-testing",
         file_cache_path: "c:/chef/cache",
         file_backup_path: "c:/chef/backup",
-        cache_options: ({ path: "c:/chef/cache/checksums", skip_expires: true })
-        ))
+        cache_options: ({ path: "c:/chef/cache/checksums", skip_expires: true })))
     end
 
     it "generates the config file data" do

data/spec/unit/knife/data_bag_from_file_spec.rb

@@ -77,7 +77,8 @@ describe Chef::Knife::DataBagFromFile do
       "id" => "item_name",
       "greeting" => "hello",
       "nested" => { "a1" => [1, 2, 3], "a2" => { "b1" => true } },
-  } end
+  }
+  end
   let(:enc_data) { Chef::EncryptedDataBagItem.encrypt_data_bag_item(plain_data, secret) }
 
   let(:rest) { double("Chef::ServerAPI") }

data/spec/unit/knife/data_bag_show_spec.rb

@@ -47,7 +47,8 @@ describe Chef::Knife::DataBagShow do
 
   let(:data_bag_contents) do
     { "id" => "id", "baz" => "http://localhost:4000/data/bag_o_data/baz",
-      "qux" => "http://localhost:4000/data/bag_o_data/qux" } end
+      "qux" => "http://localhost:4000/data/bag_o_data/qux" }
+  end
   let(:enc_hash) { Chef::EncryptedDataBagItem.encrypt_data_bag_item(data_bag_contents, secret) }
   let(:data_bag) { Chef::DataBagItem.from_hash(data_bag_contents) }
   let(:data_bag_with_encoded_hash) { Chef::DataBagItem.from_hash(enc_hash) }

data/spec/unit/knife/key_create_spec.rb

@@ -84,7 +84,7 @@ Tfuc9dUYsFjptWYrV6pfEQ+bgo1OGBXORBFcFL+2D7u9JYquKrMgosznHoEkQNLo
 0wIDAQAB
 -----END PUBLIC KEY-----"
   end
-  let(:config) { Hash.new }
+  let(:config) { {} }
   let(:actor) { "charmander" }
   let(:ui) { instance_double("Chef::Knife::UI") }
 

data/spec/unit/knife/key_delete_spec.rb

@@ -37,7 +37,7 @@ describe "key delete commands that inherit knife" do
     end
 
     context "after apply_params! is called with valid args" do
-      let(:params) { ["charmander", "charmander-key"] }
+      let(:params) { %w{charmander charmander-key} }
       before do
         command.apply_params!(params)
       end
@@ -59,7 +59,7 @@ describe "key delete commands that inherit knife" do
     it_should_behave_like "a knife key command with a keyname as the second arg"
     it_should_behave_like "a knife key command" do
       let(:service_object) { instance_double(Chef::Knife::KeyDelete) }
-      let(:params) { ["charmander", "charmander-key"] }
+      let(:params) { %w{charmander charmander-key} }
     end
   end
 
@@ -69,7 +69,7 @@ describe "key delete commands that inherit knife" do
     it_should_behave_like "a knife key command with a keyname as the second arg"
     it_should_behave_like "a knife key command" do
       let(:service_object) { instance_double(Chef::Knife::KeyDelete) }
-      let(:params) { ["charmander", "charmander-key"] }
+      let(:params) { %w{charmander charmander-key} }
     end
   end
 end

data/spec/unit/knife/key_edit_spec.rb

@@ -37,7 +37,7 @@ describe "key edit commands that inherit knife" do
     end
 
     context "after apply_params! is called with valid args" do
-      let(:params) { ["charmander", "charmander-key"] }
+      let(:params) { %w{charmander charmander-key} }
       before do
         command.apply_params!(params)
       end
@@ -59,7 +59,7 @@ describe "key edit commands that inherit knife" do
     it_should_behave_like "a knife key command with a keyname as the second arg"
     it_should_behave_like "a knife key command" do
       let(:service_object) { instance_double(Chef::Knife::KeyEdit) }
-      let(:params) { ["charmander", "charmander-key"] }
+      let(:params) { %w{charmander charmander-key} }
     end
   end
 
@@ -69,7 +69,7 @@ describe "key edit commands that inherit knife" do
     it_should_behave_like "a knife key command with a keyname as the second arg"
     it_should_behave_like "a knife key command" do
       let(:service_object) { instance_double(Chef::Knife::KeyEdit) }
-      let(:params) { ["charmander", "charmander-key"] }
+      let(:params) { %w{charmander charmander-key} }
     end
   end
 end
@@ -86,7 +86,7 @@ Tfuc9dUYsFjptWYrV6pfEQ+bgo1OGBXORBFcFL+2D7u9JYquKrMgosznHoEkQNLo
 0wIDAQAB
 -----END PUBLIC KEY-----"
   end
-  let(:config) { Hash.new }
+  let(:config) { {} }
   let(:actor) { "charmander" }
   let(:keyname) { "charmander-key" }
   let(:ui) { instance_double("Chef::Knife::UI") }

data/spec/unit/knife/key_list_spec.rb

@@ -73,7 +73,7 @@ describe "key list commands that inherit knife" do
 end
 
 describe Chef::Knife::KeyList do
-  let(:config) { Hash.new }
+  let(:config) { {} }
   let(:actor) { "charmander" }
   let(:ui) { instance_double("Chef::Knife::UI") }
 

data/spec/unit/knife/key_show_spec.rb

@@ -37,7 +37,7 @@ describe "key show commands that inherit knife" do
     end
 
     context "after apply_params! is called with valid args" do
-      let(:params) { ["charmander", "charmander-key"] }
+      let(:params) { %w{charmander charmander-key} }
       before do
         command.apply_params!(params)
       end
@@ -59,7 +59,7 @@ describe "key show commands that inherit knife" do
     it_should_behave_like "a knife key command with a keyname as the second arg"
     it_should_behave_like "a knife key command" do
       let(:service_object) { instance_double(Chef::Knife::KeyShow) }
-      let(:params) { ["charmander", "charmander-key"] }
+      let(:params) { %w{charmander charmander-key} }
     end
   end
 
@@ -69,7 +69,7 @@ describe "key show commands that inherit knife" do
     it_should_behave_like "a knife key command with a keyname as the second arg"
     it_should_behave_like "a knife key command" do
       let(:service_object) { instance_double(Chef::Knife::KeyShow) }
-      let(:params) { ["charmander", "charmander-key"] }
+      let(:params) { %w{charmander charmander-key} }
     end
   end
 end

data/spec/unit/knife/node_bulk_delete_spec.rb

@@ -28,7 +28,7 @@ describe Chef::Knife::NodeBulkDelete do
     @stdout = StringIO.new
     allow(@knife.ui).to receive(:stdout).and_return(@stdout)
     allow(@knife.ui).to receive(:confirm).and_return(true)
-    @nodes = Hash.new
+    @nodes = {}
     %w{adam brent jacob}.each do |node_name|
       @nodes[node_name] = "http://localhost:4000/nodes/#{node_name}"
     end
@@ -44,14 +44,14 @@ describe Chef::Knife::NodeBulkDelete do
       # I hate not having == defined for anything :(
       actual = @knife.all_nodes
       expect(actual.keys).to match_array(expected.keys)
-      expect(actual.values.map { |n| n.name }).to match_array(%w{adam brent jacob})
+      expect(actual.values.map(&:name)).to match_array(%w{adam brent jacob})
     end
   end
 
   describe "run" do
     before do
       @inflatedish_list = @nodes.keys.inject({}) do |nodes_by_name, name|
-        node = Chef::Node.new()
+        node = Chef::Node.new
         node.name(name)
         allow(node).to receive(:destroy).and_return(true)
         nodes_by_name[name] = node

data/spec/unit/knife/node_delete_spec.rb

@@ -29,8 +29,8 @@ describe Chef::Knife::NodeDelete do
     allow(@knife).to receive(:output).and_return(true)
     allow(@knife).to receive(:confirm).and_return(true)
 
-    @adam_node = Chef::Node.new()
-    @ben_node = Chef::Node.new()
+    @adam_node = Chef::Node.new
+    @ben_node = Chef::Node.new
     allow(@ben_node).to receive(:destroy).and_return(true)
     allow(@adam_node).to receive(:destroy).and_return(true)
     allow(Chef::Node).to receive(:load).with("adam").and_return(@adam_node)

data/spec/unit/knife/node_edit_spec.rb

@@ -35,7 +35,7 @@ describe Chef::Knife::NodeEdit do
       print_after: nil,
     }
     @knife.name_args = [ "adam" ]
-    @node = Chef::Node.new()
+    @node = Chef::Node.new
   end
 
   it "should load the node" do

data/spec/unit/knife/node_environment_set_spec.rb

@@ -24,7 +24,7 @@ describe Chef::Knife::NodeEnvironmentSet do
     @knife = Chef::Knife::NodeEnvironmentSet.new
     @knife.name_args = %w{adam bar}
     allow(@knife).to receive(:output).and_return(true)
-    @node = Chef::Node.new()
+    @node = Chef::Node.new
     @node.name("knifetest-node")
     @node.chef_environment << "foo"
     allow(@node).to receive(:save).and_return(true)
@@ -47,6 +47,11 @@ describe Chef::Knife::NodeEnvironmentSet do
       @knife.run
     end
 
+    it "sets the environment to config for display" do
+      @knife.run
+      expect(@knife.config[:environment]).to eq("bar")
+    end
+
     it "should print the environment" do
       expect(@knife).to receive(:output).and_return(true)
       @knife.run

data/spec/unit/knife/node_from_file_spec.rb

@@ -30,7 +30,7 @@ describe Chef::Knife::NodeFromFile do
     @knife.name_args = [ "adam.rb" ]
     allow(@knife).to receive(:output).and_return(true)
     allow(@knife).to receive(:confirm).and_return(true)
-    @node = Chef::Node.new()
+    @node = Chef::Node.new
     allow(@node).to receive(:save)
     allow(@knife.loader).to receive(:load_from).and_return(@node)
     @stdout = StringIO.new

data/spec/unit/knife/node_policy_set_spec.rb

@@ -20,7 +20,7 @@ require "spec_helper"
 
 describe Chef::Knife::NodePolicySet do
   let(:node) do
-    node = Chef::Node.new()
+    node = Chef::Node.new
     node.name("adam")
     node.run_list = ["role[base]"]
     node

data/spec/unit/knife/node_run_list_add_spec.rb

@@ -27,7 +27,7 @@ describe Chef::Knife::NodeRunListAdd do
     }
     @knife.name_args = [ "adam", "role[monkey]" ]
     allow(@knife).to receive(:output).and_return(true)
-    @node = Chef::Node.new()
+    @node = Chef::Node.new
     allow(@node).to receive(:save).and_return(true)
     allow(Chef::Node).to receive(:load).and_return(@node)
   end