chef 14.14.29 → 14.15.6

data/spec/support/shared/unit/file_system_support.rb

@@ -23,9 +23,10 @@ require "chef/chef_fs/file_system/memory/memory_file"
 
 module FileSystemSupport
   def memory_fs(pretty_name, value, cannot_be_in_regex = nil)
-    if !value.is_a?(Hash)
+    unless value.is_a?(Hash)
       raise "memory_fs() must take a Hash"
     end
+
     dir = Chef::ChefFS::FileSystem::Memory::MemoryRoot.new(pretty_name, cannot_be_in_regex)
     value.each do |key, child|
       dir.add_child(memory_fs_value(child, key.to_s, dir))
@@ -55,7 +56,7 @@ module FileSystemSupport
 
   def no_blocking_calls_allowed
     [ Chef::ChefFS::FileSystem::Memory::MemoryFile, Chef::ChefFS::FileSystem::Memory::MemoryDir ].each do |c|
-      [ :children, :exists?, :read ].each do |m|
+      %i{children exists? read}.each do |m|
         allow_any_instance_of(c).to receive(m).and_raise("#{m} should not be called")
       end
     end

data/spec/support/shared/unit/platform_introspector.rb

@@ -36,14 +36,14 @@ shared_examples_for "a platform introspector" do
 
     @platform_family_hash = {
       "debian" => "debian value",
-      [:rhel, :fedora] => "redhatty value",
+      %i{rhel fedora} => "redhatty value",
       "suse" => "suse value",
       :default => "default value",
     }
   end
 
   it "returns a default value when there is no known platform" do
-    node = Hash.new
+    node = {}
     expect(platform_introspector.value_for_platform(@platform_hash)).to eq("default")
   end
 
@@ -125,7 +125,7 @@ shared_examples_for "a platform introspector" do
 
     it "returns true if the node is a provided platform and platforms are provided as symbols" do
       node.automatic_attrs[:platform] = "ubuntu"
-      expect(platform_introspector.platform?([:redhat, :ubuntu])).to eq(true)
+      expect(platform_introspector.platform?(%i{redhat ubuntu})).to eq(true)
     end
 
     it "returns true if the node is a provided platform and platforms are provided as strings" do
@@ -143,7 +143,7 @@ shared_examples_for "a platform introspector" do
 
     it "returns true if the node is in a provided platform family and families are provided as symbols" do
       node.automatic_attrs[:platform_family] = "debian"
-      expect(platform_introspector.platform_family?([:rhel, :debian])).to eq(true)
+      expect(platform_introspector.platform_family?(%i{rhel debian})).to eq(true)
     end
 
     it "returns true if the node is a provided platform and platforms are provided as strings" do
@@ -165,24 +165,24 @@ shared_examples_for "a platform introspector" do
   describe "when the value is an array" do
     before do
       @platform_hash = {
-        "debian" => { "4.0" => [ :restart, :reload ], "default" => [ :restart, :reload, :status ] },
-        "ubuntu" => { "default" => [ :restart, :reload, :status ] },
-        "centos" => { "default" => [ :restart, :reload, :status ] },
-        "redhat" => { "default" => [ :restart, :reload, :status ] },
-        "fedora" => { "default" => [ :restart, :reload, :status ] },
-        "default" => { "default" => [:restart, :reload ] } }
+        "debian" => { "4.0" => %i{restart reload}, "default" => %i{restart reload status} },
+        "ubuntu" => { "default" => %i{restart reload status} },
+        "centos" => { "default" => %i{restart reload status} },
+        "redhat" => { "default" => %i{restart reload status} },
+        "fedora" => { "default" => %i{restart reload status} },
+        "default" => { "default" => %i{restart reload} } }
     end
 
     it "returns the correct default for a given platform" do
       node.automatic_attrs[:platform] = "debian"
       node.automatic_attrs[:platform_version] = "9000"
-      expect(platform_introspector.value_for_platform(@platform_hash)).to eq([ :restart, :reload, :status ])
+      expect(platform_introspector.value_for_platform(@platform_hash)).to eq(%i{restart reload status})
     end
 
     it "returns the correct platform+version specific value " do
       node.automatic_attrs[:platform] = "debian"
       node.automatic_attrs[:platform_version] = "4.0"
-      expect(platform_introspector.value_for_platform(@platform_hash)).to eq([:restart, :reload])
+      expect(platform_introspector.value_for_platform(@platform_hash)).to eq(%i{restart reload})
     end
   end
 

data/spec/support/shared/unit/provider/file.rb

