chef 14.2.0 → 14.3.37

data/spec/unit/formatters/error_description_spec.rb

@@ -69,17 +69,17 @@ describe Chef::Formatters::ErrorDescription do
     context "when no sections have been added" do
       it "should output only the title and the Platform section" do
         subject.display(out)
-        expect(out.out.string).to eq <<-END
-================================================================================
-test title
-================================================================================
-
-System Info:
-------------
-chef_version=1.2.3
-ruby=ruby 2.3.1p112 (2016-04-26 revision 54768) [x86_64-darwin15]
-program_name=chef-client
-executable=/test/bin/chef-client
+        expect(out.out.string).to eq <<~END
+          ================================================================================
+          test title
+          ================================================================================
+
+          System Info:
+          ------------
+          chef_version=1.2.3
+          ruby=ruby 2.3.1p112 (2016-04-26 revision 54768) [x86_64-darwin15]
+          program_name=chef-client
+          executable=/test/bin/chef-client
 
         END
       end
@@ -92,21 +92,21 @@ executable=/test/bin/chef-client
 
       it "should output the expected sections" do
         subject.display(out)
-        expect(out.out.string).to eq <<-END
-================================================================================
-test title
-================================================================================
-
-test heading
-------------
-test text
-
-System Info:
-------------
-chef_version=1.2.3
-ruby=ruby 2.3.1p112 (2016-04-26 revision 54768) [x86_64-darwin15]
-program_name=chef-client
-executable=/test/bin/chef-client
+        expect(out.out.string).to eq <<~END
+          ================================================================================
+          test title
+          ================================================================================
+
+          test heading
+          ------------
+          test text
+
+          System Info:
+          ------------
+          chef_version=1.2.3
+          ruby=ruby 2.3.1p112 (2016-04-26 revision 54768) [x86_64-darwin15]
+          program_name=chef-client
+          executable=/test/bin/chef-client
 
         END
       end
@@ -119,19 +119,19 @@ executable=/test/bin/chef-client
         # reset on global values.
         Chef.set_node({ "platform" => "openvms", "platform_version" => "8.4-2L1" })
         subject.display(out)
-        expect(out.out.string).to eq <<-END
-================================================================================
-test title
-================================================================================
-
-System Info:
-------------
-chef_version=1.2.3
-platform=openvms
-platform_version=8.4-2L1
-ruby=ruby 2.3.1p112 (2016-04-26 revision 54768) [x86_64-darwin15]
-program_name=chef-client
-executable=/test/bin/chef-client
+        expect(out.out.string).to eq <<~END
+          ================================================================================
+          test title
+          ================================================================================
+
+          System Info:
+          ------------
+          chef_version=1.2.3
+          platform=openvms
+          platform_version=8.4-2L1
+          ruby=ruby 2.3.1p112 (2016-04-26 revision 54768) [x86_64-darwin15]
+          program_name=chef-client
+          executable=/test/bin/chef-client
 
         END
       end

data/spec/unit/formatters/error_inspectors/compile_error_inspector_spec.rb

@@ -18,22 +18,22 @@
 
 require "spec_helper"
 
-BAD_RECIPE = <<-E
-#
-# Cookbook Name:: syntax-err
-# Recipe:: default
-#
-# Copyright 2012-2016, YOUR_COMPANY_NAME
-#
-# All rights reserved - Do Not Redistribute
-#
-
-
-file "/tmp/explode-me" do
-  mode 0655
-  owner "root"
-  this_is_not_a_valid_method
-end
+BAD_RECIPE = <<~E.freeze
+  #
+  # Cookbook Name:: syntax-err
+  # Recipe:: default
+  #
+  # Copyright 2012-2016, YOUR_COMPANY_NAME
+  #
+  # All rights reserved - Do Not Redistribute
+  #
+
+
+  file "/tmp/explode-me" do
+    mode 0655
+    owner "root"
+    this_is_not_a_valid_method
+  end
 E
 
 describe Chef::Formatters::ErrorInspectors::CompileErrorInspector do

data/spec/unit/formatters/error_inspectors/cookbook_sync_error_inspector_spec.rb

@@ -22,7 +22,7 @@ describe Chef::Formatters::ErrorInspectors::CookbookSyncErrorInspector do
   before do
     @description = Chef::Formatters::ErrorDescription.new("Error Expanding RunList:")
     @outputter = Chef::Formatters::IndentableOutputStream.new(StringIO.new, STDERR)
