puppet 8.3.1-universal-darwin → 8.5.0-universal-darwin

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

@@ -1,10 +1,10 @@
 # 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
   end
@@ -47,7 +47,7 @@ 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]
@@ -57,7 +57,7 @@ class Puppet::Util::NetworkDevice::Config
               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
@@ -70,13 +70,13 @@ class Puppet::Util::NetworkDevice::Config
           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
@@ -102,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

@@ -23,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,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/util/network_device'
 
 # stub

data/lib/puppet/util/network_device.rb

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

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

@@ -1,13 +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
@@ -43,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)
@@ -97,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 ||= ''
 

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

@@ -1,9 +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,4 +1,5 @@
 # frozen_string_literal: true
+
 module Puppet::Util::Package::Version
   class Pip
     include Comparable
@@ -71,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
 
@@ -111,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!
@@ -135,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,10 +153,12 @@ module Puppet::Util::Package::Version
           return compare(element, other.at(index)) if element != other.at(index)
         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
+        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
+        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

data/lib/puppet/util/package/version/range/eq.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../../../puppet/util/package/version/range/simple'
 
 module Puppet::Util::Package::Version
@@ -7,6 +8,7 @@ module Puppet::Util::Package::Version
       def to_s
         "#{@version}"
       end
+
       def include?(version)
         version == @version
       end

data/lib/puppet/util/package/version/range/gt.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../../../puppet/util/package/version/range/simple'
 
 module Puppet::Util::Package::Version
@@ -7,6 +8,7 @@ module Puppet::Util::Package::Version
       def to_s
         ">#{@version}"
       end
+
       def include?(version)
         version > @version
       end

data/lib/puppet/util/package/version/range/gt_eq.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../../../puppet/util/package/version/range/simple'
 
 module Puppet::Util::Package::Version
@@ -7,6 +8,7 @@ module Puppet::Util::Package::Version
       def to_s
         ">=#{@version}"
       end
+
       def include?(version)
         version >= @version
       end

data/lib/puppet/util/package/version/range/lt.rb

@@ -1,12 +1,14 @@
 # frozen_string_literal: true
+
 require_relative '../../../../../puppet/util/package/version/range/simple'
 
 module Puppet::Util::Package::Version
   class Range
-    class Lt< Simple
+    class Lt < Simple
       def to_s
         "<#{@version}"
       end
+
       def include?(version)
         version < @version
       end

data/lib/puppet/util/package/version/range/lt_eq.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../../../puppet/util/package/version/range/simple'
 
 module Puppet::Util::Package::Version
@@ -7,6 +8,7 @@ module Puppet::Util::Package::Version
       def to_s
         "<=#{@version}"
       end
+
       def include?(version)
         version <= @version
       end

data/lib/puppet/util/package/version/range/min_max.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../../../puppet/util/package/version/range'
 
 module Puppet::Util::Package::Version
@@ -8,12 +9,15 @@ module Puppet::Util::Package::Version
         @min = min
         @max = max
       end
+
       def to_s
         "#{@min} #{@max}"
       end
+
       def to_gem_version
         "#{@min}, #{@max}"
       end
+
       def include?(version)
         @min.include?(version) && @max.include?(version)
       end

data/lib/puppet/util/package/version/range/simple.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../../../puppet/util/package/version/range'
 
 module Puppet::Util::Package::Version

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative 'range/lt'
 require_relative 'range/lt_eq'
 require_relative 'range/gt'
@@ -30,20 +31,22 @@ module Puppet::Util::Package::Version
     # @api public
     def self.parse(range_string, version_class)
       raise ValidationFailure, "Unable to parse '#{range_string}' as a string" unless range_string.is_a?(String)
+
       simples = range_string.split(RANGE_SPLIT).map do |simple|
         match, operator, version = *simple.match(FULL_REGEX)
         raise ValidationFailure, "Unable to parse '#{simple}' as a version range identifier" unless match
+
         case operator
         when '>'
-          Gt.new(version_class::parse(version))
+          Gt.new(version_class.parse(version))
         when '>='
-          GtEq.new(version_class::parse(version))
+          GtEq.new(version_class.parse(version))
         when '<'
