puppet 8.5.1 → 8.7.0

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

data/lib/puppet/util/rdoc/generators/puppet_generator.rb

@@ -40,7 +40,7 @@ module Generators
     def new_markup(str, remove_para = false)
       first = @markup.nil?
       res = old_markup(str, remove_para)
-      if first and not @markup.nil?
+      if first and !@markup.nil?
         @markup.add_special(/\b([a-z]\w+(::\w+)*)/, :CROSSREF)
         # we need to call it again, since we added a rule
         res = old_markup(str, remove_para)
@@ -138,22 +138,22 @@ module Generators
         end
 
         classes.each do |k|
-          @allclasses[k.index_name] = k if !@allclasses.has_key?(k.index_name)
+          @allclasses[k.index_name] = k unless @allclasses.has_key?(k.index_name)
         end
 
         # generate nodes and plugins found
         classes.each do |k|
-          if k.context.is_module?
-            k.context.each_node do |_name, node|
-              nodes << HTMLPuppetNode.new(node, toplevel, NODE_DIR, @options)
-              @nodes << nodes.last
-            end
-            k.context.each_plugin do |plugin|
-              @plugins << HTMLPuppetPlugin.new(plugin, toplevel, PLUGIN_DIR, @options)
-            end
-            k.context.each_fact do |fact|
-              @plugins << HTMLPuppetPlugin.new(fact, toplevel, PLUGIN_DIR, @options)
-            end
+          next unless k.context.is_module?
+
+          k.context.each_node do |_name, node|
+            nodes << HTMLPuppetNode.new(node, toplevel, NODE_DIR, @options)
+            @nodes << nodes.last
+          end
+          k.context.each_plugin do |plugin|
+            @plugins << HTMLPuppetPlugin.new(plugin, toplevel, PLUGIN_DIR, @options)
+          end
+          k.context.each_fact do |fact|
+            @plugins << HTMLPuppetPlugin.new(fact, toplevel, PLUGIN_DIR, @options)
           end
         end
 
@@ -164,11 +164,11 @@ module Generators
       # scan all classes to create the child's references
       @allclasses.values.each do |klass|
         superklass = klass.context.superclass
-        if superklass
-          superklass = AllReferences[superklass]
-          if superklass && (superklass.is_a?(HTMLPuppetClass) || superklass.is_a?(HTMLPuppetNode))
-            superklass.context.add_child(klass.context)
-          end
+        next unless superklass
+
+        superklass = AllReferences[superklass]
+        if superklass && (superklass.is_a?(HTMLPuppetClass) || superklass.is_a?(HTMLPuppetNode))
+          superklass.context.add_child(klass.context)
         end
       end
 
@@ -237,14 +237,13 @@ module Generators
     def gen_class_index
       gen_an_index(@classes, 'All Classes', RDoc::Page::CLASS_INDEX, "fr_class_index.html")
       @allfiles.each do |file|
-        unless file['file'].context.file_relative_name =~ /\.rb$/
+        next if file['file'].context.file_relative_name =~ /\.rb$/
 
-          gen_composite_index(
-            file,
-            RDoc::Page::COMBO_INDEX,
-            "#{MODULE_DIR}/fr_#{file["file"].context.module_name}.html"
-          )
-        end
+        gen_composite_index(
+          file,
+          RDoc::Page::COMBO_INDEX,
+          "#{MODULE_DIR}/fr_#{file['file'].context.module_name}.html"
+        )
       end
     end
 
@@ -274,10 +273,10 @@ module Generators
             res3 << { "href" => "../" + CGI.escapeHTML(AllReferences["PLUGIN(#{fact.name})"].path), "name" => CGI.escapeHTML(fact.name) }
           end
         end
-        unless f.plugins.nil?
-          f.plugins.each do |plugin|
-            res4 << { "href" => "../" + CGI.escapeHTML(AllReferences["PLUGIN(#{plugin.name})"].path), "name" => CGI.escapeHTML(plugin.name) }
-          end
+        next if f.plugins.nil?
+
+        f.plugins.each do |plugin|
+          res4 << { "href" => "../" + CGI.escapeHTML(AllReferences["PLUGIN(#{plugin.name})"].path), "name" => CGI.escapeHTML(plugin.name) }
         end
       end
 
