openvox 7.37.1 → 8.19.0

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

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

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../../../../puppet/util/package/version/range/simple'
 
 module Puppet::Util::Package::Version
@@ -6,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,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../../../../puppet/util/package/version/range/simple'
 
 module Puppet::Util::Package::Version
@@ -6,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,11 +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,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../../../../puppet/util/package/version/range/simple'
 
 module Puppet::Util::Package::Version
@@ -6,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,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../../../../puppet/util/package/version/range'
 
 module Puppet::Util::Package::Version
@@ -7,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,3 +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,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'range/lt'
 require_relative 'range/lt_eq'
 require_relative 'range/gt'
@@ -29,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 = ''
-      version_found += "#{@epoch}:"   if @epoch
+      version_found = ''.dup
+      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(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
@@ -32,7 +35,7 @@ module Puppet::Util::Package
 
   def self.normalize(version)
     version = version.split('-')
-    version.first.sub!(/([\.0]+)$/, '')
+    version.first.sub!(/([.0]+)$/, '')
 
     version.join('-')
   end

data/lib/puppet/util/pidlock.rb

@@ -1,8 +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
@@ -24,7 +25,7 @@ class Puppet::Util::Pidlock
 
   def unlock
     if mine?
-      return @lockfile.unlock
+      @lockfile.unlock
     else
       false
     end
@@ -47,18 +48,18 @@ 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
 
   def clear_if_stale
     pid = lock_pid
-    return @lockfile.unlock if pid == nil
+    return @lockfile.unlock if pid.nil?
     return if Process.pid == pid
 
     errors = [Errno::ESRCH]
@@ -92,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,8 +1,10 @@
+# frozen_string_literal: true
+
 module Puppet
   module Util
     module Platform
-      FIPS_STATUS_FILE = "/proc/sys/crypto/fips_enabled".freeze
-      WINDOWS_FIPS_REGISTRY_KEY = 'System\\CurrentControlSet\\Control\\Lsa\\FipsAlgorithmPolicy'.freeze
+      FIPS_STATUS_FILE = "/proc/sys/crypto/fips_enabled"
+      WINDOWS_FIPS_REGISTRY_KEY = 'System\\CurrentControlSet\\Control\\Lsa\\FipsAlgorithmPolicy'
 
       def windows?
         # Ruby only sets File::ALT_SEPARATOR on Windows and the Ruby standard
@@ -22,7 +24,7 @@ module Puppet
       def default_paths
         return [] if windows?
 
-        %w{/usr/sbin /sbin}
+        %w[/usr/sbin /sbin]
       end
       module_function :default_paths
 

data/lib/puppet/util/plist.rb

@@ -1,8 +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
@@ -42,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 }
@@ -50,12 +51,12 @@ module Puppet::Util::Plist
           Puppet.warning(message)
         end
       end
-      return nil
+      nil
     end
 
     # Read plist text using the CFPropertyList gem.
     def parse_plist(plist_data, file_path = '')
-      bad_xml_doctype = /^.*<!DOCTYPE plist PUBLIC -\/\/Apple Computer.*$/
+      bad_xml_doctype = %r{^.*<!DOCTYPE plist PUBLIC -//Apple Computer.*$}
       # Depending on where parse_plist is called from, plist_data can be either XML or binary.
       # If we get XML, make sure ruby knows it's UTF-8 so we avoid invalid byte sequence errors.
       if plist_data.include?('encoding="UTF-8"') && plist_data.encoding != Encoding::UTF_8
@@ -64,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
@@ -129,27 +130,26 @@ 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}"
+        raise FormatError, "Unknown plist format #{format}"
       end
     end
 
     # This method will write a plist file using a specified format (or XML
     # by default)
     def write_plist_file(plist, file_path, format = :xml)
-      begin
-        plist_to_save       = CFPropertyList::List.new
-        plist_to_save.value = CFPropertyList.guess(plist)
-        plist_to_save.save(file_path, to_format(format), :formatted => true)
-      rescue IOError => e
-        Puppet.err(_("Unable to write the file %{file_path}. %{error}") % { file_path: file_path, error: e.inspect })
-      end
+      plist_to_save       = CFPropertyList::List.new
+      plist_to_save.value = CFPropertyList.guess(plist)
+      plist_to_save.save(file_path, to_format(format), :formatted => true)
+    rescue IOError => e
+      Puppet.err(_("Unable to write the file %{file_path}. %{error}") % { file_path: file_path, error: e.inspect })
     end
 
     def dump_plist(plist_data, format = :xml)

data/lib/puppet/util/posix.rb

