chef 14.14.29 → 14.15.6

data/spec/unit/provider/package/windows_spec.rb

@@ -436,7 +436,8 @@ describe Chef::Provider::Package::Windows, :windows_only do
 
       it "raises the checksum mismatch exception" do
         expect { provider.send(:validate_content!) }.to raise_error(
-          Chef::Exceptions::ChecksumMismatch)
+          Chef::Exceptions::ChecksumMismatch
+        )
       end
     end
   end

data/spec/unit/provider/package/yum/yum_cache_spec.rb

@@ -60,7 +60,7 @@ describe Chef::Provider::Package::Yum::YumCache do
     expect( yum_cache.version_available?("foo", "1.2.3", "x86_64") ).to be true
   end
 
-  [ :refresh, :reload, :reload_installed, :reload_provides, :reset, :reset_installed ].each do |method|
+  %i{refresh reload reload_installed reload_provides reset reset_installed}.each do |method|
     it "restarts the python helper when #{method} is called" do
       expect( python_helper ).to receive(:restart)
       yum_cache.send(method)

data/spec/unit/provider/package/zypper_spec.rb

@@ -232,7 +232,7 @@ describe Chef::Provider::Package::Zypper do
     context "when package version is not explicitly specified" do
       it "should run zypper remove with the package name" do
         shell_out_expectation!(
-            "zypper", "--non-interactive", "remove", "emacs"
+          "zypper", "--non-interactive", "remove", "emacs"
         )
         provider.remove_package(["emacs"], [nil])
       end
@@ -248,14 +248,14 @@ describe Chef::Provider::Package::Zypper do
       it "should run zypper remove without gpg checks" do
         new_resource.gpg_check false
         shell_out_expectation!(
-            "zypper", "--non-interactive", "--no-gpg-checks", "remove", "emacs=1.0"
+          "zypper", "--non-interactive", "--no-gpg-checks", "remove", "emacs=1.0"
         )
         provider.remove_package(["emacs"], ["1.0"])
       end
       it "should run zypper remove without gpg checks when the config is false" do
         Chef::Config[:zypper_check_gpg] = false
         shell_out_expectation!(
-            "zypper", "--non-interactive", "--no-gpg-checks", "remove", "emacs=1.0"
+          "zypper", "--non-interactive", "--no-gpg-checks", "remove", "emacs=1.0"
         )
         provider.remove_package(["emacs"], ["1.0"])
       end
@@ -462,7 +462,7 @@ describe Chef::Provider::Package::Zypper do
     describe "remove_package" do
       it "should run zypper remove with the package name" do
         shell_out_expectation!(
-           "zypper", "remove", "-y", "emacs"
+          "zypper", "remove", "-y", "emacs"
         )
         provider.remove_package(["emacs"], ["1.0"])
       end

data/spec/unit/provider/package_spec.rb

@@ -956,7 +956,7 @@ describe "Chef::Provider::Package - Multi" do
       Chef::Config[:treat_deprecation_warnings_as_errors] = false
     end
 
-    [ :shell_out_with_timeout, :shell_out_with_timeout! ].each do |method|
+    %i{shell_out_with_timeout shell_out_with_timeout!}.each do |method|
       stubbed_method = method == :shell_out_with_timeout! ? :shell_out_compacted! : :shell_out_compacted
       [ %w{command arg1 arg2}, "command arg1 arg2" ].each do |command|
         it "#{method} defaults to 900 seconds" do

data/spec/unit/provider/powershell_script_spec.rb

@@ -22,9 +22,9 @@ describe Chef::Provider::PowershellScript, "action_run" do
   let(:powershell_version) { nil }
   let(:node) do
     node = Chef::Node.new
-    node.default["kernel"] = Hash.new
+    node.default["kernel"] = {}
     node.default["kernel"][:machine] = :x86_64.to_s
-    if ! powershell_version.nil?
+    unless powershell_version.nil?
       node.default[:languages] = { powershell: { version: powershell_version } }
     end
     node
@@ -103,14 +103,14 @@ describe Chef::Provider::PowershellScript, "action_run" do
         "3.6" => "Bypass",
         "4.0" => "Bypass",
         "5.0" => "Bypass" }.each do |version_policy|
