20 files changed, 53 insertions, 53 deletions

diff --git a/lib/chef/provider/package/apt.rb b/lib/chef/provider/package/apt.rb
index 744e5b2e83..8cee5cdcd7 100644
--- a/lib/chef/provider/package/apt.rb
+++ b/lib/chef/provider/package/apt.rb
@@ -45,7 +45,7 @@ class Chef
           super
 
           requirements.assert(:all_actions) do |a|
-            a.assertion { !new_resource.source }
+            a.assertion do !new_resource.source end
             a.failure_message(Chef::Exceptions::Package, "apt package provider cannot handle source property. Use dpkg provider instead")
           end
         end
@@ -89,9 +89,9 @@ class Chef
         end
 
         def install_package(name, version)
-          package_name = name.zip(version).map do |n, v|
+          package_name = name.zip(version).map { |n, v|
             package_data[n][:virtual] ? n : "#{n}=#{v}"
-          end
+          }
           dgrade = "--allow-downgrades" if supports_allow_downgrade? && allow_downgrade
           run_noninteractive("apt-get", "-q", "-y", dgrade, config_file_options, default_release_options, options, "install", package_name)
         end
@@ -101,16 +101,16 @@ class Chef
         end
 
         def remove_package(name, version)
-          package_name = name.map do |n|
+          package_name = name.map { |n|
             package_data[n][:virtual] ? resolve_virtual_package_name(n) : n
-          end
+          }
           run_noninteractive("apt-get", "-q", "-y", options, "remove", package_name)
         end
 
         def purge_package(name, version)
-          package_name = name.map do |n|
+          package_name = name.map { |n|
             package_data[n][:virtual] ? resolve_virtual_package_name(n) : n
-          end
+          }
           run_noninteractive("apt-get", "-q", "-y", options, "purge", package_name)
         end
 
diff --git a/lib/chef/provider/package/bff.rb b/lib/chef/provider/package/bff.rb
index 0b358dcb46..77d5277fa2 100644
--- a/lib/chef/provider/package/bff.rb
+++ b/lib/chef/provider/package/bff.rb
@@ -33,11 +33,11 @@ class Chef
         def define_resource_requirements
           super
           requirements.assert(:install) do |a|
-            a.assertion { new_resource.source }
+            a.assertion do new_resource.source end
             a.failure_message Chef::Exceptions::Package, "Source for package #{new_resource.package_name} required for action install"
           end
           requirements.assert(:all_actions) do |a|
-            a.assertion { !new_resource.source || package_source_found? }
+            a.assertion do !new_resource.source || package_source_found? end
             a.failure_message Chef::Exceptions::Package, "Package #{new_resource.package_name} not found: #{new_resource.source}"
             a.whyrun "would assume #{new_resource.source} would be have previously been made available"
           end
diff --git a/lib/chef/provider/package/cab.rb b/lib/chef/provider/package/cab.rb
index fd099811e0..7488ec8c9b 100644
--- a/lib/chef/provider/package/cab.rb
+++ b/lib/chef/provider/package/cab.rb
@@ -51,11 +51,11 @@ class Chef
         end
 
         def source_resource
-          @source_resource ||= declare_resource(:remote_file, new_resource.name) do
+          @source_resource ||= declare_resource(:remote_file, new_resource.name) {
             path default_download_cache_path
             source new_resource.source
             backup false
-          end
+          }
         end
 
         def default_download_cache_path
@@ -90,12 +90,12 @@ class Chef
           package = new_cab_identity
           # Search for just the package name to catch a different version being installed
           logger.trace("#{new_resource} searching for installed package #{package["name"]}")
-          existing_package_identities = installed_packages.map do |p|
+          existing_package_identities = installed_packages.map { |p|
             split_package_identity(p["package_identity"])
-          end
-          found_packages = existing_package_identities.select do |existing_package_ident|
+          }
+          found_packages = existing_package_identities.select { |existing_package_ident|
             existing_package_ident["name"] == package["name"]
-          end
+          }
           if found_packages.empty?
             nil
           elsif found_packages.length == 1
diff --git a/lib/chef/provider/package/chocolatey.rb b/lib/chef/provider/package/chocolatey.rb
index a09bbf55de..8bf1427200 100644
--- a/lib/chef/provider/package/chocolatey.rb
+++ b/lib/chef/provider/package/chocolatey.rb
@@ -58,7 +58,7 @@ class Chef
           # and not a package specific alternate source like other providers
           # so we want to assert candidates exist for the alternate source
           requirements.assert(:upgrade, :install) do |a|
