chef 15.1.36-universal-mingw32 → 15.2.20-universal-mingw32

data/spec/integration/recipes/notifying_block_spec.rb

@@ -45,7 +45,7 @@ describe "notifying_block" do
       end
       file "config/client.rb", <<-EOM
         local_mode true
-        cookbook_path "#{path_to('cookbooks')}"
+        cookbook_path "#{path_to("cookbooks")}"
         log_level :warn
       EOM
     end
@@ -55,7 +55,7 @@ describe "notifying_block" do
     #  2. delayed notifications are de-dup'd in the subcontext
     #  3. delayed notifications (to resources inside the subcontext) are run at the end of the subcontext
     it "should run alpha, beta, gamma, and delta in that order" do
-      result = shell_out("#{chef_client} -c \"#{path_to('config/client.rb')}\" --no-color -F doc -o 'x::default'", cwd: chef_dir)
+      result = shell_out("#{chef_client} -c \"#{path_to("config/client.rb")}\" --no-color -F doc -o 'x::default'", cwd: chef_dir)
       expect(result.stdout).to match(/\* log\[alpha\] action write\s+\* log\[beta\] action write\s+\* log\[gamma\] action write\s+Converging 1 resources\s+\* log\[delta\] action write/)
       result.error!
     end
@@ -94,7 +94,7 @@ describe "notifying_block" do
       end
       file "config/client.rb", <<-EOM
         local_mode true
-        cookbook_path "#{path_to('cookbooks')}"
+        cookbook_path "#{path_to("cookbooks")}"
         log_level :warn
       EOM
     end
@@ -103,7 +103,7 @@ describe "notifying_block" do
     #  1. notifying block will correctly update wrapping new_resource updated_by_last_action status
     #  2. delayed notifications from a subcontext inside a resource will notify resources in their outer run_context
     it "should run foo, quux, bar, and baz in that order" do
-      result = shell_out("#{chef_client} -c \"#{path_to('config/client.rb')}\" --no-color -F doc -o 'x::default'", cwd: chef_dir)
+      result = shell_out("#{chef_client} -c \"#{path_to("config/client.rb")}\" --no-color -F doc -o 'x::default'", cwd: chef_dir)
       expect(result.stdout).to match(/\* log\[foo\] action write\s+\* log\[quux\] action write\s+\* log\[bar\] action write\s+\* log\[baz\] action write/)
       result.error!
     end

data/spec/integration/recipes/provider_choice.rb

@@ -16,8 +16,7 @@ describe "Recipe DSL methods" do
     context "And class Chef::Provider::ProviderThingy with no provides" do
       before :context do
         class Chef::Provider::ProviderThingy < Chef::Provider
-          def load_current_resource
-          end
+          def load_current_resource; end
 
           def action_create
             Chef::Log.warn("hello from #{self.class.name}")

data/spec/integration/recipes/recipe_dsl_spec.rb

@@ -28,8 +28,7 @@ describe "Recipe DSL methods" do
           Provider
         end
         class Provider < Chef::Provider
-          def load_current_resource
-          end
+          def load_current_resource; end
 
           def action_create
             BaseThingy.created_name = new_resource.name
@@ -1154,7 +1153,8 @@ describe "Recipe DSL methods" do
           def to_s
             "MyResource"
           end
-        end end
+        end
+      end
       let(:my_resource) { :"my_resource#{Namer.current_index}" }
       let(:blarghle_blarghle_little_star) { :"blarghle_blarghle_little_star#{Namer.current_index}" }
 
@@ -1340,10 +1340,10 @@ describe "Recipe DSL methods" do
       resource_class.new("blah", run_context)
     end
     it "The actions are part of actions along with :nothing" do
-      expect(resource_class.actions).to eq [ :nothing, :create ]
+      expect(resource_class.actions).to eq %i{nothing create}
     end
     it "The actions are part of allowed_actions along with :nothing" do