@@ -1,13 +1,14 @@
+# 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']
+  LOCALE_ENV_VARS = %w[LANG LC_ALL LC_MESSAGES LANGUAGE
+                       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
-  USER_ENV_VARS = ['HOME', 'USER', 'LOGNAME']
+  USER_ENV_VARS = %w[HOME USER LOGNAME]
 
   class << self
     # Returns an array of all the groups that the user's a member of.
@@ -33,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 = []
@@ -85,10 +87,10 @@ module Puppet::Util::POSIX
     end
 
     begin
-      return Etc.send(method, id).send(field)
+      Etc.send(method, id).send(field)
     rescue NoMethodError, ArgumentError
       # ignore it; we couldn't find the object
-      return nil
+      nil
     end
   end
 
@@ -126,46 +128,46 @@ module Puppet::Util::POSIX
   # Determine what the field name is for users and groups.
   def idfield(space)
     case space.intern
-    when :gr, :group; return :gid
-    when :pw, :user, :passwd; return :uid
+    when :gr, :group; :gid
+    when :pw, :user, :passwd; :uid
     else
-      raise ArgumentError.new(_("Can only handle users and groups"))
+      raise ArgumentError, _("Can only handle users and groups")
     end
   end
 
   # Determine what the method is to get users and groups by id
   def methodbyid(space)
     case space.intern
-    when :gr, :group; return :getgrgid
-    when :pw, :user, :passwd; return :getpwuid
+    when :gr, :group; :getgrgid
+    when :pw, :user, :passwd; :getpwuid
     else
-      raise ArgumentError.new(_("Can only handle users and groups"))
+      raise ArgumentError, _("Can only handle users and groups")
     end
   end
 
   # Determine what the method is to get users and groups by name
   def methodbyname(space)
     case space.intern
-    when :gr, :group; return :getgrnam
-    when :pw, :user, :passwd; return :getpwnam
+    when :gr, :group; :getgrnam
+    when :pw, :user, :passwd; :getpwnam
     else
-      raise ArgumentError.new(_("Can only handle users and groups"))
+      raise ArgumentError, _("Can only handle users and groups")
     end
   end
 
   # 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
@@ -176,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
@@ -190,14 +194,13 @@ module Puppet::Util::POSIX
 
       if id == check_value_id
         Puppet.debug("Multiple entries found for resource: '#{location}' with #{id_field}: #{id}")
-        return id
+        id
       else
         Puppet.debug("The value retrieved: '#{check_value}' is different than the required state: '#{field}', searching in all entries")
-        return search_posix_field(location, id_field, field)
+        search_posix_field(location, id_field, field)
       end
     else
-      return id
+      id
     end
   end
 end
-

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../../puppet/util/profiler'
 require_relative '../../../puppet/util/profiler/wall_clock'
 
@@ -7,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("----------------------------")
@@ -15,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])
@@ -42,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
@@ -57,7 +55,7 @@ class Puppet::Util::Profiler::Aggregate < Puppet::Util::Profiler::WallClock
     attr_reader :count, :time
 
     def [](key)
-      if !has_key?(key)
+      unless has_key?(key)
         self[key] = Metric.new
       end
       super(key)
@@ -74,12 +72,11 @@ class Puppet::Util::Profiler::Aggregate < Puppet::Util::Profiler::WallClock
 
   class Timer
     def initialize
-      @start = Time.now
+      @start = Process.clock_gettime(Process::CLOCK_MONOTONIC, :float_second)
     end
 
     def stop
-      Time.now - @start
+      Process.clock_gettime(Process::CLOCK_MONOTONIC, :float_second) - @start
     end
   end
 end
-

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

@@ -1,10 +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,3 +1,5 @@
+# frozen_string_literal: true
+
 class Puppet::Util::Profiler::Logging
   def initialize(logger, identifier)
     @logger = logger
@@ -17,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,3 +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,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../../puppet/util/profiler/logging'
 
 # A profiler implementation that measures the number of seconds a segment of
@@ -11,19 +13,19 @@ 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
     FOUR_DECIMAL_DIGITS = '%0.4f'
 
     def initialize
-      @start = Time.now
+      @start = Process.clock_gettime(Process::CLOCK_MONOTONIC, :float_second)
     end
 
     def stop
-      @time = Time.now - @start
+      @time = Process.clock_gettime(Process::CLOCK_MONOTONIC, :float_second) - @start
       @time
     end
 
@@ -32,4 +34,3 @@ class Puppet::Util::Profiler::WallClock < Puppet::Util::Profiler::Logging
     end
   end
 end
-

data/lib/puppet/util/profiler.rb

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