-        let(:powershell_version) { version_policy[0].to_f }
-        context "when running PowerShell version #{version_policy[0]}" do
           let(:powershell_version) { version_policy[0].to_f }
-          it "sets the -ExecutionPolicy flag to '#{version_policy[1]}'" do
-            expect(execution_policy_flag.downcase).to eq(version_policy[1].downcase)
+          context "when running PowerShell version #{version_policy[0]}" do
+            let(:powershell_version) { version_policy[0].to_f }
+            it "sets the -ExecutionPolicy flag to '#{version_policy[1]}'" do
+              expect(execution_policy_flag.downcase).to eq(version_policy[1].downcase)
+            end
           end
         end
-      end
     end
   end
 end

data/spec/unit/provider/registry_key_spec.rb

@@ -322,7 +322,7 @@ describe Chef::Provider::RegistryKey do
           expect(@double_registry).to receive(:get_values).with(keyname).and_return(
             [
               { name: "one", type: :string, data: "initial value" },
-              { name: "two", type: :dword, data: 9001 }
+              { name: "two", type: :dword, data: 9001 },
             ]
           )
         end

data/spec/unit/provider/remote_directory_spec.rb

@@ -90,8 +90,8 @@ describe Chef::Provider::RemoteDirectory do
     it "configures access control on files in the directory" do
       @resource.cookbook "berlin_style_tasty_cupcakes"
       cookbook_file = @provider.send(:cookbook_file_resource,
-                                    "/target/destination/path.txt",
-                                    "relative/source/path.txt")
+        "/target/destination/path.txt",
+        "relative/source/path.txt")
       expect(cookbook_file.cookbook_name).to  eq("berlin_style_tasty_cupcakes")
       expect(cookbook_file.source).to         eq("remotedir_root/relative/source/path.txt")
       expect(cookbook_file.mode).to           eq("0640")
@@ -104,14 +104,14 @@ describe Chef::Provider::RemoteDirectory do
       @resource.cookbook "gondola_rides"
       @resource.sensitive true
       cookbook_file = @provider.send(:cookbook_file_resource,
-                                    "/target/destination/path.txt",
-                                    "relative/source/path.txt")
+        "/target/destination/path.txt",
+        "relative/source/path.txt")
       expect(cookbook_file.sensitive).to eq(true)
 
       @resource.sensitive false
       cookbook_file = @provider.send(:cookbook_file_resource,
-                                    "/target/destination/path.txt",
-                                    "relative/source/path.txt")
+        "/target/destination/path.txt",
+        "relative/source/path.txt")
       expect(cookbook_file.sensitive).to eq(false)
     end
   end

data/spec/unit/provider/route_spec.rb

@@ -125,7 +125,7 @@ describe Chef::Provider::Route do
       @resource_add.action(:add)
       @provider.run_action(:add)
       expect(route_file.string.split("\n").size).to eq(1)
-      expect(route_file.string).to match(/^192\.168\.1\.0\/24 via 192\.168\.0\.1$/)
+      expect(route_file.string).to match(%r{^192\.168\.1\.0/24 via 192\.168\.0\.1$})
     end
   end
 
@@ -150,12 +150,12 @@ describe Chef::Provider::Route do
   describe Chef::Provider::Route, "generate_command for action_add" do
     it "should include a netmask when a one is specified" do
       @new_resource.netmask("255.255.0.0")
-      expect(@provider.generate_command(:add).join(" ")).to match(/\/\d{1,2}/)
+      expect(@provider.generate_command(:add).join(" ")).to match(%r{/\d{1,2}})
     end
 
     it "should not include a netmask when a one is specified" do
       @new_resource.netmask(nil)
-      expect(@provider.generate_command(:add).join(" ")).not_to match(/\/\d{1,2}/)
+      expect(@provider.generate_command(:add).join(" ")).not_to match(%r{/\d{1,2}})
     end
 
     it "should include ' via $gateway ' when a gateway is specified" do
@@ -176,12 +176,12 @@ describe Chef::Provider::Route do
   describe Chef::Provider::Route, "generate_command for action_delete" do
     it "should include a netmask when a one is specified" do
       @new_resource.netmask("255.255.0.0")