-      expect(resource.allowed_actions).to eq [ :nothing, :create ]
+      expect(resource.allowed_actions).to eq %i{nothing create}
     end
 
     context "and a subclass that declares more actions" do
@@ -1358,14 +1358,14 @@ describe "Recipe DSL methods" do
       end
 
       it "The parent class actions are not part of actions" do
-        expect(subresource_class.actions).to eq [ :nothing, :delete ]
+        expect(subresource_class.actions).to eq %i{nothing delete}
       end
       it "The parent class actions are not part of allowed_actions" do
-        expect(subresource.allowed_actions).to eq [ :nothing, :delete ]
+        expect(subresource.allowed_actions).to eq %i{nothing delete}
       end
       it "The parent class actions do not change" do
-        expect(resource_class.actions).to eq [ :nothing, :create ]
-        expect(resource.allowed_actions).to eq [ :nothing, :create ]
+        expect(resource_class.actions).to eq %i{nothing create}
+        expect(resource.allowed_actions).to eq %i{nothing create}
       end
     end
   end

data/spec/integration/recipes/remote_directory.rb

@@ -22,7 +22,7 @@ describe Chef::Resource::RemoteDirectory do
     before do
       file "config/client.rb", <<-EOM
         local_mode true
-        cookbook_path "#{path_to('cookbooks')}"
+        cookbook_path "#{path_to("cookbooks")}"
       EOM
       directory "cookbooks/test" do
         directory "files/default/source_dir" do
@@ -50,7 +50,7 @@ describe Chef::Resource::RemoteDirectory do
              end
           EOM
         end
-        shell_out!("#{chef_client} -c \"#{path_to('config/client.rb')}\" -o 'test::default'", cwd: chef_dir)
+        shell_out!("#{chef_client} -c \"#{path_to("config/client.rb")}\" -o 'test::default'", cwd: chef_dir)
       end
 
       def mode_of(path)

data/spec/integration/solo/solo_spec.rb

@@ -27,7 +27,7 @@ describe Chef::Dist::SOLOEXEC do
       file "config/solo.rb", <<~EOM
         chef_repo_path "#{@repository_dir}"
       EOM
-      result = shell_out("bundle exec chef-solo -c \"#{path_to('config/solo.rb')}\" -l debug", cwd: chef_dir)
+      result = shell_out("bundle exec chef-solo -c \"#{path_to("config/solo.rb")}\" -l debug", cwd: chef_dir)
       result.error!
     end
 
@@ -76,25 +76,25 @@ describe Chef::Dist::SOLOEXEC do
 
     it "should complete with success" do
       file "config/solo.rb", <<~EOM
-        cookbook_path "#{path_to('cookbooks')}"
-        file_cache_path "#{path_to('config/cache')}"
+        cookbook_path "#{path_to("cookbooks")}"
+        file_cache_path "#{path_to("config/cache")}"
       EOM
-      result = shell_out("#{chef_solo} -c \"#{path_to('config/solo.rb')}\" -o 'x::default' -l debug", cwd: chef_dir)
+      result = shell_out("#{chef_solo} -c \"#{path_to("config/solo.rb")}\" -o 'x::default' -l debug", cwd: chef_dir)
       result.error!
       expect(result.stdout).to include("ITWORKS")
     end
 
     it "should evaluate its node.json file" do
       file "config/solo.rb", <<~EOM
-        cookbook_path "#{path_to('cookbooks')}"
-        file_cache_path "#{path_to('config/cache')}"
+        cookbook_path "#{path_to("cookbooks")}"
+        file_cache_path "#{path_to("config/cache")}"
       EOM
 
       file "config/node.json", <<~E
         {"run_list":["x::default"]}
       E
 
-      result = shell_out("#{chef_solo} -c \"#{path_to('config/solo.rb')}\" -j '#{path_to('config/node.json')}' -l debug", cwd: chef_dir)
+      result = shell_out("#{chef_solo} -c \"#{path_to("config/solo.rb")}\" -j '#{path_to("config/node.json")}' -l debug", cwd: chef_dir)
       result.error!
       expect(result.stdout).to include("ITWORKS")
     end