@@ -417,7 +417,7 @@ shared_examples_for Chef::Provider::File do
     context "when the enclosing directory does not exist" do
       before { setup_missing_enclosing_directory }
 
-      [:create, :create_if_missing, :touch].each do |action|
+      %i{create create_if_missing touch}.each do |action|
         context "action #{action}" do
           it "raises EnclosingDirectoryDoesNotExist" do
             expect { provider.run_action(action) }.to raise_error(Chef::Exceptions::EnclosingDirectoryDoesNotExist)

data/spec/support/shared/unit/script_resource.rb

@@ -66,7 +66,7 @@ shared_examples_for "a script resource" do
 
     it "inherits exactly the :cwd, :environment, :group, :path, :user, and :umask attributes from a parent resource class" do
       inherited_difference = Chef::Resource::Script.guard_inherited_attributes -
-        [:cwd, :environment, :group, :path, :user, :umask ]
+        %i{cwd environment group path user umask}
 
       expect(inherited_difference).to eq([])
     end

data/spec/support/shared/unit/windows_script_resource.rb

@@ -25,7 +25,7 @@ shared_examples_for "a Windows script resource" do
   before(:each) do
     node = Chef::Node.new
 
-    node.default["kernel"] = Hash.new
+    node.default["kernel"] = {}
     node.default["kernel"][:machine] = :x86_64.to_s
 
     run_context = Chef::RunContext.new(node, nil, nil)

data/spec/tiny_server.rb

@@ -135,7 +135,7 @@ module TinyServer
       if response = response_for_request(env)
         response.call
       else
-        debug_info = { message: "no data matches the request for #{env['REQUEST_URI']}",
+        debug_info = { message: "no data matches the request for #{env["REQUEST_URI"]}",
                        available_routes: @routes, request: env }
         # Uncomment me for glorious debugging
         # pp :not_found => debug_info

data/spec/unit/api_client/registration_spec.rb

@@ -98,7 +98,7 @@ describe Chef::ApiClient::Registration do
   it "has an HTTP client configured with validator credentials" do
     expect(registration.http_api).to be_a_kind_of(Chef::ServerAPI)
     expect(registration.http_api.options[:client_name]).to eq("test-validator")
-    auth = registration.http_api.middlewares.find { |klass| klass.kind_of? Chef::HTTP::Authenticator }
+    auth = registration.http_api.middlewares.find { |klass| klass.is_a? Chef::HTTP::Authenticator }
     expect(auth.client_name).to eq("test-validator")
   end
 

data/spec/unit/api_client_spec.rb

@@ -41,7 +41,7 @@ describe Chef::ApiClient 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
@@ -55,7 +55,7 @@ describe Chef::ApiClient 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 a 'validator' flag attribute" do
@@ -69,7 +69,7 @@ describe Chef::ApiClient 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
@@ -79,7 +79,7 @@ describe Chef::ApiClient 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
@@ -89,7 +89,7 @@ describe Chef::ApiClient 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/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

@@ -74,7 +74,8 @@ describe Chef::Application::ExitCode do
 
     it "does write a warning on non-standard exit codes" do
       expect(Chef::Log).to receive(:warn).with(
-        /^Chef attempted to exit with a non-standard exit code of 151/)
+        /^Chef attempted to exit with a non-standard exit code of 151/
+      )
       expect(exit_codes.normalize_exit_code(151)).to eq(1)
     end
 
@@ -83,7 +84,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/audit/audit_event_proxy_spec.rb

@@ -36,7 +36,8 @@ describe Chef::Audit::AuditEventProxy do
     let(:description) { "poots" }
     let(:group) do
       double("ExampleGroup", parent_groups: parents,
-                             description: description) end
+                             description: description)
+    end
     let(:notification) { double("Notification", group: group) }
 
     context "when notified from a top-level example group" do
@@ -124,7 +125,8 @@ describe Chef::Audit::AuditEventProxy do
       let(:example) do
         double("Example", metadata: metadata,
                           description: example_description,
-                          full_description: full_description, exception: nil) end
+                          full_description: full_description, exception: nil)
+      end
 
       let(:metadata) do
         {
@@ -222,12 +224,14 @@ describe Chef::Audit::AuditEventProxy do
         let(:example_description) { "should not be listening" }
         let(:full_description) do
           [control_group_name, group_description,
-          example_description].join(" ") end
+          example_description].join(" ")
+        end
 
         # Metadata fields
         let(:described_class) do
           double("Serverspec::Type::Port",
-          class: "Serverspec::Type::Port", name: resource_name) end
+            class: "Serverspec::Type::Port", name: resource_name)
+        end
 
         # Control data fields
         let(:resource_type) { "Port" }