-          Lt.new(version_class::parse(version))
+          Lt.new(version_class.parse(version))
         when '<='
-          LtEq.new(version_class::parse(version))
+          LtEq.new(version_class.parse(version))
         when ''
-          Eq.new(version_class::parse(version))
+          Eq.new(version_class.parse(version))
         else
           raise ValidationFailure, "Operator '#{operator}' is not implemented"
         end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../../puppet/util/rpm_compare'
 
 module Puppet::Util::Package::Version
@@ -14,13 +15,14 @@ module Puppet::Util::Package::Version
 
     def self.parse(ver)
       raise ValidationFailure unless ver.is_a?(String)
+
       version = rpm_parse_evr(ver)
       new(version[:epoch], version[:version], version[:release], version[:arch]).freeze
     end
 
     def to_s
       version_found = ''.dup
-      version_found += "#{@epoch}:"   if @epoch
+      version_found += "#{@epoch}:" if @epoch
       version_found += @version
       version_found += "-#{@release}" if @release
       version_found
@@ -39,18 +41,18 @@ module Puppet::Util::Package::Version
     def <=>(other)
       raise ArgumentError, _("Cannot compare, as %{other} is not a Rpm Version") % { other: other } unless other.is_a?(self.class)
 
-      rpm_compareEVR(self.to_s, other.to_s)
+      rpm_compare_evr(self.to_s, other.to_s)
     end
 
     private
 
-    # overwrite rpm_compareEVR to treat no epoch as zero epoch
+    # overwrite rpm_compare_evr to treat no epoch as zero epoch
     # in order to compare version correctly
     #
     # returns 1 if a is newer than b,
     #         0 if they are identical
     #        -1 if a is older than b
-    def rpm_compareEVR(a, b)
+    def rpm_compare_evr(a, b)
       a_hash = rpm_parse_evr(a)
       b_hash = rpm_parse_evr(b)
 

data/lib/puppet/util/package.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Puppet::Util::Package
   def versioncmp(version_a, version_b, ignore_trailing_zeroes = false)
     vre = /[-.]|\d+|[^-.\d]+/
@@ -11,7 +12,7 @@ module Puppet::Util::Package
     ax = version_a.scan(vre)
     bx = version_b.scan(vre)
 
-    while (ax.length>0 && bx.length>0)
+    while (ax.length > 0 && bx.length > 0)
       a = ax.shift
       b = bx.shift
 
@@ -20,8 +21,10 @@ module Puppet::Util::Package
       return 1  if b == '-'
       return -1 if a == '.'
       return 1  if b == '.'
+
       if a =~ /^\d+$/ && b =~ /^\d+$/
         return a.to_s.upcase <=> b.to_s.upcase if a =~ /^0/ || b =~ /^0/
+
         return a.to_i <=> b.to_i
       end
       return a.upcase <=> b.upcase

data/lib/puppet/util/pidlock.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
+
 require 'fileutils'
 require_relative '../../puppet/util/lockfile'
 
 class Puppet::Util::Pidlock
-
   def initialize(lockfile)
     @lockfile = Puppet::Util::Lockfile.new(lockfile)
   end
@@ -48,12 +48,12 @@ class Puppet::Util::Pidlock
 
   def ps_argument_for_current_kernel
     case Puppet.runtime[:facter].value(:kernel)
-      when "Linux"
-        "-eq"
-      when "AIX"
-        "-T"
-      else
-        "-p"
+    when "Linux"
+      "-eq"
+    when "AIX"
+      "-T"
+    else
+      "-p"
     end
   end
 
@@ -93,7 +93,7 @@ class Puppet::Util::Pidlock
       # On Windows, we're checking if the filesystem path name of the running
       # process is our vendored ruby:
       begin
-        exe_path = Puppet::Util::Windows::Process::get_process_image_name_by_pid(pid)
+        exe_path = Puppet::Util::Windows::Process.get_process_image_name_by_pid(pid)
         @lockfile.unlock unless exe_path =~ /\\bin\\ruby.exe$/
       rescue Puppet::Util::Windows::Error => e
         Puppet.debug("Failed to read pidfile #{file_path}: #{e.message}")

data/lib/puppet/util/platform.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Puppet
   module Util
     module Platform