@@ -112,10 +112,10 @@ describe Chef::Dist::SOLOEXEC do
 
     it "should exit with an error" do
       file "config/solo.rb", <<~EOM
-        cookbook_path "#{path_to('cookbooks')}"
-        file_cache_path "#{path_to('config/cache')}"
+        cookbook_path "#{path_to("cookbooks")}"
+        file_cache_path "#{path_to("config/cache")}"
       EOM
-      result = shell_out("#{chef_solo} -c \"#{path_to('config/solo.rb')}\" -o 'x::default' -l debug", cwd: chef_dir)
+      result = shell_out("#{chef_solo} -c \"#{path_to("config/solo.rb")}\" -o 'x::default' -l debug", cwd: chef_dir)
       expect(result.exitstatus).to eq(0) # For CHEF-5120 this becomes 1
       expect(result.stdout).to include("WARN: MissingCookbookDependency")
     end
@@ -126,13 +126,13 @@ describe Chef::Dist::SOLOEXEC do
       file "cookbooks/x/metadata.rb", cb_metadata("x", "1.0.0", "\nchef_version '~> 999.0'")
       file "cookbooks/x/recipes/default.rb", 'puts "ITWORKS"'
       file "config/solo.rb", <<~EOM
-        cookbook_path "#{path_to('cookbooks')}"
-        file_cache_path "#{path_to('config/cache')}"
+        cookbook_path "#{path_to("cookbooks")}"
+        file_cache_path "#{path_to("config/cache")}"
       EOM
     end
 
     it "should exit with an error" do
-      result = shell_out("#{chef_solo} -c \"#{path_to('config/solo.rb')}\" -o 'x::default' -l debug", cwd: chef_dir)
+      result = shell_out("#{chef_solo} -c \"#{path_to("config/solo.rb")}\" -o 'x::default' -l debug", cwd: chef_dir)
       expect(result.exitstatus).to eq(1)
       expect(result.stdout).to include("Chef::Exceptions::CookbookChefVersionMismatch")
     end
@@ -143,13 +143,13 @@ describe Chef::Dist::SOLOEXEC do
       file "cookbooks/x/metadata.rb", cb_metadata("x", "1.0.0", "\nohai_version '~> 999.0'")
       file "cookbooks/x/recipes/default.rb", 'puts "ITWORKS"'
       file "config/solo.rb", <<~EOM
-        cookbook_path "#{path_to('cookbooks')}"
-        file_cache_path "#{path_to('config/cache')}"
+        cookbook_path "#{path_to("cookbooks")}"
+        file_cache_path "#{path_to("config/cache")}"
       EOM
     end
 
     it "should exit with an error" do
-      result = shell_out("#{chef_solo} -c \"#{path_to('config/solo.rb')}\" -o 'x::default' -l debug", cwd: chef_dir)
+      result = shell_out("#{chef_solo} -c \"#{path_to("config/solo.rb")}\" -o 'x::default' -l debug", cwd: chef_dir)
       expect(result.exitstatus).to eq(1)
       expect(result.stdout).to include("Chef::Exceptions::CookbookOhaiVersionMismatch")
     end
@@ -175,8 +175,8 @@ describe Chef::Dist::SOLOEXEC do
 
     it "while running solo concurrently" do
       file "config/solo.rb", <<~EOM
-        cookbook_path "#{path_to('cookbooks')}"
-        file_cache_path "#{path_to('config/cache')}"
+        cookbook_path "#{path_to("cookbooks")}"
+        file_cache_path "#{path_to("config/cache")}"
       EOM
       # We have a timeout protection here so that if due to some bug
       # run_lock gets stuck we can discover it.
@@ -188,13 +188,13 @@ describe Chef::Dist::SOLOEXEC do
 
           # Instantiate the first chef-solo run
           threads << Thread.new do
