puppet 8.5.1-universal-darwin → 8.6.0-universal-darwin

data/lib/puppet/provider/package/ports.rb

@@ -8,14 +8,14 @@ Puppet::Type.type(:package).provide :ports, :parent => :freebsd, :source => :fre
            :portuninstall => "/usr/local/sbin/pkg_deinstall",
            :portinfo => "/usr/sbin/pkg_info"
 
-  %w{INTERACTIVE UNAME}.each do |var|
+  %w[INTERACTIVE UNAME].each do |var|
     ENV.delete(var) if ENV.include?(var)
   end
 
   def install
     # -N: install if the package is missing, otherwise upgrade
     # -M: yes, we're a batch, so don't ask any questions
-    cmd = %w{-N -M BATCH=yes} << @resource[:name]
+    cmd = %w[-N -M BATCH=yes] << @resource[:name]
 
     output = portupgrade(*cmd)
     if output =~ /\*\* No such /
@@ -29,8 +29,8 @@ Puppet::Type.type(:package).provide :ports, :parent => :freebsd, :source => :fre
 
     begin
       output = portversion(*cmd)
-    rescue Puppet::ExecutionFailure
-      raise Puppet::Error.new(output, $!)
+    rescue Puppet::ExecutionFailure => e
+      raise Puppet::Error.new(output, e)
     end
     line = output.split("\n").pop
 
@@ -39,16 +39,16 @@ Puppet::Type.type(:package).provide :ports, :parent => :freebsd, :source => :fre
       return :latest
     end
 
-    pkgstuff = $1
-    match = $2
-    info = $3
+    pkgstuff = Regexp.last_match(1)
+    match = Regexp.last_match(2)
+    info = Regexp.last_match(3)
 
     unless pkgstuff =~ /^\S+-([^-\s]+)$/
       raise Puppet::Error,
             _("Could not match package info '%{pkgstuff}'") % { pkgstuff: pkgstuff }
     end
 
-    version = $1
+    version = Regexp.last_match(1)
 
     if match == "=" or match == ">"
       # we're up to date or more recent
@@ -62,7 +62,8 @@ Puppet::Type.type(:package).provide :ports, :parent => :freebsd, :source => :fre
             _("Could not match version info '%{info}'") % { info: info }
     end
 
-    source, newversion = $1, $2
+    source = Regexp.last_match(1)
+    newversion = Regexp.last_match(2)
 
     debug "Newer version in #{source}"
     newversion
@@ -71,8 +72,8 @@ Puppet::Type.type(:package).provide :ports, :parent => :freebsd, :source => :fre
   def query
     # support portorigin_glob such as "mail/postfix"
     name = self.name
-    if name =~ /\//
-      name = self.name.split(/\//).slice(1)
+    if name =~ %r{/}
+      name = self.name.split(%r{/}).slice(1)
     end
     self.class.instances.each do |instance|
       if instance.name == name

data/lib/puppet/provider/package/portupgrade.rb

@@ -23,7 +23,7 @@ Puppet::Type.type(:package).provide :portupgrade, :parent => Puppet::Provider::P
   # defaultfor 'os.name' => :freebsd
 
   # Remove unwanted environment variables.
-  %w{INTERACTIVE UNAME}.each do |var|
+  %w[INTERACTIVE UNAME].each do |var|
     if ENV.include?(var)
       ENV.delete(var)
     end
@@ -35,7 +35,7 @@ Puppet::Type.type(:package).provide :portupgrade, :parent => Puppet::Provider::P
     Puppet.debug "portupgrade.rb Building packages list from installed ports"
 
     # regex to match output from pkg_info
-    regex = %r{^(\S+)-([^-\s]+):(\S+)$}
+    regex = /^(\S+)-([^-\s]+):(\S+)$/
     # Corresponding field names
     fields = [:portname, :ensure, :portorigin]
     # define Temporary hash used, packages array of hashes
@@ -46,8 +46,8 @@ Puppet::Type.type(:package).provide :portupgrade, :parent => Puppet::Provider::P
     cmdline = ["-aoQ"]
     begin
       output = portinfo(*cmdline)
-    rescue Puppet::ExecutionFailure
-      raise Puppet::Error.new(output, $!)
+    rescue Puppet::ExecutionFailure => e
+      raise Puppet::Error.new(output, e)
     end
 
     # split output and match it and populate temp hash
@@ -64,7 +64,7 @@ Puppet::Type.type(:package).provide :portupgrade, :parent => Puppet::Provider::P
         # populate the actual :name field from the :portorigin
         # Set :provider to this object name
         hash[:name] = hash[:portorigin]
-        hash[:provider] = self.name
+        hash[:provider] = name
 
         # Add to the full packages listing
         packages << new(hash)
@@ -75,7 +75,7 @@ Puppet::Type.type(:package).provide :portupgrade, :parent => Puppet::Provider::P
     }
 
     # return the packages array of hashes