data/lib/puppet/util/plist.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
+
 require 'cfpropertylist' if Puppet.features.cfpropertylist?
 require_relative '../../puppet/util/execution'
 
 module Puppet::Util::Plist
-
   class FormatError < RuntimeError; end
 
   # So I don't have to prepend every method name with 'self.' Most of the
@@ -43,7 +43,7 @@ module Puppet::Util::Plist
         Puppet.debug "Plist #{file_path} ill-formatted, converting with plutil"
         begin
           plist = Puppet::Util::Execution.execute(['/usr/bin/plutil', '-convert', 'xml1', '-o', '-', file_path],
-                                                  {:failonfail => true, :combine => true})
+                                                  { :failonfail => true, :combine => true })
           return parse_plist(plist)
         rescue Puppet::ExecutionFailure => detail
           message = _("Cannot read file %{file_path}; Puppet is skipping it.") % { file_path: file_path }
@@ -65,7 +65,7 @@ module Puppet::Util::Plist
 
       begin
         if plist_data =~ bad_xml_doctype
-          plist_data.gsub!( bad_xml_doctype, plist_xml_doctype )
+          plist_data.gsub!(bad_xml_doctype, plist_xml_doctype)
           Puppet.debug("Had to fix plist with incorrect DOCTYPE declaration: #{file_path}")
         end
       rescue ArgumentError => e
@@ -130,11 +130,12 @@ module Puppet::Util::Plist
     end
 
     def to_format(format)
-      if format.to_sym == :xml
+      case format.to_sym
+      when :xml
         CFPropertyList::List::FORMAT_XML
-      elsif format.to_sym == :binary
+      when :binary
         CFPropertyList::List::FORMAT_BINARY
-      elsif format.to_sym == :plain
+      when :plain
         CFPropertyList::List::FORMAT_PLAIN
       else
         raise FormatError.new "Unknown plist format #{format}"

data/lib/puppet/util/posix.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
+
 # Utility methods for interacting with POSIX objects; mostly user and group
 module Puppet::Util::POSIX
-
   # This is a list of environment variables that we will set when we want to override the POSIX locale
   LOCALE_ENV_VARS = ['LANG', 'LC_ALL', 'LC_MESSAGES', 'LANGUAGE',
-                           'LC_COLLATE', 'LC_CTYPE', 'LC_MONETARY', 'LC_NUMERIC', 'LC_TIME']
+                     'LC_COLLATE', 'LC_CTYPE', 'LC_MONETARY', 'LC_NUMERIC', 'LC_TIME']
 
   # This is a list of user-related environment variables that we will unset when we want to provide a pristine
   # environment for "exec" runs
@@ -34,19 +34,20 @@ module Puppet::Util::POSIX
     end
 
     private
+
     def get_groups_list(user)
       raise LoadError, "The 'getgrouplist' method is not available" unless Puppet::FFI::POSIX::Functions.respond_to?(:getgrouplist)
 
       user_gid = Puppet::Etc.getpwnam(user).gid
       ngroups = Puppet::FFI::POSIX::Constants::MAXIMUM_NUMBER_OF_GROUPS
 
-      while true do # rubocop:disable Lint/LiteralInCondition
+      loop do
         FFI::MemoryPointer.new(:int) do |ngroups_ptr|
           FFI::MemoryPointer.new(:uint, ngroups) do |groups_ptr|
             old_ngroups = ngroups
             ngroups_ptr.write_int(ngroups)
 
-            if Puppet::FFI::POSIX::Functions::getgrouplist(user, user_gid, groups_ptr, ngroups_ptr) != -1
+            if Puppet::FFI::POSIX::Functions.getgrouplist(user, user_gid, groups_ptr, ngroups_ptr) != -1
               groups_gids = groups_ptr.get_array_of_uint(0, ngroups_ptr.read_int)
 
               result = []
@@ -156,17 +157,17 @@ module Puppet::Util::POSIX
 
   # Get the GID
   def gid(group)
-      get_posix_value(:group, :gid, group)
+    get_posix_value(:group, :gid, group)
   end
 
   # Get the UID
   def uid(user)