-            a.assertion { candidates_exist_for_all_uninstalled? }
+            a.assertion do candidates_exist_for_all_uninstalled? end
             a.failure_message(Chef::Exceptions::Package, "No candidate version available for #{packages_missing_candidates.join(", ")}")
             a.whyrun("Assuming a repository that offers #{packages_missing_candidates.join(", ")} would have been configured")
           end
diff --git a/lib/chef/provider/package/dnf.rb b/lib/chef/provider/package/dnf.rb
index d7b61e0789..fc142cc855 100644
--- a/lib/chef/provider/package/dnf.rb
+++ b/lib/chef/provider/package/dnf.rb
@@ -73,7 +73,7 @@ class Chef
 
         def define_resource_requirements
           requirements.assert(:install, :upgrade, :remove, :purge) do |a|
-            a.assertion { !new_resource.source || ::File.exist?(new_resource.source) }
+            a.assertion do !new_resource.source || ::File.exist?(new_resource.source) end
             a.failure_message Chef::Exceptions::Package, "Package #{new_resource.package_name} not found: #{new_resource.source}"
             a.whyrun "assuming #{new_resource.source} would have previously been created"
           end
diff --git a/lib/chef/provider/package/dnf/python_helper.rb b/lib/chef/provider/package/dnf/python_helper.rb
index c5edbfbc3a..8039bbbe0d 100644
--- a/lib/chef/provider/package/dnf/python_helper.rb
+++ b/lib/chef/provider/package/dnf/python_helper.rb
@@ -38,9 +38,9 @@ class Chef
 
           def dnf_command
             # platform-python is used for system tools on RHEL 8 and is installed under /usr/libexec
-            @dnf_command ||= which("platform-python", "python", "python3", "python2", "python2.7", extra_path: "/usr/libexec") do |f|
+            @dnf_command ||= which("platform-python", "python", "python3", "python2", "python2.7", extra_path: "/usr/libexec") { |f|
               shell_out("#{f} -c 'import dnf'").exitstatus == 0
-            end + " #{DNF_HELPER}"
+            } + " #{DNF_HELPER}"
           end
 
           def start
diff --git a/lib/chef/provider/package/dpkg.rb b/lib/chef/provider/package/dpkg.rb
index e6012edee8..89b6fce07a 100644
--- a/lib/chef/provider/package/dpkg.rb
+++ b/lib/chef/provider/package/dpkg.rb
@@ -38,12 +38,12 @@ class Chef
           super
 
           requirements.assert(:install, :upgrade) do |a|
-            a.assertion { !resolved_source_array.compact.empty? }
+            a.assertion do !resolved_source_array.compact.empty? end
             a.failure_message Chef::Exceptions::Package, "#{new_resource} the source property is required for action :install or :upgrade"
           end
 
           requirements.assert(:install, :upgrade) do |a|
-            a.assertion { source_files_exist? }
+            a.assertion do source_files_exist? end
             a.failure_message Chef::Exceptions::Package, "#{new_resource} source file(s) do not exist: #{missing_sources}"
             a.whyrun "Assuming they would have been previously created."
           end
@@ -176,11 +176,11 @@ class Chef
         def name_pkginfo
           @name_pkginfo ||=
             begin
-              pkginfos = resolved_source_array.map do |src|
+              pkginfos = resolved_source_array.map { |src|
                 logger.trace("#{new_resource} checking #{src} dpkg status")
                 status = shell_out!("dpkg-deb", "-W", src)
                 status.stdout
-              end
+              }
               Hash[*package_name_array.zip(pkginfos).flatten]
             end
         end
diff --git a/lib/chef/provider/package/ips.rb b/lib/chef/provider/package/ips.rb
index 686ffe96ee..fb96c0af40 100644
--- a/lib/chef/provider/package/ips.rb
+++ b/lib/chef/provider/package/ips.rb
@@ -35,7 +35,7 @@ class Chef
           super
 
           requirements.assert(:all_actions) do |a|
-            a.assertion { !@candidate_version.nil? }
+            a.assertion do !@candidate_version.nil? end
             a.failure_message Chef::Exceptions::Package, "Package #{new_resource.package_name} not found"
             a.whyrun "Assuming package #{new_resource.package_name} would have been made available."
           end
diff --git a/lib/chef/provider/package/msu.rb b/lib/chef/provider/package/msu.rb
index a00b3f3471..9f5c5abe30 100644
--- a/lib/chef/provider/package/msu.rb
+++ b/lib/chef/provider/package/msu.rb
@@ -89,12 +89,12 @@ class Chef
         end
 
         def source_resource