-    return packages
+    packages
   end
 
   ######## Installation sub command
@@ -88,8 +88,8 @@ Puppet::Type.type(:package).provide :portupgrade, :parent => Puppet::Provider::P
     # FIXME: it's possible that portinstall prompts for data so locks up.
     begin
       output = portinstall(*cmdline)
-    rescue Puppet::ExecutionFailure
-      raise Puppet::Error.new(output, $!)
+    rescue Puppet::ExecutionFailure => e
+      raise Puppet::Error.new(output, e)
     end
 
     if output =~ /\*\* No such /
@@ -97,7 +97,7 @@ Puppet::Type.type(:package).provide :portupgrade, :parent => Puppet::Provider::P
     end
 
     # No return code required, so do nil to be clean
-    return nil
+    nil
   end
 
   ######## Latest subcommand (returns the latest version available, or current version if installed is latest)
@@ -111,39 +111,39 @@ Puppet::Type.type(:package).provide :portupgrade, :parent => Puppet::Provider::P
 
     begin
       output = portversion(*cmdline)
-    rescue Puppet::ExecutionFailure
-      raise Puppet::Error.new(output, $!)
+    rescue Puppet::ExecutionFailure => e
+      raise Puppet::Error.new(output, e)
     end
 
     # Check: output format.
     if output =~ /^\S+-([^-\s]+)\s+(\S)\s+(.*)/
-      installedversion = $1
-      comparison = $2
-      otherdata = $3
+      installedversion = Regexp.last_match(1)
+      comparison = Regexp.last_match(2)
+      otherdata = Regexp.last_match(3)
 
       # Only return a new version number when it's clear that there is a new version
       # all others return the current version so no unexpected 'upgrades' occur.
       case comparison
       when "=", ">"
         Puppet.debug "portupgrade.latest() - Installed package is latest (#{installedversion})"
-        return installedversion
+        installedversion
       when "<"
         # "portpkg-1.7_5 < needs updating (port has 1.14)"
         # "portpkg-1.7_5 < needs updating (port has 1.14) (=> 'newport/pkg')
         if otherdata =~ /\(port has (\S+)\)/
-          newversion = $1
+          newversion = Regexp.last_match(1)
           Puppet.debug "portupgrade.latest() - Installed version needs updating to (#{newversion})"
-          return newversion
+          newversion
         else
           Puppet.debug "portupgrade.latest() - Unable to determine new version from (#{otherdata})"
-          return installedversion
+          installedversion
         end
       when "?", "!", "#"
         Puppet.debug "portupgrade.latest() - Comparison Error reported from portversion (#{output})"
-        return installedversion
+        installedversion
       else
         Puppet.debug "portupgrade.latest() - Unknown code from portversion output (#{output})"
-        return installedversion
+        installedversion
       end
 
     elsif output =~ /^\*\* No matching package /
