openvox 7.37.1 → 8.19.0

data/lib/puppet/util/logging.rb

@@ -1,18 +1,20 @@
+# frozen_string_literal: true
+
 # A module to make logging a bit easier.
 require_relative '../../puppet/util/log'
 require_relative '../../puppet/error'
 
 module Puppet::Util
 module Logging
-
   def send_log(level, message)
-    Puppet::Util::Log.create({:level => level, :source => log_source, :message => message}.merge(log_metadata))
+    Puppet::Util::Log.create({ :level => level, :source => log_source, :message => message }.merge(log_metadata))
   end
 
   # Create a method for each log level.
   Puppet::Util::Log.eachlevel do |level|
     # handle debug a special way for performance reasons
     next if level == :debug
+
     define_method(level) do |args|
       args = args.join(" ") if args.is_a?(Array)
       send_log(level, args)
@@ -31,6 +33,7 @@ module Logging
   #
   def debug(*args)
     return nil unless Puppet::Util::Log.level == :debug
+
     if block_given?
       send_log(:debug, yield(*args))
     else
@@ -54,17 +57,17 @@ module Logging
       # Retain all detailed info and keep plain message and stacktrace separate
       backtrace = build_exception_trace(exception, combined_trace, puppet_trace)
       Puppet::Util::Log.create({
-          :level => level,
-          :source => log_source,
-          :message => exception.basic_message,
-          :issue_code => exception.issue_code,
-          :backtrace => backtrace.empty? ? nil : backtrace,
-          :file => exception.file,
-          :line => exception.line,
-          :pos => exception.pos,
-          :environment => exception.environment,
-          :node => exception.node
-        }.merge(log_metadata))
+        :level => level,
+        :source => log_source,
+        :message => exception.basic_message,
+        :issue_code => exception.issue_code,
+        :backtrace => backtrace.empty? ? nil : backtrace,
+        :file => exception.file,
+        :line => exception.line,
+        :pos => exception.pos,
+        :environment => exception.environment,
+        :node => exception.node
+      }.merge(log_metadata))
     else
       send_log(level, format_exception(exception, message, combined_trace, puppet_trace))
     end
@@ -74,7 +77,7 @@ module Logging
     built_trace = format_backtrace(exception, combined_trace, puppet_trace)
 
     if exception.respond_to?(:original)
-      original =  exception.original
+      original = exception.original
       unless original.nil?
         built_trace << _('Wrapped exception:')
         built_trace << original.message
@@ -124,7 +127,7 @@ module Logging
     raise exception, message + "\n" + exception.to_s, exception.backtrace
   end
 
-  class DeprecationWarning < Exception; end
+  class DeprecationWarning < Exception; end # rubocop:disable Lint/InheritException
 
   # Logs a warning indicating that the Ruby code path is deprecated.  Note that
   # this method keeps track of the offending lines of code that triggered the
@@ -156,8 +159,8 @@ module Logging
     key = options[:key]
     file = options[:file]
     line = options[:line]
-    #TRANSLATORS the literals ":file", ":line", and ":key" should not be translated
-    raise Puppet::DevError, _("Need either :file and :line, or :key") if (key.nil?) && (file.nil? || line.nil?)
+    # TRANSLATORS the literals ":file", ":line", and ":key" should not be translated
+    raise Puppet::DevError, _("Need either :file and :line, or :key") if key.nil? && (file.nil? || line.nil?)
 
     key ||= "#{file}:#{line}"
     issue_deprecation_warning(message, key, file, line, false)
@@ -177,9 +180,10 @@ module Logging
   # Either :file and :line and/or :key must be passed.
   def warn_once(kind, key, message, file = nil, line = nil, level = :warning)
     return if Puppet[:disable_warnings].include?(kind)
+
     $unique_warnings ||= {}
     if $unique_warnings.length < 100 then
-      if (! $unique_warnings.has_key?(key)) then
+      unless $unique_warnings.has_key?(key) then
         $unique_warnings[key] = message
         call_trace = if file == :default and line == :default
                        # Suppress the file and line number output
@@ -197,7 +201,7 @@ module Logging
     end
   end
 
-  def get_deprecation_offender()
+  def get_deprecation_offender
     # we have to put this in its own method to simplify testing; we need to be able to mock the offender results in
     # order to test this class, and our framework does not appear to enjoy it if you try to mock Kernel.caller
     #
