puppet 8.2.0-x86-mingw32 → 8.4.0-x86-mingw32

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

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/provider/package'
 
 Puppet::Type.type(:package).provide :pkgng, :parent => Puppet::Provider::Package do
@@ -23,7 +24,9 @@ Puppet::Type.type(:package).provide :pkgng, :parent => Puppet::Provider::Package
   end
 
   def self.cached_version_list
+    # rubocop:disable Naming/MemoizedInstanceVariableName
     @version_list ||= get_version_list
+    # rubocop:enable Naming/MemoizedInstanceVariableName
   end
 
   def self.get_version_list
@@ -37,6 +40,7 @@ Puppet::Type.type(:package).provide :pkgng, :parent => Puppet::Provider::Package
       if ['!', '?'].include?(compare)
         return nil
       end
+
       latest_version = status.split(' ').last.split(')').first
       return latest_version
     end
@@ -45,15 +49,15 @@ Puppet::Type.type(:package).provide :pkgng, :parent => Puppet::Provider::Package
 
   def self.parse_pkg_query_line(line)
     name, version, origin = line.chomp.split(' ', 3)
-    latest_version  = get_latest_version(origin) || version
+    latest_version = get_latest_version(origin) || version
 
     {
-      :ensure   => version,
-      :name     => name,
+      :ensure => version,
+      :name => name,
       :provider => self.name,
-      :origin   => origin,
-      :version  => version,
-      :latest   => latest_version
+      :origin => origin,
+      :version => version,
+      :latest => latest_version
     }
   end
 
@@ -92,6 +96,7 @@ Puppet::Type.type(:package).provide :pkgng, :parent => Puppet::Provider::Package
     # extract repo tag from URN: urn:freebsd:repo:<tag>
     match = /^urn:freebsd:repo:(.+)$/.match(urn)
     raise ArgumentError urn.inspect unless match
+
     match[1]
   end
 
@@ -170,5 +175,4 @@ Puppet::Type.type(:package).provide :pkgng, :parent => Puppet::Provider::Package
   def install_options
     join_options(@resource[:install_options])
   end
-
 end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Packaging using Peter Bonivart's pkgutil program.
 Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun do
   desc "Package management using Peter Bonivart's ``pkgutil`` command on Solaris."
@@ -65,7 +66,7 @@ Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun d
     output = pkguti ["-a"]
 
     output.split("\n").collect do |line|
-      next if line =~ /^common\s+package/  # header of package list
+      next if line =~ /^common\s+package/ # header of package list
       next if noise?(line)
 
       if line =~ /\s*(\S+)\s+(\S+)\s+(.*)/
@@ -94,7 +95,7 @@ Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun d
     end
 
     list = output.collect do |line|
-      next if line =~ /installed\s+catalog/  # header of package list
+      next if line =~ /installed\s+catalog/ # header of package list
       next if noise?(line)
 
       pkgsplit(line)
@@ -128,10 +129,10 @@ Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun d
       hash = {}
       hash[:name] = $1
       hash[:ensure] = if $2 == "notinst"
-        :absent
-      else
-        $2
-      end
+                        :absent
+                      else
+                        $2
+                      end
       hash[:avail] = $3
 
       if hash[:avail] =~ /^SAME\s*$/

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/provider/package'
 require 'fileutils'
 
@@ -222,12 +223,12 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
       end
 
       case packages.size
-        when 0
-          raise Puppet::Error.new(_("No package found with the specified name [%{name}]") % { name: @resource[:name] })
-        when 1
-          @eix_result = packages[0]
-        else
-          raise Puppet::Error.new(_("More than one package with the specified name [%{search_value}], please use the category parameter to disambiguate") % { search_value: search_value })
+      when 0
+        raise Puppet::Error.new(_("No package found with the specified name [%{name}]") % { name: @resource[:name] })
+      when 1
+        @eix_result = packages[0]
+      else
+        raise Puppet::Error.new(_("More than one package with the specified name [%{search_value}], please use the category parameter to disambiguate") % { search_value: search_value })
       end
     rescue Puppet::ExecutionFailure => detail
       raise Puppet::Error.new(detail)
@@ -239,9 +240,11 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
   end
 
   private
+
   def eix_get_version_for_versions(versions, target)
     # [2.7.10-r1,2.7.12,3.4.3-r1,3.4.5,3.5.2] 3.5.2
     return nil if versions.nil?