-    #@outputter = Chef::Formatters::IndentableOutputStream.new(STDOUT, STDERR)
+    # @outputter = Chef::Formatters::IndentableOutputStream.new(STDOUT, STDERR)
   end
 
   describe "when explaining a 502 error" do

data/spec/unit/formatters/error_inspectors/node_load_error_inspector_spec.rb

@@ -19,7 +19,7 @@
 require "spec_helper"
 
 # spec_helper loads the shared examples already.
-#require 'support/shared/unit/api_error_inspector_spec'
+# require 'support/shared/unit/api_error_inspector_spec'
 
 describe Chef::Formatters::ErrorInspectors::NodeLoadErrorInspector do
   it_behaves_like "an api error inspector"

data/spec/unit/formatters/error_inspectors/registration_error_inspector_spec.rb

@@ -19,7 +19,7 @@
 require "spec_helper"
 
 # spec_helper loads the shared examples already.
-#require 'support/shared/unit/api_error_inspector_spec'
+# require 'support/shared/unit/api_error_inspector_spec'
 
 describe Chef::Formatters::ErrorInspectors::RegistrationErrorInspector do
   it_behaves_like "an api error inspector"

data/spec/unit/formatters/error_inspectors/resource_failure_inspector_spec.rb

@@ -40,7 +40,7 @@ describe Chef::Formatters::ErrorInspectors::ResourceFailureInspector do
     @description = Chef::Formatters::ErrorDescription.new("Error Converging Resource:")
     @stdout = StringIO.new
     @outputter = Chef::Formatters::IndentableOutputStream.new(@stdout, STDERR)
-    #@outputter = Chef::Formatters::IndentableOutputStream.new(STDOUT, STDERR)
+    # @outputter = Chef::Formatters::IndentableOutputStream.new(STDOUT, STDERR)
 
     allow(Chef::Config).to receive(:cookbook_path).and_return([ "/var/chef/cache" ])
   end

data/spec/unit/formatters/error_inspectors/run_list_expansion_error_inspector_spec.rb

@@ -27,7 +27,7 @@ describe Chef::Formatters::ErrorInspectors::RunListExpansionErrorInspector do
 
     @description = Chef::Formatters::ErrorDescription.new("Error Expanding RunList:")
     @outputter = Chef::Formatters::IndentableOutputStream.new(StringIO.new, STDERR)
-    #@outputter = Chef::Formatters::IndentableOutputStream.new(STDOUT, STDERR)
+    # @outputter = Chef::Formatters::IndentableOutputStream.new(STDOUT, STDERR)
   end
 
   describe "when explaining a missing role error" do
@@ -57,7 +57,7 @@ describe Chef::Formatters::ErrorInspectors::RunListExpansionErrorInspector do
       allow(@response).to receive(:body).and_return(@response_body)
       @exception = Net::HTTPServerException.new("(exception) forbidden", @response)
       @inspector = Chef::Formatters::ErrorInspectors::RunListExpansionErrorInspector.new(@node, @exception)
-      allow(@inspector).to receive(:config).and_return(:node_name => "unit-test.example.com")
+      allow(@inspector).to receive(:config).and_return(node_name: "unit-test.example.com")
 
       @inspector.add_explanation(@description)
     end
@@ -76,9 +76,9 @@ describe Chef::Formatters::ErrorInspectors::RunListExpansionErrorInspector do
       @exception = Net::HTTPServerException.new("(exception) unauthorized", @response)
 
       @inspector = Chef::Formatters::ErrorInspectors::RunListExpansionErrorInspector.new(@node, @exception)
-      allow(@inspector).to receive(:config).and_return(:node_name => "unit-test.example.com",
-                                                       :client_key => "/etc/chef/client.pem",
-                                                       :chef_server_url => "http://chef.example.com")
+      allow(@inspector).to receive(:config).and_return(node_name: "unit-test.example.com",
+                                                       client_key: "/etc/chef/client.pem",
+                                                       chef_server_url: "http://chef.example.com")
 
       @inspector.add_explanation(@description)
     end

data/spec/unit/guard_interpreter/resource_guard_interpreter_spec.rb

@@ -106,7 +106,7 @@ describe Chef::GuardInterpreter::ResourceGuardInterpreter do
           end
 
           let(:shell_out) do
-            instance_double(Mixlib::ShellOut, :live_stream => true, :run_command => true, :error! => nil)
+            instance_double(Mixlib::ShellOut, live_stream: true, run_command: true, error!: nil)
           end
 
           before do
