puppet 8.3.1 → 8.4.0

data/lib/puppet/indirector/terminus.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/indirector'
 require_relative '../../puppet/indirector/errors'
 require_relative '../../puppet/indirector/indirection'
@@ -52,6 +53,7 @@ class Puppet::Indirector::Terminus
       if longname =~ /#<Class/
         raise Puppet::DevError, _("Terminus subclasses must have associated constants")
       end
+
       names = longname.split("::")
 
       # Convert everything to a lower-case symbol, converting camelcase to underscore word separation.
@@ -72,6 +74,7 @@ class Puppet::Indirector::Terminus
 
       # This subclass is specifically associated with an indirection.
       raise("Invalid name #{longname}") unless names.length > 0
+
       processed_name = names.pop.sub(/^[A-Z]/) { |i| i.downcase }.gsub(/[A-Z]/) { |i| "_#{i.downcase}" }
 
       if processed_name.empty?
@@ -98,7 +101,7 @@ class Puppet::Indirector::Terminus
 
     # Convert a short name to a constant.
     def name2const(name)
-      name.to_s.capitalize.sub(/_(.)/) { |i| $1.upcase }
+      name.to_s.capitalize.sub(/_(.)/) { |_i| $1.upcase }
     end
 
     # Register a class, probably autoloaded.

data/lib/puppet/indirector/yaml.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/indirector/terminus'
 require_relative '../../puppet/util/yaml'
 

data/lib/puppet/indirector.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Manage indirections to termini.  They are organized in terms of indirections -
 # - e.g., configuration, node, file, certificate -- and each indirection has one
 # or more terminus types defined.  The indirection is configured via the
@@ -37,6 +38,7 @@ module Puppet::Indirector
   # to override it.
   def indirects(indirection, options = {})
     raise(ArgumentError, _("Already handling indirection for %{current}; cannot also handle %{next}") % { current: @indirection.name, next: indirection }) if @indirection
+
     # populate this class with the various new methods
     extend ClassMethods
     include Puppet::Indirector::Envelope

data/lib/puppet/info_service/class_information_service.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet'
 require_relative '../../puppet/pops'
 require_relative '../../puppet/pops/evaluator/json_strict_literal_evaluator'
 
 class Puppet::InfoService::ClassInformationService
-
   def initialize
     @file_to_result = {}
     @parser = Puppet::Pops::Parser::EvaluatingParser.new()
@@ -45,7 +45,7 @@ class Puppet::InfoService::ClassInformationService
   end
 
   def result_of(f)
-    entry =  @file_to_result[f]
+    entry = @file_to_result[f]
     if entry.nil?
       @file_to_result[f] = entry = parse_file(f)
     end