@@ -166,25 +166,25 @@ Puppet::Type.type(:package).provide :portupgrade, :parent => Puppet::Provider::P
     cmdline = ["-qO", @resource[:name]]
     begin
       output = portinfo(*cmdline)
-    rescue Puppet::ExecutionFailure
-      raise Puppet::Error.new(output, $!)
+    rescue Puppet::ExecutionFailure => e
+      raise Puppet::Error.new(output, e)
     end
 
     # Check: if output isn't in the right format, return nil
     if output =~ /^(\S+)-([^-\s]+)/
       # Fill in the details
       hash = Hash.new
-      hash[:portorigin] = self.name
-      hash[:portname]   = $1
-      hash[:ensure]     = $2
+      hash[:portorigin] = name
+      hash[:portname]   = Regexp.last_match(1)
+      hash[:ensure]     = Regexp.last_match(2)
 
       # If more details are required, then we can do another pkg_info
       # query here and parse out that output and add to the hash
       # return the hash to the caller
-      return hash
+      hash
     else
       Puppet.debug "portupgrade.query() - package (#{@resource[:name]}) not installed"
-      return nil
+      nil
     end
   end
 
@@ -196,13 +196,13 @@ Puppet::Type.type(:package).provide :portupgrade, :parent => Puppet::Provider::P
     cmdline = ["-qO", @resource[:name]]
     begin
       output = portinfo(*cmdline)
-    rescue Puppet::ExecutionFailure
-      raise Puppet::Error.new(output, $!)
+    rescue Puppet::ExecutionFailure => e
+      raise Puppet::Error.new(output, e)
     end
 
     if output =~ /^(\S+)/
       # output matches, so uninstall it
-      portuninstall $1
+      portuninstall Regexp.last_match(1)
     end
   end
 
@@ -214,17 +214,17 @@ Puppet::Type.type(:package).provide :portupgrade, :parent => Puppet::Provider::P
     cmdline = ["-qO", @resource[:name]]
     begin
       output = portinfo(*cmdline)
-    rescue Puppet::ExecutionFailure
-      raise Puppet::Error.new(output, $!)
+    rescue Puppet::ExecutionFailure => e
+      raise Puppet::Error.new(output, e)
     end
 
     if output =~ /^(\S+)/
       # output matches, so upgrade the software
-      cmdline = ["-M BATCH=yes", $1]
+      cmdline = ["-M BATCH=yes", Regexp.last_match(1)]
       begin
         output = portupgrade(*cmdline)
-      rescue Puppet::ExecutionFailure
-        raise Puppet::Error.new(output, $!)
+      rescue Puppet::ExecutionFailure => e
+        raise Puppet::Error.new(output, e)
       end
     end
   end

data/lib/puppet/provider/package/puppetserver_gem.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'English'
 unless Puppet::Util::Platform.jruby_fips?
   require 'rubygems/commands/list_command'
 end
@@ -37,7 +38,7 @@ Puppet::Type.type(:package).provide :puppetserver_gem, :parent => :gem do
   end
 
   def self.gemlist(options)
-    command_options = ['gem', 'list']
+    command_options = %w[gem list]
 
     if options[:local]
       command_options << '--local'
@@ -74,14 +75,14 @@ Puppet::Type.type(:package).provide :puppetserver_gem, :parent => :gem do
                .map { |set| gemsplit(set) }
 
     if options[:justme]
-      return gem_list.shift
+      gem_list.shift
     else
-      return gem_list
+      gem_list
     end
   end
 
   def install(useversion = true)
-    command_options = ['gem', 'install']
+    command_options = %w[gem install]
     command_options += install_options if resource[:install_options]
 
     command_options << '-v' << resource[:ensure] if (!resource[:ensure].is_a? Symbol) && useversion
@@ -103,10 +104,10 @@ Puppet::Type.type(:package).provide :puppetserver_gem, :parent => :gem do
         command_options << uri.path
       when 'puppet'
         # we don't support puppet:// URLs (yet)