-      get_posix_value(:passwd, :uid, user)
+    get_posix_value(:passwd, :uid, user)
   end
 
   private
 
-  # Get the specified id_field of a given field (user or group), 
+  # Get the specified id_field of a given field (user or group),
   # whether an ID name is provided
   def get_posix_value(location, id_field, field)
     begin
@@ -177,11 +178,13 @@ module Puppet::Util::POSIX
     if field.is_a?(Integer)
       name = get_posix_field(location, :name, field)
       return nil unless name
+
       id = get_posix_field(location, id_field, name)
       check_value = id
     else
       id = get_posix_field(location, id_field, field)
       return nil unless id
+
       name = get_posix_field(location, :name, id)
       check_value = name
     end
@@ -201,4 +204,3 @@ module Puppet::Util::POSIX
     end
   end
 end
-

data/lib/puppet/util/profiler/aggregate.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/util/profiler'
 require_relative '../../../puppet/util/profiler/wall_clock'
 
@@ -8,7 +9,7 @@ class Puppet::Util::Profiler::Aggregate < Puppet::Util::Profiler::WallClock
     @metrics_hash = Metric.new
   end
 
-  def shutdown()
+  def shutdown
     super
     @logger.call("AGGREGATE PROFILING RESULTS:")
     @logger.call("----------------------------")
@@ -16,10 +17,6 @@ class Puppet::Util::Profiler::Aggregate < Puppet::Util::Profiler::WallClock
     @logger.call("----------------------------")
   end
 
-  def do_start(description, metric_id)
-    super(description, metric_id)
-  end
-
   def do_finish(context, description, metric_id)
     result = super(context, description, metric_id)
     update_metric(@metrics_hash, metric_id, result[:time])
@@ -43,7 +40,7 @@ class Puppet::Util::Profiler::Aggregate < Puppet::Util::Profiler::WallClock
   end
 
   def print_metrics(metrics_hash, prefix)
-    metrics_hash.sort_by {|k,v| v.time }.reverse_each do |k,v|
+    metrics_hash.sort_by { |_k, v| v.time }.reverse_each do |k, v|
       @logger.call("#{prefix}#{k}: #{v.time} s (#{v.count} calls)")
       print_metrics(metrics_hash[k], "#{prefix}#{k} -> ")
     end
@@ -83,4 +80,3 @@ class Puppet::Util::Profiler::Aggregate < Puppet::Util::Profiler::WallClock
     end
   end
 end
-

data/lib/puppet/util/profiler/around_profiler.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
+
 # A Profiler that can be used to wrap around blocks of code. It is configured
 # with other profilers and controls them to start before the block is executed
 # and finish after the block is executed.
 #
 # @api private
 class Puppet::Util::Profiler::AroundProfiler
-
   def initialize
     @profilers = []
   end

data/lib/puppet/util/profiler/logging.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Puppet::Util::Profiler::Logging
   def initialize(logger, identifier)
     @logger = logger
@@ -18,7 +19,7 @@ class Puppet::Util::Profiler::Logging
     @logger.call("PROFILE [#{@identifier}] #{@sequence} #{description}: #{profile_explanation}")
   end
 
-  def shutdown()
+  def shutdown
     # nothing to do
   end
 

data/lib/puppet/util/profiler/object_counts.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/util/profiler/logging'
 
 class Puppet::Util::Profiler::ObjectCounts < Puppet::Util::Profiler::Logging

data/lib/puppet/util/profiler/wall_clock.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/util/profiler/logging'
 
 # A profiler implementation that measures the number of seconds a segment of
@@ -12,8 +13,8 @@ class Puppet::Util::Profiler::WallClock < Puppet::Util::Profiler::Logging
   end
 
   def do_finish(context, description, metric_id)
-    {:time => context.stop,
-     :msg => _("took %{context} seconds") % { context: context }}
+    { :time => context.stop,
+      :msg => _("took %{context} seconds") % { context: context } }
   end
 
   class Timer
@@ -33,4 +34,3 @@ class Puppet::Util::Profiler::WallClock < Puppet::Util::Profiler::Logging
     end
   end
 end
-

data/lib/puppet/util/profiler.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'benchmark'
 
 # A simple profiling callback system.