puppet 8.3.1-x64-mingw32 → 8.5.0-x64-mingw32

data/lib/puppet/interface/option.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # This represents an option on an action or face (to be globally applied
 # to its actions). Options should be constructed by calling
 # {Puppet::Interface::OptionManager#option}, which is available on
@@ -21,6 +22,7 @@ class Puppet::Interface::Option
         unless item =~ /^-[a-z]\b/ or item =~ /^--[^-]/ then
           raise ArgumentError, _("%{option}: long options need two dashes (--)") % { option: item.inspect }
         end
+
         @optparse << item
 
         # Duplicate checking...
@@ -36,10 +38,11 @@ class Puppet::Interface::Option
         if Puppet.settings.include? name then
           raise ArgumentError, _("%{option}: already defined in puppet") % { option: item.inspect }
         end
+
         dup = dups[name]
         if dup
           raise ArgumentError, _("%{option}: duplicates existing alias %{duplicate} in %{parent}") %
-              { option: item.inspect, duplicate: dup.inspect, parent: @parent }
+                               { option: item.inspect, duplicate: dup.inspect, parent: @parent }
         else
           dups[name] = item
         end
@@ -67,11 +70,11 @@ class Puppet::Interface::Option
 
     # Is our argument optional?  The rules about consistency apply here, also,
     # just like they do to taking arguments at all. --daniel 2011-03-30