-        raise Puppet::Error.new(_('puppet:// URLs are not supported as gem sources'))
+        raise Puppet::Error, _('puppet:// URLs are not supported as gem sources')
       else
         # interpret it as a gem repository
-        command_options << '--source' << "#{resource[:source]}" << resource[:name]
+        command_options << '--source' << resource[:source].to_s << resource[:name]
       end
     else
       command_options << resource[:name]
@@ -118,7 +119,7 @@ Puppet::Type.type(:package).provide :puppetserver_gem, :parent => :gem do
   end
 
   def uninstall
-    command_options = ['gem', 'uninstall']
+    command_options = %w[gem uninstall]
     command_options << '--executables' << '--all' << resource[:name]
     command_options += uninstall_options if resource[:uninstall_options]
 
@@ -158,7 +159,7 @@ Puppet::Type.type(:package).provide :puppetserver_gem, :parent => :gem do
       gem_env['GEM_HOME'] = puppetserver_conf['jruby-puppet'].key?('gem-home') ? puppetserver_conf['jruby-puppet']['gem-home'] : puppetserver_default_gem_home
       gem_env['GEM_PATH'] = puppetserver_conf['jruby-puppet'].key?('gem-path') ? puppetserver_conf['jruby-puppet']['gem-path'].join(':') : puppetserver_default_gem_path
     end
-    gem_env['GEM_SPEC_CACHE'] = "/tmp/#{$$}"
+    gem_env['GEM_SPEC_CACHE'] = "/tmp/#{$PROCESS_ID}"
 
     # Remove the 'gem' from the command_options
     command_options.shift
@@ -167,7 +168,7 @@ Puppet::Type.type(:package).provide :puppetserver_gem, :parent => :gem do
     # There is no method exclude default gems from the local gem list,
     # for example: psych (default: 2.2.2)
     # but default gems should not be managed by this (or any) provider.