-            s1 = Process.spawn("#{chef_solo} -c \"#{path_to('config/solo.rb')}\" -o 'x::default'  -l debug -L #{path_to('logs/runs.log')}", chdir: chef_dir)
+            s1 = Process.spawn("#{chef_solo} -c \"#{path_to("config/solo.rb")}\" -o 'x::default'  -l debug -L #{path_to("logs/runs.log")}", chdir: chef_dir)
             Process.waitpid(s1)
           end
 
           # Instantiate the second chef-solo run
           threads << Thread.new do
-            s2 = Process.spawn("#{chef_solo} -c \"#{path_to('config/solo.rb')}\" -o 'x::default'  -l debug -L #{path_to('logs/runs.log')}", chdir: chef_dir)
+            s2 = Process.spawn("#{chef_solo} -c \"#{path_to("config/solo.rb")}\" -o 'x::default'  -l debug -L #{path_to("logs/runs.log")}", chdir: chef_dir)
             Process.waitpid(s2)
           end
 

data/spec/spec_helper.rb

@@ -52,7 +52,7 @@ require "chef/knife"
 
 Dir["lib/chef/knife/**/*.rb"]
   .map { |f| f.gsub("lib/", "") }
-  .map { |f| f.gsub(%r{\.rb$}, "") }
+  .map { |f| f.gsub(/\.rb$/, "") }
   .each { |f| require f }
 
 require "chef/resource_resolver"
@@ -93,7 +93,7 @@ require "spec/support/shared/unit/mock_shellout"
 Dir["spec/support/**/*.rb"]
   .reject { |f| f =~ %r{^spec/support/platforms} }
   .reject { |f| f =~ %r{^spec/support/pedant} }
-  .map { |f| f.gsub(%r{.rb$}, "") }
+  .map { |f| f.gsub(/.rb$/, "") }
   .map { |f| f.gsub(%r{spec/}, "") }
   .each { |f| require f }
 
@@ -140,12 +140,11 @@ RSpec.configure do |config|
 
   config.filter_run_excluding skip_appveyor: true if ENV["APPVEYOR"]
   config.filter_run_excluding appveyor_only: true unless ENV["APPVEYOR"]
-  config.filter_run_excluding skip_travis: true if ENV["TRAVIS"]
 
   config.filter_run_excluding windows_only: true unless windows?
   config.filter_run_excluding not_supported_on_windows: true if windows?
   config.filter_run_excluding not_supported_on_macos: true if mac_osx?
-  config.filter_run_excluding macos_only: true if !mac_osx?
+  config.filter_run_excluding macos_only: true unless mac_osx?
   config.filter_run_excluding not_supported_on_aix: true if aix?
   config.filter_run_excluding not_supported_on_solaris: true if solaris?
   config.filter_run_excluding not_supported_on_gce: true if gce?
@@ -159,7 +158,7 @@ RSpec.configure do |config|
   config.filter_run_excluding ruby64_only: true unless ruby_64bit?
   config.filter_run_excluding ruby32_only: true unless ruby_32bit?
   config.filter_run_excluding windows_powershell_dsc_only: true unless windows_powershell_dsc?
-  config.filter_run_excluding windows_powershell_no_dsc_only: true unless ! windows_powershell_dsc?
+  config.filter_run_excluding windows_powershell_no_dsc_only: true if windows_powershell_dsc?
   config.filter_run_excluding windows_domain_joined_only: true unless windows_domain_joined?
   config.filter_run_excluding windows_not_domain_joined_only: true if windows_domain_joined?
   # We think this line was causing rspec tests to not run on the Jenkins windows
@@ -189,6 +188,8 @@ RSpec.configure do |config|
   config.filter_run_excluding rhel: true unless rhel?
   config.filter_run_excluding rhel6: true unless rhel6?
   config.filter_run_excluding rhel7: true unless rhel7?
