puppet 8.4.0-universal-darwin → 8.5.1-universal-darwin

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

@@ -29,7 +29,7 @@ Puppet::Type.type(:package).provide :nim, :parent => :aix, :source => :aix do
   attr_accessor :latest_info
 
   def self.srclistcmd(source)
-    [ command(:nimclient), "-o", "showres", "-a", "installp_flags=L", "-a", "resource=#{source}" ]
+    [command(:nimclient), "-o", "showres", "-a", "installp_flags=L", "-a", "resource=#{source}"]
   end
 
   def uninstall
@@ -62,7 +62,7 @@ Puppet::Type.type(:package).provide :nim, :parent => :aix, :source => :aix do
 
     pkg = @resource[:name]
 
-    version_specified = (useversion and (! @resource.should(:ensure).is_a? Symbol))
+    version_specified = (useversion and (!@resource.should(:ensure).is_a? Symbol))
 
     # This is unfortunate for a couple of reasons.  First, because of a subtle
     # difference in the command-line syntax for installing an RPM vs an
@@ -100,7 +100,7 @@ Puppet::Type.type(:package).provide :nim, :parent => :aix, :source => :aix do
 
       errmsg = if version_specified
                  _("Unable to find package '%{package}' with version '%{version}' on lpp_source '%{source}'") %
-                     { package: pkg, version: version, source: source }
+                   { package: pkg, version: version, source: source }
                else
                  _("Unable to find package '%{package}' on lpp_source '%{source}'") % { package: pkg, source: source }
                end
@@ -245,7 +245,7 @@ Puppet::Type.type(:package).provide :nim, :parent => :aix, :source => :aix do
     package_string = match.captures[1]
 
     case package_type_flag
-    when "I","S"
+    when "I", "S"
       parse_installp_package_string(package_string)
     when "R"
       parse_rpm_package_string(package_string)

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

@@ -31,14 +31,14 @@ Puppet::Type.type(:package).provide :openbsd, :parent => Puppet::Provider::Packa
       execpipe(listcmd) do |process|
         # our regex for matching pkg_info output
         regex = /^(.*)-(\d[^-]*)[-]?([\w-]*)(.*)$/