-    gem_list = gem_out.lines.reject { |gem| gem =~ / \(default\: / }
+    gem_list = gem_out.lines.reject { |gem| gem =~ / \(default: / }
     gem_list.join("\n")
   end
 end

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

@@ -24,8 +24,8 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
   # Note: self:: is required here to keep these constants in the context of what will
   # eventually become this Puppet::Type::Package::ProviderRpm class.
   # The query format by which we identify installed packages
-  self::NEVRA_FORMAT = %Q{%{NAME} %|EPOCH?{%{EPOCH}}:{0}| %{VERSION} %{RELEASE} %{ARCH}\\n}
-  self::NEVRA_REGEX  = %r{^'?(\S+) (\S+) (\S+) (\S+) (\S+)$}
+  self::NEVRA_FORMAT = '%{NAME} %|EPOCH?{%{EPOCH}}:{0}| %{VERSION} %{RELEASE} %{ARCH}\\n'
+  self::NEVRA_REGEX  = /^'?(\S+) (\S+) (\S+) (\S+) (\S+)$/
   self::NEVRA_FIELDS = [:name, :epoch, :version, :release, :arch]
   self::MULTIVERSION_SEPARATOR = "; "
 
@@ -71,8 +71,8 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
         # now turn each returned line into a package object
         nevra_to_multiversion_hash(process).each { |hash| packages << new(hash) }
       }
-    rescue Puppet::ExecutionFailure
-      raise Puppet::Error, _("Failed to list packages"), $!.backtrace
+    rescue Puppet::ExecutionFailure => e
+      raise Puppet::Error, _("Failed to list packages"), e.backtrace
     end
 
     packages
@@ -85,7 +85,7 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
     # NOTE: Prior to a fix for issue 1243, this method potentially returned a cached value
     # IF YOU CALL THIS METHOD, IT WILL CALL RPM
     # Use get(:property) to check if cached values are available
-    cmd = ["-q", @resource[:name], "#{self.class.nosignature}", "#{self.class.nodigest}", "--qf", "#{self.class::NEVRA_FORMAT}"]
+    cmd = ["-q", @resource[:name], self.class.nosignature.to_s, self.class.nodigest.to_s, "--qf", self.class::NEVRA_FORMAT.to_s]
 
     begin
       output = rpm(*cmd)
@@ -114,7 +114,7 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
       @resource.fail _("RPMs must specify a package source")
     end
 
-    cmd = [command(:rpm), "-q", "--qf", "#{self.class::NEVRA_FORMAT}", "-p", source]
+    cmd = [command(:rpm), "-q", "--qf", self.class::NEVRA_FORMAT.to_s, "-p", source]
     h = self.class.nevra_to_multiversion_hash(execute(cmd))
     h[:ensure]
   rescue Puppet::ExecutionFailure => e
@@ -175,7 +175,7 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
   end
 
   def update
-    self.install
+    install
   end
 
   def install_options
@@ -209,14 +209,14 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
     match = self::NEVRA_REGEX.match(line)
     if match
       self::NEVRA_FIELDS.zip(match.captures) { |f, v| hash[f] = v }
-      hash[:provider] = self.name
+      hash[:provider] = name
       hash[:ensure] = "#{hash[:version]}-#{hash[:release]}"
       hash[:ensure].prepend("#{hash[:epoch]}:") if hash[:epoch] != '0'
     else
       Puppet.debug("Failed to match rpm line #{line}")
     end
 
-    return hash
+    hash
   end
 
   # @param line [String] multiple lines of rpm package query information
@@ -227,22 +227,22 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
     list = []
     multiversion_hash = {}
     multiline.each_line do |line|
-      hash = self.nevra_to_hash(line)
-      if !hash.empty?
-        if multiversion_hash.empty?
-          multiversion_hash = hash.dup
-          next
-        end
-
-        if multiversion_hash[:name] != hash[:name]
-          list << multiversion_hash
-          multiversion_hash = hash.dup
-          next
-        end
-
-        if !multiversion_hash[:ensure].include?(hash[:ensure])
-          multiversion_hash[:ensure].concat("#{self::MULTIVERSION_SEPARATOR}#{hash[:ensure]}")
-        end
+      hash = nevra_to_hash(line)
+      next if hash.empty?
+
+      if multiversion_hash.empty?
+        multiversion_hash = hash.dup
+        next
+      end
+
+      if multiversion_hash[:name] != hash[:name]
+        list << multiversion_hash
+        multiversion_hash = hash.dup
+        next
+      end
+
+      unless multiversion_hash[:ensure].include?(hash[:ensure])
+        multiversion_hash[:ensure].concat("#{self::MULTIVERSION_SEPARATOR}#{hash[:ensure]}")
       end
     end
     list << multiversion_hash if multiversion_hash
@@ -250,6 +250,6 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
       return list[0]
     end
 
-    return list
+    list
   end
 end

data/lib/puppet/provider/package/rug.rb

@@ -12,7 +12,7 @@ Puppet::Type.type(:package).provide :rug, :parent => :rpm do
   # Install a package using 'rug'.
   def install
     should = @resource.should(:ensure)
-    self.debug "Ensuring => #{should}"
+    debug "Ensuring => #{should}"
     wanted = @resource[:name]
 
     # XXX: We don't actually deal with epochs here.
@@ -25,10 +25,8 @@ Puppet::Type.type(:package).provide :rug, :parent => :rpm do
     end
     rug "--quiet", :install, "-y", wanted
 
-    unless self.query
-      raise Puppet::ExecutionFailure.new(
-        _("Could not find package %{name}") % { name: self.name }
-      )
+    unless query
+      raise Puppet::ExecutionFailure, _("Could not find package %{name}") % { name: name }
     end
   end
 
@@ -37,17 +35,17 @@ Puppet::Type.type(:package).provide :rug, :parent => :rpm do
     # rug can only get a list of *all* available packages?
     output = rug "list-updates"
 
-    if output =~ /#{Regexp.escape @resource[:name]}\s*\|\s*([^\s\|]+)/
-      return $1
+    if output =~ /#{Regexp.escape @resource[:name]}\s*\|\s*([^\s|]+)/
+      Regexp.last_match(1)
     else
       # rug didn't find updates, pretend the current
       # version is the latest
-      return @property_hash[:ensure]
+      @property_hash[:ensure]
     end
   end
 
   def update
     # rug install can be used for update, too
-    self.install
+    install
   end
 end

data/lib/puppet/provider/package/sun.rb

@@ -47,7 +47,7 @@ Puppet::Type.type(:package).provide :sun, :parent => Puppet::Provider::Package d
         pkgs << pkg unless pkg.empty?
         pkg = {}
       when /^\s*([^:]+):\s+(.+)$/
-        pkg[$1] = $2
+        pkg[Regexp.last_match(1)] = Regexp.last_match(2)
       end
     end
     pkgs << pkg unless pkg.empty?
@@ -81,7 +81,7 @@ Puppet::Type.type(:package).provide :sun, :parent => Puppet::Provider::Package d
       # so even though pkginfo passed, we have to check the actual output
       raise Puppet::Error, _("Unable to get information about package %{name} because of: %{errmsg}") % { name: @resource[:name], errmsg: errmsg }
     rescue Puppet::ExecutionFailure
-      return { :ensure => :absent }
+      { :ensure => :absent }
     end
   end
 
@@ -115,8 +115,8 @@ Puppet::Type.type(:package).provide :sun, :parent => Puppet::Provider::Package d
   # Remove the old package, and install the new one.  This will probably
   # often fail.
   def update
-    self.uninstall if (@property_hash[:ensure] || info2hash[:ensure]) != :absent
-    self.install
+    uninstall if (@property_hash[:ensure] || info2hash[:ensure]) != :absent
+    install
   end
 
   def prepare_cmd(opt)

data/lib/puppet/provider/package/up2date.rb

@@ -14,10 +14,8 @@ Puppet::Type.type(:package).provide :up2date, :parent => :rpm, :source => :rpm d
   def install
     up2date "-u", @resource[:name]
 
-    unless self.query
-      raise Puppet::ExecutionFailure.new(
-        _("Could not find package %{name}") % { name: self.name }
-      )
+    unless query
+      raise Puppet::ExecutionFailure, _("Could not find package %{name}") % { name: name }
     end
   end
 
@@ -27,16 +25,16 @@ Puppet::Type.type(:package).provide :up2date, :parent => :rpm, :source => :rpm d
     output = up2date "--showall"
 
     if output =~ /^#{Regexp.escape @resource[:name]}-(\d+.*)\.\w+/
-      return $1
+      Regexp.last_match(1)
     else
       # up2date didn't find updates, pretend the current
       # version is the latest
-      return @property_hash[:ensure]
+      @property_hash[:ensure]
     end
   end
 
   def update
     # Install in up2date can be used for update, too
-    self.install
+    install
   end
 end

data/lib/puppet/provider/package/urpmi.rb

@@ -10,7 +10,7 @@ Puppet::Type.type(:package).provide :urpmi, :parent => :rpm, :source => :rpm do
 
   def install
     should = @resource.should(:ensure)
-    self.debug "Ensuring => #{should}"
+    debug "Ensuring => #{should}"
     wanted = @resource[:name]
 
     # XXX: We don't actually deal with epochs here.
@@ -24,8 +24,8 @@ Puppet::Type.type(:package).provide :urpmi, :parent => :rpm, :source => :rpm do
 
     urpmi "--auto", wanted
 
-    unless self.query
-      raise Puppet::Error, _("Package %{name} was not present after trying to install it") % { name: self.name }
+    unless query
+      raise Puppet::Error, _("Package %{name} was not present after trying to install it") % { name: name }
     end
   end
 
@@ -34,17 +34,17 @@ Puppet::Type.type(:package).provide :urpmi, :parent => :rpm, :source => :rpm do
     output = urpmq "-S", @resource[:name]
 
     if output =~ /^#{Regexp.escape @resource[:name]}\s+:\s+.*\(\s+(\S+)\s+\)/
-      return $1
+      Regexp.last_match(1)
     else
       # urpmi didn't find updates, pretend the current
       # version is the latest
-      return @resource[:ensure]
+      @resource[:ensure]
     end
   end
 
   def update
     # Install in urpmi can be used for update, too
-    self.install
+    install
   end
 
   # For normal package removal the urpmi provider will delegate to the RPM

data/lib/puppet/provider/package/windows/exe_package.rb

@@ -16,7 +16,7 @@ class Puppet::Provider::Package::Windows
       'Security Update',
       'Update Rollup',
       'Hotfix',
-      'WindowsInstaller',
+      'WindowsInstaller'
     ]
 
     def self.register(path)
@@ -44,10 +44,10 @@ class Puppet::Provider::Package::Windows
          values['UninstallString'].length > 0 &&
          values['WindowsInstaller'] != 1 && # DWORD
          name !~ /^KB[0-9]{6}/ &&
-         values['ParentKeyName'] == nil &&
-         values['Security Update'] == nil &&
-         values['Update Rollup'] == nil &&
-         values['Hotfix'] == nil)
+         values['ParentKeyName'].nil? &&
+         values['Security Update'].nil? &&
+         values['Update Rollup'].nil? &&
+         values['Hotfix'].nil?)
     end
 
     def initialize(name, version, uninstall_string)