-          @source_resource ||= declare_resource(:remote_file, new_resource.name) do
+          @source_resource ||= declare_resource(:remote_file, new_resource.name) {
             path default_download_cache_path
             source new_resource.source
             checksum new_resource.checksum
             backup false
-          end
+          }
         end
 
         def default_download_cache_path
diff --git a/lib/chef/provider/package/openbsd.rb b/lib/chef/provider/package/openbsd.rb
index 38ff84f105..62b4ea6d4a 100644
--- a/lib/chef/provider/package/openbsd.rb
+++ b/lib/chef/provider/package/openbsd.rb
@@ -52,7 +52,7 @@ class Chef
 
           # Below are incomplete/missing features for this package provider
           requirements.assert(:all_actions) do |a|
-            a.assertion { !new_resource.source }
+            a.assertion do !new_resource.source end
             a.failure_message(Chef::Exceptions::Package, "The openbsd package provider does not support the source property")
           end
           requirements.assert(:all_actions) do |a|
diff --git a/lib/chef/provider/package/portage.rb b/lib/chef/provider/package/portage.rb
index 889d262d1e..2c9c629615 100644
--- a/lib/chef/provider/package/portage.rb
+++ b/lib/chef/provider/package/portage.rb
@@ -39,11 +39,11 @@ class Chef
           globsafe_category = category ? Chef::Util::PathHelper.escape_glob_dir(category) : nil
           globsafe_pkg = Chef::Util::PathHelper.escape_glob_dir(pkg)
           possibilities = Dir["/var/db/pkg/#{globsafe_category || "*"}/#{globsafe_pkg}-*"].map { |d| d.sub(%r{/var/db/pkg/}, "") }