-    @optional_argument = @optparse.any? { |o| o=~/[ =]\[/ }
+    @optional_argument = @optparse.any? { |o| o =~ /[ =]\[/ }
     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 not @optparse.all? { |o| o =~ /[ =]\[/ } then
       raise ArgumentError, _("Option %{name} is inconsistent about the argument being optional") % { name: @name }
     end
   end
@@ -90,6 +93,7 @@ class Puppet::Interface::Option
     unless found
       raise ArgumentError, _("Can't find a name in the declaration %{declaration}") % { declaration: declaration.inspect }
     end
+
     found.captures.first
   end
 
@@ -99,16 +103,18 @@ class Puppet::Interface::Option
     unless name.to_s =~ /^[a-z]\w*$/
       raise _("%{name} is an invalid option name") % { name: name.inspect }
     end
+
     name.to_sym
   end
 
-
   def takes_argument?
     !!@argument
   end
+
   def optional_argument?
     !!@optional_argument
   end
+
   def required?
     !!@required
   end
@@ -121,10 +127,11 @@ class Puppet::Interface::Option
     if required
       raise ArgumentError, _("%{name} can't be optional and have a default value") % { name: self }
     end
+
     unless proc.is_a? Proc
-      #TRANSLATORS 'proc' is a Ruby block of code
+      # TRANSLATORS 'proc' is a Ruby block of code
       raise ArgumentError, _("default value for %{name} is a %{class_name}, not a proc") %
-          { name: self, class_name: proc.class.name.inspect }
+                           { name: self, class_name: proc.class.name.inspect }
     end
     @default = proc
   end
@@ -134,30 +141,34 @@ class Puppet::Interface::Option
   end
 
   attr_reader :parent, :name, :aliases, :optparse, :required
+
   def required=(value)
     if has_default?
       raise ArgumentError, _("%{name} can't be optional and have a default value") % { name: self }
     end
+
     @required = value
   end
 
   attr_reader :before_action
+
   def before_action=(proc)
     unless proc.is_a? Proc
-      #TRANSLATORS 'proc' is a Ruby block of code
+      # TRANSLATORS 'proc' is a Ruby block of code
       raise ArgumentError, _("before action hook for %{name} is a %{class_name}, not a proc") %
-          { name: self, class_name: proc.class.name.inspect }
+                           { name: self, class_name: proc.class.name.inspect }
     end
     @before_action =
       @parent.__send__(:__add_method, __decoration_name(:before), proc)
   end
 
   attr_reader :after_action
+
   def after_action=(proc)
     unless proc.is_a? Proc
-      #TRANSLATORS 'proc' is a Ruby block of code
+      # TRANSLATORS 'proc' is a Ruby block of code
       raise ArgumentError, _("after action hook for %{name} is a %{class_name}, not a proc") %
-          { name: self, class_name: proc.class.name.inspect }
+                           { name: self, class_name: proc.class.name.inspect }
     end
     @after_action =
       @parent.__send__(:__add_method, __decoration_name(:after), proc)

data/lib/puppet/interface/option_builder.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # @api public
 class Puppet::Interface::OptionBuilder
   # The option under construction
@@ -17,12 +18,12 @@ class Puppet::Interface::OptionBuilder
     @face   = face
     @option = Puppet::Interface::Option.new(face, *declaration)
     instance_eval(&block) if block_given?
-    @option
   end
 
   # Metaprogram the simple DSL from the option class.
   Puppet::Interface::Option.instance_methods.grep(/=$/).each do |setter|
     next if setter =~ /^=/
+
     dsl = setter.to_s.chomp('=')
 
     unless private_method_defined? dsl
@@ -42,17 +43,18 @@ class Puppet::Interface::OptionBuilder
   # @dsl Faces
   def before_action(&block)
     unless block
-      #TRANSLATORS 'before_action' is a method name and should not be translated
+      # TRANSLATORS 'before_action' is a method name and should not be translated
       raise ArgumentError, _("%{option} before_action requires a block") % { option: @option }
     end
     if @option.before_action
-      #TRANSLATORS 'before_action' is a method name and should not be translated
+      # TRANSLATORS 'before_action' is a method name and should not be translated
       raise ArgumentError, _("%{option} already has a before_action set") % { option: @option }
     end
     unless block.arity == 3 then
-      #TRANSLATORS 'before_action' is a method name and should not be translated
+      # TRANSLATORS 'before_action' is a method name and should not be translated
       raise ArgumentError, _("before_action takes three arguments, action, args, and options")
     end
+
     @option.before_action = block
   end
 
@@ -62,17 +64,18 @@ class Puppet::Interface::OptionBuilder
   # @dsl Faces
   def after_action(&block)
     unless block
-      #TRANSLATORS 'after_action' is a method name and should not be translated
+      # TRANSLATORS 'after_action' is a method name and should not be translated
       raise ArgumentError, _("%{option} after_action requires a block") % { option: @option }
     end
     if @option.after_action
-      #TRANSLATORS 'after_action' is a method name and should not be translated
+      # TRANSLATORS 'after_action' is a method name and should not be translated
       raise ArgumentError, _("%{option} already has an after_action set") % { option: @option }
     end
     unless block.arity == 3 then
-      #TRANSLATORS 'after_action' is a method name and should not be translated
+      # TRANSLATORS 'after_action' is a method name and should not be translated
       raise ArgumentError, _("after_action takes three arguments, action, args, and options")
     end
+
     @option.after_action = block
   end
 
@@ -91,16 +94,17 @@ class Puppet::Interface::OptionBuilder
   # @dsl Faces
   def default_to(&block)
     unless block
-      #TRANSLATORS 'default_to' is a method name and should not be translated
+      # TRANSLATORS 'default_to' is a method name and should not be translated
       raise ArgumentError, _("%{option} default_to requires a block") % { option: @option }
     end
     if @option.has_default?
       raise ArgumentError, _("%{option} already has a default value") % { option: @option }
     end
     unless block.arity == 0
-      #TRANSLATORS 'default_to' is a method name and should not be translated
+      # TRANSLATORS 'default_to' is a method name and should not be translated
       raise ArgumentError, _("%{option} default_to block should not take any arguments") % { option: @option }
     end
+
     @option.default = block
   end
 end

data/lib/puppet/interface/option_manager.rb

@@ -1,19 +1,20 @@
 # frozen_string_literal: true
+
 # This class is not actually public API, but the method
 # {Puppet::Interface::OptionManager#option option} is public when used
 # as part of the Faces DSL (i.e. from within a
 # {Puppet::Interface.define define} block).
 # @api public
 module Puppet::Interface::OptionManager
-
   # @api private
   def display_global_options(*args)
     @display_global_options ||= []
     [args].flatten.each do |refopt|
       unless Puppet.settings.include?(refopt)
-        #TRANSLATORS 'Puppet.settings' references to the Puppet settings options and should not be translated
+        # TRANSLATORS 'Puppet.settings' references to the Puppet settings options and should not be translated
         raise ArgumentError, _("Global option %{option} does not exist in Puppet.settings") % { option: refopt }
       end
+
       @display_global_options << refopt if refopt
     end
     @display_global_options.uniq!
@@ -57,7 +58,7 @@ module Puppet::Interface::OptionManager
       conflict = get_option(name)
       if conflict
         raise ArgumentError, _("Option %{option} conflicts with existing option %{conflict}") %
-            { option: option, conflict: conflict }
+                             { option: option, conflict: conflict }
       end
 
       actions.each do |action|
@@ -65,7 +66,7 @@ module Puppet::Interface::OptionManager
         conflict = action.get_option(name)
         if conflict
           raise ArgumentError, _("Option %{option} conflicts with existing option %{conflict} on %{action}") %
-              { option: option, conflict: conflict, action: action }
+                               { option: option, conflict: conflict, action: action }
         end
       end
     end

data/lib/puppet/interface.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../puppet'
 require_relative '../puppet/util/autoload'
 require 'prettyprint'
@@ -16,7 +17,6 @@ class Puppet::Interface
   require_relative 'interface/option_builder'
   require_relative 'interface/option_manager'
 
-
   include FullDocs
 
   include Puppet::Interface::ActionManager
@@ -51,7 +51,7 @@ class Puppet::Interface
     # @param name [Symbol] the name of the face
     # @param version [String] the version of the face (this should
     #   conform to {http://semver.org/ Semantic Versioning})
-    # @overload define(name, version, {|| ... })
+    # @overload define(name, version, { ... })
     # @return [Puppet::Interface] The created face
     # @api public
     # @dsl Faces
@@ -121,7 +121,6 @@ class Puppet::Interface
   # splits out this should merge into a module that both the action and face
   # include. --daniel 2011-04-17
 
-
   # Returns the synopsis for the face. This shows basic usage and global
   # options.
   # @return [String] usage synopsis
@@ -130,7 +129,6 @@ class Puppet::Interface
     build_synopsis self.name, '<action>'
   end
 
-
   ########################################################################
 
   # The name of the face
@@ -201,7 +199,9 @@ class Puppet::Interface
   # to be unrecognizable in the final outcome.  At which point we will throw
   # all this away, replace it with something nice, and work out if we should
   # be making this visible to the outside world... --daniel 2011-04-14
+
   private
+
   # @return [void]
   # @api private
   def __invoke_decorations(type, action, passed_args = [], passed_options = {})

data/lib/puppet/loaders.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../puppet/concurrent/synchronized'
 
 module Puppet
@@ -27,5 +28,4 @@ module Puppet
       require_relative '../puppet/pops/loader/puppet_plan_instantiator'
     end
   end
-
 end

data/lib/puppet/metatype/manager.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet'
 require_relative '../../puppet/util/classgen'
 require_relative '../../puppet/node/environment'
@@ -16,7 +17,7 @@ module Manager
   # @api private
   #
   def allclear
-    @types.each { |name, type|
+    @types.each { |_name, type|
       type.clear
     }
   end
@@ -27,7 +28,7 @@ module Manager
   #
   def clear_misses
     unless @types.nil?
-      @types.delete_if {|_, v| v.nil? }
+      @types.compact
     end
   end
 
@@ -37,11 +38,11 @@ module Manager
   # @yieldreturn [Object] the last returned object is also returned from this method
   # @return [Object] the last returned value from the block.
   def eachtype
-    @types.each do |name, type|
+    @types.each do |_name, type|
       # Only consider types that have names
-      #if ! type.parameters.empty? or ! type.validproperties.empty?
-        yield type
-      #end
+      # if ! type.parameters.empty? or ! type.validproperties.empty?
+      yield type
+      # end
     end
   end
 
@@ -74,9 +75,9 @@ module Manager
     @manager_lock.synchronize do
       # Handle backward compatibility
       unless options.is_a?(Hash)
-        #TRANSLATORS 'Puppet::Type.newtype' should not be translated
+        # TRANSLATORS 'Puppet::Type.newtype' should not be translated
         Puppet.warning(_("Puppet::Type.newtype(%{name}) now expects a hash as the second argument, not %{argument}") %
-                       { name: name, argument: options.inspect})
+                       { name: name, argument: options.inspect })
       end
 
       # First make sure we don't have a method sitting around
@@ -89,7 +90,7 @@ module Manager
       if @types.include?(name)
         if self.respond_to?(newmethod)
           # Remove the old newmethod
-          selfobj.send(:remove_method,newmethod)
+          selfobj.send(:remove_method, newmethod)
         end
       end
 
@@ -107,7 +108,7 @@ module Manager
       # Now define a "new<type>" method for convenience.
       if self.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
+        # 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 })
       else
         selfobj.send(:define_method, newmethod) do |*args|
@@ -117,7 +118,7 @@ module Manager
 
       # If they've got all the necessary methods defined and they haven't
       # already added the property, then do so now.
-      klass.ensurable if klass.ensurable? and ! klass.validproperty?(:ensure)
+      klass.ensurable if klass.ensurable? and !klass.validproperty?(:ensure)
 
       # Now set up autoload any providers that might exist for this type.
 
@@ -170,7 +171,7 @@ module Manager
       end
       # Try loading the type.
       if typeloader.load(name, Puppet.lookup(:current_environment))
-        #TRANSLATORS 'puppet/type/%{name}' should not be translated
+        # TRANSLATORS 'puppet/type/%{name}' should not be translated
         Puppet.warning(_("Loaded puppet/type/%{name} but no class was created") % { name: name }) unless @types.include? name
       elsif !Puppet[:always_retry_plugins]
         # PUP-5482 - Only look for a type once if plugin retry is disabled
@@ -195,4 +196,3 @@ module Manager
   end
 end
 end
-

data/lib/puppet/module/plan.rb

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/util/logging'
 
 class Puppet::Module
   class Plan
     class Error < Puppet::Error
       attr_accessor :kind, :details
+
       def initialize(message, kind, details = nil)
         super(message)
         @details = details || {}
@@ -34,26 +36,29 @@ class Puppet::Module
 
     class InvalidPlan < Error
     end
+
     class InvalidMetadata < Error
     end
+
     class PlanNotFound < Error
       def initialize(plan_name, module_name)
         msg = _("Plan %{plan_name} not found in module %{module_name}.") %
-          {plan_name: plan_name, module_name: module_name}
+              { plan_name: plan_name, module_name: module_name }
         super(msg, 'puppet.plans/plan-not-found', { 'name' => plan_name })
       end
     end
 
     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}
+                        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
-        callable data default enum float hash integer numeric optional pattern
-        resource runtime scalar string struct tuple type undef variant}
+                             callable data default enum float hash integer numeric optional pattern
+                             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
     end
 
@@ -71,6 +76,7 @@ class Puppet::Module
       if RESERVED_DATA_TYPES.include?(name)
         return [false, _("Plan name cannot be a Puppet data type, but was '%{name}'") % { name: name }]
       end
+
       return [true]
     end
 
@@ -96,7 +102,7 @@ class Puppet::Module
     def self.plans_in_module(pup_module)
       # Search e.g. 'modules/<pup_module>/plans' for all plans
       plan_files = Dir.glob(File.join(pup_module.plans_directory, '*'))
-        .keep_if { |f| valid, _ = is_plans_filename?(f); valid }
+                      .keep_if { |f| valid, _ = is_plans_filename?(f); valid }
 
       plans = plan_files.group_by { |f| plan_name_from_path(f) }
 
@@ -138,7 +144,7 @@ class Puppet::Module
 
     def ==(other)
       self.name == other.name &&
-      self.module == other.module
+        self.module == other.module
     end
 
     def environment_name

data/lib/puppet/module/task.rb

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/util/logging'
 
 class Puppet::Module
   class Task
     class Error < Puppet::Error
       attr_accessor :kind, :details
+
       def initialize(message, kind, details = nil)
         super(message)
         @details = details || {}
@@ -35,12 +37,14 @@ class Puppet::Module
 
     class InvalidTask < Error
     end
+
     class InvalidMetadata < Error
     end
+
     class TaskNotFound < Error
       def initialize(task_name, module_name)
         msg = _("Task %{task_name} not found in module %{module_name}.") %
-          {task_name: task_name, module_name: module_name}
+              { task_name: task_name, module_name: module_name }
         super(msg, 'puppet.tasks/task-not-found', { 'name' => task_name })
       end
     end
@@ -50,6 +54,7 @@ class Puppet::Module
 
     def self.is_task_name?(name)
       return true if name =~ /^[a-z][a-z0-9_]*$/
+
       return false
     end
 
@@ -61,6 +66,7 @@ class Puppet::Module
     def self.is_tasks_filename?(path)
       name_less_extension = File.basename(path, '.*')
       return false if not is_task_name?(name_less_extension)
+
       FORBIDDEN_EXTENSIONS.each do |ext|
         return false if path.end_with?(ext)
       end
@@ -74,23 +80,23 @@ class Puppet::Module
       # Partition matches on the first instance it finds of the parameter
       name = "#{mod.name}#{path.partition(mod.path).last}"
 
-      { "name" => name, "path" =>  path }
+      { "name" => name, "path" => path }
     end
     private_class_method :get_file_details
 
     # Find task's required lib files and retrieve paths for both 'files' and 'implementation:files' metadata keys
     def self.find_extra_files(metadata, envname = nil)
       return [] if metadata.nil?
-      
+
       files = metadata.fetch('files', [])
       unless files.is_a?(Array)
-        msg = _("The 'files' task metadata expects an array, got %{files}.") % {files: files}
+        msg = _("The 'files' task metadata expects an array, got %{files}.") % { files: files }
         raise InvalidMetadata.new(msg, 'puppet.tasks/invalid-metadata')
       end
-      impl_files = metadata.fetch('implementations', []).flat_map do |impl| 
+      impl_files = metadata.fetch('implementations', []).flat_map do |impl|
         file_array = impl.fetch('files', [])
         unless file_array.is_a?(Array)
-          msg = _("The 'files' task metadata expects an array, got %{files}.") % {files: file_array}
+          msg = _("The 'files' task metadata expects an array, got %{files}.") % { files: file_array }
           raise InvalidMetadata.new(msg, 'puppet.tasks/invalid-metadata')
         end
         file_array
@@ -106,13 +112,13 @@ class Puppet::Module
         pup_module = Puppet::Module.find(module_name, envname)
         if pup_module.nil?
           msg = _("Could not find module %{module_name} containing task file %{filename}" %
-                  {module_name: module_name, filename: endpath})
+                  { module_name: module_name, filename: endpath })
           raise InvalidMetadata.new(msg, 'puppet.tasks/invalid-metadata')
         end
 
         unless MOUNTS.include? mount
           msg = _("Files must be saved in module directories that Puppet makes available via mount points: %{mounts}" %
-                  {mounts: MOUNTS.join(', ')})
+                  { mounts: MOUNTS.join(', ') })
           raise InvalidMetadata.new(msg, 'puppet.tasks/invalid-metadata')
         end
 