@@ -69,7 +69,7 @@ class Puppet::Provider::Package::Windows
           uri = URI(Puppet::Util.uri_encode(file_location))
           client = Puppet.runtime[:http]
           client.get(uri, options: { include_system_store: true }) do |response|
-            raise Puppet::HTTP::ResponseError.new(response) unless response.success?
+            raise Puppet::HTTP::ResponseError, response unless response.success?
 
             File.open(tempfile.path, 'wb') do |file|
               response.read_body do |data|
@@ -80,7 +80,7 @@ class Puppet::Provider::Package::Windows
         rescue => detail
           raise Puppet::Error.new(_("Error when installing %{package}: %{detail}") % { package: resource[:name], detail: detail.message }, detail)
         ensure
-          self.register(tempfile.path)
+          register(tempfile.path)
           tempfile.close()
           file_location = tempfile.path
         end

data/lib/puppet/provider/package/windows/msi_package.rb

@@ -13,9 +13,9 @@ class Puppet::Provider::Package::Windows
     # registry values to load under each product entry in
     # HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall
     # for this provider
-    REG_VALUE_NAMES = [
-      'DisplayVersion',
-      'WindowsInstaller'
+    REG_VALUE_NAMES = %w[
+      DisplayVersion
+      WindowsInstaller
     ]
 
     # Get the COM installer object, it's in a separate method for testing

data/lib/puppet/provider/package/windows/package.rb

@@ -13,7 +13,7 @@ class Puppet::Provider::Package::Windows
 
     attr_reader :name, :version
 
-    REG_DISPLAY_VALUE_NAMES = ['DisplayName', 'QuietDisplayName']
+    REG_DISPLAY_VALUE_NAMES = %w[DisplayName QuietDisplayName]
 
     def self.reg_value_names_to_load
       REG_DISPLAY_VALUE_NAMES |
@@ -91,7 +91,7 @@ class Puppet::Provider::Package::Windows
     end
 
     def self.quote(value)
-      value.include?(' ') ? %Q["#{value.gsub(/"/, '\"')}"] : value
+      value.include?(' ') ? %Q("#{value.gsub(/"/, '\"')}") : value
     end
 
     def self.get_display_name(values)