+
     versions = versions.split(',')
     # [2.7.10-r1 2.7.12 3.4.3-r1 3.4.5 3.5.2]
     versions.find { |version| version == target }
@@ -249,9 +252,11 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
   end
 
   private
+
   def eix_get_version_for_slot(versions_and_slots, slot)
     # [2.7.12:2.7 3.4.5:3.4 3.5.2:3.5] 3.5
     return nil if versions_and_slots.nil?
+
     versions_and_slots = versions_and_slots.split(',')
     # [2.7.12:2.7 3.4.5:3.4 3.5.2:3.5]
     versions_and_slots.map! { |version_and_slot| version_and_slot.split(':') }

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

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
+
 Puppet::Type.type(:package).provide :ports, :parent => :freebsd, :source => :freebsd do
   desc "Support for FreeBSD's ports.  Note that this, too, mixes packages and ports."
 
   commands :portupgrade => "/usr/local/sbin/portupgrade",
-    :portversion => "/usr/local/sbin/portversion",
-    :portuninstall => "/usr/local/sbin/pkg_deinstall",
-    :portinfo => "/usr/sbin/pkg_info"
+           :portversion => "/usr/local/sbin/portversion",
+           :portuninstall => "/usr/local/sbin/pkg_deinstall",
+           :portinfo => "/usr/sbin/pkg_info"
 
   %w{INTERACTIVE UNAME}.each do |var|
     ENV.delete(var) if ENV.include?(var)
@@ -44,7 +45,7 @@ Puppet::Type.type(:package).provide :ports, :parent => :freebsd, :source => :fre
 
     unless pkgstuff =~ /^\S+-([^-\s]+)$/
       raise Puppet::Error,
-        _("Could not match package info '%{pkgstuff}'") % { pkgstuff: pkgstuff }
+            _("Could not match package info '%{pkgstuff}'") % { pkgstuff: pkgstuff }
     end
 
     version = $1
@@ -58,7 +59,7 @@ Puppet::Type.type(:package).provide :ports, :parent => :freebsd, :source => :fre
 
     unless info =~ /\((\w+) has (.+)\)/
       raise Puppet::Error,
-        _("Could not match version info '%{info}'") % { info: info }
+            _("Could not match version info '%{info}'") % { info: info }
     end
 
     source, newversion = $1, $2

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Whole new package, so include pack stuff
 require_relative '../../../puppet/provider/package'
 
@@ -12,11 +13,11 @@ Puppet::Type.type(:package).provide :portupgrade, :parent => Puppet::Provider::P
   ## has_features is usually autodetected based on defs below.
   # has_features :installable, :uninstallable, :upgradeable
 
-  commands :portupgrade   => "/usr/local/sbin/portupgrade",
-  :portinstall   => "/usr/local/sbin/portinstall",
-  :portversion   => "/usr/local/sbin/portversion",
-  :portuninstall => "/usr/local/sbin/pkg_deinstall",
-  :portinfo      => "/usr/sbin/pkg_info"
+  commands :portupgrade => "/usr/local/sbin/portupgrade",
+           :portinstall => "/usr/local/sbin/portinstall",
+           :portversion => "/usr/local/sbin/portversion",
+           :portuninstall => "/usr/local/sbin/pkg_deinstall",
+           :portinfo => "/usr/sbin/pkg_info"
 
   ## Activate this only once approved by someone important.
   # defaultfor 'os.name' => :freebsd
@@ -155,14 +156,7 @@ Puppet::Type.type(:package).provide :portupgrade, :parent => Puppet::Provider::P
         # Any other error (dump output to log)
         raise Puppet::ExecutionFailure, _("Unexpected output from portversion: %{output}") % { output: output }
       end
-
-      # Just in case we still are running, return nil
-      return nil
     end
-
-    # At this point normal operation has finished and we shouldn't have been called.
-    # Error out and let the admin deal with it.
-    raise Puppet::Error, _("portversion.latest() - fatal error with portversion: %{output}") % { output: output }
   end
 
   ###### Query subcommand - return a hash of details if exists, or nil if it doesn't.

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Puppet::Type.type(:package).provide :puppet_gem, :parent => :gem do
   desc "Puppet Ruby Gem support. This provider is useful for managing
         gems needed by the ruby provided in the puppet-agent package."

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 unless Puppet::Util::Platform.jruby_fips?
   require 'rubygems/commands/list_command'
 end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/provider/package'
 require_relative '../../../puppet/util/rpm_compare'
 