-      expect(@provider.generate_command(:delete).join(" ")).to match(/\/\d{1,2}/)
+      expect(@provider.generate_command(:delete).join(" ")).to match(%r{/\d{1,2}})
     end
 
     it "should not include a netmask when a one is specified" do
       @new_resource.netmask(nil)
-      expect(@provider.generate_command(:delete).join(" ")).not_to match(/\/\d{1,2}/)
+      expect(@provider.generate_command(:delete).join(" ")).not_to match(%r{/\d{1,2}})
     end
 
     it "should include ' via $gateway ' when a gateway is specified" do
@@ -197,11 +197,11 @@ describe Chef::Provider::Route do
   describe Chef::Provider::Route, "config_file_contents for action_add" do
     it "should include a netmask when a one is specified" do
       @new_resource.netmask("255.255.0.0")
-      expect(@provider.config_file_contents(:add, target: @new_resource.target, netmask: @new_resource.netmask)).to match(/\/\d{1,2}.*\n$/)
+      expect(@provider.config_file_contents(:add, target: @new_resource.target, netmask: @new_resource.netmask)).to match(%r{/\d{1,2}.*\n$})
     end
 
     it "should not include a netmask when a one is specified" do
-      expect(@provider.config_file_contents(:add, target: @new_resource.target)).not_to match(/\/\d{1,2}.*\n$/)
+      expect(@provider.config_file_contents(:add, target: @new_resource.target)).not_to match(%r{/\d{1,2}.*\n$})
     end
 
     it "should include ' via $gateway ' when a gateway is specified" do
@@ -261,10 +261,10 @@ describe Chef::Provider::Route do
       @provider.action = :add
       @provider.generate_config
       expect(route_file.string.split("\n").size).to eq(4)
-      expect(route_file.string).to match(/^192\.168\.1\.0\/24 via 192\.168\.0\.1$/)
-      expect(route_file.string).to match(/^192\.168\.2\.0\/24 via 192\.168\.0\.1$/)
-      expect(route_file.string).to match(/^192\.168\.3\.0\/24 via 192\.168\.0\.1$/)
-      expect(route_file.string).to match(/^192\.168\.4\.0\/24 via 192\.168\.0\.1$/)
+      expect(route_file.string).to match(%r{^192\.168\.1\.0/24 via 192\.168\.0\.1$})
+      expect(route_file.string).to match(%r{^192\.168\.2\.0/24 via 192\.168\.0\.1$})
+      expect(route_file.string).to match(%r{^192\.168\.3\.0/24 via 192\.168\.0\.1$})
+      expect(route_file.string).to match(%r{^192\.168\.4\.0/24 via 192\.168\.0\.1$})
     end
   end
 end

data/spec/unit/provider/service/arch_service_spec.rb

@@ -121,7 +121,7 @@ describe Chef::Provider::Service::Arch, "load_current_resource" do
         aj        7842  5057  0 21:26 pts/2    00:00:06 vi init.rb
         aj        7903  5016  0 21:26 pts/5    00:00:00 /bin/bash
         aj        8119  6041  0 21:34 pts/3    00:00:03 vi init_service_spec.rb
-DEFAULT_PS
+      DEFAULT_PS
       @status = double("Status", exitstatus: 0, stdout: @stdout)
       allow(@provider).to receive(:shell_out!).and_return(@status)
 
@@ -132,7 +132,7 @@ DEFAULT_PS
       @stdout = StringIO.new(<<~RUNNING_PS)
         aj        7842  5057  0 21:26 pts/2    00:00:06 chef
         aj        7842  5057  0 21:26 pts/2    00:00:06 poos
-RUNNING_PS
+      RUNNING_PS
       allow(@status).to receive(:stdout).and_return(@stdout)
       @provider.load_current_resource
       expect(@provider.current_resource.running).to be_truthy
@@ -181,7 +181,7 @@ RUNNING_PS
       it "should add chef to DAEMONS array" do
         allow(::File).to receive(:read).with("/etc/rc.conf").and_return("DAEMONS=(network)")
         expect(@provider).to receive(:update_daemons).with(%w{network chef})
-        @provider.enable_service()
+        @provider.enable_service
       end
     end
 