@@ -252,7 +256,8 @@ describe Chef::Audit::AuditEventProxy do
         let(:example_description) { "is not listening" }
         let(:full_description) do
           [control_group_name, group_description,
-          example_description].join(" ") end
+          example_description].join(" ")
+        end
 
         # Metadata fields
         let(:described_class) { nil }
@@ -283,12 +288,14 @@ describe Chef::Audit::AuditEventProxy do
         let(:example_description) { "is a file" }
         let(:full_description) do
           [control_group_name, outer_group_description,
-          group_description, example_description].join(" ") end
+          group_description, example_description].join(" ")
+        end
 
         # Metadata parts
         let(:described_class) do
           double("Serverspec::Type::File",
-          class: "Serverspec::Type::File", name: resource_name) end
+            class: "Serverspec::Type::File", name: resource_name)
+        end
 
         # Example group parts
         let(:parent_group) do

data/spec/unit/audit/audit_reporter_spec.rb

@@ -30,7 +30,8 @@ describe Chef::Audit::AuditReporter do
   let(:end_time) { Time.new(2014, 12, 3, 9, 36, 14, "-08:00") }
   let(:run_status) do
     instance_double(Chef::RunStatus, node: node, run_id: run_id,
-                                     start_time: start_time, end_time: end_time) end
+                                     start_time: start_time, end_time: end_time)
+  end
 
   describe "#audit_phase_start" do
 
@@ -89,7 +90,8 @@ describe Chef::Audit::AuditReporter do
         let(:audit_error) do
           double("AuditError", class: "Chef::Exceptions::AuditError",
                                message: "Audit phase failed with error message: derpderpderp",
-                               backtrace: ["/path/recipe.rb:57", "/path/library.rb:106"]) end
+                               backtrace: ["/path/recipe.rb:57", "/path/library.rb:106"])
+        end
 
         before do
           reporter.instance_variable_set(:@audit_phase_error, audit_error)
@@ -103,7 +105,7 @@ describe Chef::Audit::AuditReporter do
             Chef::Exceptions::AuditError: Audit phase failed with error message: derpderpderp
             /path/recipe.rb:57
             /path/library.rb:106
-EOM
+          EOM
         end
 
       end
@@ -238,12 +240,14 @@ EOM
     let(:audit_error) do
       double("AuditError", class: "Chef::Exceptions::AuditError",
                            message: "Audit phase failed with error message: derpderpderp",
-                           backtrace: ["/path/recipe.rb:57", "/path/library.rb:106"]) end
+                           backtrace: ["/path/recipe.rb:57", "/path/library.rb:106"])
+    end
 
     let(:run_error) do
       double("RunError", class: "Chef::Exceptions::RunError",
                          message: "This error shouldn't be reported.",
-                         backtrace: ["fix it", "fix it", "fix it"]) end
+                         backtrace: ["fix it", "fix it", "fix it"])
+    end
 
     before do
       allow(reporter).to receive(:auditing_enabled?).and_return(true)
@@ -273,7 +277,7 @@ EOM
           Chef::Exceptions::AuditError: Audit phase failed with error message: derpderpderp
           /path/recipe.rb:57
           /path/library.rb:106
-EOM
+        EOM
       end
     end
   end
@@ -282,10 +286,12 @@ EOM
 
     let(:control_group_foo) do
       instance_double(Chef::Audit::ControlGroupData,
-      metadata: double("foo metadata")) end
+        metadata: double("foo metadata"))
+    end
     let(:control_group_bar) do
       instance_double(Chef::Audit::ControlGroupData,
-      metadata: double("bar metadata")) end
+        metadata: double("bar metadata"))
+    end
 
     let(:ordered_control_groups) do
       {
@@ -296,11 +302,13 @@ EOM
 
     let(:audit_data) do
       instance_double(Chef::Audit::AuditData,
-      add_control_group: true) end
+        add_control_group: true)
+    end
 
     let(:run_context) do
       instance_double(Chef::RunContext,
-      audits: ordered_control_groups) end
+        audits: ordered_control_groups)
+    end
 
     before do
       allow(reporter).to receive(:ordered_control_groups).and_return(ordered_control_groups)
@@ -350,7 +358,8 @@ EOM
     let(:name) { "bat" }
     let(:control_group) do
       instance_double(Chef::Audit::ControlGroupData,
-      metadata: double("metadata")) end
+        metadata: double("metadata"))
+    end
 
     before do
       allow(Chef::Audit::ControlGroupData).to receive(:new)