-          versions = possibilities.map do |entry|
+          versions = possibilities.map { |entry|
             if entry =~ %r{[^/]+/#{Regexp.escape(pkg)}\-(\d[\.\d]*[a-z]?((_(alpha|beta|pre|rc|p)\d*)*)?(-r\d+)?)}
               [$&, $1]
             end
-          end.compact
+          }.compact
 
           if versions.size > 1
             atoms = versions.map(&:first).sort
diff --git a/lib/chef/provider/package/powershell.rb b/lib/chef/provider/package/powershell.rb
index a27f7fa6c8..26f8206f10 100644
--- a/lib/chef/provider/package/powershell.rb
+++ b/lib/chef/provider/package/powershell.rb
@@ -41,7 +41,7 @@ class Chef
           end
 
           requirements.assert(:install) do |a|
-            a.assertion { candidates_exist_for_all_uninstalled? }
+            a.assertion do candidates_exist_for_all_uninstalled? end
             a.failure_message(Chef::Exceptions::Package, "No candidate version available for #{packages_missing_candidates.join(", ")}")
             a.whyrun("Assuming a repository that offers #{packages_missing_candidates.join(", ")} would have been configured")
           end
diff --git a/lib/chef/provider/package/rpm.rb b/lib/chef/provider/package/rpm.rb
index 75b41a26e4..1f62aa84c4 100644
--- a/lib/chef/provider/package/rpm.rb
+++ b/lib/chef/provider/package/rpm.rb
@@ -32,12 +32,12 @@ class Chef
           super
 
           requirements.assert(:all_actions) do |a|
-            a.assertion { @package_source_exists }
+            a.assertion do @package_source_exists end
             a.failure_message Chef::Exceptions::Package, "Package #{new_resource.package_name} not found: #{new_resource.source}"
             a.whyrun "Assuming package #{new_resource.package_name} would have been made available."
           end
           requirements.assert(:all_actions) do |a|
-            a.assertion { !@rpm_status.nil? && (@rpm_status.exitstatus == 0 || @rpm_status.exitstatus == 1) }
+            a.assertion do !@rpm_status.nil? && (@rpm_status.exitstatus == 0 || @rpm_status.exitstatus == 1) end
             a.failure_message Chef::Exceptions::Package, "Unable to determine current version due to RPM failure. Detail: #{@rpm_status.inspect}"
             a.whyrun "Assuming current version would have been determined for package #{new_resource.package_name}."
           end
diff --git a/lib/chef/provider/package/rubygems.rb b/lib/chef/provider/package/rubygems.rb
index 876a90392c..031c49c0eb 100644
--- a/lib/chef/provider/package/rubygems.rb
+++ b/lib/chef/provider/package/rubygems.rb
@@ -100,7 +100,7 @@ class Chef
               # Filter down to only to only stubs we actually want. The name
               # filter is needed in case of things like `foo-*.gemspec` also
               # matching a gem named `foo-bar`.
-              stubs.select! { |stub| stub.name == gem_dep.name && gem_dep.requirement.satisfied_by?(stub.version) }
+              stubs.select! do |stub| stub.name == gem_dep.name && gem_dep.requirement.satisfied_by?(stub.version) end
               # This isn't sorting before returning beacuse the only code that
               # uses this method calls `max_by` so it doesn't need to be sorted.
               stubs
@@ -151,11 +151,11 @@ class Chef
           def candidate_version_from_file(gem_dependency, source)
             spec = spec_from_file(source)
             if spec.satisfies_requirement?(gem_dependency)
-              logger.trace { "found candidate gem version #{spec.version} from local gem package #{source}" }
+              logger.trace do "found candidate gem version #{spec.version} from local gem package #{source}" end
               spec.version
             else
               # This is probably going to end badly...
-              logger.warn { "gem package #{source} does not satisfy the requirements #{gem_dependency}" }
+              logger.warn do "gem package #{source} does not satisfy the requirements #{gem_dependency}" end
               nil
             end
           end
@@ -196,11 +196,11 @@ class Chef
 
             version = spec && spec.version
             if version
-              logger.trace { "found gem #{spec.name} version #{version} for platform #{spec.platform} from #{source}" }
+              logger.trace do "found gem #{spec.name} version #{version} for platform #{spec.platform} from #{source}" end
               version
             else
               source_list = sources.compact.empty? ? "[#{Gem.sources.to_a.join(", ")}]" : "[#{sources.join(", ")}]"
-              logger.warn { "failed to find gem #{gem_dependency} from #{source_list}" }
+              logger.warn do "failed to find gem #{gem_dependency} from #{source_list}" end
               nil
             end
           end
@@ -459,16 +459,16 @@ class Chef
           # is the current version
           if !matching_installed_versions.empty?
             gemspec = matching_installed_versions.max_by(&:version)
-            logger.trace { "#{new_resource} found installed gem #{gemspec.name} version #{gemspec.version} matching #{gem_dependency}" }
+            logger.trace do "#{new_resource} found installed gem #{gemspec.name} version #{gemspec.version} matching #{gem_dependency}" end
             gemspec
             # If no version matching the requirements exists, the latest installed
             # version is the current version.
           elsif !all_installed_versions.empty?
             gemspec = all_installed_versions.max_by(&:version)
-            logger.trace { "#{new_resource} newest installed version of gem #{gemspec.name} is #{gemspec.version}" }
+            logger.trace do "#{new_resource} newest installed version of gem #{gemspec.name} is #{gemspec.version}" end
             gemspec
           else
-            logger.trace { "#{new_resource} no installed version found for #{gem_dependency}" }
+            logger.trace do "#{new_resource} no installed version found for #{gem_dependency}" end
             nil
           end
         end
@@ -500,7 +500,7 @@ class Chef
 
         def cleanup_after_converge
           if @cleanup_gem_env
-            logger.trace { "#{new_resource} resetting gem environment to default" }
+            logger.trace do "#{new_resource} resetting gem environment to default" end
             Gem.clear_paths
           end
         end
diff --git a/lib/chef/provider/package/snap.rb b/lib/chef/provider/package/snap.rb
index cb639ff77f..7be0266afe 100644
--- a/lib/chef/provider/package/snap.rb
+++ b/lib/chef/provider/package/snap.rb
@@ -42,7 +42,7 @@ class Chef
 
         def define_resource_requirements
           requirements.assert(:install, :upgrade, :remove, :purge) do |a|
-            a.assertion { !new_resource.source || ::File.exist?(new_resource.source) }
+            a.assertion do !new_resource.source || ::File.exist?(new_resource.source) end
             a.failure_message Chef::Exceptions::Package, "Package #{new_resource.package_name} not found: #{new_resource.source}"
             a.whyrun "assuming #{new_resource.source} would have previously been created"
           end
@@ -238,14 +238,14 @@ class Chef
         #   @param path [String] Path to the package on disk
         #   @param content_length [Integer] byte size of the snap file
         def generate_multipart_form_data(snap_name, action, options, path, content_length)
-          snap_options = options.map do |k, v|
+          snap_options = options.map { |k, v|
             <<~SNAP_OPTION
               Content-Disposition: form-data; name="#{k}"
 
               #{v}
               --#{snap_name}
             SNAP_OPTION
-          end
+          }
 
           multipart_form_data = <<~SNAP_S
             Host:
diff --git a/lib/chef/provider/package/solaris.rb b/lib/chef/provider/package/solaris.rb
index fb0e88ecdb..28c33f4299 100644
--- a/lib/chef/provider/package/solaris.rb
+++ b/lib/chef/provider/package/solaris.rb
@@ -37,11 +37,11 @@ class Chef
         def define_resource_requirements
           super
           requirements.assert(:install) do |a|
-            a.assertion { new_resource.source }
+            a.assertion do new_resource.source end
             a.failure_message Chef::Exceptions::Package, "Source for package #{new_resource.package_name} required for action install"
           end
           requirements.assert(:all_actions) do |a|
-            a.assertion { !new_resource.source || @package_source_found }
+            a.assertion do !new_resource.source || @package_source_found end
             a.failure_message Chef::Exceptions::Package, "Package #{new_resource.package_name} not found: #{new_resource.source}"
             a.whyrun "would assume #{new_resource.source} would be have previously been made available"
           end
diff --git a/lib/chef/provider/package/windows.rb b/lib/chef/provider/package/windows.rb
index d21c6576b6..8bde66fad3 100644
--- a/lib/chef/provider/package/windows.rb
+++ b/lib/chef/provider/package/windows.rb
@@ -36,13 +36,13 @@ class Chef
 
         def define_resource_requirements
           requirements.assert(:install) do |a|
-            a.assertion { new_resource.source || msi? }
+            a.assertion do new_resource.source || msi? end
             a.failure_message Chef::Exceptions::NoWindowsPackageSource, "Source for package #{new_resource.package_name} must be specified in the resource's source property for package to be installed because the package_name property is used to test for the package installation state for this package type."
           end
 
           unless uri_scheme?(new_resource.source)
             requirements.assert(:install) do |a|
-              a.assertion { ::File.exist?(new_resource.source) }
+              a.assertion do ::File.exist?(new_resource.source) end
               a.failure_message Chef::Exceptions::Package, "Source for package #{new_resource.package_name} does not exist"
               a.whyrun "Assuming source file #{new_resource.source} would have been created."
             end
diff --git a/lib/chef/provider/package/yum.rb b/lib/chef/provider/package/yum.rb
index e32457cc0c..ad528f9463 100644
--- a/lib/chef/provider/package/yum.rb
+++ b/lib/chef/provider/package/yum.rb
@@ -66,7 +66,7 @@ class Chef
 
         def define_resource_requirements
           requirements.assert(:install, :upgrade, :remove, :purge) do |a|
-            a.assertion { !new_resource.source || ::File.exist?(new_resource.source) }
+            a.assertion do !new_resource.source || ::File.exist?(new_resource.source) end
             a.failure_message Chef::Exceptions::Package, "Package #{new_resource.package_name} not found: #{new_resource.source}"
             a.whyrun "assuming #{new_resource.source} would have previously been created"
           end
diff --git a/lib/chef/provider/package/yum/python_helper.rb b/lib/chef/provider/package/yum/python_helper.rb
index f99b17bcce..bc1124818d 100644
--- a/lib/chef/provider/package/yum/python_helper.rb
+++ b/lib/chef/provider/package/yum/python_helper.rb
@@ -40,9 +40,9 @@ class Chef
           YUM_HELPER = ::File.expand_path(::File.join(::File.dirname(__FILE__), "yum_helper.py")).freeze
 
           def yum_command
-            @yum_command ||= which("platform-python", "python", "python2", "python2.7", extra_path: "/usr/libexec") do |f|
+            @yum_command ||= which("platform-python", "python", "python2", "python2.7", extra_path: "/usr/libexec") { |f|
               shell_out("#{f} -c 'import yum'").exitstatus == 0
-            end + " #{YUM_HELPER}"
+            } + " #{YUM_HELPER}"
           end
 
           def start
diff --git a/lib/chef/provider/package/zypper.rb b/lib/chef/provider/package/zypper.rb
index a828da1c6c..286bc04c62 100644
--- a/lib/chef/provider/package/zypper.rb
+++ b/lib/chef/provider/package/zypper.rb
@@ -56,9 +56,9 @@ class Chef
         def versions
           @versions ||=
             begin
-              raw_versions = package_name_array.map do |package_name|
+              raw_versions = package_name_array.map { |package_name|
                 get_versions(package_name)
-              end
+              }
               Hash[*package_name_array.zip(raw_versions).flatten]
             end
         end