@@ -234,16 +238,16 @@ module Logging
 
     # Deprecation messages are UTF-8 as they are produced by Ruby
     Puppet::FileSystem.open(deprecations_file, nil, "a:UTF-8") do |f|
-      if ($deprecation_warnings) then
+      if $deprecation_warnings then
         $deprecation_warnings.each do |offender, message|
-          if (! $logged_deprecation_warnings.has_key?(offender)) then
-            $logged_deprecation_warnings[offender] = true
-            if ((pattern.nil?) || (message =~ pattern)) then
-              f.puts(message)
-              f.puts(offender)
-              f.puts()
-            end
-          end
+          next if $logged_deprecation_warnings.has_key?(offender)
+
+          $logged_deprecation_warnings[offender] = true
+          next unless pattern.nil? || (message =~ pattern)
+
+          f.puts(message)
+          f.puts(offender)
+          f.puts()
         end
       end
     end
@@ -260,6 +264,7 @@ module Logging
 
   def issue_deprecation_warning(message, key, file, line, use_caller)
     return if Puppet[:disable_warnings].include?('deprecations')
+
     $deprecation_warnings ||= {}
     if $deprecation_warnings.length < 100
       key ||= (offender = get_deprecation_offender)
@@ -285,9 +290,8 @@ module Logging
   end
 
   def log_metadata
-    [:file, :line, :tags].inject({}) do |result, attr|
+    [:file, :line, :tags].each_with_object({}) do |attr, result|
       result[attr] = send(attr) if respond_to?(attr)
-      result
     end
   end
 

data/lib/puppet/util/metaid.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Object
   # The hidden singleton lurks behind everyone
   def singleton_class; class << self; self; end; end
@@ -18,4 +20,3 @@ class Object
     class_eval { define_method name, &blk }
   end
 end
-

data/lib/puppet/util/metric.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # included so we can test object types
 require_relative '../../puppet'
 require_relative '../../puppet/network/format_support'
@@ -34,13 +36,13 @@ class Puppet::Util::Metric
   def [](name)
     value = @values.find { |v| v[0] == name }
     if value
-      return value[2]
+      value[2]
     else
-      return 0
+      0
     end
   end
 
-  def initialize(name,label = nil)
+  def initialize(name, label = nil)
     @name = name.to_s
 
     @label = label || self.class.labelize(name)
@@ -48,10 +50,11 @@ class Puppet::Util::Metric
     @values = []
   end
 
-  def newvalue(name,value,label = nil)
-    raise ArgumentError.new("metric name #{name.inspect} is not a string") unless name.is_a? String
+  def newvalue(name, value, label = nil)
+    raise ArgumentError, "metric name #{name.inspect} is not a string" unless name.is_a? String
+
     label ||= self.class.labelize(name)
-    @values.push [name,label,value]
+    @values.push [name, label, value]
   end
 
   def values

data/lib/puppet/util/monkey_patches.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../puppet/util/platform'
 
 module Puppet::Util::MonkeyPatches
@@ -12,10 +14,10 @@ rescue NotImplementedError
 end
 
 module RDoc
-  def self.caller(skip=nil)
+  def self.caller(skip = nil)
     in_gem_wrapper = false
     Kernel.caller.reject { |call|
-      in_gem_wrapper ||= call =~ /#{Regexp.escape $0}:\d+:in `load'/
+      in_gem_wrapper ||= call =~ /#{Regexp.escape $PROGRAM_NAME}:\d+:in `load'/
     }
   end
 end
@@ -29,39 +31,31 @@ class Object
   end
 end
 
