puppet 8.5.0 → 8.6.0

data/lib/puppet/interface/action.rb

@@ -40,9 +40,9 @@ class Puppet::Interface::Action
   # @return [void]
   # @api private
   def __dup_and_rebind_to(to)
-    bound_version = self.dup
+    bound_version = dup
     bound_version.instance_variable_set(:@face, to)
-    return bound_version
+    bound_version
   end
 
   def to_s() "#{@face}##{@name}" end
@@ -88,7 +88,7 @@ class Puppet::Interface::Action
     return @when_rendering[alt].bind(@face) if @when_rendering.has_key? alt
 
     # Guess not, nothing to run.
-    return nil
+    nil
   end
 
   # @api private
@@ -254,7 +254,7 @@ class Puppet::Interface::Action
     file    = __FILE__ + "+eval[wrapper]"
     line    = __LINE__ + 2 # <== points to the same line as 'def' in the wrapper.
     wrapper = <<~WRAPPER
-      def #{@name}(#{decl.join(", ")})
+      def #{@name}(#{decl.join(', ')})
         #{optn}
         args    = #{args}
         action  = get_action(#{name.inspect})
@@ -394,7 +394,7 @@ class Puppet::Interface::Action
     end
 
     # All done.
-    return result
+    result
   end
 
   ########################################################################

data/lib/puppet/interface/action_manager.rb

@@ -39,7 +39,7 @@ module Puppet::Interface::ActionManager
     @actions ||= {}
     result = @actions.keys
 
-    if self.is_a?(Class) and superclass.respond_to?(:actions)
+    if is_a?(Class) and superclass.respond_to?(:actions)
       result += superclass.actions
     elsif self.class.respond_to?(:actions)
       result += self.class.actions
@@ -58,7 +58,7 @@ module Puppet::Interface::ActionManager
     @actions ||= {}
     result = @actions[name.to_sym]
     if result.nil?
-      if self.is_a?(Class) and superclass.respond_to?(:get_action)
+      if is_a?(Class) and superclass.respond_to?(:get_action)
         found = superclass.get_action(name)
       elsif self.class.respond_to?(:get_action)
         found = self.class.get_action(name)
@@ -71,16 +71,16 @@ module Puppet::Interface::ActionManager
         result = @actions[name.to_sym] = found.__dup_and_rebind_to(self)
       end
     end
-    return result
+    result
   end
 
   # Retrieves the default action for the face
   # @return [Puppet::Interface::Action]
   # @api private
   def get_default_action
-    default = actions.map { |x| get_action(x) }.select { |x| x.default }
+    default = actions.map { |x| get_action(x) }.select(&:default)
     if default.length > 1
-      raise "The actions #{default.map(&:name).join(", ")} cannot all be default"
+      raise "The actions #{default.map(&:name).join(', ')} cannot all be default"
     end
 
     default.first

data/lib/puppet/interface/documentation.rb

@@ -79,7 +79,7 @@ class Puppet::Interface
 
         options.each do |option|
           option = get_option(option)
-          wrap = option.required? ? %w{< >} : %w{[ ]}
+          wrap = option.required? ? %w[< >] : %w{[ ]}
 
           s.group(0, *wrap) do
             option.optparse.each do |item|
@@ -184,7 +184,7 @@ class Puppet::Interface
         first_paragraph_break = lines.index('') || 5
         grab = [5, first_paragraph_break].min
         @short_description = lines[0, grab].join("\n")
-        @short_description += ' [...]' if (grab < lines.length and first_paragraph_break >= 5)
+        @short_description += ' [...]' if grab < lines.length and first_paragraph_break >= 5
       end
       @short_description
     end
@@ -250,7 +250,7 @@ class Puppet::Interface
     # @api public
     # @dsl Faces
     def copyright(owner = nil, years = nil)
-      if years.nil? and not owner.nil? then
+      if years.nil? and !owner.nil? then
         # TRANSLATORS 'copyright' is an attribute name and should not be translated
         raise ArgumentError, _('copyright takes the owners names, then the years covered')
       end
@@ -258,8 +258,8 @@ class Puppet::Interface
       self.copyright_owner = owner unless owner.nil?
       self.copyright_years = years unless years.nil?
 
-      if self.copyright_years or self.copyright_owner then
-        "Copyright #{self.copyright_years} by #{self.copyright_owner}"
+      if copyright_years or copyright_owner then
+        "Copyright #{copyright_years} by #{copyright_owner}"
       else
         "Unknown copyright owner and years."
       end

data/lib/puppet/interface/face_collection.rb

@@ -40,7 +40,7 @@ module Puppet::Interface::FaceCollection
       end
     end
 
-    return action
+    action
   end
 
   # get face from memory, without loading.
@@ -51,11 +51,11 @@ module Puppet::Interface::FaceCollection
     versions = @faces[name].keys - [:current]
     range = pattern.is_a?(SemanticPuppet::Version) ? SemanticPuppet::VersionRange.new(pattern, pattern) : SemanticPuppet::VersionRange.parse(pattern)
     found = find_matching(range, versions)
-    return @faces[name][found]
+    @faces[name][found]
   end
 
   def self.find_matching(range, versions)
-    versions.select { |v| range === v }.sort.last
+    versions.select { |v| range === v }.max
   end
 
   # try to load the face, and return it.
@@ -95,7 +95,7 @@ module Puppet::Interface::FaceCollection
         # versions here and return the last item in that set.
         #
         # --daniel 2011-04-06
-        latest_ver = @faces[name].keys.sort.last
+        latest_ver = @faces[name].keys.max
         @faces[name][:current] = @faces[name][latest_ver]
       end
     end
@@ -105,7 +105,7 @@ module Puppet::Interface::FaceCollection
       safely_require name, version
     end
 
-    return get_face(name, version)
+    get_face(name, version)
   end
 
   def self.safely_require(name, version = nil)
@@ -113,12 +113,12 @@ module Puppet::Interface::FaceCollection
     require path
     true
   rescue LoadError => e
-    raise unless e.message =~ %r{-- #{path}$}
+    raise unless e.message =~ /-- #{path}$/
 
     # ...guess we didn't find the file; return a much better problem.
     nil
   rescue SyntaxError => e
-    raise unless e.message =~ %r{#{path}\.rb:\d+: }
+    raise unless e.message =~ /#{path}\.rb:\d+: /
 
     Puppet.err _("Failed to load face %{name}:\n%{detail}") % { name: name, detail: e }
     # ...but we just carry on after complaining.

data/lib/puppet/interface/option.rb

@@ -64,7 +64,7 @@ class Puppet::Interface::Option
     # incoherence here makes our life super-difficult, and we can more easily
     # relax this rule later if we find a valid use case for it. --daniel 2011-03-30
     @argument = @optparse.any? { |o| o =~ /[ =]/ }
-    if @argument and not @optparse.all? { |o| o =~ /[ =]/ } then
+    if @argument and !@optparse.all? { |o| o =~ /[ =]/ } then
       raise ArgumentError, _("Option %{name} is inconsistent about taking an argument") % { name: @name }
     end
 
@@ -74,7 +74,7 @@ class Puppet::Interface::Option
     if @optional_argument
       raise ArgumentError, _("Options with optional arguments are not supported")
     end
-    if @optional_argument and not @optparse.all? { |o| o =~ /[ =]\[/ } then
+    if @optional_argument and !@optparse.all? { |o| o =~ /[ =]\[/ } then
       raise ArgumentError, _("Option %{name} is inconsistent about the argument being optional") % { name: @name }
     end
   end

data/lib/puppet/interface/option_manager.rb

@@ -28,13 +28,13 @@ module Puppet::Interface::OptionManager
 
   # @api private
   def walk_inheritance_tree(start, sym)
-    result = (start || [])
-    if self.is_a?(Class) and superclass.respond_to?(sym)
+    result = start || []
+    if is_a?(Class) and superclass.respond_to?(sym)
       result = superclass.send(sym) + result
     elsif self.class.respond_to?(sym)
       result = self.class.send(sym) + result
     end
-    return result
+    result
   end
 
   # Declare that this app can take a specific option, and provide the
@@ -77,7 +77,7 @@ module Puppet::Interface::OptionManager
       @options_hash[name] = option
     end
 
-    return option
+    option
   end
 
   # @api private
@@ -91,14 +91,14 @@ module Puppet::Interface::OptionManager
 
     result = @options_hash[name.to_sym]
     if result.nil? and with_inherited_options then
-      if self.is_a?(Class) and superclass.respond_to?(:get_option)
+      if is_a?(Class) and superclass.respond_to?(:get_option)
         result = superclass.get_option(name)
       elsif self.class.respond_to?(:get_option)
         result = self.class.get_option(name)
       end
     end
 
-    return result
+    result
   end
 
   # @api private

data/lib/puppet/interface.rb

@@ -58,7 +58,7 @@ class Puppet::Interface
     def define(name, version, &block)
       face = Puppet::Interface::FaceCollection[name, version]
       if face.nil? then
-        face = self.new(name, version)
+        face = new(name, version)
         Puppet::Interface::FaceCollection.register(face)
         # REVISIT: Shouldn't this be delayed until *after* we evaluate the
         # current block, not done before? --daniel 2011-04-07
@@ -67,7 +67,7 @@ class Puppet::Interface
 
       face.instance_eval(&block) if block_given?
 
-      return face
+      face
     end
 
     # Retrieves a face by name and version. Use `:current` for the
@@ -126,7 +126,7 @@ class Puppet::Interface
   # @return [String] usage synopsis
   # @api private
   def synopsis
-    build_synopsis self.name, '<action>'
+    build_synopsis name, '<action>'
   end
 
   ########################################################################
@@ -219,7 +219,7 @@ class Puppet::Interface
     # Exceptions here should propagate up; this implements a hook we can use
     # reasonably for option validation.
     methods.each do |hook|
-      respond_to? hook and self.__send__(hook, action, passed_args, passed_options)
+      respond_to? hook and __send__(hook, action, passed_args, passed_options)
     end
   end
 

data/lib/puppet/metatype/manager.rb

@@ -88,7 +88,7 @@ module Manager
       selfobj = singleton_class
 
       if @types.include?(name)
-        if self.respond_to?(newmethod)
+        if respond_to?(newmethod)
           # Remove the old newmethod
           selfobj.send(:remove_method, newmethod)
         end
@@ -106,7 +106,7 @@ module Manager
       )
 
       # Now define a "new<type>" method for convenience.
-      if self.respond_to? newmethod
+      if respond_to? newmethod
         # Refuse to overwrite existing methods like 'newparam' or 'newtype'.
         # TRANSLATORS 'new%{method}' will become a method name, do not translate this string
         Puppet.warning(_("'new%{method}' method already exists; skipping") % { method: name.to_s })

data/lib/puppet/module/plan.rb

@@ -48,18 +48,18 @@ class Puppet::Module
       end
     end
 
-    ALLOWED_EXTENSIONS = %w{.pp .yaml}
-    RESERVED_WORDS = %w{and application attr case class consumes default else
+    ALLOWED_EXTENSIONS = %w[.pp .yaml]
+    RESERVED_WORDS = %w[and application attr case class consumes default else
                         elsif environment false function if import in inherits node or private
-                        produces site true type undef unless}
-    RESERVED_DATA_TYPES = %w{any array boolean catalogentry class collection
+                        produces site true type undef unless]
+    RESERVED_DATA_TYPES = %w[any array boolean catalogentry class collection
                              callable data default enum float hash integer numeric optional pattern
-                             resource runtime scalar string struct tuple type undef variant}
+                             resource runtime scalar string struct tuple type undef variant]
 
     def self.is_plan_name?(name)
       return true if name =~ /^[a-z][a-z0-9_]*$/
 
-      return false
+      false
     end
 
     # Determine whether a plan file has a legal name and extension
@@ -77,7 +77,7 @@ class Puppet::Module
         return [false, _("Plan name cannot be a Puppet data type, but was '%{name}'") % { name: name }]
       end
 
-      return [true]
+      [true]
     end
 
     # Executables list should contain the full path of all possible implementation files
@@ -89,7 +89,7 @@ class Puppet::Module
       implementations = plan_files.select { |impl| File.basename(impl, '.*') == basename }
 
       # Select .pp before .yaml, since .pp comes before .yaml alphabetically.
-      chosen = implementations.sort.first
+      chosen = implementations.min
 
       [{ "name" => File.basename(chosen), "path" => chosen }]
     end
@@ -143,7 +143,7 @@ class Puppet::Module
     end
 
     def ==(other)
-      self.name == other.name &&
+      name == other.name &&
         self.module == other.module
     end
 
@@ -159,7 +159,7 @@ class Puppet::Module
 
     # Abstracted here so we can add support for subdirectories later
     def self.plan_name_from_path(path)
-      return File.basename(path, '.*')
+      File.basename(path, '.*')
     end
     private_class_method :plan_name_from_path
   end

data/lib/puppet/module/task.rb

@@ -49,13 +49,13 @@ class Puppet::Module
       end
     end
 
-    FORBIDDEN_EXTENSIONS = %w{.conf .md}
+    FORBIDDEN_EXTENSIONS = %w[.conf .md]
     MOUNTS = %w[files lib scripts tasks]
 
     def self.is_task_name?(name)
       return true if name =~ /^[a-z][a-z0-9_]*$/
 
-      return false
+      false
     end
 
     def self.is_tasks_file?(path)
@@ -65,12 +65,12 @@ class Puppet::Module
     # Determine whether a file has a legal name for either a task's executable or metadata file.
     def self.is_tasks_filename?(path)
       name_less_extension = File.basename(path, '.*')
-      return false if not is_task_name?(name_less_extension)
+      return false unless is_task_name?(name_less_extension)
 
       FORBIDDEN_EXTENSIONS.each do |ext|
         return false if path.end_with?(ext)
       end
-      return true
+      true
     end
 
     def self.get_file_details(path, mod)
@@ -130,7 +130,7 @@ class Puppet::Module
 
         unless File.exist?(path)
           msg = _("Could not find %{path} on disk" % { path: path })
-          raise InvalidFile.new(msg)
+          raise InvalidFile, msg
         end
 
         last_char = file[-1] == '/'
@@ -226,7 +226,7 @@ class Puppet::Module
 
     # file paths must be relative to the modules task directory
     def initialize(pup_module, task_name, module_executables, metadata_file = nil)
-      if !Puppet::Module::Task.is_task_name?(task_name)
+      unless Puppet::Module::Task.is_task_name?(task_name)
         raise InvalidName, _("Task names must start with a lowercase letter and be composed of only lowercase letters, numbers, and underscores")
       end
 
@@ -264,7 +264,7 @@ class Puppet::Module
     end
 
     def ==(other)
-      self.name == other.name &&
+      name == other.name &&
         self.module == other.module
     end
 
@@ -281,7 +281,7 @@ class Puppet::Module
 
     # Abstracted here so we can add support for subdirectories later
     def self.task_name_from_path(path)
-      return File.basename(path, '.*')
+      File.basename(path, '.*')
     end
     private_class_method :task_name_from_path
   end

data/lib/puppet/module.rb

@@ -46,21 +46,21 @@ class Puppet::Module
     fullpath = File.join(path, name)
     return false unless Puppet::FileSystem.directory?(fullpath)
 
-    return is_module_directory_name?(name)
+    is_module_directory_name?(name)
   end
 
   def self.is_module_directory_name?(name)
     # it must match an installed module name according to forge validator
     return true if name =~ /^[a-z][a-z0-9_]*$/
 
-    return false
+    false
   end
 
   def self.is_module_namespaced_name?(name)
     # it must match the full module name according to forge validator
-    return true if name =~ /^[a-zA-Z0-9]+[-][a-z][a-z0-9_]*$/
+    return true if name =~ /^[a-zA-Z0-9]+-[a-z][a-z0-9_]*$/
 
-    return false
+    false
   end
 
   # @api private
@@ -96,16 +96,14 @@ class Puppet::Module
 
   # @deprecated The puppetversion module metadata field is no longer used.
   def validate_puppet_version
-    return
+    nil
   end
 
   def has_metadata?
-    begin
-      load_metadata
-      @metadata.is_a?(Hash) && !@metadata.empty?
-    rescue Puppet::Module::MissingMetadata
-      false
-    end
+    load_metadata
+    @metadata.is_a?(Hash) && !@metadata.empty?
+  rescue Puppet::Module::MissingMetadata
+    false
   end
 
   FILETYPES.each do |type, location|
@@ -118,7 +116,7 @@ class Puppet::Module
         return false
       end
 
-      return true
+      true
     end
 
     # A method for returning a given file of a given type.
@@ -137,7 +135,7 @@ class Puppet::Module
 
       return nil unless Puppet::FileSystem.exist?(full_path)
 
-      return full_path
+      full_path
     end
 
     # Return the base directory for the given type
@@ -173,9 +171,9 @@ class Puppet::Module
     end
 
     if Puppet::FileSystem.exist?(full_path)
-      return full_path
+      full_path
     else
-      return nil
+      nil
     end
   end
 
@@ -206,9 +204,9 @@ class Puppet::Module
     end
 
     if Puppet::FileSystem.exist?(full_path)
-      return full_path
+      full_path
     else
-      return nil
+      nil
     end
   end
 
@@ -252,11 +250,11 @@ class Puppet::Module
 
     [:source, :author, :version, :license, :dependencies].each do |attr|
       value = data[attr.to_s]
-      raise MissingMetadata, "No #{attr} module metadata provided for #{self.name}" if value.nil?
+      raise MissingMetadata, "No #{attr} module metadata provided for #{name}" if value.nil?
 
       if attr == :dependencies
         unless value.is_a?(Array)
-          raise MissingMetadata, "The value for the key dependencies in the file metadata.json of the module #{self.name} must be an array, not: '#{value}'"
+          raise MissingMetadata, "The value for the key dependencies in the file metadata.json of the module #{name} must be an array, not: '#{value}'"
         end
 
         value.each do |dep|
@@ -338,7 +336,7 @@ class Puppet::Module
   # @return true if the module has a directory for the locale, false
   #         false otherwise
   def has_translations?(locale)
-    return Puppet::FileSystem.exist?(File.join(locale_directory, locale))
+    Puppet::FileSystem.exist?(File.join(locale_directory, locale))
   end
 
   def has_external_facts?
@@ -368,7 +366,7 @@ class Puppet::Module
   end
 
   def required_by
-    environment.module_requirements[self.forge_name] || {}
+    environment.module_requirements[forge_name] || {}
   end
 
   # Identify and mark unmet dependencies.  A dependency will be marked unmet
@@ -415,8 +413,8 @@ class Puppet::Module
         :name => name,
         :version_constraint => version_string.gsub(/^(?=\d)/, "v"),
         :parent => {
-          :name => self.forge_name,
-          :version => self.version.gsub(/^(?=\d)/, "v")
+          :name => forge_name,
+          :version => version.gsub(/^(?=\d)/, "v")
         },
         :mod_details => {
           :installed_version => dep_mod.nil? ? nil : dep_mod.version
@@ -429,32 +427,32 @@ class Puppet::Module
         next
       end
 
-      if version_string
-        begin
-          required_version_semver_range = self.class.parse_range(version_string)
-          actual_version_semver = SemanticPuppet::Version.parse(dep_mod.version)
-        rescue ArgumentError
-          error_details[:reason] = :non_semantic_version
-          unmet_dependencies << error_details
-          next
-        end
+      next unless version_string
 
-        unless required_version_semver_range.include? actual_version_semver
-          error_details[:reason] = :version_mismatch
-          unmet_dependencies << error_details
-          next
-        end
+      begin
+        required_version_semver_range = self.class.parse_range(version_string)
+        actual_version_semver = SemanticPuppet::Version.parse(dep_mod.version)
+      rescue ArgumentError
+        error_details[:reason] = :non_semantic_version
+        unmet_dependencies << error_details
+        next
       end
+
+      next if required_version_semver_range.include? actual_version_semver
+
+      error_details[:reason] = :version_mismatch
+      unmet_dependencies << error_details
+      next
     end
 
     unmet_dependencies
   end
 
   def ==(other)
-    self.name == other.name &&
-      self.version == other.version &&
-      self.path == other.path &&
-      self.environment == other.environment
+    name == other.name &&
+      version == other.version &&
+      path == other.path &&
+      environment == other.environment
   end
 
   private

data/lib/puppet/module_tool/applications/application.rb

@@ -28,7 +28,11 @@ module Puppet::ModuleTool
         when Net::HTTPOK, Net::HTTPCreated
           Puppet.notice success
         else
-          errors = Puppet::Util::Json.load(response.body)['error'] rescue "HTTP #{response.code}, #{response.body}"
+          errors = begin
+            Puppet::Util::Json.load(response.body)['error']
+          rescue
+            "HTTP #{response.code}, #{response.body}"
+          end
           Puppet.warning "#{failure} (#{errors})"
         end
       end
@@ -50,11 +54,9 @@ module Puppet::ModuleTool
 
         if File.file?(metadata_path)
           File.open(metadata_path) do |f|
-            begin
-              @metadata.update(Puppet::Util::Json.load(f))
-            rescue Puppet::Util::Json::ParseError => ex
-              raise ArgumentError, _("Could not parse JSON %{metadata_path}") % { metadata_path: metadata_path }, ex.backtrace
-            end
+            @metadata.update(Puppet::Util::Json.load(f))
+          rescue Puppet::Util::Json::ParseError => ex
+            raise ArgumentError, _("Could not parse JSON %{metadata_path}") % { metadata_path: metadata_path }, ex.backtrace
           end
         end
 
@@ -62,7 +64,7 @@ module Puppet::ModuleTool
           Puppet.warning _("A Modulefile was found in the root directory of the module. This file will be ignored and can safely be removed.")
         end
 
-        return @metadata
+        @metadata
       end
 
       def load_metadata!
@@ -82,7 +84,7 @@ module Puppet::ModuleTool
           raise ArgumentError, _("Invalid version format: %{version} (Semantic Versions are acceptable: http://semver.org)") % { version: version }
         end
 
-        return {
+        {
           :module_name => module_name,
           :author => author,
           :dir_name => shortname,