@@ -118,7 +118,7 @@ describe Chef::GuardInterpreter::ResourceGuardInterpreter do
           end
 
           it "merges to :code" do
-            expect(command_opts).to receive(:merge).with({ :code => "exit 0" }).and_call_original
+            expect(command_opts).to receive(:merge).with({ code: "exit 0" }).and_call_original
             expect(guard_interpreter.evaluate).to eq(true)
           end
         end
@@ -131,7 +131,7 @@ describe Chef::GuardInterpreter::ResourceGuardInterpreter do
           end
 
           it "merges to :code" do
-            expect(command_opts).to receive(:merge).with({ :command => "exit 0" }).and_call_original
+            expect(command_opts).to receive(:merge).with({ command: "exit 0" }).and_call_original
             expect(guard_interpreter.evaluate).to eq(true)
           end
         end
@@ -145,7 +145,7 @@ describe Chef::GuardInterpreter::ResourceGuardInterpreter do
         end
 
         it "merges to :command" do
-          expect(command_opts).to receive(:merge).with({ :command => "exit 0" }).and_call_original
+          expect(command_opts).to receive(:merge).with({ command: "exit 0" }).and_call_original
           expect(guard_interpreter.evaluate).to eq(true)
         end
       end

data/spec/unit/handler/json_file_spec.rb

@@ -20,7 +20,7 @@ require "spec_helper"
 
 describe Chef::Handler::JsonFile do
   before(:each) do
-    @handler = Chef::Handler::JsonFile.new(:the_sun => "will rise", :path => "/tmp/foobarbazqux")
+    @handler = Chef::Handler::JsonFile.new(the_sun: "will rise", path: "/tmp/foobarbazqux")
   end
 
   it "accepts arbitrary config options" do

data/spec/unit/http/api_versions_spec.rb

@@ -43,7 +43,7 @@ describe Chef::HTTP::APIVersions do
   end
 
   let(:response) do
-    m = double("HttpResponse", :body => response_body)
+    m = double("HttpResponse", body: response_body)
     allow(m).to receive(:key?).with("x-ops-server-api-version").and_return(true)
     allow(m).to receive(:code).and_return(return_value)
     allow(m).to receive(:[]) do |key|

data/spec/unit/http/authenticator_spec.rb

@@ -34,8 +34,8 @@ describe Chef::HTTP::Authenticator do
 
       it "merges the default version of X-Ops-Server-API-Version into the headers" do
         # headers returned
-        expect(class_instance.handle_request(method, url, headers, data)[2]).
-          to include({ "X-Ops-Server-API-Version" => Chef::HTTP::Authenticator::DEFAULT_SERVER_API_VERSION })
+        expect(class_instance.handle_request(method, url, headers, data)[2])
+          .to include({ "X-Ops-Server-API-Version" => Chef::HTTP::Authenticator::DEFAULT_SERVER_API_VERSION })
       end
 
       context "when version_class is provided" do
@@ -53,17 +53,17 @@ describe Chef::HTTP::Authenticator do
         it "uses it to select the correct http version" do
           Chef::ServerAPIVersions.instance.reset!
           expect(AuthFactoryClass).to receive(:best_request_version).and_call_original
-          expect(class_instance.handle_request(method, url, headers, data)[2]).
-            to include({ "X-Ops-Server-API-Version" => "2" })
+          expect(class_instance.handle_request(method, url, headers, data)[2])
+            .to include({ "X-Ops-Server-API-Version" => "2" })
         end
       end
 
       context "when api_version is set to something other than the default" do
-        let(:class_instance) { Chef::HTTP::Authenticator.new({ :api_version => "-10" }) }
+        let(:class_instance) { Chef::HTTP::Authenticator.new({ api_version: "-10" }) }
 
         it "merges the requested version of X-Ops-Server-API-Version into the headers" do
-          expect(class_instance.handle_request(method, url, headers, data)[2]).
-            to include({ "X-Ops-Server-API-Version" => "-10" })
+          expect(class_instance.handle_request(method, url, headers, data)[2])
+            .to include({ "X-Ops-Server-API-Version" => "-10" })
         end
       end
     end
@@ -98,16 +98,16 @@ describe Chef::HTTP::Authenticator do
     end
 
     context "when ssh_agent_signing" do