-if RUBY_VERSION.to_f < 3.0
-  # absolute/relative were optimized to avoid chop_basename in ruby 3
-  # see https://github.com/ruby/ruby/commit/39312cf4d6c2ab3f07d688ad1a467c8f84b58db0
-  require 'pathname'
-  class Pathname
-    if File.dirname('A:') == 'A:.' # DOSish drive letter
-      ABSOLUTE_PATH = /\A(?:[A-Za-z]:|#{SEPARATOR_PAT})/o
-    else
-      ABSOLUTE_PATH = /\A#{SEPARATOR_PAT}/o
-    end
-    private_constant :ABSOLUTE_PATH
-
-    def absolute?
-      ABSOLUTE_PATH.match? @path
+unless Dir.singleton_methods.include?(:exists?)
+  class Dir
+    def self.exists?(file_name)
+      warn("Dir.exists?('#{file_name}') is deprecated, use Dir.exist? instead") if $VERBOSE
+      Dir.exist?(file_name)
     end
+  end
+end
 
-    def relative?
-      !absolute?
+unless File.singleton_methods.include?(:exists?)
+  class File
+    def self.exists?(file_name)
+      warn("File.exists?('#{file_name}') is deprecated, use File.exist? instead") if $VERBOSE
+      File.exist?(file_name)
     end
   end
 end
 
-# (#19151) Reject all SSLv2 ciphers and handshakes
 require_relative '../../puppet/ssl/openssl_loader'
 unless Puppet::Util::Platform.jruby_fips?
   class OpenSSL::SSL::SSLContext
     if DEFAULT_PARAMS[:options]
-      DEFAULT_PARAMS[:options] |= OpenSSL::SSL::OP_NO_SSLv2 | OpenSSL::SSL::OP_NO_SSLv3
+      DEFAULT_PARAMS[:options] |= OpenSSL::SSL::OP_NO_SSLv3
     else
-      DEFAULT_PARAMS[:options] = OpenSSL::SSL::OP_NO_SSLv2 | OpenSSL::SSL::OP_NO_SSLv3
-    end
-    if DEFAULT_PARAMS[:ciphers]
-      DEFAULT_PARAMS[:ciphers] << ':!SSLv2'
+      DEFAULT_PARAMS[:options] = OpenSSL::SSL::OP_NO_SSLv3
     end
 
     alias __original_initialize initialize
@@ -88,12 +82,10 @@ if Puppet::Util::Platform.windows?
       unless @puppet_certs_loaded
         @puppet_certs_loaded = true
 
-        Puppet::Util::Windows::RootCerts.instance.to_a.uniq { |cert| cert.to_der }.each do |x509|
-          begin
-            add_cert(x509)
-          rescue OpenSSL::X509::StoreError
-            warn "Failed to add #{x509.subject.to_utf8}"
-          end
+        Puppet::Util::Windows::RootCerts.instance.to_a.uniq(&:to_der).each do |x509|
+          add_cert(x509)
+        rescue OpenSSL::X509::StoreError
+          warn "Failed to add #{x509.subject.to_utf8}"
         end
       end
 

data/lib/puppet/util/multi_match.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 # MultiMatch allows multiple values to be tested at once in a case expression.
 # This class is needed since Array does not implement the === operator to mean
-# "each v === other.each v". 
+# "each v === other.each v".
 #
 # This class is useful in situations when the Puppet Type System cannot be used
 # (e.g. in Logging, since it needs to be able to log very early in the initialization
@@ -10,7 +12,7 @@
 # NOT_NIL
 # TUPLE
 # TRIPLE
-# 
+#
 # which test against single NOT_NIL value, Array with two NOT_NIL, and Array with three NOT_NIL
 #
 module Puppet::Util
@@ -22,14 +24,16 @@ class MultiMatch
   end
 
   def ===(other)
-    lv = @values  # local var is faster than instance var
+    lv = @values # local var is faster than instance var
     case other
     when MultiMatch
       return false unless other.values.size == values.size
-      other.values.each_with_index {|v, i| return false unless lv[i] === v || v === lv[i]}
+
+      other.values.each_with_index { |v, i| return false unless lv[i] === v || v === lv[i] }
     when Array
       return false unless other.size == values.size
-      other.each_with_index {|v, i| return false unless lv[i] === v || v === lv[i]}
+
+      other.each_with_index { |v, i| return false unless lv[i] === v || v === lv[i] }
     else
       false
     end

data/lib/puppet/util/network_device/base.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
+
 require_relative '../../../puppet/util/autoload'
 require 'uri'
 require_relative '../../../puppet/util/network_device/transport'
 require_relative '../../../puppet/util/network_device/transport/base'
 
 class Puppet::Util::NetworkDevice::Base
-
   attr_accessor :url, :transport
 
   def initialize(url, options = {})
@@ -15,7 +16,7 @@ class Puppet::Util::NetworkDevice::Base
     if @autoloader.load(@url.scheme, Puppet.lookup(:current_environment))
       @transport = Puppet::Util::NetworkDevice::Transport.const_get(@url.scheme.capitalize).new(options[:debug])
       @transport.host = @url.host
-      @transport.port = @url.port || case @url.scheme ; when "ssh" ; 22 ; when "telnet" ; 23 ; end
+      @transport.port = @url.port || case @url.scheme; when "ssh"; 22; when "telnet"; 23; end
       @transport.user = @url.user
       @transport.password = @url.password
     end

data/lib/puppet/util/network_device/config.rb

@@ -1,11 +1,12 @@
+# frozen_string_literal: true
+
 require 'ostruct'
 require_relative '../../../puppet/util/watched_file'
 require_relative '../../../puppet/util/network_device'
 
 class Puppet::Util::NetworkDevice::Config
-
   def self.main
-    @main ||= self.new
+    @main ||= new
   end
 
   def self.devices
@@ -46,17 +47,17 @@ class Puppet::Util::NetworkDevice::Config
           when /^\s*#/ # skip comments
             file_line_count += 1
             next
-          when /^\s*$/  # skip blank lines
+          when /^\s*$/ # skip blank lines
             file_line_count += 1
             next
           when /^\[([\w.-]+)\]\s*$/ # [device.fqdn]
-            name = $1
+            name = ::Regexp.last_match(1)
             name.chomp!
             if devices.include?(name)
               file_error_location = Puppet::Util::Errors.error_location(nil, file_line_count)
               device_error_location = Puppet::Util::Errors.error_location(nil, device.line)
               raise Puppet::Error, _("Duplicate device found at %{file_error_location}, already found at %{device_error_location}") %
-                  { file_error_location: file_error_location, device_error_location: device_error_location }
+                                   { file_error_location: file_error_location, device_error_location: device_error_location }
             end
             device = OpenStruct.new
             device.name = name
@@ -65,17 +66,17 @@ class Puppet::Util::NetworkDevice::Config
             Puppet.debug "found device: #{device.name} at #{device.line}"
             devices[name] = device
           when /^\s*(type|url|debug)(\s+(.+)\s*)*$/
-            parse_directive(device, $1, $3, file_line_count)
+            parse_directive(device, ::Regexp.last_match(1), ::Regexp.last_match(3), file_line_count)
           else
             error_location_str = Puppet::Util::Errors.error_location(nil, file_line_count)
             raise Puppet::Error, _("Invalid entry at %{error_location}: %{file_text}") %
-                { error_location: error_location_str, file_text: line }
+                                 { error_location: error_location_str, file_text: line }
           end
         end
       end
     rescue Errno::EACCES
       Puppet.err _("Configuration error: Cannot read %{file}; cannot serve") % { file: @file }
-      #raise Puppet::Error, "Cannot read #{@config}"
+      # raise Puppet::Error, "Cannot read #{@config}"
     rescue Errno::ENOENT
       Puppet.err _("Configuration error: '%{file}' does not exit; cannot serve") % { file: @file }
     end
@@ -101,5 +102,4 @@ class Puppet::Util::NetworkDevice::Config
       raise Puppet::Error, _("Invalid argument '%{var}' at %{error_location}") % { var: var, error_location: error_location_str }
     end
   end
-
 end

data/lib/puppet/util/network_device/transport/base.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 require_relative '../../../../puppet/util/network_device'
 require_relative '../../../../puppet/util/network_device/transport'
@@ -22,5 +23,4 @@ class Puppet::Util::NetworkDevice::Transport::Base
       yield output if block_given?
     end
   end
-
 end

data/lib/puppet/util/network_device/transport.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../../puppet/util/network_device'
 
 # stub

data/lib/puppet/util/network_device.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Puppet::Util::NetworkDevice
   class << self
     attr_reader :current

data/lib/puppet/util/package/version/debian.rb

@@ -1,12 +1,14 @@
+# frozen_string_literal: true
+
 module Puppet::Util::Package::Version
   class Debian < Numeric
     include Comparable
 
     # Version string matching regexes
-    REGEX_EPOCH   = '(?:([0-9]+):)?'
+    REGEX_EPOCH = '(?:([0-9]+):)?'
     # alphanumerics and the characters . + - ~ , starts with a digit, ~ only of debian_revision is present
     REGEX_UPSTREAM_VERSION = '([\.\+~0-9a-zA-Z-]+?)'
-    #alphanumerics and the characters + . ~
+    # alphanumerics and the characters + . ~
     REGEX_DEBIAN_REVISION = '(?:-([\.\+~0-9a-zA-Z]*))?'
 
     REGEX_FULL    = REGEX_EPOCH + REGEX_UPSTREAM_VERSION + REGEX_DEBIAN_REVISION.freeze
@@ -42,6 +44,7 @@ module Puppet::Util::Package::Version
 
     def <=>(other)
       return nil unless other.is_a?(self.class)
+
       cmp = @epoch <=> other.epoch
       if cmp == 0
         cmp = compare_upstream_version(other)
@@ -96,7 +99,7 @@ module Puppet::Util::Package::Version
       mine ||= ''
       yours ||= ''
       while mine_index < mine.length && yours_index < yours.length && cmp == 0
-        #handle ~
+        # handle ~
         _mymatch, mytilde = *match_tildes(mine.slice(mine_index..-1))
         mytilde ||= ''
 
@@ -107,42 +110,41 @@ module Puppet::Util::Package::Version
         mine_index += mytilde.length
         yours_index += yourstilde.length
 
-        if cmp == 0 # handle letters
+        next unless cmp == 0 # handle letters
 
-          _mymatch, myletters = *match_letters(mine.slice(mine_index..-1))
-          myletters ||= ''
+        _mymatch, myletters = *match_letters(mine.slice(mine_index..-1))
+        myletters ||= ''
 
-          _yoursmatch, yoursletters = *match_letters(yours.slice(yours_index..-1))
-          yoursletters ||= ''
+        _yoursmatch, yoursletters = *match_letters(yours.slice(yours_index..-1))
+        yoursletters ||= ''
 
-          cmp = myletters <=> yoursletters
-          mine_index += myletters.length
-          yours_index += yoursletters.length
+        cmp = myletters <=> yoursletters
+        mine_index += myletters.length
+        yours_index += yoursletters.length
 
-          if cmp == 0 # handle nonletters except tilde
-            _mymatch, mynon_letters = *match_non_letters(mine.slice(mine_index..-1))
-            mynon_letters ||= ''
+        next unless cmp == 0 # handle nonletters except tilde
 
-            _yoursmatch, yoursnon_letters = *match_non_letters(yours.slice(yours_index..-1))
-            yoursnon_letters ||= ''
+        _mymatch, mynon_letters = *match_non_letters(mine.slice(mine_index..-1))
+        mynon_letters ||= ''
 
-            cmp = mynon_letters <=> yoursnon_letters
-            mine_index += mynon_letters.length
-            yours_index += yoursnon_letters.length
+        _yoursmatch, yoursnon_letters = *match_non_letters(yours.slice(yours_index..-1))
+        yoursnon_letters ||= ''
 
-            if cmp == 0 # handle digits
-              _mymatch, mydigits = *match_digits(mine.slice(mine_index..-1))
-              mydigits ||= ''
+        cmp = mynon_letters <=> yoursnon_letters
+        mine_index += mynon_letters.length
+        yours_index += yoursnon_letters.length
 
-              _yoursmatch, yoursdigits = *match_digits(yours.slice(yours_index..-1))
-              yoursdigits ||= ''
+        next unless cmp == 0 # handle digits
 
-              cmp = mydigits.to_i <=> yoursdigits.to_i
-              mine_index += mydigits.length
-              yours_index += yoursdigits.length
-            end
-          end
-        end
+        _mymatch, mydigits = *match_digits(mine.slice(mine_index..-1))
+        mydigits ||= ''
+
+        _yoursmatch, yoursdigits = *match_digits(yours.slice(yours_index..-1))
+        yoursdigits ||= ''
+
+        cmp = mydigits.to_i <=> yoursdigits.to_i
+        mine_index += mydigits.length
+        yours_index += yoursdigits.length
       end
       if cmp == 0
         if mine_index < mine.length && match_tildes(mine[mine_index])
@@ -161,7 +163,7 @@ module Puppet::Util::Package::Version
     end
 
     def match_non_letters(a)
-      a.match(/^([\.\+-]+)/)
+      a.match(/^([.+-]+)/)
     end
 
     def match_tildes(a)

data/lib/puppet/util/package/version/gem.rb

@@ -1,8 +1,11 @@
+# frozen_string_literal: true
+
 module Puppet::Util::Package::Version
   class Gem < ::Gem::Version
     def self.parse(version)
       raise ValidationFailure, version unless version.is_a? String
       raise ValidationFailure, version unless version =~ ANCHORED_VERSION_PATTERN
+
       new(version)
     end
 

data/lib/puppet/util/package/version/pip.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Puppet::Util::Package::Version
   class Pip
     include Comparable
@@ -31,12 +33,12 @@ module Puppet::Util::Package::Version
         )?
       )
       (?:\\+(?<local>[a-z0-9]+(?:[-_\\.][a-z0-9]+)*))?      # local version