@@ -202,7 +202,7 @@ RUNNING_PS
       it "should remove chef from DAEMONS array" do
         allow(::File).to receive(:read).with("/etc/rc.conf").and_return("DAEMONS=(network chef)")
         expect(@provider).to receive(:update_daemons).with(["network", "!chef"])
-        @provider.disable_service()
+        @provider.disable_service
       end
     end
 
@@ -223,12 +223,12 @@ RUNNING_PS
       it "should call the start command if one is specified" do
         @new_resource.start_command("/etc/rc.d/chef startyousillysally")
         expect(@provider).to receive(:shell_out!).with("/etc/rc.d/chef startyousillysally", default_env: false)
-        @provider.start_service()
+        @provider.start_service
       end
 
       it "should call '/etc/rc.d/service_name start' if no start command is specified" do
         expect(@provider).to receive(:shell_out!).with("/etc/rc.d/#{@new_resource.service_name} start", default_env: false)
-        @provider.start_service()
+        @provider.start_service
       end
     end
 
@@ -249,12 +249,12 @@ RUNNING_PS
       it "should call the stop command if one is specified" do
         @new_resource.stop_command("/etc/rc.d/chef itoldyoutostop")
         expect(@provider).to receive(:shell_out!).with("/etc/rc.d/chef itoldyoutostop", default_env: false)
-        @provider.stop_service()
+        @provider.stop_service
       end
 
       it "should call '/etc/rc.d/service_name stop' if no stop command is specified" do
         expect(@provider).to receive(:shell_out!).with("/etc/rc.d/#{@new_resource.service_name} stop", default_env: false)
-        @provider.stop_service()
+        @provider.stop_service
       end
     end
 
@@ -276,20 +276,20 @@ RUNNING_PS
       it "should call 'restart' on the service_name if the resource supports it" do
         @new_resource.supports({ restart: true })
         expect(@provider).to receive(:shell_out!).with("/etc/rc.d/#{@new_resource.service_name} restart", default_env: false)
-        @provider.restart_service()
+        @provider.restart_service
       end
 
       it "should call the restart_command if one has been specified" do
         @new_resource.restart_command("/etc/rc.d/chef restartinafire")
         expect(@provider).to receive(:shell_out!).with("/etc/rc.d/#{@new_resource.service_name} restartinafire", default_env: false)
-        @provider.restart_service()
+        @provider.restart_service
       end
 
       it "should just call stop, then start when the resource doesn't support restart and no restart_command is specified" do
         expect(@provider).to receive(:stop_service)
         expect(@provider).to receive(:sleep).with(1)
         expect(@provider).to receive(:start_service)
-        @provider.restart_service()
+        @provider.restart_service
       end
     end
 
@@ -311,13 +311,13 @@ RUNNING_PS
       it "should call 'reload' on the service if it supports it" do
         @new_resource.supports({ reload: true })
         expect(@provider).to receive(:shell_out!).with("/etc/rc.d/#{@new_resource.service_name} reload", default_env: false)
-        @provider.reload_service()
+        @provider.reload_service
       end
 
       it "should should run the user specified reload command if one is specified and the service doesn't support reload" do
         @new_resource.reload_command("/etc/rc.d/chef lollerpants")
         expect(@provider).to receive(:shell_out!).with("/etc/rc.d/#{@new_resource.service_name} lollerpants", default_env: false)
-        @provider.reload_service()
+        @provider.reload_service
       end
     end
   end

data/spec/unit/provider/service/debian_service_spec.rb

@@ -89,7 +89,8 @@ describe Chef::Provider::Service::Debian do
             "0" => [:stop, "20"],
             "1" => [:stop, "20"],
             "6" => [:stop, "20"],
-          })
+          }
+        )
       end
     end
 

data/spec/unit/provider/service/freebsd_service_spec.rb

@@ -142,7 +142,7 @@ describe Chef::Provider::Service::Freebsd do
           413  ??  Ss     0:02.51 /usr/sbin/syslogd -s
           539  ??  Is     0:00.14 /usr/sbin/sshd
           545  ??  Ss     0:17.53 sendmail: accepting connections (sendmail)
-PS_SAMPLE
+        PS_SAMPLE
       end
       let(:status) { double(stdout: stdout, exitstatus: 0) }
 
