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

data/lib/chef/provider/package.rb

@@ -68,8 +68,8 @@ class Chef
         # if not, shouldn't we raise to tell the user to use install instead of upgrade if they want to pin a version?
         requirements.assert(:install) do |a|
           a.assertion { candidates_exist_for_all_forced_changes? }
-          a.failure_message(Chef::Exceptions::Package, "No version specified, and no candidate version available for #{forced_packages_missing_candidates.join(', ')}")
-          a.whyrun("Assuming a repository that offers #{forced_packages_missing_candidates.join(', ')} would have been configured")
+          a.failure_message(Chef::Exceptions::Package, "No version specified, and no candidate version available for #{forced_packages_missing_candidates.join(", ")}")
+          a.whyrun("Assuming a repository that offers #{forced_packages_missing_candidates.join(", ")} would have been configured")
         end
 
         # XXX: Does it make sense to pass in a source with :upgrade? Probably
@@ -77,8 +77,8 @@ class Chef
         # so we'll just leave things as-is for now.
         requirements.assert(:upgrade, :install) do |a|
           a.assertion { candidates_exist_for_all_uninstalled? || new_resource.source }
-          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")
+          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
       end
 
@@ -102,6 +102,7 @@ class Chef
         description = []
         target_version_array.each_with_index do |target_version, i|
           next if target_version.nil?
+
           package_name = package_name_array[i]
           description << "install version #{target_version} of package #{package_name}"
         end
@@ -130,6 +131,7 @@ class Chef
         description = []
         target_version_array.each_with_index do |target_version, i|
           next if target_version.nil?
+
           package_name = package_name_array[i]
           candidate_version = candidate_version_array[i]
           current_version = current_version_array[i] || "uninstalled"
@@ -231,8 +233,7 @@ class Chef
       end
 
       # Subclasses will override this to a method and provide a preseed file path
-      def prepare_for_installation
-      end
+      def prepare_for_installation; end
 
       # @todo use composition rather than inheritance
 
@@ -322,6 +323,7 @@ class Chef
       #
       def version_equals?(v1, v2)
         return false unless v1 && v2
+
         v1 == v2
       end
 
@@ -507,6 +509,7 @@ class Chef
             missing = []
             each_package do |package_name, new_version, current_version, candidate_version|
               next if new_version.nil? || current_version.nil?
+
               if !version_requirement_satisfied?(current_version, new_version) && candidate_version.nil?
                 missing.push(package_name)
               end

data/lib/chef/provider/package/apt.rb

@@ -84,9 +84,7 @@ class Chef
           @locked_packages ||=
             begin
               locked = shell_out!("apt-mark", "showhold")
-              locked.stdout.each_line.map do |line|
-                line.strip
-              end
+              locked.stdout.each_line.map(&:strip)
             end
         end
 
@@ -134,6 +132,7 @@ class Chef
         # @return [Boolean] if apt-get supports --allow-downgrades
         def supports_allow_downgrade?
           return @supports_allow_downgrade unless @supports_allow_downgrade.nil?
+
           @supports_allow_downgrade = ( version_compare(apt_version, "1.1.0") >= 0 )
         end
 