-      let(:public_key) { <<-EOH }
------BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA49TA0y81ps0zxkOpmf5V
-4/c4IeR5yVyQFpX3JpxO4TquwnRh8VSUhrw8kkTLmB3cS39Db+3HadvhoqCEbqPE
-6915kXSuk/cWIcNozujLK7tkuPEyYVsyTioQAddSdfe+8EhQVf3oHxaKmUd6waXr
-WqYCnhxgOjxocenREYNhZ/OETIeiPbOku47vB4nJK/0GhKBytL2XnsRgfKgDxf42
-BqAi1jglIdeq8lAWZNF9TbNBU21AO1iuT7Pm6LyQujhggPznR5FJhXKRUARXBJZa
-wxpGV4dGtdcahwXNE4601aXPra+xPcRd2puCNoEDBzgVuTSsLYeKBDMSfs173W1Q
-YwIDAQAB
------END PUBLIC KEY-----
+      let(:public_key) { <<~EOH }
+        -----BEGIN PUBLIC KEY-----
+        MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA49TA0y81ps0zxkOpmf5V
+        4/c4IeR5yVyQFpX3JpxO4TquwnRh8VSUhrw8kkTLmB3cS39Db+3HadvhoqCEbqPE
+        6915kXSuk/cWIcNozujLK7tkuPEyYVsyTioQAddSdfe+8EhQVf3oHxaKmUd6waXr
+        WqYCnhxgOjxocenREYNhZ/OETIeiPbOku47vB4nJK/0GhKBytL2XnsRgfKgDxf42
+        BqAi1jglIdeq8lAWZNF9TbNBU21AO1iuT7Pm6LyQujhggPznR5FJhXKRUARXBJZa
+        wxpGV4dGtdcahwXNE4601aXPra+xPcRd2puCNoEDBzgVuTSsLYeKBDMSfs173W1Q
+        YwIDAQAB
+        -----END PUBLIC KEY-----
 EOH
 
       let(:class_instance) { Chef::HTTP::Authenticator.new(client_name: "test", raw_key: public_key, ssh_agent_signing: true) }

data/spec/unit/http/ssl_policies_spec.rb

@@ -145,7 +145,7 @@ describe "HTTP SSL Policy" do
           # For whatever reason, OpenSSL errors out when adding a
           # cert you already have to the certificate store.
           ssl_policy.set_custom_certs
-          ssl_policy.set_custom_certs #should not raise an error
+          ssl_policy.set_custom_certs # should not raise an error
         end
       end
     end

data/spec/unit/http/validate_content_length_spec.rb

@@ -44,7 +44,7 @@ describe Chef::HTTP::ValidateContentLength do
   end
 
   let(:response) do
-    m = double("HttpResponse", :body => response_body)
+    m = double("HttpResponse", body: response_body)
     allow(m).to receive(:[]) do |key|
       response_headers[key]
     end
@@ -67,7 +67,7 @@ describe Chef::HTTP::ValidateContentLength do
       data_length = streaming_length
       while data_length > 0
         chunk_size = data_length > 10 ? 10 : data_length
-        stream_handler.handle_chunk(double("Chunk", :bytesize => chunk_size))
+        stream_handler.handle_chunk(double("Chunk", bytesize: chunk_size))
         data_length -= chunk_size
       end
 

data/spec/unit/key_spec.rb

@@ -24,16 +24,16 @@ describe Chef::Key do
   # whether user or client irrelevent to these tests
   let(:key) { Chef::Key.new("original_actor", "user") }
   let(:public_key_string) do
-    <<EOS
------BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvPo+oNPB7uuNkws0fC02
-KxSwdyqPLu0fhI1pOweNKAZeEIiEz2PkybathHWy8snSXGNxsITkf3eyvIIKa8OZ
-WrlqpI3yv/5DOP8HTMCxnFuMJQtDwMcevlqebX4bCxcByuBpNYDcAHjjfLGSfMjn
-E5lZpgYWwnpic4kSjYcL9ORK9nYvlWV9P/kCYmRhIjB4AhtpWRiOfY/TKi3P2LxT
-IjSmiN/ihHtlhV/VSnBJ5PzT/lRknlrJ4kACoz7Pq9jv+aAx5ft/xE9yDa2DYs0q
-Tfuc9dUYsFjptWYrV6pfEQ+bgo1OGBXORBFcFL+2D7u9JYquKrMgosznHoEkQNLo
-0wIDAQAB
------END PUBLIC KEY-----
+    <<~EOS
+      -----BEGIN PUBLIC KEY-----
+      MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvPo+oNPB7uuNkws0fC02
+      KxSwdyqPLu0fhI1pOweNKAZeEIiEz2PkybathHWy8snSXGNxsITkf3eyvIIKa8OZ
+      WrlqpI3yv/5DOP8HTMCxnFuMJQtDwMcevlqebX4bCxcByuBpNYDcAHjjfLGSfMjn
+      E5lZpgYWwnpic4kSjYcL9ORK9nYvlWV9P/kCYmRhIjB4AhtpWRiOfY/TKi3P2LxT
+      IjSmiN/ihHtlhV/VSnBJ5PzT/lRknlrJ4kACoz7Pq9jv+aAx5ft/xE9yDa2DYs0q
+      Tfuc9dUYsFjptWYrV6pfEQ+bgo1OGBXORBFcFL+2D7u9JYquKrMgosznHoEkQNLo
+      0wIDAQAB
+      -----END PUBLIC KEY-----
 EOS
   end
 