@@ -59,7 +59,7 @@ class Puppet::InfoService::ClassInformationService
       parse_result = @parser.parse_file(f)
       {:classes =>
         parse_result.definitions.select {|d| d.is_a?(Puppet::Pops::Model::HostClassDefinition)}.map do |d|
-          {:name   => d.name,
+          {:name => d.name,
            :params => d.parameters.map {|p| extract_param(p) }
           }
         end
@@ -75,6 +75,7 @@ class Puppet::InfoService::ClassInformationService
 
   def extract_type(structure, p)
     return structure if p.type_expr.nil?
+
     structure[:type] = typeexpr_to_string(p.type_expr)
     structure
   end
@@ -82,6 +83,7 @@ class Puppet::InfoService::ClassInformationService
   def extract_default(structure, p)
     value_expr = p.value
     return structure if value_expr.nil?
+
     default_value = value_as_literal(value_expr)
     structure[:default_literal] = default_value unless default_value.nil?
     structure[:default_source] = extract_value_source(value_expr)

data/lib/puppet/info_service/plan_information_service.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Puppet::InfoService::PlanInformationService
   require_relative '../../puppet/module'
 

data/lib/puppet/info_service/task_information_service.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Puppet::InfoService::TaskInformationService
   require_relative '../../puppet/module'
 

data/lib/puppet/interface/action.rb

@@ -1,5 +1,6 @@
 # coding: utf-8
 # frozen_string_literal: true
+
 require 'prettyprint'
 
 # This represents an action that is attached to a face. Actions should
@@ -14,6 +15,7 @@ class Puppet::Interface::Action
   # @api private
   def initialize(face, name)
     raise "#{name.inspect} is an invalid action name" unless name.to_s =~ /^[a-z]\w*$/
+
     @face    = face
     @name    = name.to_sym
 
@@ -21,11 +23,11 @@ class Puppet::Interface::Action
     # is a favour to our end users; if you happen to get that in a core face
     # report it as a bug, please. --daniel 2011-04-26
     @authors = []
-    @license  = 'All Rights Reserved'
+    @license = 'All Rights Reserved'
 
     # @options collects the added options in the order they're declared.
     # @options_hash collects the options keyed by alias for quick lookups.
-    @options        = []
+    @options = []
     @display_global_options = []
     @options_hash   = {}
     @when_rendering = {}
@@ -57,6 +59,7 @@ class Puppet::Interface::Action
   # @return [Boolean]
   # @api private
   attr_accessor :default
+
   def default?
     !!@default
   end
@@ -72,7 +75,6 @@ class Puppet::Interface::Action
   ########################################################################
   # Support for rendering formats and all.
 
-
   # @api private
   def when_rendering(type)
     unless type.is_a? Symbol
@@ -93,10 +95,10 @@ class Puppet::Interface::Action
   def set_rendering_method_for(type, proc)
     unless proc.is_a? Proc
       msg = if proc.nil?
-              #TRANSLATORS 'set_rendering_method_for' and 'Proc' should not be translated
+              # TRANSLATORS 'set_rendering_method_for' and 'Proc' should not be translated
               _("The second argument to set_rendering_method_for must be a Proc")
             else
-              #TRANSLATORS 'set_rendering_method_for' and 'Proc' should not be translated
+              # TRANSLATORS 'set_rendering_method_for' and 'Proc' should not be translated
               _("The second argument to set_rendering_method_for must be a Proc, not %{class_name}") %
                   { class_name: proc.class.name }
             end
@@ -105,13 +107,13 @@ class Puppet::Interface::Action
 
     if proc.arity != 1 and proc.arity != (@positional_arg_count + 1)
       msg = if proc.arity < 0 then
-              #TRANSLATORS 'when_rendering', 'when_invoked' are method names and should not be translated
+              # TRANSLATORS 'when_rendering', 'when_invoked' are method names and should not be translated
               _("The when_rendering method for the %{face} face %{name} action takes either just one argument,"\
                   " the result of when_invoked, or the result plus the %{arg_count} arguments passed to the"\
                   " when_invoked block, not a variable number") %
                   { face: @face.name, name: name, arg_count: @positional_arg_count }
             else
-              #TRANSLATORS 'when_rendering', 'when_invoked' are method names and should not be translated
+              # TRANSLATORS 'when_rendering', 'when_invoked' are method names and should not be translated
               _("The when_rendering method for the %{face} face %{name} action takes either just one argument,"\
                   " the result of when_invoked, or the result plus the %{arg_count} arguments passed to the"\
                   " when_invoked block, not %{string}") %
@@ -125,6 +127,7 @@ class Puppet::Interface::Action
     if @when_rendering.has_key? type then
       raise ArgumentError, _("You can't define a rendering method for %{type} twice") % { type: type }
     end
+
     # Now, the ugly bit.  We add the method to our interface object, and
     # retrieve it, to rotate through the dance of getting a suitable method
     # object out of the whole process. --daniel 2011-04-18
@@ -139,10 +142,10 @@ class Puppet::Interface::Action
   end
   private :__render_method_name_for
 
-
   # @api private
   # @return [Symbol]
   attr_reader :render_as
+
   def render_as=(value)
     @render_as = value.to_sym
   end
@@ -194,7 +197,6 @@ class Puppet::Interface::Action
   #   @face.send(name, *args, &block)
   # end
 
-
   # We need to build an instance method as a wrapper, using normal code, to be
   # able to expose argument defaulting between the caller and definer in the
   # Ruby API.  An extra method is, sadly, required for Ruby 1.8 to work since
@@ -214,7 +216,6 @@ class Puppet::Interface::Action
   # idea how motivated we were to make this cleaner.  Sorry.
   # --daniel 2011-03-31
 
-
   # The arity of the action
   # @return [Integer]
   attr_reader :positional_arg_count
@@ -222,8 +223,8 @@ class Puppet::Interface::Action
   # The block that is executed when the action is invoked
   # @return [block]
   attr_reader :when_invoked
-  def when_invoked=(block)
 
+  def when_invoked=(block)
     internal_name = "#{@name} implementation, required on Ruby 1.8".to_sym
 
     arity = @positional_arg_count = block.arity
@@ -232,7 +233,7 @@ class Puppet::Interface::Action
       # but will on 1.9.2, which treats it as "no arguments".  Which bites,
       # because this just begs for us to wind up in the horrible situation
       # where a 1.8 vs 1.9 error bites our end users. --daniel 2011-04-19
-      #TRANSLATORS 'when_invoked' should not be translated
+      # TRANSLATORS 'when_invoked' should not be translated
       raise ArgumentError, _("when_invoked requires at least one argument (options) for action %{name}") % { name: @name }
     elsif arity > 0 then
       range = Range.new(1, arity - 1)
@@ -252,25 +253,27 @@ 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(", ")})
-  #{optn}
-  args    = #{args}
-  action  = get_action(#{name.inspect})
-  args   << action.validate_and_clean(args.pop)
-  __invoke_decorations(:before, action, args, args.last)
-  rval = self.__send__(#{internal_name.inspect}, *args)
-  __invoke_decorations(:after, action, args, args.last)
-  return rval
-end
-WRAPPER
+    wrapper = <<~WRAPPER
+      def #{@name}(#{decl.join(", ")})
+        #{optn}
+        args    = #{args}
+        action  = get_action(#{name.inspect})
+        args   << action.validate_and_clean(args.pop)
+        __invoke_decorations(:before, action, args, args.last)
+        rval = self.__send__(#{internal_name.inspect}, *args)
+        __invoke_decorations(:after, action, args, args.last)
+        return rval
+      end
+    WRAPPER
 
+    # It should be possible to rewrite this code to use `define_method`
+    # instead of `class/instance_eval` since Ruby 1.8 is long dead.
     if @face.is_a?(Class)
-      @face.class_eval do eval wrapper, nil, file, line end
+      @face.class_eval do eval wrapper, nil, file, line end # rubocop:disable Security/Eval
       @face.send(:define_method, internal_name, &block)
       @when_invoked = @face.instance_method(name)
     else
-      @face.instance_eval do eval wrapper, nil, file, line end
+      @face.instance_eval do eval wrapper, nil, file, line end # rubocop:disable Security/Eval
       @face.meta_def(internal_name, &block)
       @when_invoked = @face.method(name).unbind
     end
@@ -312,9 +315,10 @@ WRAPPER
     @display_global_options ||= []
     [args].flatten.each do |refopt|
       unless Puppet.settings.include? refopt
-        #TRANSLATORS 'Puppet.settings' should not be translated
+        # TRANSLATORS 'Puppet.settings' should not be translated
         raise ArgumentError, _("Global option %{option} does not exist in Puppet.settings") % { option: refopt }
       end
+
       @display_global_options << refopt
     end
     @display_global_options.uniq!
@@ -397,6 +401,7 @@ WRAPPER
   # Support code for action decoration; see puppet/interface.rb for the gory
   # details of why this is hidden away behind private. --daniel 2011-04-15
   private
+
   # @return [void]
   # @api private
   def __add_method(name, proc)

data/lib/puppet/interface/action_builder.rb

@@ -1,10 +1,13 @@
 # frozen_string_literal: true
+
 # This class is used to build {Puppet::Interface::Action actions}.
 # When an action is defined with
 # {Puppet::Interface::ActionManager#action} the block is evaluated
 # within the context of a new instance of this class.
 # @api public
 class Puppet::Interface::ActionBuilder
+  extend Forwardable
+
   # The action under construction
   # @return [Puppet::Interface::Action]
   # @api private
@@ -15,6 +18,7 @@ class Puppet::Interface::ActionBuilder
   # @api private
   def self.build(face, name, &block)
     raise "Action #{name.inspect} must specify a block" unless block
+
     new(face, name, &block).action
   end
 
@@ -57,14 +61,15 @@ class Puppet::Interface::ActionBuilder
   # @todo this needs more
   # @dsl Faces
   def when_rendering(type = nil, &block)
-    if type.nil? then           # the default error message sucks --daniel 2011-04-18
-      #TRANSLATORS 'when_rendering' is a method name and should not be translated
+    if type.nil? then # the default error message sucks --daniel 2011-04-18
+      # TRANSLATORS 'when_rendering' is a method name and should not be translated
       raise ArgumentError, _('You must give a rendering format to when_rendering')
     end
     if block.nil? then
-      #TRANSLATORS 'when_rendering' is a method name and should not be translated
+      # TRANSLATORS 'when_rendering' is a method name and should not be translated
       raise ArgumentError, _('You must give a block to when_rendering')
     end
+
     @action.set_rendering_method_for(type, block)
   end
 
@@ -123,7 +128,7 @@ class Puppet::Interface::ActionBuilder
   # @api private
   def render_as(value = nil)
     if value.nil?
-      #TRANSLATORS 'render_as' is a method name and should not be translated
+      # TRANSLATORS 'render_as' is a method name and should not be translated
       raise ArgumentError, _("You must give a rendering format to render_as")
     end
 
@@ -139,28 +144,23 @@ class Puppet::Interface::ActionBuilder
   # Metaprogram the simple DSL from the target class.
   Puppet::Interface::Action.instance_methods.grep(/=$/).each do |setter|
     next if setter =~ /^=/
+
     property = setter.to_s.chomp('=')
 
     unless method_defined? property
-      # Using eval because the argument handling semantics are less awful than
-      # when we use the define_method/block version.  The later warns on older
-      # Ruby versions if you pass the wrong number of arguments, but carries
-      # on, which is totally not what we want. --daniel 2011-04-18
-      eval <<-METHOD
-        def #{property}(value)
-          @action.#{property} = value
-        end
-      METHOD
+      # ActionBuilder#<property> delegates to Action#<setter>
+      def_delegator :@action, setter, property
     end
   end
 
   private
+
   def initialize(face, name, &block)
     @face   = face
     @action = Puppet::Interface::Action.new(face, name)
     instance_eval(&block)
     unless @action.when_invoked
-      #TRANSLATORS 'when_invoked' is a method name and should not be translated and 'block' is a Ruby code block
+      # TRANSLATORS 'when_invoked' is a method name and should not be translated and 'block' is a Ruby code block
       raise ArgumentError, _("actions need to know what to do when_invoked; please add the block")
     end
   end

data/lib/puppet/interface/action_manager.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # This class is not actually public API, but the method
 # {Puppet::Interface::ActionManager#action action} is public when used
 # as part of the Faces DSL (i.e. from within a
@@ -81,6 +82,7 @@ module Puppet::Interface::ActionManager
     if default.length > 1
       raise "The actions #{default.map(&:name).join(", ")} cannot all be default"
     end
+
     default.first
   end
 

data/lib/puppet/interface/documentation.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Puppet::Interface
   # @api private
   module DocGen
@@ -57,7 +58,7 @@ class Puppet::Interface
     # @dsl Faces
     attr_doc :summary do |value|
       value =~ /\n/ and
-        #TRANSLATORS 'Face' refers to a programming API in Puppet, 'summary' and 'description' are specifc attribute names and should not be translated
+        # TRANSLATORS 'Face' refers to a programming API in Puppet, 'summary' and 'description' are specifc attribute names and should not be translated
         raise ArgumentError, _("Face summary should be a single line; put the long text in 'description' instead.")
       value
     end
@@ -110,7 +111,6 @@ class Puppet::Interface
         end
       end
     end
-
   end
 
   # This module can be mixed in to provide a full set of documentation
@@ -179,9 +179,10 @@ class Puppet::Interface
       self.short_description = value unless value.nil?
       if @short_description.nil? then
         return nil if @description.nil?
+
         lines = @description.split("\n")
         first_paragraph_break = lines.index('') || 5
-        grab  = [5, first_paragraph_break].min
+        grab = [5, first_paragraph_break].min
         @short_description = lines[0, grab].join("\n")
         @short_description += ' [...]' if (grab < lines.length and first_paragraph_break >= 5)
       end
@@ -202,14 +203,15 @@ class Puppet::Interface
     def author(value = nil)
       unless value.nil? then
         unless value.is_a? String
-          #TRANSLATORS 'author' is an attribute name and should not be translated
+          # TRANSLATORS 'author' is an attribute name and should not be translated
           raise ArgumentError, _('author must be a string; use multiple statements for multiple authors')
         end
 
         if value =~ /\n/ then
-          #TRANSLATORS 'author' is an attribute name and should not be translated
+          # TRANSLATORS 'author' is an attribute name and should not be translated
           raise ArgumentError, _('author should be a single line; use multiple statements for multiple authors')
         end
+
         @authors.push(Puppet::Interface::DocGen.strip_whitespace(value))
       end
       @authors.empty? ? nil : @authors.join("\n")
@@ -227,9 +229,10 @@ class Puppet::Interface
       # I think it's a bug that this ends up being the exposed
       # version of `author` on ActionBuilder
       if Array(value).any? {|x| x =~ /\n/ } then
-        #TRANSLATORS 'author' is an attribute name and should not be translated
+        # TRANSLATORS 'author' is an attribute name and should not be translated
         raise ArgumentError, _('author should be a single line; use multiple statements')
       end
+
       @authors = Array(value).map{|x| Puppet::Interface::DocGen.strip_whitespace(x) }
     end
     alias :authors= :author=
@@ -248,9 +251,10 @@ class Puppet::Interface
     # @dsl Faces
     def copyright(owner = nil, years = nil)
       if years.nil? and not owner.nil? then
-        #TRANSLATORS 'copyright' is an attribute name and should not be translated
+        # TRANSLATORS 'copyright' is an attribute name and should not be translated
         raise ArgumentError, _('copyright takes the owners names, then the years covered')
       end
+
       self.copyright_owner = owner unless owner.nil?
       self.copyright_years = years unless years.nil?
 
@@ -267,15 +271,15 @@ class Puppet::Interface
     # @return [String] Comma-separated list of copyright owners
     # @api private
     attr_reader :copyright_owner
+
     def copyright_owner=(value)
       case value
       when String then @copyright_owner = value
       when Array  then @copyright_owner = value.join(", ")
       else
-        #TRANSLATORS 'copyright' is an attribute name and should not be translated
+        # TRANSLATORS 'copyright' is an attribute name and should not be translated
         raise ArgumentError, _("copyright owner must be a string or an array of strings")
       end
-      @copyright_owner
     end
 
     # Sets the copyright year
@@ -284,10 +288,11 @@ class Puppet::Interface
     # @return [String]
     # @api private
     attr_reader :copyright_years
+
     def copyright_years=(value)
       years = munge_copyright_year value
-      years = (years.is_a?(Array) ? years : [years]).
-        sort_by do |x| x.is_a?(Range) ? x.first : x end
+      years = (years.is_a?(Array) ? years : [years])
+        .sort_by do |x| x.is_a?(Range) ? x.first : x end
 
       @copyright_years = years.map do |year|
         if year.is_a? Range then
@@ -309,7 +314,7 @@ class Puppet::Interface
           fault = "after #{future}"
         end
         if fault then
-          #TRANSLATORS 'copyright' is an attribute name and should not be translated
+          # TRANSLATORS 'copyright' is an attribute name and should not be translated
           raise ArgumentError, _("copyright with a year %{value} is very strange; did you accidentally add or subtract two years?") %
               { value: fault }
         end
@@ -325,12 +330,13 @@ class Puppet::Interface
             found = part.split(/-/)
             if found
               unless found.length == 2 and found.all? {|x| x.strip =~ /^\d+$/ }
-                #TRANSLATORS 'copyright' is an attribute name and should not be translated
+                # TRANSLATORS 'copyright' is an attribute name and should not be translated
                 raise ArgumentError, _("%{value} is not a good copyright year or range") % { value: part.inspect }
               end
+
               Range.new(found[0].to_i, found[1].to_i)
             else
-              #TRANSLATORS 'copyright' is an attribute name and should not be translated
+              # TRANSLATORS 'copyright' is an attribute name and should not be translated
               raise ArgumentError, _("%{value} is not a good copyright year or range") % { value: part.inspect }
             end
           end
@@ -349,7 +355,7 @@ class Puppet::Interface
         result
 
       else
-        #TRANSLATORS 'copyright' is an attribute name and should not be translated
+        # TRANSLATORS 'copyright' is an attribute name and should not be translated
         raise ArgumentError, _("%{value} is not a good copyright year, set, or range") % { value: input.inspect }
       end
     end

data/lib/puppet/interface/face_collection.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Puppet::Interface::FaceCollection
   @faces = Hash.new { |hash, key| hash[key] = {} }
 
@@ -27,6 +28,7 @@ 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
@@ -110,13 +112,14 @@ module Puppet::Interface::FaceCollection
     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}$}
+
     # ...guess we didn't find the file; return a much better problem.
     nil
   rescue SyntaxError => e
     raise unless e.message =~ %r{#{path}\.rb:\d+: }
+
     Puppet.err _("Failed to load face %{name}:\n%{detail}") % { name: name, detail: e }
     # ...but we just carry on after complaining.
     nil
@@ -128,7 +131,7 @@ 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 }
     end

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,6 +38,7 @@ 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}") %
@@ -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,8 +127,9 @@ 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 }
     end
@@ -134,17 +141,20 @@ 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 }
     end
@@ -153,9 +163,10 @@ class Puppet::Interface::Option
   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 }
     end