+  config.filter_run_excluding rhel8: true unless rhel8?
+  config.filter_run_excluding rhel_gte_8: true unless rhel_gte_8?
   config.filter_run_excluding intel_64bit: true unless intel_64bit?
   config.filter_run_excluding not_rhel: true if rhel?
   config.filter_run_excluding not_rhel6: true if rhel6?
@@ -311,14 +312,11 @@ require "thread"
 module WEBrick
   module Utils
     class TimeoutHandler
-      def initialize
-      end
+      def initialize; end
 
-      def register(*args)
-      end
+      def register(*args); end
 
-      def cancel(*args)
-      end
+      def cancel(*args); end
     end
   end
 end

data/spec/stress/win32/security_spec.rb

@@ -50,7 +50,7 @@ describe "Chef::ReservedNames::Win32::Security", :windows_only do
 
   it "should not leak when retrieving and reading the ACE from a file", :volatile do
     expect do
-      sids = Chef::ReservedNames::Win32::Security::SecurableObject.new(@monkeyfoo).security_descriptor.dacl.select { |ace| ace.sid }
+      sids = Chef::ReservedNames::Win32::Security::SecurableObject.new(@monkeyfoo).security_descriptor.dacl.select(&:sid)
       GC.start
     end.not_to leak_memory(warmup: 50, iterations: 100)
   end

data/spec/support/lib/chef/resource/zen_follower.rb

@@ -25,7 +25,7 @@ class Chef
       provides :follower, platform: "zen"
 
       def master(arg = nil)
-        if !arg.nil?
+        unless arg.nil?
           @master = arg
         end
         @master

data/spec/support/lib/chef/resource/zen_master.rb

@@ -30,7 +30,7 @@ class Chef
       end
 
       def something(arg = nil)
-        if !arg.nil?
+        unless arg.nil?
           @something = arg
         end
         @something

data/spec/support/mock/platform.rb

@@ -19,7 +19,7 @@ def platform_mock(platform = :unix)
     mock_constants({ "RUBY_PLATFORM" => (platform == :windows ? "i386-mingw32" : "x86_64-darwin11.2.0"),
                      "File::PATH_SEPARATOR" => (platform == :windows ? ";" : ":"),
                      "File::ALT_SEPARATOR" => (platform == :windows ? "\\" : nil) }) do
-      yield
-    end
+                       yield
+                     end
   end
 end

data/spec/support/platform_helpers.rb

@@ -46,6 +46,7 @@ require "wmi-lite/wmi" if windows?
 
 def windows_domain_joined?
   return false unless windows?
+
   wmi = WmiLite::Wmi.new
   computer_system = wmi.first_of("Win32_ComputerSystem")
   computer_system["partofdomain"]
@@ -53,11 +54,13 @@ end
 
 def windows_2012r2?
   return false unless windows?
+
   (host_version && host_version.start_with?("6.3"))
 end
 
 def windows_gte_10?
   return false unless windows?
+
   Gem::Requirement.new(">= 10").satisfied_by?(Gem::Version.new(host_version))
 end
 
@@ -71,6 +74,7 @@ end
 
 def windows_powershell_dsc?
   return false unless windows?
+
   supports_dsc = false
   begin
     wmi = WmiLite::Wmi.new("root/microsoft/windows/desiredstateconfiguration")
@@ -88,6 +92,7 @@ end
 
 def windows_user_right?(right)
   return false unless windows?
+
   require "chef/win32/security"
   Chef::ReservedNames::Win32::Security.get_account_right(ENV["USERNAME"]).include?(right)
 end
@@ -170,6 +175,14 @@ def rhel7?
   rhel? && !!(ohai[:platform_version].to_i == 7)
 end
 
+def rhel8?
+  rhel? && !!(ohai[:platform_version].to_i == 8)
+end
+
+def rhel_gte_8?
+  rhel? && !!(ohai[:platform_version].to_i >= 8)
+end
+
 def debian_family?
   !!(ohai[:platform_family] == "debian")
 end
