openvox 7.37.1 → 8.19.0

data/lib/puppet/interface/face_collection.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Puppet::Interface::FaceCollection
   @faces = Hash.new { |hash, key| hash[key] = {} }
 
@@ -9,9 +11,9 @@ module Puppet::Interface::FaceCollection
       names = @loader.files_to_load(Puppet.lookup(:current_environment)).map do |fn|
         ::File.basename(fn, '.rb')
       end.uniq
-      names.each {|name| self[name, :current]}
+      names.each { |name| self[name, :current] }
     end
-    @faces.keys.select {|name| @faces[name].length > 0 }
+    @faces.keys.select { |name| @faces[name].length > 0 }
   end
 
   def self.[](name, version)
@@ -26,18 +28,19 @@ module Puppet::Interface::FaceCollection
     # elsewhere.  Usually this will start from :current and all...
     face = self[name, version]
     return nil unless face
+
     action = face.get_action(action_name)
     unless action
       # ...we need to search for it bound to an o{lder,ther} version.  Since
       # we load all actions when the face is first references, this will be in
       # memory in the known set of versions of the face.
-      (@faces[name].keys - [ :current ]).sort.reverse_each do |vers|
+      (@faces[name].keys - [:current]).sort.reverse_each do |vers|
         action = @faces[name][vers].get_action(action_name)
         break if action
       end
     end
 
-    return action
+    action
   end
 
   # get face from memory, without loading.
@@ -45,14 +48,14 @@ module Puppet::Interface::FaceCollection
     return nil unless @faces.has_key? name
     return @faces[name][:current] if pattern == :current
 
-    versions = @faces[name].keys - [ :current ]
+    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.
@@ -92,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
@@ -102,20 +105,21 @@ 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)
     path = @loader.expand(version ? ::File.join(version.to_s, name.to_s) : name)
     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.
     nil
@@ -127,9 +131,9 @@ module Puppet::Interface::FaceCollection
 
   def self.underscorize(name)
     unless name.to_s =~ /^[-_a-z][-_a-z0-9]*$/i then
-      #TRANSLATORS 'face' refers to a programming API in Puppet
+      # TRANSLATORS 'face' refers to a programming API in Puppet
       raise ArgumentError, _("%{name} (%{class_name}) is not a valid face name") %
-          { name: name.inspect, class_name: name.class }
+                           { name: name.inspect, class_name: name.class }
     end
 
     name.to_s.downcase.split(/[-_]/).join('_').to_sym

data/lib/puppet/interface/option.rb

@@ -1,3 +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
@@ -20,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...
@@ -35,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
@@ -60,17 +64,17 @@ 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
 
     # 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 !@optparse.all? { |o| o =~ /[ =]\[/ } then
       raise ArgumentError, _("Option %{name} is inconsistent about the argument being optional") % { name: @name }
     end
   end
@@ -89,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
 
@@ -98,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
@@ -120,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
@@ -133,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,3 +1,5 @@
+# frozen_string_literal: true
+
 # @api public
 class Puppet::Interface::OptionBuilder
   # The option under construction
@@ -16,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
@@ -41,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
 
@@ -61,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
 
@@ -90,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,18 +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!
@@ -26,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
@@ -56,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|
@@ -64,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
@@ -75,7 +77,7 @@ module Puppet::Interface::OptionManager
       @options_hash[name] = option
     end
 
-    return option
+    option
   end
 
   # @api private
@@ -89,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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../puppet'
 require_relative '../puppet/util/autoload'
 require 'prettyprint'
@@ -15,7 +17,6 @@ class Puppet::Interface
   require_relative 'interface/option_builder'
   require_relative 'interface/option_manager'
 
-
   include FullDocs
 
   include Puppet::Interface::ActionManager
@@ -50,14 +51,14 @@ 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
     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
@@ -66,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
@@ -120,16 +121,14 @@ 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
   # @api private
   def synopsis
-    build_synopsis self.name, '<action>'
+    build_synopsis name, '<action>'
   end
 
-
   ########################################################################
 
   # The name of the face
@@ -200,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 = {})
@@ -218,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/loaders.rb

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

data/lib/puppet/metatype/manager.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../puppet'
 require_relative '../../puppet/util/classgen'
 require_relative '../../puppet/node/environment'
@@ -15,7 +17,7 @@ module Manager
   # @api private
   #
   def allclear
-    @types.each { |name, type|
+    @types.each { |_name, type|
       type.clear
     }
   end
@@ -26,7 +28,7 @@ module Manager
   #
   def clear_misses
     unless @types.nil?
-      @types.delete_if {|_, v| v.nil? }
+      @types.compact
     end
   end
 
@@ -36,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
 
@@ -73,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
@@ -86,9 +88,9 @@ 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)
+          selfobj.send(:remove_method, newmethod)
         end
       end
 
@@ -104,9 +106,9 @@ 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
+        # 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|
@@ -116,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.
 
@@ -169,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
@@ -194,4 +196,3 @@ module Manager
   end
 end
 end
-

data/lib/puppet/module/plan.rb

@@ -1,9 +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 || {}
@@ -33,27 +36,30 @@ 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}
-    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}
+    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
+                             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
+
+      false
     end
 
     # Determine whether a plan file has a legal name and extension
@@ -70,7 +76,8 @@ 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]
+
+      [true]
     end
 
     # Executables list should contain the full path of all possible implementation files
@@ -82,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
@@ -95,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) }
 
@@ -136,8 +143,8 @@ class Puppet::Module
     end
 
     def ==(other)
-      self.name == other.name &&
-      self.module == other.module
+      name == other.name &&
+        self.module == other.module
     end
 
     def environment_name
@@ -152,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