puppet 8.5.0-x86-mingw32 → 8.6.0-x86-mingw32

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)

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

@@ -39,11 +39,9 @@ Puppet::Type.type(:package).provide(:windows, :parent => Puppet::Provider::Packa
 
   def self.post_resource_eval
     @paths.each do |path|
-      begin
-        Puppet::FileSystem.unlink(path)
-      rescue => detail
-        raise Puppet::Error.new(_("Error when unlinking %{path}: %{detail}") % { path: path, detail: detail.message }, detail)
-      end
+      Puppet::FileSystem.unlink(path)
+    rescue => detail
+      raise Puppet::Error.new(_("Error when unlinking %{path}: %{detail}") % { path: path, detail: detail.message }, detail)
     end if @paths
   end
 

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

@@ -59,12 +59,10 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
       end
 
       is.split(self.class::MULTIVERSION_SEPARATOR).any? do |version|
-        begin
-          is_version = RPM_VERSION.parse(version)
-          should_version.include?(is_version)
-        rescue RPM_VERSION::ValidationFailure
-          Puppet.debug("Cannot parse #{is} as a RPM version")
-        end
+        is_version = RPM_VERSION.parse(version)
+        should_version.include?(is_version)
+      rescue RPM_VERSION::ValidationFailure
+        Puppet.debug("Cannot parse #{is} as a RPM version")
       end
     end
   end
@@ -126,9 +124,9 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
     when 100
       updates = parse_updates(output)
     when 0
-      self.debug "#{command(:cmd)} check-update exited with 0; no package updates available."
+      debug "#{command(:cmd)} check-update exited with 0; no package updates available."
     else
-      self.warning _("Could not check for updates, '%{cmd} check-update' exited with %{status}") % { cmd: command(:cmd), status: output.exitstatus }
+      warning _("Could not check for updates, '%{cmd} check-update' exited with %{status}") % { cmd: command(:cmd), status: output.exitstatus }
     end
     updates
   end
@@ -213,15 +211,13 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
       end
       versions = []
       available_versions(@resource[:name], disablerepo, enablerepo, disableexcludes).each do |version|
-        begin
-          rpm_version = RPM_VERSION.parse(version)
-          versions << rpm_version if should_range.include?(rpm_version)
-        rescue RPM_VERSION::ValidationFailure
-          Puppet.debug("Cannot parse #{version} as a RPM version")
-        end
+        rpm_version = RPM_VERSION.parse(version)
+        versions << rpm_version if should_range.include?(rpm_version)
+      rescue RPM_VERSION::ValidationFailure
+        Puppet.debug("Cannot parse #{version} as a RPM version")
       end
 
-      version = versions.sort.last if versions.any?
+      version = versions.max if versions.any?
 
       if version
         version = version.to_s.sub(/^\d+:/, '')
@@ -255,17 +251,17 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
     end
 
     should = @resource.should(:ensure)
-    self.debug "Ensuring => #{should}"
+    debug "Ensuring => #{should}"
     operation = :install
 
     case should
     when :latest
-      current_package = self.query
+      current_package = query
       if current_package && !current_package[:ensure].to_s.empty?
         operation = update_command
-        self.debug "Ensuring latest, so using #{operation}"
+        debug "Ensuring latest, so using #{operation}"
       else
-        self.debug "Ensuring latest, but package is absent, so using install"
+        debug "Ensuring latest, but package is absent, so using install"
         operation = :install
       end
       should = nil
@@ -274,7 +270,7 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
       # version feed it to yum directly
       if @resource[:source]
         wanted = @resource[:source]
-        self.debug "Installing directly from #{wanted}"
+        debug "Installing directly from #{wanted}"
       end
       should = nil
     when false, :absent
@@ -286,26 +282,26 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
         # version, and also supplying the path to a package that supplies that
         # version.
         wanted = @resource[:source]
-        self.debug "Installing directly from #{wanted}"
+        debug "Installing directly from #{wanted}"
       else
         # No explicit source was specified, so add the package version
         should = best_version(should)
         wanted += "-#{should}"
         if wanted.scan(self.class::ARCH_REGEX)
-          self.debug "Detected Arch argument in package! - Moving arch to end of version string"
+          debug "Detected Arch argument in package! - Moving arch to end of version string"
           wanted.gsub!(/(.+)(#{self.class::ARCH_REGEX})(.+)/, '\1\3\2')
         end
       end
-      current_package = self.query
+      current_package = query
       if current_package
         if @resource[:install_only]
-          self.debug "Updating package #{@resource[:name]} from version #{current_package[:ensure]} to #{should} as install_only packages are never downgraded"
+          debug "Updating package #{@resource[:name]} from version #{current_package[:ensure]} to #{should} as install_only packages are never downgraded"
           operation = update_command
         elsif rpm_compare_evr(should, current_package[:ensure]) < 0
-          self.debug "Downgrading package #{@resource[:name]} from version #{current_package[:ensure]} to #{should}"
+          debug "Downgrading package #{@resource[:name]} from version #{current_package[:ensure]} to #{should}"
           operation = :downgrade
         elsif rpm_compare_evr(should, current_package[:ensure]) > 0
-          self.debug "Upgrading package #{@resource[:name]} from version #{current_package[:ensure]} to #{should}"
+          debug "Upgrading package #{@resource[:name]} from version #{current_package[:ensure]} to #{should}"
           operation = update_command
         end
       end
@@ -313,7 +309,7 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
 
     # Yum on el-4 and el-5 returns exit status 0 when trying to install a package it doesn't recognize;
     # ensure we capture output to check for errors.
-    no_debug = if Puppet.runtime[:facter].value('os.release.major').to_i > 5 then ["-d", "0"] else [] end
+    no_debug = Puppet.runtime[:facter].value('os.release.major').to_i > 5 ? ["-d", "0"] : []
     command = [command(:cmd)] + no_debug + ["-e", error_level, "-y", install_options, operation, wanted].compact
     output = execute(command)
 
@@ -323,8 +319,8 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
 
     # If a version was specified, query again to see if it is a matching version
     if should
-      is = self.query
-      raise Puppet::Error, _("Could not find package %{name}") % { name: self.name } unless is
+      is = query
+      raise Puppet::Error, _("Could not find package %{name}") % { name: name } unless is
 
       version = is[:ensure]
       # FIXME: Should we raise an exception even if should == :latest
@@ -337,23 +333,23 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
   # What's the latest package version available?
   def latest
     upd = self.class.latest_package_version(@resource[:name], disablerepo, enablerepo, disableexcludes)
-    unless upd.nil?
-      # FIXME: there could be more than one update for a package
-      # because of multiarch
-      return "#{upd[:epoch]}:#{upd[:version]}-#{upd[:release]}"
-    else
+    if upd.nil?
       # Yum didn't find updates, pretend the current version is the latest
-      self.debug "Yum didn't find updates, current version (#{properties[:ensure]}) is the latest"
+      debug "Yum didn't find updates, current version (#{properties[:ensure]}) is the latest"
       version = properties[:ensure]
       raise Puppet::DevError, _("Tried to get latest on a missing package") if version == :absent || version == :purged
 
-      return version
+      version
+    else
+      # FIXME: there could be more than one update for a package
+      # because of multiarch
+      "#{upd[:epoch]}:#{upd[:version]}-#{upd[:release]}"
     end
   end
 
   def update
     # Install in yum can be used for update, too
-    self.install
+    install
   end
 
   def purge

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

@@ -82,7 +82,7 @@ Puppet::Type.type(:package).provide :zypper, :parent => :rpm, :source => :rpm do
         end
       end
 
-      return versions.sort.last if versions.any?
+      return versions.max if versions.any?
 
       Puppet.debug("No available version for package #{@resource[:name]} is included in range #{should_range}")
       should
@@ -92,7 +92,7 @@ Puppet::Type.type(:package).provide :zypper, :parent => :rpm, :source => :rpm do
   # Install a package using 'zypper'.
   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.
@@ -112,8 +112,8 @@ Puppet::Type.type(:package).provide :zypper, :parent => :rpm, :source => :rpm do
     # Assume that this will work on newer zypper versions
 
     # extract version numbers and convert to integers
-    major, minor, patch = zypper_version.scan(/\d+/).map { |x| x.to_i }
-    self.debug "Detected zypper version #{major}.#{minor}.#{patch}"
+    major, minor, patch = zypper_version.scan(/\d+/).map(&:to_i)
+    debug "Detected zypper version #{major}.#{minor}.#{patch}"
 
     # zypper version < 1.0 does not support --quiet flag
     if major < 1
@@ -144,29 +144,27 @@ Puppet::Type.type(:package).provide :zypper, :parent => :rpm, :source => :rpm do
 
     zypper(*options)
 
-    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
 
   # What's the latest package version available?
   def latest
-    return self.class.latest_package_version(@resource[:name]) ||
-           # zypper didn't find updates, pretend the current
-           # version is the latest
-           @property_hash[:ensure]
+    self.class.latest_package_version(@resource[:name]) ||
+      # zypper didn't find updates, pretend the current
+      # version is the latest
+      @property_hash[:ensure]
   end
 
   def update
     # zypper install can be used for update, too
-    self.install
+    install
   end
 
   def uninstall
     # extract version numbers and convert to integers
-    major, minor, _ = zypper_version.scan(/\d+/).map { |x| x.to_i }
+    major, minor, _ = zypper_version.scan(/\d+/).map(&:to_i)
 
     if major < 1
       super

data/lib/puppet/provider/package.rb

@@ -25,7 +25,7 @@ class Puppet::Provider::Package < Puppet::Provider
       # Purged is the "most uninstalled" a package can be, so a purged package will be in-sync with
       # either `ensure => absent` or `ensure => purged`; an absent package will be out of sync with `ensure => purged`.
       default_status = self.class.feature?(:purgeable) ? :purged : :absent
-      @property_hash = query || { :ensure => (default_status) }
+      @property_hash = query || { :ensure => default_status }
       @property_hash[:ensure] = default_status if @property_hash.empty?
     end
     @property_hash.dup