@@ -217,6 +230,7 @@ end
 
 def root?
   return false if windows?
+
   Process.euid == 0
 end
 

data/spec/support/platforms/win32/spec_service.rb

@@ -20,12 +20,12 @@ require "win32/daemon"
 
 class SpecService < ::Win32::Daemon
   def service_init
-    @test_service_file = "#{ENV['TMP']}/spec_service_file"
+    @test_service_file = "#{ENV["TMP"]}/spec_service_file"
   end
 
   def service_main(*startup_parameters)
     while running?
-      if !File.exists?(@test_service_file)
+      unless File.exists?(@test_service_file)
         File.open(@test_service_file, "wb") do |f|
           f.write("This file is created by SpecService")
         end
@@ -39,17 +39,13 @@ class SpecService < ::Win32::Daemon
   # Control Signal Callback Methods
   ################################################################################
 
-  def service_stop
-  end
+  def service_stop; end
 
-  def service_pause
-  end
+  def service_pause; end
 
-  def service_resume
-  end
+  def service_resume; end
 
-  def service_shutdown
-  end
+  def service_shutdown; end
 end
 
 # To run this file as a service, it must be called as a script from within

data/spec/support/shared/functional/execute_resource.rb

@@ -21,7 +21,7 @@ shared_context "a non-admin Windows user" do
 
   let(:windows_nonadmin_user_domain) { ENV["COMPUTERNAME"] }
   let(:windows_nonadmin_user_qualified) { "#{windows_nonadmin_user_domain}\\#{windows_nonadmin_user}" }
-  let(:temp_profile_path) { "#{ENV['USERPROFILE']}\\..\\cheftesttempuser" }
+  let(:temp_profile_path) { "#{ENV["USERPROFILE"]}\\..\\cheftesttempuser" }
   before do
     shell_out!("net.exe user /delete #{windows_nonadmin_user}", returns: [0, 2])
 
@@ -40,7 +40,7 @@ end
 shared_context "alternate user identity" do
   let(:windows_alternate_user) { "chef%02d%02d%02d" % [Time.now.year % 100, Time.now.month, Time.now.day] }
   let(:windows_alternate_user_password) { "lj28;fx3T!x,2" }
-  let(:windows_alternate_user_qualified) { "#{ENV['COMPUTERNAME']}\\#{windows_alternate_user}" }
+  let(:windows_alternate_user_qualified) { "#{ENV["COMPUTERNAME"]}\\#{windows_alternate_user}" }
 
   let(:windows_nonadmin_user) { windows_alternate_user }
   let(:windows_nonadmin_user_password) { windows_alternate_user_password }
@@ -58,7 +58,7 @@ shared_context "a command that can be executed as an alternate user" do
   include Chef::Mixin::ShellOut
 
   before do
-    shell_out!("icacls \"#{script_output_dir.gsub(/\//, '\\')}\" /grant \"authenticated users:(F)\"")
+    shell_out!("icacls \"#{script_output_dir.gsub(%r{/}, '\\')}\" /grant \"authenticated users:(F)\"")
   end
 
   after do
@@ -73,7 +73,7 @@ shared_examples_for "an execute resource that supports alternate user identity"
     include_context "a command that can be executed as an alternate user"
 
     let(:windows_current_user) { ENV["USERNAME"] }
-    let(:windows_current_user_qualified) { "#{ENV['USERDOMAIN'] || ENV['COMPUTERNAME']}\\#{windows_current_user}" }
+    let(:windows_current_user_qualified) { "#{ENV["USERDOMAIN"] || ENV["COMPUTERNAME"]}\\#{windows_current_user}" }
     let(:resource_identity_command) { "powershell.exe -noprofile -command \"import-module microsoft.powershell.utility;([Security.Principal.WindowsPrincipal]([Security.Principal.WindowsIdentity]::GetCurrent())).identity.name | out-file -encoding ASCII '#{script_output_path}'\"" }
 
     let(:execute_resource) do