@@ -42,6 +43,7 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
 
   def self.current_version
     return @current_version unless @current_version.nil?
+
     output = rpm "--version"
     @current_version = output.gsub('RPM version ', '').strip
   end
@@ -76,10 +78,10 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
   # a hash with entries :instance => fully versioned package name, and
   # :ensure => version-release
   def query
-    #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}"]
+    # 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}"]
 
     begin
       output = rpm(*cmd)
@@ -121,7 +123,7 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
       @resource.fail _("RPMs must specify a package source")
     end
 
-    version =  @property_hash[:ensure]
+    version = @property_hash[:ensure]
 
     # RPM gets upset if you try to install an already installed package
     return if @resource.should(:ensure) == version || (@resource.should(:ensure) == :latest && version == latest)
@@ -190,11 +192,12 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
 
     should = resource[:ensure]
     is.split(self.class::MULTIVERSION_SEPARATOR).any? do |version|
-      0 == rpm_compareEVR(should, version)
+      0 == rpm_compare_evr(should, version)
     end
   end
 
   private
+
   # @param line [String] one line of rpm package query information
   # @return [Hash] of NEVRA_FIELDS strings parsed from package info
   # or an empty hash if we failed to parse
@@ -246,6 +249,7 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
     if list.size == 1
       return list[0]
     end
+
     return list
   end
 end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Puppet::Type.type(:package).provide :rug, :parent => :rpm do
   desc "Support for suse `rug` package manager."
 
@@ -33,7 +34,7 @@ Puppet::Type.type(:package).provide :rug, :parent => :rpm do
 
   # What's the latest package version available?
   def latest
-    #rug can only get a list of *all* available packages?
+    # rug can only get a list of *all* available packages?
     output = rug "list-updates"
 
     if output =~ /#{Regexp.escape @resource[:name]}\s*\|\s*([^\s\|]+)/

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Sun packaging.
 
 require_relative '../../../puppet/provider/package'
@@ -12,8 +13,8 @@ Puppet::Type.type(:package).provide :sun, :parent => Puppet::Provider::Package d
      or a hash."
 
   commands :pkginfo => "/usr/bin/pkginfo",
-    :pkgadd => "/usr/sbin/pkgadd",
-    :pkgrm => "/usr/sbin/pkgrm"
+           :pkgadd => "/usr/sbin/pkgadd",
+           :pkgrm => "/usr/sbin/pkgrm"
 
   confine 'os.family' => :solaris
   defaultfor 'os.family' => :solaris
@@ -21,13 +22,13 @@ Puppet::Type.type(:package).provide :sun, :parent => Puppet::Provider::Package d
   has_feature :install_options
 
   self::Namemap = {
-    "PKGINST"  => :name,
+    "PKGINST" => :name,
     "CATEGORY" => :category,
-    "ARCH"     => :platform,
-    "VERSION"  => :ensure,
-    "BASEDIR"  => :root,
-    "VENDOR"   => :vendor,
-    "DESC"     => :description,
+    "ARCH" => :platform,
+    "VERSION" => :ensure,
+    "BASEDIR" => :root,
+    "VENDOR" => :vendor,
+    "DESC" => :description,
   }
 
   def self.namemap(hash)
@@ -69,12 +70,13 @@ Puppet::Type.type(:package).provide :sun, :parent => Puppet::Provider::Package d
     begin
       pkgs = self.class.parse_pkginfo(pkginfo(*args))
       errmsg = case pkgs.size
-        when 0
-          'No message'
-        when 1
-           pkgs[0]['ERROR']
-      end
+               when 0
+                 'No message'
+               when 1
+                 pkgs[0]['ERROR']
+               end
       return self.class.namemap(pkgs[0]) if errmsg.nil?
+
       # according to commit 41356a7 some errors do not raise an exception
       # 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 }
@@ -94,13 +96,14 @@ Puppet::Type.type(:package).provide :sun, :parent => Puppet::Provider::Package d
 
   # only looking for -G now
   def install