-        fields = [:name, :ensure, :flavor ]
+        fields = [:name, :ensure, :flavor]
         hash = {}
 
         # now turn each returned line into a package object
         process.each_line { |line|
           match = regex.match(line.split[0])
           if match
-            fields.zip(match.captures) { |field,value|
+            fields.zip(match.captures) { |field, value|
               hash[field] = value
             }
 
@@ -69,7 +69,7 @@ Puppet::Type.type(:package).provide :openbsd, :parent => Puppet::Provider::Packa
   def latest
     parse_pkgconf
 
-    if @resource[:source][-1,1] == ::File::SEPARATOR
+    if @resource[:source][-1, 1] == ::File::SEPARATOR
       e_vars = { 'PKG_PATH' => @resource[:source] }
     else
       e_vars = {}
@@ -81,7 +81,7 @@ Puppet::Type.type(:package).provide :openbsd, :parent => Puppet::Provider::Packa
       query = @resource[:name]
     end
 
-    output = Puppet::Util.withenv(e_vars) {pkginfo "-Q", query}
+    output = Puppet::Util.withenv(e_vars) { pkginfo "-Q", query }
     version = properties[:ensure]
 
     if output.nil? or output.size == 0 or output =~ /Error from /
@@ -89,7 +89,7 @@ Puppet::Type.type(:package).provide :openbsd, :parent => Puppet::Provider::Packa
       return version
     else
       # Remove all fuzzy matches first.
-      output = output.split.select {|p| p =~ /^#{resource[:name]}-(\d[^-]*)[-]?(\w*)/ }.join
+      output = output.split.select { |p| p =~ /^#{resource[:name]}-(\d[^-]*)[-]?(\w*)/ }.join
       debug "pkg_info -Q for #{resource[:name]}: #{output}"
     end
 
@@ -104,7 +104,7 @@ Puppet::Type.type(:package).provide :openbsd, :parent => Puppet::Provider::Packa
         return match[2]
       end
 
-      vcmp = version.split('.').map{|s|s.to_i} <=> match[2].split('.').map{|s|s.to_i}
+      vcmp = version.split('.').map { |s| s.to_i } <=> match[2].split('.').map { |s| s.to_i }
       if vcmp > 0
         # The locally installed package may actually be newer than what a mirror
         # has. Log it at debug, but ignore it otherwise.
@@ -155,7 +155,7 @@ Puppet::Type.type(:package).provide :openbsd, :parent => Puppet::Provider::Packa
 
     parse_pkgconf
 
-    if @resource[:source][-1,1] == ::File::SEPARATOR
+    if @resource[:source][-1, 1] == ::File::SEPARATOR
       e_vars = { 'PKG_PATH' => @resource[:source] }
       full_name = get_full_name(latest)
     else
@@ -194,7 +194,7 @@ Puppet::Type.type(:package).provide :openbsd, :parent => Puppet::Provider::Packa
         use_version = get_version
       end
 
-      [ @resource[:name], use_version, @resource[:flavor]].join('-').gsub(/-+$/, '')
+      [@resource[:name], use_version, @resource[:flavor]].join('-').gsub(/-+$/, '')
     end
   end
 

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

@@ -20,7 +20,7 @@ Puppet::Type.type(:package).provide :opkg, :source => :opkg, :parent => Puppet::
       process.each_line { |line|
         match = regex.match(line)
         if match
-          fields.zip(match.captures) { |field,value| hash[field] = value }
+          fields.zip(match.captures) { |field, value| hash[field] = value }
           hash[:provider] = self.name
           packages << new(hash)
           hash = {}
@@ -35,7 +35,7 @@ Puppet::Type.type(:package).provide :opkg, :source => :opkg, :parent => Puppet::
   end
 
   def latest
-    output = opkg( "list", @resource[:name])
+    output = opkg("list", @resource[:name])
     matches = /^(\S+) - (\S+)/.match(output).captures
     matches[1]
   end
@@ -46,14 +46,14 @@ Puppet::Type.type(:package).provide :opkg, :source => :opkg, :parent => Puppet::
     opkg('update') if package_lists.size <= 2
 
     if @resource[:source]
-      opkg( '--force-overwrite', 'install', @resource[:source] )
+      opkg('--force-overwrite', 'install', @resource[:source])
     else
-      opkg( '--force-overwrite', 'install', @resource[:name] )
+      opkg('--force-overwrite', 'install', @resource[:name])
     end
   end
 
   def uninstall
-    opkg( 'remove', @resource[:name] )
+    opkg('remove', @resource[:name])
   end
 
   def update
@@ -62,7 +62,7 @@ Puppet::Type.type(:package).provide :opkg, :source => :opkg, :parent => Puppet::
 
   def query
     # list out our specific package
-    output = opkg( 'list-installed', @resource[:name] )
+    output = opkg('list-installed', @resource[:name])
     if output =~ /^(\S+) - (\S+)/
       return { :ensure => $2 }
     end

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

@@ -116,7 +116,7 @@ Puppet::Type.type(:package).provide :pacman, :parent => Puppet::Provider::Packag
 
       # Replace the list of packages with a version string consisting of packages that make up the group
       groups.each do |name, packages|
-        groups[name] = packages.sort.map {|package| "#{package} #{installed_packages[package]}"}.join ', '
+        groups[name] = packages.sort.map { |package| "#{package} #{installed_packages[package]}" }.join ', '
       end
     rescue Puppet::ExecutionFailure
       # pacman returns an expected non-zero exit code when the filter name is not a group
@@ -137,7 +137,7 @@ Puppet::Type.type(:package).provide :pacman, :parent => Puppet::Provider::Packag
     resource_name = @resource[:name]
 
     # If target is a group, construct the group version
-    return pacman("-Sp", "--print-format", "%n %v", resource_name).lines.map{ |line| line.chomp }.sort.join(', ') if self.class.group?(resource_name)
+    return pacman("-Sp", "--print-format", "%n %v", resource_name).lines.map { |line| line.chomp }.sort.join(', ') if self.class.group?(resource_name)
 
     # Start by querying with pacman first
     # If that fails, retry using yaourt against the AUR

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

@@ -93,7 +93,7 @@ Puppet::Type.type(:package).provide :pip, :parent => ::Puppet::Provider::Package
     # Pip list would also show pip installed version, but "pip list" doesn't exist for older versions of pip (E.G v1.0)
     # Not needed when "pip freeze --all" is available.
     if compare_pip_versions(command_version, '8.1.0') == -1
-      packages << new({:ensure => command_version, :name => File.basename(command), :provider => name, :command => command})
+      packages << new({ :ensure => command_version, :name => File.basename(command), :provider => name, :command => command })
     end
 
     packages
@@ -103,7 +103,7 @@ Puppet::Type.type(:package).provide :pip, :parent => ::Puppet::Provider::Package
   # _package_==_version_ or _package_===_version_
   def self.parse(line)
     if line.chomp =~ /^([^=]+)===?([^=]+)$/
-      {:ensure => $2, :name => $1, :provider => name}
+      { :ensure => $2, :name => $1, :provider => name }
     end
   end
 
@@ -167,7 +167,7 @@ Puppet::Type.type(:package).provide :pip, :parent => ::Puppet::Provider::Package
       process.collect do |line|
         # PIP OUTPUT: Could not find a version that satisfies the requirement example==versionplease (from versions: 1.2.3, 4.5.6)
         if line =~ /from versions: (.+)\)/
-          versionList = $1.split(', ').sort do |x,y|
+          versionList = $1.split(', ').sort do |x, y|
             self.class.compare_pip_versions(x, y)
           end
           return versionList
@@ -188,7 +188,7 @@ Puppet::Type.type(:package).provide :pip, :parent => ::Puppet::Provider::Package
         process.collect do |line|
           # PIP OUTPUT: Using version 0.10.1 (newest of versions: 1.2.3, 4.5.6)
           if line =~ /Using version .+? \(newest of versions: (.+?)\)/
-            versionList = $1.split(', ').sort do |x,y|
+            versionList = $1.split(', ').sort do |x, y|
               self.class.compare_pip_versions(x, y)
             end
             return versionList
@@ -214,13 +214,13 @@ Puppet::Type.type(:package).provide :pip, :parent => ::Puppet::Provider::Package
     should_range
   end
 
-  def get_install_command_options()
+  def get_install_command_options
     should = @resource[:ensure]
     command_options = %w{install -q}
     command_options += install_options if @resource[:install_options]
 
     if @resource[:source]
-      if String === should
+      if should.is_a?(String)
         command_options << "#{@resource[:source]}@#{should}#egg=#{@resource[:name]}"
       else
         command_options << "#{@resource[:source]}#egg=#{@resource[:name]}"
@@ -235,7 +235,7 @@ Puppet::Type.type(:package).provide :pip, :parent => ::Puppet::Provider::Package
       return command_options
     end
 
-    unless String === should
+    unless should.is_a?(String)
       command_options << @resource[:name]
 
       return command_options
@@ -339,7 +339,7 @@ Puppet::Type.type(:package).provide :pip, :parent => ::Puppet::Provider::Package
   def list_extra_flags(command_version)
     klass = self.class
     if klass.compare_pip_versions(command_version, '20.2.4') == 1 &&
-      klass.compare_pip_versions(command_version, '21.1') == -1
+       klass.compare_pip_versions(command_version, '21.1') == -1
       '--use-deprecated=legacy-resolver'
     end
   end

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

@@ -6,7 +6,7 @@ Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package d
   desc "OpenSolaris image packaging system. See pkg(5) for more information.
 
     This provider supports the `install_options` attribute, which allows
-    command-line flags to be passed to pkg. These options should be specified as an 
+    command-line flags to be passed to pkg. These options should be specified as an
     array where each element is either a string or a hash."
 
   # https://docs.oracle.com/cd/E19963-01/html/820-6572/managepkgs.html
@@ -35,7 +35,7 @@ Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package d
   defaultfor 'os.family' => :solaris, :kernelrelease => ['5.11', '5.12']
 
   def self.instances
-    pkg(:list, '-Hv').split("\n").map{|l| new(parse_line(l))}
+    pkg(:list, '-Hv').split("\n").map { |l| new(parse_line(l)) }
   end
 
   # The IFO flag field is just what it names, the first field can have either
@@ -48,9 +48,9 @@ Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package d
     (
       case flags[0..0]
       when 'i'
-        {:status => 'installed'}
+        { :status => 'installed' }
       when '-'
-        {:status => 'known'}
+        { :status => 'known' }
       else
         raise ArgumentError, _('Unknown format %{resource_name}: %{full_flags}[%{bad_flag}]') %
             { resource_name: self.name, full_flags: flags, bad_flag: flags[0..0] }
@@ -58,7 +58,7 @@ Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package d
     ).merge(
       case flags[1..1]
       when 'f'
-        {:mark => :hold}
+        { :mark => :hold }
       when '-'
         {}
       else
@@ -89,9 +89,9 @@ Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package d
   def self.pkg_state(state)
     case state
     when /installed/
-      {:status => 'installed'}
+      { :status => 'installed' }
     when /known/
-      {:status => 'known'}
+      { :status => 'known' }
     else
       raise ArgumentError, _('Unknown format %{resource_name}: %{state}') % { resource_name: self.name, state: state }
     end
@@ -104,16 +104,16 @@ Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package d
      # FMRI                                                                         IFO
      # pkg://omnios/SUNWcs@0.5.11,5.11-0.151008:20131204T022241Z                    ---
      when %r'^pkg://([^/]+)/([^@]+)@(\S+) +(...)$'
-       {:publisher => $1, :name => $2, :ensure => $3}.merge ifo_flag($4)
+       { :publisher => $1, :name => $2, :ensure => $3 }.merge ifo_flag($4)
 
      # FMRI                                                             STATE      UFOXI
      # pkg://solaris/SUNWcs@0.5.11,5.11-0.151.0.1:20101105T001108Z      installed  u----
      when %r'^pkg://([^/]+)/([^@]+)@(\S+) +(\S+) +(.....)$'
-       {:publisher => $1, :name => $2, :ensure => $3}.merge pkg_state($4).merge(ufoxi_flag($5))
+       { :publisher => $1, :name => $2, :ensure => $3 }.merge pkg_state($4).merge(ufoxi_flag($5))
 
      else
        raise ArgumentError, _('Unknown line format %{resource_name}: %{parse_line}') % { resource_name: self.name, parse_line: line }
-     end).merge({:provider => self.name})
+     end).merge({ :provider => self.name })
   end
 
   def hold
@@ -122,7 +122,7 @@ Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package d
 
   def unhold
     r = exec_cmd(command(:pkg), 'unfreeze', @resource[:name])
-    raise Puppet::Error, _("Unable to unfreeze %{package}") % { package: r[:out] } unless [0,4].include? r[:exit]
+    raise Puppet::Error, _("Unable to unfreeze %{package}") % { package: r[:out] } unless [0, 4].include? r[:exit]
   end
 
   def insync?(is)
@@ -154,12 +154,12 @@ Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package d
       # unfortunately it doesn't consider downgrades 'available' (eg. with
       # installed foo@1.0, list -a foo@0.9 would fail).
       name = @resource[:name]
-      potential_matches = pkg(:list, '-Hvfa', "#{name}@#{should}").split("\n").map{|l|self.class.parse_line(l)}
+      potential_matches = pkg(:list, '-Hvfa', "#{name}@#{should}").split("\n").map { |l| self.class.parse_line(l) }
       n = potential_matches.length
       if n > 1
         warning(_("Implicit version %{should} has %{n} possible matches") % { should: should, n: n })
       end
-      potential_matches.each{ |p|
+      potential_matches.each { |p|
         command = is == :absent ? 'install' : 'update'
         options = ['-n']
         options.concat(join_options(@resource[:install_options])) if @resource[:install_options]
@@ -182,7 +182,7 @@ Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package d
         end
       }
       raise Puppet::DevError, _("No version of %{name} matching %{should} is installable, even though the package is currently installed") %
-          { name: name, should: should }
+                              { name: name, should: should }
     end
 
     false
@@ -216,7 +216,7 @@ Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package d
     end
 
     # If not, then return the installed, else nil
-    (lst.find {|p| p[:status] == 'installed' } || {})[:ensure]
+    (lst.find { |p| p[:status] == 'installed' } || {})[:ensure]
   end
 
   # install the package and accept all licenses.
@@ -247,7 +247,7 @@ Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package d
           raise Puppet::Error, _("Pkg could not install %{name} after %{tries} tries. Aborting run") % { name: name, tries: tries }
         end
 
-        sleep 2 ** tries
+        sleep 2**tries
         tries += 1
         r = exec_cmd(command(:pkg), command, *args, name)
       end
@@ -280,7 +280,7 @@ Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package d
   def update
     r = install(true)
     # 4 == /No updates available for this image./
-    return if [0,4].include? r[:exit]
+    return if [0, 4].include? r[:exit]
 
     raise Puppet::Error, _("Unable to update %{package}") % { package: r[:out] }
   end
@@ -288,13 +288,13 @@ Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package d
   # list a specific package
   def query
     r = exec_cmd(command(:pkg), 'list', '-Hv', @resource[:name])
-    return {:ensure => :absent, :name => @resource[:name]} if r[:exit] != 0
+    return { :ensure => :absent, :name => @resource[:name] } if r[:exit] != 0
 
     self.class.parse_line(r[:out])
   end
 
   def exec_cmd(*cmd)
     output = Puppet::Util::Execution.execute(cmd, :failonfail => false, :combine => true)
-    {:out => output, :exit => output.exitstatus}
+    { :out => output, :exit => output.exitstatus }
   end
 end

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

@@ -87,7 +87,7 @@ Puppet::Type.type(:package).provide :pkgdmg, :parent => Puppet::Provider::Packag
     begin
       if %r{\A[A-Za-z][A-Za-z0-9+\-\.]*://} =~ cached_source
         cached_source = File.join(tmpdir, "#{name}#{ext}")
-        args = [ "-o", cached_source, "-C", "-", "-L", "-s", "--fail", "--url", source ]
+        args = ["-o", cached_source, "-C", "-", "-L", "-s", "--fail", "--url", source]
         if http_proxy_host and http_proxy_port
           args << "--proxy" << "#{http_proxy_host}:#{http_proxy_port}"
         elsif http_proxy_host and not http_proxy_port
@@ -109,9 +109,9 @@ Puppet::Type.type(:package).provide :pkgdmg, :parent => Puppet::Provider::Packag
           hdiutil_info = Puppet::Util::Plist.parse_plist(xml_str)
           raise Puppet::Error.new(_("No disk entities returned by mount at %{path}") % { path: dmg.path }) unless hdiutil_info.has_key?("system-entities")
 
-          mounts = hdiutil_info["system-entities"].collect { |entity|
+          mounts = hdiutil_info["system-entities"].filter_map { |entity|
             entity["mount-point"]
-          }.compact
+          }
           begin
             mounts.each do |mountpoint|
               Dir.entries(mountpoint).select { |f|
@@ -137,7 +137,7 @@ Puppet::Type.type(:package).provide :pkgdmg, :parent => Puppet::Provider::Packag
   def query
     if Puppet::FileSystem.exist?("/var/db/.puppet_pkgdmg_installed_#{@resource[:name]}")
       Puppet.debug "/var/db/.puppet_pkgdmg_installed_#{@resource[:name]} found"
-      return {:name => @resource[:name], :ensure => :present}
+      return { :name => @resource[:name], :ensure => :present }
     else
       return nil
     end
@@ -154,6 +154,6 @@ Puppet::Type.type(:package).provide :pkgdmg, :parent => Puppet::Provider::Packag
       raise Puppet::Error.new(_("Mac OS X PKG DMGs must specify a package name."))
     end
 
-    self.class.installpkgdmg(source,name)
+    self.class.installpkgdmg(source, name)
   end
 end

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

@@ -7,7 +7,7 @@ Puppet::Type.type(:package).provide :pkgin, :parent => Puppet::Provider::Package
 
   commands :pkgin => "pkgin"
 
-  defaultfor 'os.name' => [ :smartos, :netbsd ]
+  defaultfor 'os.name' => [:smartos, :netbsd]
 
   has_feature :installable, :uninstallable, :upgradeable, :versionable
 
@@ -48,7 +48,7 @@ Puppet::Type.type(:package).provide :pkgin, :parent => Puppet::Provider::Package
       end
     end
 
-    packages.first.update( :ensure => :absent )
+    packages.first.update(:ensure => :absent)
   end
 
   def parse_pkgsearch_line
@@ -59,12 +59,12 @@ Puppet::Type.type(:package).provide :pkgin, :parent => Puppet::Provider::Package
     # Remove the last three lines of help text.
     packages.slice!(-4, 4)
 
-    pkglist = packages.map{ |line| self.class.parse_pkgin_line(line) }
-    pkglist.select{ |package| resource[:name] == package[:name] }
+    pkglist = packages.map { |line| self.class.parse_pkgin_line(line) }
+    pkglist.select { |package| resource[:name] == package[:name] }
   end
 
   def install
-    if String === @resource[:ensure]
+    if @resource[:ensure].is_a?(String)
       pkgin("-y", :install, "#{resource[:name]}-#{resource[:ensure]}")
     else
       pkgin("-y", :install, resource[:name])
@@ -76,7 +76,7 @@ Puppet::Type.type(:package).provide :pkgin, :parent => Puppet::Provider::Package
   end
 
   def latest
-    package = parse_pkgsearch_line.detect{ |p| p[:status] == '<' }
+    package = parse_pkgsearch_line.detect { |p| p[:status] == '<' }
     return properties[:ensure] if not package
 
     return package[:ensure]

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

@@ -85,7 +85,7 @@ Puppet::Type.type(:package).provide :pkgng, :parent => Puppet::Provider::Package
   def self.prefetch(resources)
     packages = instances
     resources.each_key do |name|
-      provider = packages.find{|p| p.name == name or p.origin == name }
+      provider = packages.find { |p| p.name == name or p.origin == name }
       if provider
         resources[name].provider = provider
       end

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

@@ -12,22 +12,22 @@ Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun d
   confine 'os.family' => :solaris
 
   has_command(:pkguti, pkgutil_bin) do
-    environment :HOME => ENV['HOME']
+    environment :HOME => ENV.fetch('HOME', nil)
   end
 
-  def self.healthcheck()
+  def self.healthcheck
     unless Puppet::FileSystem.exist?("/var/opt/csw/pkgutil/admin")
       Puppet.notice _("It is highly recommended you create '/var/opt/csw/pkgutil/admin'.")
       Puppet.notice _("See /var/opt/csw/pkgutil")
     end
 
     correct_wgetopts = false
-    [ "/opt/csw/etc/pkgutil.conf", "/etc/opt/csw/pkgutil.conf" ].each do |confpath|
+    ["/opt/csw/etc/pkgutil.conf", "/etc/opt/csw/pkgutil.conf"].each do |confpath|
       File.open(confpath) do |conf|
-        conf.each_line {|line| correct_wgetopts = true if line =~ /^\s*wgetopts\s*=.*(-nv|-q|--no-verbose|--quiet)/ }
+        conf.each_line { |line| correct_wgetopts = true if line =~ /^\s*wgetopts\s*=.*(-nv|-q|--no-verbose|--quiet)/ }
       end
     end
-    if ! correct_wgetopts
+    if !correct_wgetopts
       Puppet.notice _("It is highly recommended that you set 'wgetopts=-nv' in your pkgutil.conf.")
     end
   end
@@ -65,7 +65,7 @@ Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun d
   def self.availlist
     output = pkguti ["-a"]
 
-    output.split("\n").collect do |line|
+    output.split("\n").filter_map do |line|
       next if line =~ /^common\s+package/ # header of package list
       next if noise?(line)
 
@@ -74,7 +74,7 @@ Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun d
       else
         Puppet.warning _("Cannot match %{line}") % { line: line }
       end
-    end.reject { |h| h.nil? }
+    end
   end
 
   # Turn our pkgutil -c listing into a hash for a single package.
@@ -94,12 +94,12 @@ Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun d
       return nil
     end
 
-    list = output.collect do |line|
+    list = output.filter_map do |line|
       next if line =~ /installed\s+catalog/ # header of package list
       next if noise?(line)
 
       pkgsplit(line)
-    end.reject { |h| h.nil? }
+    end
 
     if hash[:justme]
       # Single queries may have been for an alias so return the name requested
@@ -154,7 +154,7 @@ Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun d
     # get passed to pkgutil via one or more -t options
     if resource[:source]
       sources = [resource[:source]].flatten
-      pkguti(*[sources.map{|src| [ "-t", src ]}, *args].flatten)
+      pkguti(*[sources.map { |src| ["-t", src] }, *args].flatten)
     else
       pkguti(*args.flatten)
     end
@@ -175,7 +175,7 @@ Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun d
     if hash
       hash
     else
-      {:ensure => :absent}
+      { :ensure => :absent }
     end
   end
 

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

@@ -180,8 +180,8 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
       end
 
       if @resource[:name] =~ /^@/
-        if package_sets.include?(@resource[:name][1..-1].to_s)
-          return({:name => "#{@resource[:name]}", :ensure => '9999', :version_available => nil, :installed_versions => nil, :installable_versions => "9999,"})
+        if package_sets.include?(@resource[:name][1..].to_s)
+          return({ :name => "#{@resource[:name]}", :ensure => '9999', :version_available => nil, :installed_versions => nil, :installable_versions => "9999," })
         end
       end
 
@@ -190,7 +190,7 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
 
       search_output = nil
       Puppet::Util.withenv :EIX_LIMIT => limit, :LASTVERSION => version_format, :LASTSLOTVERSIONS => slot_versions_format, :INSTALLEDVERSIONS => installed_versions_format, :STABLEVERSIONS => installable_versions_format do
-        search_output = eix(*(self.class.eix_search_arguments + ['--exact',search_field,search_value]))
+        search_output = eix(*(self.class.eix_search_arguments + ['--exact', search_field, search_value]))
       end
 
       packages = []

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

@@ -146,16 +146,14 @@ Puppet::Type.type(:package).provide :portupgrade, :parent => Puppet::Provider::P
         return installedversion
       end
 
-    else
+    elsif output =~ /^\*\* No matching package /
       # error: output not parsed correctly, error out with nil.
       # Seriously - this section should never be called in a perfect world.
       # as verification that the port is installed has already happened in query.
-      if output =~ /^\*\* No matching package /
-        raise Puppet::ExecutionFailure, _("Could not find package %{name}") % { name: @resource[:name] }
-      else
-        # Any other error (dump output to log)
-        raise Puppet::ExecutionFailure, _("Unexpected output from portversion: %{output}") % { output: output }
-      end
+      raise Puppet::ExecutionFailure, _("Could not find package %{name}") % { name: @resource[:name] }
+    else
+      # Any other error (dump output to log)
+      raise Puppet::ExecutionFailure, _("Unexpected output from portversion: %{output}") % { output: output }
     end
   end
 

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

@@ -9,9 +9,9 @@ Puppet::Type.type(:package).provide :puppet_gem, :parent => :gem do
   confine :true => Puppet.runtime[:facter].value(:aio_agent_version)
 
   def self.windows_gemcmd
-    puppet_dir = ENV['PUPPET_DIR']
+    puppet_dir = ENV.fetch('PUPPET_DIR', nil)
     if puppet_dir
-      File.join(ENV['PUPPET_DIR'].to_s, 'bin', 'gem.bat')
+      File.join(puppet_dir.to_s, 'bin', 'gem.bat')
     else
       File.join(Gem.default_bindir, 'gem.bat')
     end

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

@@ -33,7 +33,7 @@ Puppet::Type.type(:package).provide :puppetserver_gem, :parent => :gem do
   # CommandDefiner in provider.rb will set failonfail, combine, and environment.
 
   has_command(:puppetservercmd, '/opt/puppetlabs/bin/puppetserver') do
-    environment(HOME: ENV['HOME'])
+    environment(HOME: ENV.fetch('HOME', nil))
   end
 
   def self.gemlist(options)
@@ -69,9 +69,9 @@ Puppet::Type.type(:package).provide :puppetserver_gem, :parent => :gem do
     # causing gemsplit to output:
     # Warning: Could not match *** LOCAL GEMS ***
     gem_list = list
-                 .lines
-                 .select { |x| x =~ /^(\S+)\s+\((.+)\)/ }
-                 .map { |set| gemsplit(set) }
+               .lines
+               .select { |x| x =~ /^(\S+)\s+\((.+)\)/ }
+               .map { |set| gemsplit(set) }
 
     if options[:justme]
       return gem_list.shift