@@ -261,7 +261,8 @@ PS_SAMPLE
           [
           %Q{thing_#{new_resource.service_name}_enable="YES"},
           %Q{#{new_resource.service_name}_enable="NO"},
-        ] end
+        ]
+        end
         it "sets enabled based on the exact match (false)" do
           provider.determine_enabled_status!
           expect(current_resource.enabled).to be false
@@ -273,7 +274,8 @@ PS_SAMPLE
           [
           %Q{#{new_resource.service_name}_thing_enable="YES"},
           %Q{#{new_resource.service_name}_enable="NO"},
-        ] end
+        ]
+        end
         it "sets enabled based on the exact match (false)" do
           provider.determine_enabled_status!
           expect(current_resource.enabled).to be false
@@ -285,7 +287,8 @@ PS_SAMPLE
           [
           %Q{thing_#{new_resource.service_name}_enable="NO"},
           %Q{#{new_resource.service_name}_enable="YES"},
-        ] end
+        ]
+        end
         it "sets enabled based on the exact match (true)" do
           provider.determine_enabled_status!
           expect(current_resource.enabled).to be true
@@ -297,7 +300,8 @@ PS_SAMPLE
           [
           %Q{#{new_resource.service_name}_thing_enable="NO"},
           %Q{#{new_resource.service_name}_enable="YES"},
-        ] end
+        ]
+        end
         it "sets enabled based on the exact match (true)" do
           provider.determine_enabled_status!
           expect(current_resource.enabled).to be true
@@ -344,7 +348,7 @@ PS_SAMPLE
         StringIO.new(<<~EOF)
           name="#{new_resource.service_name}"
           rcvar=`set_rcvar`
-EOF
+        EOF
       end
 
       it "should not raise an exception if the rcscript have a name variable" do
@@ -365,7 +369,7 @@ EOF
       let(:rcscript) do
         StringIO.new <<~EOF
           rcvar=`set_rcvar`
-EOF
+        EOF
       end
 
       before do
@@ -380,7 +384,7 @@ EOF
             #
             # #{new_resource.service_name}_enable="YES"
             #   (default: "")
-EOF
+          EOF
         end
 
         it "should get the service name from rcvar if the rcscript does not have a name variable" do
@@ -397,7 +401,7 @@ EOF
           rcvar_stdout = <<~EOF
             # service_with_noname
             #
-EOF
+          EOF
         end
 
         it "should return nil" do
@@ -445,12 +449,12 @@ EOF
       it "should call the start command if one is specified" do
         new_resource.start_command("/etc/rc.d/chef startyousillysally")
         expect(provider).to receive(:shell_out!).with("/etc/rc.d/chef startyousillysally", default_env: false)
-        provider.start_service()
+        provider.start_service
       end
 
       it "should call '/usr/local/etc/rc.d/service_name faststart' if no start command is specified" do
         expect(provider).to receive(:shell_out!).with("/usr/local/etc/rc.d/#{new_resource.service_name} faststart", default_env: false)
-        provider.start_service()
+        provider.start_service
       end
     end
 
@@ -458,12 +462,12 @@ EOF
       it "should call the stop command if one is specified" do
         new_resource.stop_command("/etc/init.d/chef itoldyoutostop")
         expect(provider).to receive(:shell_out!).with("/etc/init.d/chef itoldyoutostop", default_env: false)
-        provider.stop_service()
+        provider.stop_service
       end
 
       it "should call '/usr/local/etc/rc.d/service_name faststop' if no stop command is specified" do
         expect(provider).to receive(:shell_out!).with("/usr/local/etc/rc.d/#{new_resource.service_name} faststop", default_env: false)
-        provider.stop_service()
+        provider.stop_service
       end
     end
 
@@ -471,19 +475,19 @@ EOF
       it "should call 'restart' on the service_name if the resource supports it" do
         new_resource.supports({ restart: true })
         expect(provider).to receive(:shell_out!).with("/usr/local/etc/rc.d/#{new_resource.service_name} fastrestart", default_env: false)
-        provider.restart_service()
+        provider.restart_service
       end
 
       it "should call the restart_command if one has been specified" do
         new_resource.restart_command("/etc/init.d/chef restartinafire")
         expect(provider).to receive(:shell_out!).with("/etc/init.d/chef restartinafire", default_env: false)
-        provider.restart_service()
+        provider.restart_service
       end
 
       it "otherwise it should call stop and start" do
         expect(provider).to receive(:stop_service)
         expect(provider).to receive(:start_service)
-        provider.restart_service()
+        provider.restart_service
       end
     end
   end
@@ -550,21 +554,21 @@ EOF
       allow(current_resource).to receive(:enabled).and_return(false)
       expect(provider).to receive(:read_rc_conf).and_return([ "foo", "#{new_resource.service_name}_enable=\"NO\"", "bar" ])
       expect(provider).to receive(:write_rc_conf).with(["foo", "bar", "#{new_resource.service_name}_enable=\"YES\""])
-      provider.enable_service()
+      provider.enable_service
     end
 
     it "should not partial match an already enabled service" do
       allow(current_resource).to receive(:enabled).and_return(false)
       expect(provider).to receive(:read_rc_conf).and_return([ "foo", "thing_#{new_resource.service_name}_enable=\"NO\"", "bar" ])
       expect(provider).to receive(:write_rc_conf).with(["foo", "thing_#{new_resource.service_name}_enable=\"NO\"", "bar", "#{new_resource.service_name}_enable=\"YES\""])
-      provider.enable_service()
+      provider.enable_service
     end
 
     it "should enable the service if it is not enabled and not already specified in the rc.conf file" do
       allow(current_resource).to receive(:enabled).and_return(false)
       expect(provider).to receive(:read_rc_conf).and_return(%w{foo bar})
       expect(provider).to receive(:write_rc_conf).with(["foo", "bar", "#{new_resource.service_name}_enable=\"YES\""])
-      provider.enable_service()
+      provider.enable_service
     end
 
     it "should not enable the service if it is already enabled" do
@@ -577,7 +581,7 @@ EOF
       allow(current_resource).to receive(:enabled).and_return(false)
       expect(provider).to receive(:read_rc_conf).and_return([ "foo", "bar", "\# #{new_resource.service_name}_enable=\"YES\"", "\# #{new_resource.service_name}_enable=\"NO\""])
       expect(provider).to receive(:write_rc_conf).with(["foo", "bar", "#{new_resource.service_name}_enable=\"YES\""])
-      provider.enable_service()
+      provider.enable_service
     end
   end
 
@@ -591,27 +595,27 @@ EOF
       allow(current_resource).to receive(:enabled).and_return(true)
       expect(provider).to receive(:read_rc_conf).and_return([ "foo", "#{new_resource.service_name}_enable=\"YES\"", "bar" ])
       expect(provider).to receive(:write_rc_conf).with(["foo", "bar", "#{new_resource.service_name}_enable=\"NO\""])
-      provider.disable_service()
+      provider.disable_service
     end
 
     it "should not disable an enabled service that partially matches" do
       allow(current_resource).to receive(:enabled).and_return(true)
       expect(provider).to receive(:read_rc_conf).and_return([ "foo", "thing_#{new_resource.service_name}_enable=\"YES\"", "bar" ])
       expect(provider).to receive(:write_rc_conf).with(["foo", "thing_#{new_resource.service_name}_enable=\"YES\"", "bar", "#{new_resource.service_name}_enable=\"NO\""])
-      provider.disable_service()
+      provider.disable_service
     end
 
     it "should not disable the service if it is already disabled" do
       allow(current_resource).to receive(:enabled).and_return(false)
       expect(provider).not_to receive(:write_rc_conf)
-      provider.disable_service()
+      provider.disable_service
     end
 
     it "should remove commented out versions of it being disabled or enabled" do
       allow(current_resource).to receive(:enabled).and_return(true)
       expect(provider).to receive(:read_rc_conf).and_return([ "foo", "bar", "\# #{new_resource.service_name}_enable=\"YES\"", "\# #{new_resource.service_name}_enable=\"NO\""])
       expect(provider).to receive(:write_rc_conf).with(["foo", "bar", "#{new_resource.service_name}_enable=\"NO\""])
-      provider.disable_service()
+      provider.disable_service
     end
   end
 end