-    #TRANSLATORS Sun refers to the company name, do not translate
+    # TRANSLATORS Sun refers to the company name, do not translate
     raise Puppet::Error, _("Sun packages must specify a package source") unless @resource[:source]
+
     options = {
-      :adminfile    => @resource[:adminfile],
+      :adminfile => @resource[:adminfile],
       :responsefile => @resource[:responsefile],
-      :source       => @resource[:source],
-      :cmd_options  => @resource[:install_options]
+      :source => @resource[:source],
+      :cmd_options => @resource[:install_options]
     }
     pkgadd prepare_cmd(options)
   end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # At this point, it's an exact copy of the Blastwave stuff.
 Puppet::Type.type(:package).provide :sunfreeware, :parent => :blastwave, :source => :sun do
   desc "Package management using sunfreeware.com's `pkg-get` command on Solaris.

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Puppet::Type.type(:package).provide :tdnf, :parent => :dnf do
   desc "Support via `tdnf`.
 

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Puppet::Type.type(:package).provide :up2date, :parent => :rpm, :source => :rpm do
   desc "Support for Red Hat's proprietary `up2date` package update
     mechanism."
@@ -22,7 +23,7 @@ Puppet::Type.type(:package).provide :up2date, :parent => :rpm, :source => :rpm d
 
   # What's the latest package version available?
   def latest
-    #up2date can only get a list of *all* available packages?
+    # up2date can only get a list of *all* available packages?
     output = up2date "--showall"
 
     if output =~ /^#{Regexp.escape @resource[:name]}-(\d+.*)\.\w+/

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Puppet::Type.type(:package).provide :urpmi, :parent => :rpm, :source => :rpm do
   desc "Support via `urpmi`."
   commands :urpmi => "urpmi", :urpmq => "urpmq", :rpm => "rpm", :urpme => "urpme"

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../../puppet/provider/package/windows/package'
 
 class Puppet::Provider::Package::Windows

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../../puppet/provider/package/windows/package'
 
 class Puppet::Provider::Package::Windows

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../../puppet/provider/package'
 require_relative '../../../../puppet/util/windows'
 
@@ -44,9 +45,9 @@ class Puppet::Provider::Package::Windows
         [KEY64, KEY32].each do |mode|
           mode |= KEY_READ
           begin
-            open(hive, 'Software\Microsoft\Windows\CurrentVersion\Uninstall', mode) do |uninstall|
-              each_key(uninstall) do |name, wtime|
-                open(hive, "#{uninstall.keyname}\\#{name}", mode) do |key|
+            self.open(hive, 'Software\Microsoft\Windows\CurrentVersion\Uninstall', mode) do |uninstall|
+              each_key(uninstall) do |name, _wtime|
+                self.open(hive, "#{uninstall.keyname}\\#{name}", mode) do |key|
                   yield key, values_by_name(key, reg_value_names_to_load)
                 end
               end
@@ -70,6 +71,7 @@ class Puppet::Provider::Package::Windows
       when /\.exe"?\Z/i
         fail(_("The source does not exist: '%{source}'") % { source: resource[:source] }) unless
           Puppet::FileSystem.exist?(resource[:source]) || resource[:source].start_with?('http://', 'https://')
+
         ExePackage
       else
         fail(_("Don't know how to install '%{source}'") % { source: resource[:source] })

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/provider/package'
 require_relative '../../../puppet/util/windows'
 require_relative 'windows/package'
