puppet 8.3.1 → 8.4.0

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Puppet::Type.type(:package).provide :dnf, :parent => :yum do
   desc "Support via `dnf`.
 
@@ -33,6 +34,7 @@ Puppet::Type.type(:package).provide :dnf, :parent => :yum do
   notdefaultfor 'os.name' => :fedora, 'os.release.major' => (19..21).to_a
   defaultfor 'os.family' => :redhat
   notdefaultfor 'os.family' => :redhat, 'os.release.major' => (4..7).to_a
+  defaultfor 'os.name' => :amazon, 'os.release.major' => ["2023"]
 
   def self.update_command
     # In DNF, update is deprecated for upgrade

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # dnfmodule - A puppet package provider for DNF modules
 #
 # Installing a module:
@@ -8,13 +9,11 @@
 #   flavor   => 'client',  # install a specific profile
 # }
 
-
 require_relative '../../../puppet/provider/package'
 
 Puppet::Type.type(:package).provide :dnfmodule, :parent => :dnf do
-
   has_feature :installable, :uninstallable, :versionable, :supports_flavors, :disableable
-  #has_feature :upgradeable
+  # has_feature :upgradeable
   # it's not (yet) feasible to make this upgradeable since module streams don't
   # always have matching version types (i.e. idm has streams DL1 and client,
   # other modules have semver streams, others have string streams... we cannot
@@ -30,6 +29,7 @@ Puppet::Type.type(:package).provide :dnfmodule, :parent => :dnf do
     if Puppet::Util::Package.versioncmp(current_version, '3.0.1') < 0
       raise Puppet::Error, _("Modules are not supported on DNF versions lower than 3.0.1")
     end
+
     super
   end
 
@@ -39,7 +39,8 @@ Puppet::Type.type(:package).provide :dnfmodule, :parent => :dnf do
     execute(cmd).each_line do |line|
       # select only lines with actual packages since DNF clutters the output
       next unless line =~ /\[[eix]\][, ]/
-      line.gsub!(/\[d\]/, '')  # we don't care about the default flag
+
+      line.gsub!(/\[d\]/, '') # we don't care about the default flag
 
       flavor = if line.include?('[i]')
                  line.split('[i]').first.split.last
@@ -63,8 +64,8 @@ Puppet::Type.type(:package).provide :dnfmodule, :parent => :dnf do
 
   def query
     pkg = self.class.instances.find do |package|
-            @resource[:name] == package.name
-          end
+      @resource[:name] == package.name
+    end
     pkg ? pkg.properties : nil
   end
 
@@ -94,7 +95,7 @@ Puppet::Type.type(:package).provide :dnfmodule, :parent => :dnf do
         # module has no default profile and no profile was requested, so just enable the stream
         # DNF versions prior to 4.2.8 do not need this workaround
         # see https://bugzilla.redhat.com/show_bug.cgi?id=1669527
-        if @resource[:flavor] == nil && e.message =~ /^(?:missing|broken) groups or modules: #{Regexp.quote(@resource[:name])}$/
+        if @resource[:flavor] == nil && e.message =~ /^(?:missing|broken) groups or modules: #{Regexp.quote(args)}$/
           enable(args)
         else
           raise

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/provider/package'
 
 Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package do
@@ -90,8 +91,8 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
     unless file
       raise ArgumentError, _("You cannot install dpkg packages without a source")
     end
-    args = []
 
+    args = []
 
     if @resource[:configfiles] == :keep
       args << '--force-confold'
@@ -134,8 +135,8 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
           "-W",
           "--showformat",
           self.class::DPKG_QUERY_PROVIDES_FORMAT_STRING