@@ -396,14 +395,14 @@ module Generators
       resources = @resources.sort
       resources.each do |r|
         row = {}
-        if r.section == section and r.document_self
-          row["name"] = CGI.escapeHTML(r.name)
-          desc = r.description.strip
-          row["m_desc"]      = desc unless desc.empty?
-          row["aref"]        = r.aref
-          row["params"]      = r.params
-          outer << row
-        end
+        next unless r.section == section and r.document_self
+
+        row["name"] = CGI.escapeHTML(r.name)
+        desc = r.description.strip
+        row["m_desc"]      = desc unless desc.empty?
+        row["aref"]        = r.aref
+        row["params"]      = r.params
+        outer << row
       end
       outer
     end
@@ -419,12 +418,12 @@ module Generators
 
       @context.sections.each do |section|
         secdata = @values["sections"].select { |s| s["secsequence"] == section.sequence }
-        if secdata.size == 1
-          secdata = secdata[0]
+        next unless secdata.size == 1
 
-          rdl = build_resource_detail_list(section)
-          secdata["resource_list"] = rdl unless rdl.empty?
-        end
+        secdata = secdata[0]
+
+        rdl = build_resource_detail_list(section)
+        secdata["resource_list"] = rdl unless rdl.empty?
       end
 
       rl = build_require_list(@context)
@@ -483,7 +482,7 @@ module Generators
     # which is also its url
     def http_url(full_name, prefix)
       path = full_name.dup
-      path.gsub!(/<<\s*(\w*)/) { "from-#$1" } if path['<<']
+      path.gsub!(/<<\s*(\w*)/) { "from-#{::Regexp.last_match(1)}" } if path['<<']
       File.join(prefix, path.split("::").collect { |p| Digest::MD5.hexdigest(p) }) + ".html"
     end
 
@@ -571,17 +570,17 @@ module Generators
       atts.each do |att|
         next unless att.section == section
 
-        if att.visibility == :public || att.visibility == :protected || @options.show_all
-          entry = {
-            "name" => CGI.escapeHTML(att.name),
-            "rw" => att.rw,
-            "a_desc" => markup(att.comment, true)
-          }
-          unless att.visibility == :public || att.visibility == :protected
-            entry["rw"] << "-"
-          end
-          res << entry
+        next unless att.visibility == :public || att.visibility == :protected || @options.show_all
+
+        entry = {
+          "name" => CGI.escapeHTML(att.name),
+          "rw" => att.rw,
+          "a_desc" => markup(att.comment, true)
+        }
+        unless att.visibility == :public || att.visibility == :protected
+          entry["rw"] << "-"
         end
+        res << entry
       end
       res
     end
@@ -643,7 +642,7 @@ module Generators
     end
 
     def <=>(other)
-      self.name <=> other.name
+      name <=> other.name
     end
   end
 
@@ -668,13 +667,13 @@ module Generators
       prefix = "&nbsp;&nbsp;::" * level;
 
       context.nodes.sort.each do |node|
-        if node.document_self
-          res <<
-            prefix <<
-            "Node " <<
-            href(url(node.viewer.path), "link", node.full_name) <<
-            "<br />\n"
-        end
+        next unless node.document_self
+
+        res <<
+          prefix <<
+          "Node " <<
+          href(url(node.viewer.path), "link", node.full_name) <<
+          "<br />\n"
       end
       res
     end
@@ -725,7 +724,7 @@ module Generators
     # which is also its url
     def http_url(full_name, prefix)
       path = full_name.dup
-      path.gsub!(/<<\s*(\w*)/) { "from-#$1" } if path['<<']
+      path.gsub!(/<<\s*(\w*)/) { "from-#{::Regexp.last_match(1)}" } if path['<<']
       File.join(prefix, path.split("::")) + ".html"
     end
 
@@ -810,7 +809,7 @@ module Generators
     end
 
     def <=>(other)
-      self.name <=> other.name
+      name <=> other.name
     end
   end
 
@@ -850,7 +849,7 @@ module Generators
     end
 
     def index_name
-      "#{@context.name}"
+      @context.name.to_s
     end
 
     def params