@@ -130,14 +136,14 @@ class Puppet::Module
         last_char = file[-1] == '/'
         if File.directory?(path)
           unless last_char
-            msg = _("Directories specified in task metadata must include a trailing slash: %{dir}" % { dir: file } )
+            msg = _("Directories specified in task metadata must include a trailing slash: %{dir}" % { dir: file })
             raise InvalidMetadata.new(msg, 'puppet.tasks/invalid-metadata')
           end
           dir_files = Dir.glob("#{path}**/*").select { |f| File.file?(f) }
           dir_files.map { |f| get_file_details(f, pup_module) }
         else
           if last_char
-            msg = _("Files specified in task metadata cannot include a trailing slash: %{file}" % { file: file } )
+            msg = _("Files specified in task metadata cannot include a trailing slash: %{file}" % { file: file })
             raise InvalidMetadata.new(msg, 'puppet.task/invalid-metadata')
           end
           get_file_details(path, pup_module)
@@ -166,7 +172,7 @@ class Puppet::Module
           path = executables.find { |real_impl| File.basename(real_impl) == impl['name'] }
           unless path
             msg = _("Task metadata for task %{name} specifies missing implementation %{implementation}" % { name: name, implementation: impl['name'] })
-            raise InvalidTask.new(msg, 'puppet.tasks/missing-implementation', { missing: [impl['name']] } )
+            raise InvalidTask.new(msg, 'puppet.tasks/missing-implementation', { missing: [impl['name']] })
           end
           { "name" => impl['name'], "path" => path }
         end
