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

data/lib/puppet/util/metric.rb

@@ -36,9 +36,9 @@ 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
 
@@ -51,7 +51,7 @@ class Puppet::Util::Metric
   end
 
   def newvalue(name, value, label = nil)
-    raise ArgumentError.new("metric name #{name.inspect} is not a string") unless name.is_a? String
+    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]

data/lib/puppet/util/monkey_patches.rb

@@ -17,7 +17,7 @@ module RDoc
   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
@@ -82,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/network_device/config.rb

@@ -6,7 +6,7 @@ require_relative '../../../puppet/util/network_device'
 
 class Puppet::Util::NetworkDevice::Config
   def self.main
-    @main ||= self.new
+    @main ||= new
   end
 
   def self.devices
@@ -51,7 +51,7 @@ class Puppet::Util::NetworkDevice::Config
             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)
@@ -66,7 +66,7 @@ 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}") %

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

@@ -110,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])
@@ -164,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/pip.rb

@@ -38,7 +38,7 @@ module Puppet::Util::Package::Version
     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)
@@ -59,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
@@ -93,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
 

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

@@ -6,7 +6,7 @@ module Puppet::Util::Package::Version
   class Range
     class Eq < Simple
       def to_s
-        "#{@version}"
+        @version.to_s
       end
 
       def include?(version)

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

@@ -41,7 +41,7 @@ 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_compare_evr(self.to_s, other.to_s)
+      rpm_compare_evr(to_s, other.to_s)
     end
 
     private

data/lib/puppet/util/package.rb

@@ -12,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
 
@@ -35,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

@@ -25,7 +25,7 @@ class Puppet::Util::Pidlock
 
   def unlock
     if mine?
-      return @lockfile.unlock
+      @lockfile.unlock
     else
       false
     end
@@ -59,7 +59,7 @@ class Puppet::Util::Pidlock
 
   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]

data/lib/puppet/util/platform.rb

@@ -24,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

@@ -51,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
@@ -138,20 +138,18 @@ module Puppet::Util::Plist
       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

@@ -3,12 +3,12 @@
 # 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.
@@ -87,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
 
@@ -128,30 +128,30 @@ 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
 
@@ -194,13 +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

@@ -55,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)

data/lib/puppet/util/provider_features.rb

@@ -22,13 +22,13 @@ module Puppet::Util::ProviderFeatures
     # @param obj [Object, Class] the object or class to check if requirements are met
     # @return [Boolean] whether all requirements for this feature are met or not.
     def available?(obj)
-      if self.methods
-        return !!methods_available?(obj)
+      if methods
+        !!methods_available?(obj)
       else
         # In this case, the provider has to declare support for this
         # feature, and that's been checked before we ever get to the
         # method checks.
-        return false
+        false
       end
     end
 

data/lib/puppet/util/rdoc/code_objects.rb

@@ -73,7 +73,7 @@ module RDoc
 
       @node_container ||= add_module(NormalModule, "__nodes__")
       cls = @node_container.add_class(PuppetNode, name, superclass)
-      @nodes[name] = cls if !@done_documenting
+      @nodes[name] = cls unless @done_documenting
       cls
     end
 
@@ -147,7 +147,7 @@ module RDoc
     # ourselves.
     def find_symbol(symbol, method = nil)
       result = super(symbol)
-      if not result and symbol =~ /::/
+      if !result and symbol =~ /::/
         modules = symbol.split(/::/)
         unless modules.empty?
           module_name = modules.shift
@@ -168,7 +168,7 @@ module RDoc
           end
         end
         if result && method
-          if !result.respond_to?(:find_local_symbol)
+          unless result.respond_to?(:find_local_symbol)
             p result.name
             p method
             fail