chef 14.14.29 → 14.15.6

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

@@ -24,10 +24,10 @@ describe Chef::Knife::NodeEditor do
     { "name" => "test_node",
       "chef_environment" => "production",
       "automatic" => { "foo" => "bar" },
-      "default"   => { "alpha" => { "bravo" => "charlie", "delta" => "echo" } },
-      "normal"    => { "alpha" => { "bravo" => "hotel" }, "tags" => [] },
-      "override"  => { "alpha" => { "bravo" => "foxtrot", "delta" => "golf" } },
-      "policy_name"  => nil,
+      "default" => { "alpha" => { "bravo" => "charlie", "delta" => "echo" } },
+      "normal" => { "alpha" => { "bravo" => "hotel" }, "tags" => [] },
+      "override" => { "alpha" => { "bravo" => "foxtrot", "delta" => "golf" } },
+      "policy_name" => nil,
       "policy_group" => nil,
       "run_list" => %w{role[comedy] role[drama] recipe[mystery]},
     }
@@ -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/ui_spec.rb

@@ -214,7 +214,7 @@ describe Chef::Knife::UI do
       expect(@out.string).to eq <<~EOM
         hi: a
         lo: b
-EOM
+      EOM
     end
 
     it "formats empty hashes appropriately" do
@@ -227,7 +227,7 @@ EOM
       expect(@out.string).to eq <<~EOM
         a
         b
-EOM
+      EOM
     end
 
     it "formats empty arrays appropriately" do
@@ -253,7 +253,7 @@ EOM
 
         c
         d
-EOM
+      EOM
     end
 
     it "formats nested arrays with single- and empty subarrays appropriately" do
@@ -267,7 +267,7 @@ EOM
 
         d
         e
-EOM
+      EOM
     end
 
     it "formats arrays of hashes with extra lines in between for readability" do
@@ -280,7 +280,7 @@ EOM
 
         m: n
         o: p
-EOM
+      EOM
     end
 
     it "formats hashes with empty array members appropriately" do
@@ -288,7 +288,7 @@ EOM
       expect(@out.string).to eq <<~EOM
         a:
         b: c
-EOM
+      EOM
     end
 
     it "formats hashes with single-member array values appropriately" do
@@ -296,7 +296,7 @@ EOM
       expect(@out.string).to eq <<~EOM
         a: foo
         b: c
-EOM
+      EOM
     end
 
     it "formats hashes with array members appropriately" do
@@ -306,7 +306,7 @@ EOM
           foo
           bar
         b: c
-EOM
+      EOM
     end
 
     it "formats hashes with single-member nested array values appropriately" do
@@ -315,7 +315,7 @@ EOM
         a:
           foo
         b: c
-EOM
+      EOM
     end
 
     it "formats hashes with nested array values appropriately" do
@@ -332,7 +332,7 @@ EOM
           aa: bb
           cc: dd
         b: c
-EOM
+      EOM
     end
 
     it "formats hashes with empty hash values appropriately" do
@@ -340,7 +340,7 @@ EOM
       expect(@out.string).to eq <<~EOM
         a:
         b: c
-EOM
+      EOM
     end
   end
 

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)

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

data/spec/unit/knife/node_run_list_remove_spec.rb

@@ -24,7 +24,7 @@ describe Chef::Knife::NodeRunListRemove do
     @knife = Chef::Knife::NodeRunListRemove.new
     @knife.config[:print_after] = nil
     @knife.name_args = [ "adam", "role[monkey]" ]
-    @node = Chef::Node.new()
+    @node = Chef::Node.new
     @node.name("knifetest-node")
     @node.run_list << "role[monkey]"
     allow(@node).to receive(:save).and_return(true)

data/spec/unit/knife/node_run_list_set_spec.rb

@@ -25,7 +25,7 @@ describe Chef::Knife::NodeRunListSet do
     @knife.config = {}
     @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

data/spec/unit/knife/node_show_spec.rb

@@ -21,7 +21,7 @@ require "spec_helper"
 describe Chef::Knife::NodeShow 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/raw_spec.rb

@@ -35,8 +35,8 @@ describe Chef::Knife::Raw do
     it "should set the x-ops-request-source header when --proxy-auth is set" do
       knife.config[:proxy_auth] = true
       expect(rest).to receive(:request).with(:GET, "/nodes",
-                                              { "Content-Type" => "application/json",
-                                                "x-ops-request-source" => "web" }, false)
+        { "Content-Type" => "application/json",
+          "x-ops-request-source" => "web" }, false)
       knife.run
     end
   end

data/spec/unit/knife/role_bulk_delete_spec.rb

@@ -29,9 +29,9 @@ describe Chef::Knife::RoleBulkDelete do
     @stdout = StringIO.new
     allow(@knife.ui).to receive(:stdout).and_return(@stdout)
     allow(@knife.ui).to receive(:confirm).and_return(true)
-    @roles = Hash.new
+    @roles = {}
     %w{dev staging production}.each do |role_name|
-      role = Chef::Role.new()
+      role = Chef::Role.new
       role.name(role_name)
       allow(role).to receive(:destroy).and_return(true)
       @roles[role_name] = role

data/spec/unit/knife/role_create_spec.rb

@@ -27,7 +27,7 @@ describe Chef::Knife::RoleCreate do
     }
     @knife.name_args = [ "adam" ]
     allow(@knife).to receive(:output).and_return(true)
-    @role = Chef::Role.new()
+    @role = Chef::Role.new
     allow(@role).to receive(:save)
     allow(Chef::Role).to receive(:new).and_return(@role)
     allow(@knife).to receive(:edit_data).and_return(@role)

data/spec/unit/knife/role_delete_spec.rb

@@ -28,7 +28,7 @@ describe Chef::Knife::RoleDelete do
     @knife.name_args = [ "adam" ]
     allow(@knife).to receive(:output).and_return(true)
     allow(@knife).to receive(:confirm).and_return(true)
-    @role = Chef::Role.new()
+    @role = Chef::Role.new
     allow(@role).to receive(:destroy).and_return(true)
     allow(Chef::Role).to receive(:load).and_return(@role)
     @stdout = StringIO.new