@@ -31,6 +32,7 @@ Puppet::Type.type(:package).provide(:windows, :parent => Puppet::Provider::Packa
   has_feature :versionable
 
   attr_accessor :package
+
   class << self
     attr_accessor :paths
   end
@@ -56,8 +58,8 @@ Puppet::Type.type(:package).provide(:windows, :parent => Puppet::Provider::Packa
 
   def self.to_hash(pkg)
     {
-      :name     => pkg.name,
-      :ensure   => pkg.version || :installed,
+      :name => pkg.name,
+      :ensure => pkg.version || :installed,
       :provider => :windows
     }
   end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/util/package/version/range'
 require_relative '../../../puppet/util/package/version/rpm'
 require_relative '../../../puppet/util/rpm_compare'
@@ -16,7 +17,7 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
   This provider supports the `install_options` attribute, which allows command-line flags to be passed to yum.
   These options should be specified as an array where each element is either a string or a hash."
 
-  has_feature :install_options, :versionable, :virtual_packages, :install_only
+  has_feature :install_options, :versionable, :virtual_packages, :install_only, :version_ranges
 
   RPM_VERSION       = Puppet::Util::Package::Version::Rpm
   RPM_VERSION_RANGE = Puppet::Util::Package::Version::Range
@@ -33,8 +34,8 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
       end
   end
 
-defaultfor 'os.name' => :amazon
-defaultfor 'os.family' => :redhat, 'os.release.major' => (4..7).to_a
+  defaultfor 'os.name' => :amazon
+  defaultfor 'os.family' => :redhat, 'os.release.major' => (4..7).to_a
 
   def insync?(is)
     return false if [:purged, :absent].include?(is)
@@ -68,6 +69,7 @@ defaultfor 'os.family' => :redhat, 'os.release.major' => (4..7).to_a
 
   def self.prefetch(packages)
     raise Puppet::Error, _("The yum provider can only be used as root") if Process.euid != 0
+
     super
   end
 
@@ -85,7 +87,6 @@ defaultfor 'os.family' => :redhat, 'os.release.major' => (4..7).to_a
   # @param disableexcludes [Array<String>] A list of repository excludes to disable for this query
   # @return [Hash<Symbol, String>]
   def self.latest_package_version(package, disablerepo, enablerepo, disableexcludes)
-
     key = [disablerepo, enablerepo, disableexcludes]
 
     @latest_versions ||= {}
@@ -149,7 +150,6 @@ defaultfor 'os.family' => :redhat, 'os.release.major' => (4..7).to_a
   end
 
   def self.update_to_hash(pkgname, pkgversion)
-
     # The pkgname string has two parts: name, and architecture. Architecture
     # is the portion of the string following the last "." character. All
     # characters preceding the final dot are the package name. Parse out
@@ -169,7 +169,7 @@ defaultfor 'os.family' => :redhat, 'os.release.major' => (4..7).to_a
       :epoch => epoch,
       :version => version,
       :release => release,
-      :arch    => arch,
+      :arch => arch,
     }
   end
 
@@ -256,7 +256,7 @@ defaultfor 'os.family' => :redhat, 'os.release.major' => (4..7).to_a
         operation = update_command
         self.debug "Ensuring latest, so using #{operation}"
       else
-        self.debug "Ensuring latest, but package is absent, so using #{:install}"
+        self.debug "Ensuring latest, but package is absent, so using install"
         operation = :install
       end
       should = nil
@@ -292,10 +292,10 @@ defaultfor 'os.family' => :redhat, 'os.release.major' => (4..7).to_a
         if @resource[:install_only]
           self.debug "Updating package #{@resource[:name]} from version #{current_package[:ensure]} to #{should} as install_only packages are never downgraded"
           operation = update_command
-        elsif rpm_compareEVR(should, current_package[:ensure]) < 0
+        elsif rpm_compare_evr(should, current_package[:ensure]) < 0
           self.debug "Downgrading package #{@resource[:name]} from version #{current_package[:ensure]} to #{should}"
           operation = :downgrade
-        elsif rpm_compareEVR(should, current_package[:ensure]) > 0
+        elsif rpm_compare_evr(should, current_package[:ensure]) > 0
           self.debug "Upgrading package #{@resource[:name]} from version #{current_package[:ensure]} to #{should}"
           operation = update_command
         end
@@ -337,6 +337,7 @@ defaultfor 'os.family' => :redhat, 'os.release.major' => (4..7).to_a
       self.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
     end
   end
@@ -374,13 +375,15 @@ defaultfor 'os.family' => :redhat, 'os.release.major' => (4..7).to_a
   # @return [Array<String>] All hash values with the given key.
   def scan_options(options, key)
     return [] unless options.is_a?(Enumerable)
+
     values = options.map do | repo |
       value = if repo.is_a?(String)
-        next unless repo.include?('=')
-        Hash[*repo.strip.split('=')] # make it a hash
-      else
-        repo
-      end
+                next unless repo.include?('=')
+
+                Hash[*repo.strip.split('=')] # make it a hash
+              else
+                repo
+              end
       value[key]
     end
     values.compact.uniq