-    ".freeze
+    "
 
     def self.parse(version)
       raise ValidationFailure, version.to_s unless version.is_a? String
 
-      matched = version.match(Regexp.new(("^\\s*") + VERSION_PATTERN + ("\\s*$"), Regexp::EXTENDED | Regexp::MULTILINE | Regexp::IGNORECASE))
+      matched = version.match(Regexp.new("^\\s*" + VERSION_PATTERN + "\\s*$", Regexp::EXTENDED | Regexp::MULTILINE | Regexp::IGNORECASE))
       raise ValidationFailure, version unless matched
 
       new(matched)
@@ -57,7 +59,7 @@ module Puppet::Util::Package::Version
       parts.push(@pre_data.join)              if @pre_data
       parts.push(".post#{@post_data[1]}")     if @post_data
       parts.push(".dev#{@dev_data[1]}")       if @dev_data
-      parts.push("+#{@local_data.join(".")}") if @local_data
+      parts.push("+#{@local_data.join('.')}") if @local_data
 
       parts.join
     end
@@ -70,6 +72,7 @@ module Puppet::Util::Package::Version
 
     def <=>(other)
       raise ValidationFailure, other.to_s unless other.is_a?(self.class)
+
       compare(key, other.key)
     end
 
@@ -90,16 +93,16 @@ module Puppet::Util::Package::Version
 
     def parse_letter_version(letter, number)
       if letter