@@ -194,6 +193,7 @@ class Chef
           showpkg = run_noninteractive("apt-cache", "showpkg", pkg).stdout
           partitions = showpkg.rpartition(/Reverse Provides: ?#{$/}/)
           return nil if partitions[0] == "" && partitions[1] == "" # not found in output
+
           set = partitions[2].lines.each_with_object(Set.new) do |line, acc|
             # there may be multiple reverse provides for a single package
             acc.add(line.split[0])
@@ -201,6 +201,7 @@ class Chef
           if set.size > 1
             raise Chef::Exceptions::Package, "#{new_resource.package_name} is a virtual package provided by multiple packages, you must explicitly select one"
           end
+
           set.to_a.first
         end
 

data/lib/chef/provider/package/bff.rb

@@ -84,6 +84,7 @@ class Chef
 
         def candidate_version
           return @candidate_version if @candidate_version
+
           if package_source_found?
             ret = shell_out("installp", "-L", "-d", new_resource.source)
             ret.stdout.each_line do |line|

data/lib/chef/provider/package/cab.rb

@@ -78,6 +78,7 @@ class Chef
             result = shell_out("dism.exe /Online /English #{command} /NoRestart", { timeout: new_resource.timeout })
             if result.exitstatus == -2146498530
               raise Chef::Exceptions::Package, "The specified package is not applicable to this image." if result.stdout.include?("0x800f081e")
+
               result.error!
             end
             result
@@ -88,7 +89,7 @@ class Chef
           # e.g. Package_for_KB2975719~31bf3856ad364e35~amd64~~6.3.1.8
           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']}")
+          logger.trace("#{new_resource} searching for installed package #{package["name"]}")
           existing_package_identities = installed_packages.map do |p|
             split_package_identity(p["package_identity"])
           end
@@ -101,7 +102,7 @@ class Chef
             found_packages.first["version"]
           else
             # Presuming this won't happen, otherwise we need to handle it
-            raise Chef::Exceptions::Package, "Found multiple packages installed matching name #{package['name']}, found: #{found_packages.length} matches"
+            raise Chef::Exceptions::Package, "Found multiple packages installed matching name #{package["name"]}, found: #{found_packages.length} matches"
           end
         end
 
@@ -127,6 +128,7 @@ class Chef
           text.each_line do |line|
             key, value = line.split(":") if line.start_with?("Package Identity")
             next if key.nil? || value.nil?
+
             package = {}
             package[key.downcase.strip.tr(" ", "_")] = value.strip.chomp
             packages << package

data/lib/chef/provider/package/chocolatey.rb

@@ -59,8 +59,8 @@ class Chef
           # 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.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")
+            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
         end
 
@@ -154,6 +154,7 @@ class Chef
               # run before choco.exe gets called from #load_current_resource.
               exe_path = ::File.join(choco_install_path.to_s, "bin", "choco.exe")
               raise Chef::Exceptions::MissingLibrary, CHOCO_MISSING_MSG unless ::File.exist?(exe_path)
+
               exe_path
             end
         end
@@ -230,6 +231,7 @@ class Chef
         # @return [Hash] name-to-version mapping of available packages
         def available_packages
           return @available_packages if @available_packages
+
           @available_packages = {}
           package_name_array.each do |pkg|
             available_versions =
@@ -266,6 +268,7 @@ class Chef
           hash = {}
           choco_command(*args).stdout.each_line do |line|
             next if line.start_with?("Chocolatey v")
+
             name, version = line.split("|")
             hash[name.downcase] = version&.chomp
           end

data/lib/chef/provider/package/dnf.rb

@@ -126,7 +126,7 @@ class Chef
             # does not match what the dnf library accepts.
             case line
             when /^(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)$/
-              return Version.new($1, "#{$2 == '(none)' ? '0' : $2}:#{$3}-#{$4}", $5)
+              return Version.new($1, "#{$2 == "(none)" ? "0" : $2}:#{$3}-#{$4}", $5)
             end
           end
         end

data/lib/chef/provider/package/dnf/dnf_helper.py

@@ -14,8 +14,22 @@ def get_sack():
     global base
     if base is None:
         base = dnf.Base()
+        conf = base.conf
+        conf.read()
+        conf.installroot = '/'
+        subst = conf.substitutions
+        subst.update_from_etc(conf.installroot)
+        try:
+            base.init_plugins()
+            base.pre_configure_plugins()
+        except AttributeError:
+            pass
         base.read_all_repos()
-        base.fill_sack()
+        try:
+            base.configure_plugins()
+        except AttributeError:
+            pass
+        base.fill_sack(load_system_repo='auto')
     return base.sack
 
 # FIXME: leaks memory and does not work

data/lib/chef/provider/package/dnf/python_helper.rb

@@ -161,6 +161,7 @@ class Chef
               retry
             else
               raise e if output.empty?
+
               raise "dnf-helper.py had stderr output:\n\n#{output}"
             end
           end

data/lib/chef/provider/package/dpkg.rb

@@ -75,17 +75,17 @@ class Chef
 
         def install_package(name, version)
           sources = name.map { |n| name_sources[n] }
-          logger.info("#{new_resource} installing package(s): #{name.join(' ')}")
+          logger.info("#{new_resource} installing package(s): #{name.join(" ")}")
           run_noninteractive("dpkg", "-i", *options, *sources)
         end
 
         def remove_package(name, version)
-          logger.info("#{new_resource} removing package(s): #{name.join(' ')}")
+          logger.info("#{new_resource} removing package(s): #{name.join(" ")}")
           run_noninteractive("dpkg", "-r", *options, *name)
         end
 
         def purge_package(name, version)
-          logger.info("#{new_resource} purging packages(s): #{name.join(' ')}")
+          logger.info("#{new_resource} purging packages(s): #{name.join(" ")}")
           run_noninteractive("dpkg", "-P", *options, *name)
         end
 
@@ -218,7 +218,7 @@ class Chef
         #
         # @return [Boolean] true if we're doing :install or :upgrade
         def installing?
-          [:install, :upgrade].include?(action)
+          %i{install upgrade}.include?(action)
         end
 
       end

data/lib/chef/provider/package/freebsd/base.rb

@@ -37,12 +37,12 @@ class Chef
             case port
 
             # When the package name starts with a '/' treat it as the full path to the ports directory.
-            when /^\//
+            when %r{^/}
               port
 
             # Otherwise if the package name contains a '/' not at the start (like 'www/wordpress') treat
             # as a relative path from /usr/ports.
-            when /\//
+            when %r{/}
               "/usr/ports/#{port}"
 
             # Otherwise look up the path to the ports directory using 'whereis'
@@ -51,6 +51,7 @@ class Chef
               unless path = whereis.stdout[/^#{Regexp.escape(port)}:\s+(.+)$/, 1]
                 raise Chef::Exceptions::Package, "Could not find port with the name #{port}"
               end
+
               path
             end
           end

data/lib/chef/provider/package/freebsd/pkgng.rb

@@ -27,7 +27,7 @@ class Chef
           def install_package(name, version)
             unless current_resource.version
               case new_resource.source
-              when /^(http|ftp|\/)/
+              when %r{^(http|ftp|/)}
                 shell_out!("pkg", "add", options, new_resource.source, env: { "LC_ALL" => nil }).status
                 logger.trace("#{new_resource} installed from: #{new_resource.source}")
               else
@@ -38,7 +38,7 @@ class Chef
 
           def remove_package(name, version)
             options_dup = options && options.map { |str| str.sub(repo_regex, "") }.reject!(&:empty?)
-            shell_out!("pkg", "delete", "-y", options_dup, "#{name}#{version ? '-' + version : ''}", env: nil).status
+            shell_out!("pkg", "delete", "-y", options_dup, "#{name}#{version ? "-" + version : ""}", env: nil).status
           end
 
           def current_installed_version

data/lib/chef/provider/package/homebrew.rb

@@ -126,7 +126,7 @@ class Chef
           homebrew_uid = find_homebrew_uid(new_resource.respond_to?(:homebrew_user) && new_resource.homebrew_user)
           homebrew_user = Etc.getpwuid(homebrew_uid)
 
-          logger.trace "Executing '#{command.join(' ')}' as user '#{homebrew_user.name}'"
+          logger.trace "Executing '#{command.join(" ")}' as user '#{homebrew_user.name}'"
           # FIXME: this 1800 second default timeout should be deprecated
           output = shell_out!(*command, timeout: 1800, user: homebrew_uid, environment: { "HOME" => homebrew_user.dir, "RUBYOPT" => nil, "TMPDIR" => nil })
           output.stdout.chomp

data/lib/chef/provider/package/macports.rb

@@ -93,6 +93,7 @@ class Chef
           unless status.exitstatus == 0 || status.exitstatus == 1
             raise Chef::Exceptions::Package, "#{command} failed - #{status.inspect}!"
           end
+
           output
         end
       end

data/lib/chef/provider/package/msu.rb

@@ -54,6 +54,7 @@ class Chef
           else
             current_resource.version(get_current_versions)
           end
+
           current_resource
         end
 
@@ -125,7 +126,7 @@ class Chef
 
         def extract_msu_contents(msu_file, destination)
           with_os_architecture(nil) do
-            shell_out!("#{ENV['SYSTEMROOT']}\\system32\\expand.exe -f:* #{msu_file} #{destination}")
+            shell_out!("#{ENV["SYSTEMROOT"]}\\system32\\expand.exe -f:* #{msu_file} #{destination}")
           end
         end
 
@@ -148,6 +149,7 @@ class Chef
 
             cab_files
           end
+
           cab_files
         end
 

data/lib/chef/provider/package/openbsd.rb

@@ -130,7 +130,7 @@ class Chef
         end
 
         def pkg_path
-          ENV["PKG_PATH"] || "http://ftp.OpenBSD.org/pub/#{node['kernel']['name']}/#{node['kernel']['release']}/packages/#{node['kernel']['machine']}/"
+          ENV["PKG_PATH"] || "http://ftp.OpenBSD.org/pub/#{node["kernel"]["name"]}/#{node["kernel"]["release"]}/packages/#{node["kernel"]["machine"]}/"
         end
 
       end

data/lib/chef/provider/package/paludis.rb

@@ -38,6 +38,7 @@ class Chef
           shell_out!("cave", "-L", "warning", "print-ids", "-M", "none", "-m", new_resource.package_name, "-f", "%c/%p %v %r\n").stdout.each_line do |line|
             res = re.match(line)
             next if res.nil?
+
             case res[3]
             when "accounts", "installed-accounts"
               next

data/lib/chef/provider/package/portage.rb

@@ -38,7 +38,7 @@ 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/}, "") }
+          possibilities = Dir["/var/db/pkg/#{globsafe_category || "*"}/#{globsafe_pkg}-*"].map { |d| d.sub(%r{/var/db/pkg/}, "") }
           versions = possibilities.map do |entry|
             if entry =~ %r{[^/]+/#{Regexp.escape(pkg)}\-(\d[\.\d]*[a-z]?((_(alpha|beta|pre|rc|p)\d*)*)?(-r\d+)?)}
               [$&, $1]
@@ -49,7 +49,7 @@ class Chef
             atoms = versions.map(&:first).sort
             categories = atoms.map { |v| v.split("/")[0] }.uniq
             if !category && categories.size > 1
-              raise Chef::Exceptions::Package, "Multiple packages found for #{new_resource.package_name}: #{atoms.join(' ')}. Specify a category."
+              raise Chef::Exceptions::Package, "Multiple packages found for #{new_resource.package_name}: #{atoms.join(" ")}. Specify a category."
             end
           elsif versions.size == 1
             current_resource.version(versions.first.last)

data/lib/chef/provider/package/powershell.rb

@@ -39,10 +39,11 @@ class Chef
           if powershell_out("$PSVersionTable.PSVersion.Major").stdout.strip.to_i < 5
             raise "Minimum installed PowerShell Version required is 5"
           end
+
           requirements.assert(:install) do |a|
             a.assertion { candidates_exist_for_all_uninstalled? }
-            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")
+            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
         end
 

data/lib/chef/provider/package/rpm.rb

@@ -116,6 +116,7 @@ class Chef
         def uri_scheme?(str)
           scheme = URI.split(str).first
           return false unless scheme
+
           %w{http https ftp file}.include?(scheme.downcase)
         rescue URI::InvalidURIError
           false

data/lib/chef/provider/package/rubygems.rb

@@ -199,7 +199,7 @@ class Chef
               logger.trace { "found gem #{spec.name} version #{version} for platform #{spec.platform} from #{source}" }
               version
             else
-              source_list = sources.compact.empty? ? "[#{Gem.sources.to_a.join(', ')}]" : "[#{sources.join(', ')}]"
+              source_list = sources.compact.empty? ? "[#{Gem.sources.to_a.join(", ")}]" : "[#{sources.join(", ")}]"
               logger.warn { "failed to find gem #{gem_dependency} from #{source_list}" }
               nil
             end
@@ -421,11 +421,11 @@ class Chef
 
         def is_omnibus?
           if RbConfig::CONFIG["bindir"] =~ %r{/(opscode|chef|chefdk)/embedded/bin}
-            logger.trace("#{new_resource} detected omnibus installation in #{RbConfig::CONFIG['bindir']}")
+            logger.trace("#{new_resource} detected omnibus installation in #{RbConfig::CONFIG["bindir"]}")
             # Omnibus installs to a static path because of linking on unix, find it.
             true
           elsif RbConfig::CONFIG["bindir"].sub(/^[\w]:/, "") == "/opscode/chef/embedded/bin"
-            logger.trace("#{new_resource} detected omnibus installation in #{RbConfig::CONFIG['bindir']}")
+            logger.trace("#{new_resource} detected omnibus installation in #{RbConfig::CONFIG["bindir"]}")
             # windows, with the drive letter removed
             true
           else
@@ -444,6 +444,7 @@ class Chef
         def source_is_remote?
           return true if new_resource.source.nil?
           return true if new_resource.source.is_a?(Array)
+
           scheme = URI.parse(new_resource.source).scheme
           # URI.parse gets confused by MS Windows paths with forward slashes.
           scheme = nil if scheme =~ /^[a-z]$/
@@ -516,6 +517,7 @@ class Chef
 
         def version_requirement_satisfied?(current_version, new_version)
           return false unless current_version && new_version
+
           Gem::Requirement.new(new_version).satisfied_by?(Gem::Version.new(current_version))
         end
 

data/lib/chef/provider/package/smartos.rb

@@ -56,6 +56,7 @@ class Chef
 
         def candidate_version
           return @candidate_version if @candidate_version
+
           name = nil
           version = nil
           pkg = shell_out!("/opt/local/bin/pkgin", "se", new_resource.package_name, env: nil, returns: [0, 1])

data/lib/chef/provider/package/snap.rb

@@ -154,6 +154,7 @@ class Chef
           if response["type"] == "error"
             raise "status: #{response["status"]}, kind: #{response["result"]["kind"]}, message: #{response["result"]["message"]}"
           end
+
           response["change"]
         end
 
@@ -177,6 +178,7 @@ class Chef
             end
             n += 1
             raise "Snap operating timed out after #{n} seconds." if n == 300
+
             sleep(1)
           end
         end
@@ -188,7 +190,7 @@ class Chef
         def get_snap_version_from_source(path)
           body = {
               "context-id" => "get_snap_version_from_source_#{path}",
-              "args" => ["info", path,],
+              "args" => ["info", path],
           }.to_json
 
           # json = call_snap_api('POST', '/v2/snapctl', body)
@@ -319,6 +321,7 @@ class Chef
           unless [200, 404].include? json["status-code"]
             raise Chef::Exceptions::Package, json["result"], caller
           end
+
           json["result"]
         end
 
@@ -338,6 +341,7 @@ class Chef
           unless [200, 404].include? json["status-code"]
             raise Chef::Exceptions::Package, json["result"], caller
           end
+
           json["result"]
         end