-          #the regex searches for the resource[:name] in the dpkquery result in which the Provides field is also available
-          #it will search for the packages only in the brackets ex: [rubygems]
+          # the regex searches for the resource[:name] in the dpkquery result in which the Provides field is also available
+          # it will search for the packages only in the brackets ex: [rubygems]
         ).lines.find {|package| package.match(/[\[ ](#{Regexp.escape(@resource[:name])})[\],]/)}
         if output
           hash = self.class.parse_line(output,self.class::FIELDS_REGEX_WITH_PROVIDES)
@@ -189,5 +190,4 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
       execute([:dpkg, "--set-selections"], :failonfail => false, :combine => false, :stdinfile => tmpfile.path.to_s)
     end
   end
-
 end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Puppet::Type.type(:package).provide :fink, :parent => :dpkg, :source => :dpkg do
   # Provide sorting functionality
   include Puppet::Util::Package
@@ -48,7 +49,7 @@ Puppet::Type.type(:package).provide :fink, :parent => :dpkg, :source => :dpkg do
 
   # What's the latest package version available?
   def latest
-    output = aptcache :policy,  @resource[:name]
+    output = aptcache :policy, @resource[:name]
 
     if output =~ /Candidate:\s+(\S+)\s/
       return $1

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Puppet::Type.type(:package).provide :freebsd, :parent => :openbsd do
   desc "The specific form of package management on FreeBSD.  This is an
     extremely quirky packaging system, in that it freely mixes between
@@ -7,8 +8,8 @@ Puppet::Type.type(:package).provide :freebsd, :parent => :openbsd do
     libraries."
 
   commands :pkginfo => "/usr/sbin/pkg_info",
-    :pkgadd => "/usr/sbin/pkg_add",
-    :pkgdelete => "/usr/sbin/pkg_delete"
+           :pkgadd => "/usr/sbin/pkg_add",
+           :pkgdelete => "/usr/sbin/pkg_delete"
 
   confine 'os.name' => :freebsd
 

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/util/package/version/gem'
 require_relative '../../../puppet/util/package/version/range'
 require_relative '../../../puppet/provider/package_targetable'
@@ -56,9 +57,11 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package::
   # that contains the content of PATH but without puppet/bin dir.
   # This is used to pass a custom PATH and execute commands in a controlled environment
   def self.windows_path_without_puppet_bin
+    # rubocop:disable Naming/MemoizedInstanceVariableName
     @path ||= ENV['PATH'].split(File::PATH_SEPARATOR)
                          .reject { |dir| dir =~ /puppet\\bin$/ }
                          .join(File::PATH_SEPARATOR)
+    # rubocop:enable Naming/MemoizedInstanceVariableName
   end
 
   private_class_method :windows_path_without_puppet_bin
@@ -116,9 +119,9 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package::
     end
 
     begin
-      list = execute_gem_command(options[:command], command_options).lines.
-        map {|set| gemsplit(set) }.
-        reject {|x| x.nil? }
+      list = execute_gem_command(options[:command], command_options).lines
+        .map {|set| gemsplit(set) }
+        .reject {|x| x.nil? }
     rescue Puppet::ExecutionFailure => detail
       raise Puppet::Error, _("Could not list gems: %{detail}") % { detail: detail }, detail.backtrace
     end
@@ -141,8 +144,8 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package::
       gem_name = $1
       versions = $2.sub('default: ', '').split(/,\s*/)
       {
-        :name     => gem_name,
-        :ensure   => versions.map{|v| v.split[0]},
+        :name => gem_name,
+        :ensure => versions.map{|v| v.split[0]},
         :provider => name
       }
     else
@@ -153,6 +156,7 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package::
 
   def insync?(is)
     return false unless is && is != :absent
+
     is = [is] unless is.is_a? Array
     should = @resource[:ensure]
 

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

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
+
 # HP-UX packaging.
 
 require_relative '../../../puppet/provider/package'
 
 Puppet::Type.type(:package).provide :hpux, :parent => Puppet::Provider::Package do
-
   desc "HP-UX's packaging system."
 
   commands :swinstall => "/usr/sbin/swinstall",
-    :swlist => "/usr/sbin/swlist",
-    :swremove => "/usr/sbin/swremove"
+           :swlist => "/usr/sbin/swlist",
+           :swremove => "/usr/sbin/swremove"
 
   confine 'os.name' => "hp-ux"
 
@@ -23,6 +23,7 @@ Puppet::Type.type(:package).provide :hpux, :parent => Puppet::Provider::Package
   # source and name are required
   def install
     raise ArgumentError, _("source must be provided to install HP-UX packages") unless resource[:source]
+
     args = standard_args + ["-s", resource[:source], resource[:name]]
     swinstall(*args)
   end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/provider/package'
 require_relative '../../../puppet/provider/command'
 
@@ -24,7 +25,6 @@ Puppet::Type.type(:package).provide :macports, :parent => Puppet::Provider::Pack
   has_feature :upgradeable
   has_feature :versionable
 
-
   def self.parse_installed_query_line(line)
     regex = /(\S+)\s+@(\S+)_(\d+).*\(active\)/
     fields = [:name, :ensure, :revision]
@@ -75,6 +75,7 @@ Puppet::Type.type(:package).provide :macports, :parent => Puppet::Provider::Pack
   def query
     result = self.class.parse_installed_query_line(execute([command(:port), "-q", :installed, @resource[:name]], :failonfail => false, :combine => false))
     return {} if result.nil?
+
     return result
   end
 

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/provider/package'
 require_relative '../../../puppet/util/package'
 
@@ -14,21 +15,19 @@ Puppet::Type.type(:package).provide :nim, :parent => :aix, :source => :aix do
 
   # The commands we are using on an AIX box are installed standard
   # (except nimclient) nimclient needs the bos.sysmgt.nim.client fileset.
-  commands    :nimclient  => "/usr/sbin/nimclient",
-              :lslpp      => "/usr/bin/lslpp",
-              :rpm        => "rpm"
+  commands    :nimclient => "/usr/sbin/nimclient",
+              :lslpp => "/usr/bin/lslpp",
+              :rpm => "rpm"
 
   # If NIM has not been configured, /etc/niminfo will not be present.
   # However, we have no way of knowing if the NIM server is not configured
   # properly.
-  confine  :exists => "/etc/niminfo"
+  confine :exists => "/etc/niminfo"
 
   has_feature :versionable
 
   attr_accessor :latest_info
 
-
-
   def self.srclistcmd(source)
     [ command(:nimclient), "-o", "showres", "-a", "installp_flags=L", "-a", "resource=#{source}" ]
   end
@@ -91,7 +90,6 @@ Puppet::Type.type(:package).provide :nim, :parent => :aix, :source => :aix do
     end
     output = Puppet::Util::Execution.execute(showres_command)
 
-
     if (version_specified)
       package_type = determine_package_type(output, pkg, version)
     else
@@ -146,7 +144,6 @@ Puppet::Type.type(:package).provide :nim, :parent => :aix, :source => :aix do
     end
   end
 
-
   private
 
   ## UTILITY METHODS FOR PARSING `nimclient -o showres` output
@@ -181,7 +178,6 @@ Puppet::Type.type(:package).provide :nim, :parent => :aix, :source => :aix do
   #   @@R:mypackage.foo-1.2.3-4 1.2.3-4
   #   @@R:mypackage.foo-1.2.3-8 1.2.3-8
 
-
   # Parse the output of a `nimclient -o showres` command.  Returns a two-dimensional
   # hash, where the first-level keys are package names, the second-level keys are
   # version number strings for all of the available version numbers for a package,
@@ -249,12 +245,12 @@ Puppet::Type.type(:package).provide :nim, :parent => :aix, :source => :aix do
     package_string = match.captures[1]
 
     case package_type_flag
-      when "I","S"
-        parse_installp_package_string(package_string)
-      when "R"
-        parse_rpm_package_string(package_string)
-      else
-        self.fail _("Unrecognized package type specifier: '%{package_type_flag}' in package line:\n'%{line}'") % { package_type_flag: package_type_flag, line: line }
+    when "I","S"
+      parse_installp_package_string(package_string)
+    when "R"
+      parse_rpm_package_string(package_string)
+    else
+      self.fail _("Unrecognized package type specifier: '%{package_type_flag}' in package line:\n'%{line}'") % { package_type_flag: package_type_flag, line: line }
     end
   end
 
@@ -272,6 +268,7 @@ Puppet::Type.type(:package).provide :nim, :parent => :aix, :source => :aix do
     unless packages.has_key?(package_name)
       return nil
     end
+
     if (packages[package_name].count == 1)
       version = packages[package_name].keys[0]
       return packages[package_name][version], nil
@@ -287,6 +284,7 @@ Puppet::Type.type(:package).provide :nim, :parent => :aix, :source => :aix do
     unless (packages.has_key?(package_name) and packages[package_name].has_key?(version))
       return nil
     end
+
     packages[package_name][version]
   end
 end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/provider/package'
 
 # Packaging on OpenBSD.  Doesn't work anywhere else that I know of.
@@ -10,8 +11,8 @@ Puppet::Type.type(:package).provide :openbsd, :parent => Puppet::Provider::Packa
     These options should be specified as an array where each element is either a
      string or a hash."
 
-  commands :pkginfo   => "pkg_info",
-           :pkgadd    => "pkg_add",
+  commands :pkginfo => "pkg_info",
+           :pkgadd => "pkg_add",
            :pkgdelete => "pkg_delete"
 
   defaultfor 'os.name' => :openbsd
@@ -140,11 +141,11 @@ Puppet::Type.type(:package).provide :openbsd, :parent => Puppet::Provider::Packa
 
         unless @resource[:source]
           raise Puppet::Error,
-          _("No valid installpath found in /etc/pkg.conf and no source was set")
+                _("No valid installpath found in /etc/pkg.conf and no source was set")
         end
       else
         raise Puppet::Error,
-        _("You must specify a package source or configure an installpath in /etc/pkg.conf")
+              _("You must specify a package source or configure an installpath in /etc/pkg.conf")
       end
     end
   end
@@ -217,6 +218,7 @@ Puppet::Type.type(:package).provide :openbsd, :parent => Puppet::Provider::Packa
 
       return master_version unless master_version == 0
       return '' if version == -1
+
       raise Puppet::Error, _("%{version} is not available for this package") % { version: version }
     end
   rescue Puppet::ExecutionFailure

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/provider/package'
 
 Puppet::Type.type(:package).provide :opkg, :source => :opkg, :parent => Puppet::Provider::Package do
@@ -65,6 +66,7 @@ Puppet::Type.type(:package).provide :opkg, :source => :opkg, :parent => Puppet::
     if output =~ /^(\S+) - (\S+)/
       return { :ensure => $2 }
     end
+
     nil
   rescue Puppet::ExecutionFailure
     return {

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/provider/package'
 require 'set'
 require 'uri'
@@ -186,8 +187,8 @@ Puppet::Type.type(:package).provide :pacman, :parent => Puppet::Provider::Packag
 
   def self.to_resource_hash(name, version)
     {
-      :name     => name,
-      :ensure   => version,
+      :name => name,
+      :ensure => version,
       :provider => self.name
     }
   end
@@ -232,15 +233,15 @@ Puppet::Type.type(:package).provide :pacman, :parent => Puppet::Provider::Packag
     end
 
     source = case source_uri.scheme
-    when nil then source
-    when /https?/i then source
-    when /ftp/i then source
-    when /file/i then source_uri.path
-    when /puppet/i
-      fail _("puppet:// URL is not supported by pacman")
-    else
-      fail _("Source %{source} is not supported by pacman") % { source: source }
-    end
+             when nil       then source
+             when /https?/i then source
+             when /ftp/i    then source
+             when /file/i   then source_uri.path
+             when /puppet/i
+               fail _("puppet:// URL is not supported by pacman")
+             else
+               fail _("Source %{source} is not supported by pacman") % { source: source }
+             end
     pacman "--noconfirm", "--noprogressbar", "-S"
     pacman "--noconfirm", "--noprogressbar", "-U", source
   end
@@ -261,5 +262,4 @@ Puppet::Type.type(:package).provide :pacman, :parent => Puppet::Provider::Packag
       pacman(*cmd)
     end
   end
-
 end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Puppet package provider for Python's `pip` package management frontend.
 # <http://pip.pypa.io/>
 
@@ -7,7 +8,6 @@ require_relative '../../../puppet/util/package/version/range'
 require_relative '../../../puppet/provider/package_targetable'
 
 Puppet::Type.type(:package).provide :pip, :parent => ::Puppet::Provider::Package::Targetable do
-
   desc "Python packages via `pip`.
 
   This provider supports the `install_options` attribute, which allows command-line flags to be passed to pip.
@@ -83,6 +83,7 @@ Puppet::Type.type(:package).provide :pip, :parent => ::Puppet::Provider::Package
       process.collect do |line|
         pkg = parse(line)
         next unless pkg
+
         pkg[:command] = command
         packages << new(pkg)
       end
@@ -304,6 +305,7 @@ Puppet::Type.type(:package).provide :pip, :parent => ::Puppet::Provider::Package
 
   def insync?(is)
     return false unless is && is != :absent
+
     begin
       should = @resource[:ensure]
       should_range = PIP_VERSION_RANGE.parse(should, PIP_VERSION)

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

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
+
 # Puppet package provider for Python's `pip2` package management frontend.
 # <http://pip.pypa.io/>
 
 Puppet::Type.type(:package).provide :pip2,
-  :parent => :pip do
-
+                                    :parent => :pip do
   desc "Python packages via `pip2`.
 
   This provider supports the `install_options` attribute, which allows command-line flags to be passed to pip2.

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

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
+
 # Puppet package provider for Python's `pip3` package management frontend.
 # <http://pip.pypa.io/>
 
 Puppet::Type.type(:package).provide :pip3,
-  :parent => :pip do
-
+                                    :parent => :pip do
   desc "Python packages via `pip3`.
 
   This provider supports the `install_options` attribute, which allows command-line flags to be passed to pip3.

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/provider/package'
 
 Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package do
@@ -100,19 +101,19 @@ Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package d
   # formats of output for different pkg versions.
   def self.parse_line(line)
     (case line.chomp
-    # 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)
-
-    # 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))
-
-    else
-      raise ArgumentError, _('Unknown line format %{resource_name}: %{parse_line}') % { resource_name: self.name, parse_line: line }
-    end).merge({:provider => self.name})
+     # 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)
+
+     # 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))
+
+     else
+       raise ArgumentError, _('Unknown line format %{resource_name}: %{parse_line}') % { resource_name: self.name, parse_line: line }
+     end).merge({:provider => self.name})
   end
 
   def hold
@@ -245,6 +246,7 @@ Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package d
         if tries > 4
           raise Puppet::Error, _("Pkg could not install %{name} after %{tries} tries. Aborting run") % { name: name, tries: tries }
         end
+
         sleep 2 ** tries
         tries += 1
         r = exec_cmd(command(:pkg), command, *args, name)
@@ -279,6 +281,7 @@ Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package d
     r = install(true)
     # 4 == /No updates available for this image./
     return if [0,4].include? r[:exit]
+
     raise Puppet::Error, _("Unable to update %{package}") % { package: r[:out] }
   end
 
@@ -286,6 +289,7 @@ Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package d
   def query
     r = exec_cmd(command(:pkg), 'list', '-Hv', @resource[:name])
     return {:ensure => :absent, :name => @resource[:name]} if r[:exit] != 0
+
     self.class.parse_line(r[:out])
   end
 

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 #
 # Motivation: DMG files provide a true HFS file system
 # and are easier to manage and .pkg bundles.
@@ -37,7 +38,7 @@ Puppet::Type.type(:package).provide :pkgdmg, :parent => Puppet::Provider::Packag
       package, you must create a new DMG with a different filename."
 
   confine 'os.name' => :darwin
-  confine :feature         => :cfpropertylist
+  confine :feature => :cfpropertylist
   defaultfor 'os.name' => :darwin
   commands :installer => "/usr/sbin/installer"
   commands :hdiutil => "/usr/bin/hdiutil"
@@ -78,6 +79,7 @@ Puppet::Type.type(:package).provide :pkgdmg, :parent => Puppet::Provider::Packag
     unless source =~ /\.dmg$/i || source =~ /\.pkg$/i
       raise Puppet::Error.new(_("Mac OS X PKG DMGs must specify a source string ending in .dmg or flat .pkg file"))
     end
+
     require 'open-uri' # Dead code; this is never used. The File.open call 20-ish lines south of here used to be Kernel.open but changed in '09. -NF
     cached_source = source
     tmpdir = Dir.mktmpdir
@@ -93,7 +95,7 @@ Puppet::Type.type(:package).provide :pkgdmg, :parent => Puppet::Provider::Packag
         end
         begin
           curl(*args)
-            Puppet.debug "Success: curl transferred [#{name}] (via: curl #{args.join(" ")})"
+          Puppet.debug "Success: curl transferred [#{name}] (via: curl #{args.join(" ")})"
         rescue Puppet::ExecutionFailure
           Puppet.debug "curl #{args.join(" ")} did not transfer [#{name}].  Falling back to local file." # This used to fall back to open-uri. -NF
           cached_source = source
@@ -106,6 +108,7 @@ Puppet::Type.type(:package).provide :pkgdmg, :parent => Puppet::Provider::Packag
           xml_str = hdiutil "mount", "-plist", "-nobrowse", "-readonly", "-mountrandom", "/tmp", dmg.path
           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|
             entity["mount-point"]
           }.compact
@@ -145,10 +148,12 @@ Puppet::Type.type(:package).provide :pkgdmg, :parent => Puppet::Provider::Packag
     unless source
       raise Puppet::Error.new(_("Mac OS X PKG DMGs must specify a package source."))
     end
+
     name = @resource[:name]
     unless name
       raise Puppet::Error.new(_("Mac OS X PKG DMGs must specify a package name."))
     end
+
     self.class.installpkgdmg(source,name)
   end
 end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/provider/package'
 
 Puppet::Type.type(:package).provide :pkgin, :parent => Puppet::Provider::Package do
@@ -11,15 +12,14 @@ Puppet::Type.type(:package).provide :pkgin, :parent => Puppet::Provider::Package
   has_feature :installable, :uninstallable, :upgradeable, :versionable
 
   def self.parse_pkgin_line(package)
-
     # e.g.
     #   vim-7.2.446;Vim editor (vi clone) without GUI
     match, name, version, status = *package.match(/([^\s;]+)-([^\s;]+)[;\s](=|>|<)?.+$/)
     if match
       {
-        :name     => name,
-        :status   => status,
-        :ensure   => version
+        :name => name,
+        :status => status,
+        :ensure => version
       }
     end
   end
@@ -78,11 +78,11 @@ Puppet::Type.type(:package).provide :pkgin, :parent => Puppet::Provider::Package
   def latest
     package = parse_pkgsearch_line.detect{ |p| p[:status] == '<' }
     return properties[:ensure] if not package
+
     return package[:ensure]
   end
 
   def update
     pkgin("-y", :install, resource[:name])
   end
-
 end