@@ -564,7 +564,7 @@ EOS
         end
       end
 
-    end #update
+    end # update
 
     describe "load" do
       shared_examples_for "load" do
@@ -592,7 +592,7 @@ EOS
         end
       end
 
-    end #load
+    end # load
 
     describe "destroy" do
       shared_examples_for "destroy key" do

data/spec/unit/knife/bootstrap/client_builder_spec.rb

@@ -41,7 +41,7 @@ describe Chef::Knife::Bootstrap::ClientBuilder do
   end
 
   context "#sanity_check!" do
-    let(:response_404) { OpenStruct.new(:code => "404") }
+    let(:response_404) { OpenStruct.new(code: "404") }
     let(:exception_404) { Net::HTTPServerException.new("404 not found", response_404) }
 
     context "in cases where the prompting fails" do
@@ -180,8 +180,8 @@ describe Chef::Knife::Bootstrap::ClientBuilder do
     end
 
     it "builds a node with first_boot_attributes if they're given" do
-      knife_config[:first_boot_attributes] = { :baz => :quux }
-      expect(node).to receive(:normal_attrs=).with({ :baz => :quux })
+      knife_config[:first_boot_attributes] = { baz: :quux }
+      expect(node).to receive(:normal_attrs=).with({ baz: :quux })
       expect(node).to receive(:run_list).with([])
       client_builder.run
     end

data/spec/unit/knife/client_bulk_delete_spec.rb

@@ -128,7 +128,7 @@ describe Chef::Knife::ClientBulkDelete do
       end
 
       describe "with --delete-validators" do
-        let(:option_args) { { :delete_validators => true } }
+        let(:option_args) { { delete_validators: true } }
 
         it "should mention that validator clients will be deleted" do
           knife.run

data/spec/unit/knife/client_delete_spec.rb

@@ -23,7 +23,7 @@ describe Chef::Knife::ClientDelete do
     @knife = Chef::Knife::ClientDelete.new
     # defaults
     @knife.config = {
-      :delete_validators => false,
+      delete_validators: false,
     }
     @knife.name_args = [ "adam" ]
   end

data/spec/unit/knife/client_reregister_spec.rb

@@ -22,7 +22,7 @@ describe Chef::Knife::ClientReregister do
   before(:each) do
     @knife = Chef::Knife::ClientReregister.new
     @knife.name_args = [ "adam" ]
-    @client_mock = double("client_mock", :private_key => "foo_key")
+    @client_mock = double("client_mock", private_key: "foo_key")
     @stdout = StringIO.new
     allow(@knife.ui).to receive(:stdout).and_return(@stdout)
   end

data/spec/unit/knife/configure_client_spec.rb

@@ -43,10 +43,10 @@ describe Chef::Knife::ConfigureClient do
         @knife.name_args = ["/home/bob/.chef"]
         @client_file = StringIO.new
         @validation_file = StringIO.new
-        expect(File).to receive(:open).with("/home/bob/.chef/client.rb", "w").
-          and_yield(@client_file)
-        expect(File).to receive(:open).with("/home/bob/.chef/validation.pem", "w").
-          and_yield(@validation_file)
+        expect(File).to receive(:open).with("/home/bob/.chef/client.rb", "w")
+          .and_yield(@client_file)
+        expect(File).to receive(:open).with("/home/bob/.chef/validation.pem", "w")
+          .and_yield(@validation_file)
         expect(IO).to receive(:read).and_return("foo_bar_baz")
       end