-        number = 0 if !number
+        number ||= 0
         letter.downcase!
 
         if letter == "alpha"
           letter = "a"
         elsif letter == "beta"
           letter = "b"
-        elsif ["c", "pre", "preview"].include?(letter)
+        elsif %w[c pre preview].include?(letter)
           letter = "rc"
-        elsif ["rev", "r"].include?(letter)
+        elsif %w[rev r].include?(letter)
           letter = "post"
         end
 
@@ -110,13 +113,14 @@ module Puppet::Util::Package::Version
     end
 
     def parse_local_version(local_version)
-      local_version.split(/[\\._-]/).map{|part| part =~ /[0-9]+/ && part !~ /[a-zA-Z]+/ ? part.to_i : part.downcase} if local_version
+      local_version.split(/[\\._-]/).map { |part| part =~ /[0-9]+/ && part !~ /[a-zA-Z]+/ ? part.to_i : part.downcase } if local_version
     end
 
     def compose_key(epoch, release, pre, post, dev, local)
       release_key = release.reverse
       release_key.each_with_index do |element, index|
         break unless element == 0
+
         release_key.delete_at(index) unless release_key.at(index + 1) != 0
       end
       release_key.reverse!
@@ -134,7 +138,7 @@ module Puppet::Util::Package::Version
       if !local
         local_key = [[-Float::INFINITY, ""]]
       else
-        local_key = local.map{|i| (i.is_a? Integer) ? [i, ""] : [-Float::INFINITY, i]}
+        local_key = local.map { |i| (i.is_a? Integer) ? [i, ""] : [-Float::INFINITY, i] }
       end
 
       [epoch, release_key, pre_key, post_key, dev_key, local_key]
@@ -150,9 +154,11 @@ module Puppet::Util::Package::Version
         end
       elsif (this.is_a? Array) && !(other.is_a? Array)
         raise Puppet::Error, "Cannot compare #{this} (Array) with #{other} (#{other.class}). Only ±Float::INFINITY accepted." unless other.abs == Float::INFINITY
+
         return other == -Float::INFINITY ? 1 : -1
       elsif !(this.is_a? Array) && (other.is_a? Array)
         raise Puppet::Error, "Cannot compare #{this} (#{this.class}) with #{other} (Array). Only ±Float::INFINITY accepted." unless this.abs == Float::INFINITY
+
         return this == -Float::INFINITY ? -1 : 1
       end
       this <=> other