@@ -178,11 +184,11 @@ class Puppet::Module
       implementations = executables.select { |impl| File.basename(impl, '.*') == basename }
       if implementations.empty?
         msg = _('No source besides task metadata was found in directory %{directory} for task %{name}') %
-          { name: name, directory: directory }
+              { name: name, directory: directory }
         raise InvalidTask.new(msg, 'puppet.tasks/no-implementation')
       elsif implementations.length > 1
-        msg =_("Multiple executables were found in directory %{directory} for task %{name}; define 'implementations' in metadata to differentiate between them") %
-          { name: name, directory: implementations[0] }
+        msg = _("Multiple executables were found in directory %{directory} for task %{name}; define 'implementations' in metadata to differentiate between them") %
+              { name: name, directory: implementations[0] }
         raise InvalidTask.new(msg, 'puppet.tasks/multiple-implementations')
       end
 
@@ -205,7 +211,7 @@ class Puppet::Module
 
     def self.tasks_in_module(pup_module)
       task_files = Dir.glob(File.join(pup_module.tasks_directory, '*'))
-        .keep_if { |f| is_tasks_file?(f) }
+                      .keep_if { |f| is_tasks_file?(f) }
 
       module_executables = task_files.reject(&method(:is_tasks_metadata_filename?)).map.to_a
 
@@ -219,7 +225,7 @@ class Puppet::Module
     attr_reader :name, :module, :metadata_file
 
     # file paths must be relative to the modules task directory
-    def initialize(pup_module, task_name,  module_executables, metadata_file = nil)
+    def initialize(pup_module, task_name, module_executables, metadata_file = nil)
       if !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
@@ -238,7 +244,7 @@ class Puppet::Module
         content.empty? ? {} : Puppet::Util::Json.load(content)
       end
     rescue SystemCallError, IOError => err
-      msg = _("Error reading metadata: %{message}" % {message: err.message})
+      msg = _("Error reading metadata: %{message}" % { message: err.message })
       raise InvalidMetadata.new(msg, 'puppet.tasks/unreadable-metadata')
     rescue Puppet::Util::Json::ParseError => err
       raise InvalidMetadata.new(err.message, 'puppet.tasks/unparseable-metadata')
@@ -259,7 +265,7 @@ class Puppet::Module
 
     def ==(other)
       self.name == other.name &&
-      self.module == other.module
+        self.module == other.module
     end
 
     def environment_name