puppet 8.5.1 → 8.6.0

data/lib/puppet/indirector/indirection.rb

@@ -26,7 +26,7 @@ class Puppet::Indirector::Indirection
   # Return a list of all known indirections.  Used to generate the
   # reference.
   def self.instances
-    @@indirections.collect { |i| i.name }
+    @@indirections.collect(&:name)
   end
 
   # Find an indirected model by name.  This is provided so that Terminus classes
@@ -121,10 +121,10 @@ class Puppet::Indirector::Indirection
   def set_global_setting(setting, value)
     case setting
     when :cache_class
-      validate_terminus_class(value) if !value.nil?
+      validate_terminus_class(value) unless value.nil?
       @cache_class = Puppet::ThreadLocal.new(value)
     when :terminus_class
-      validate_terminus_class(value) if !value.nil?
+      validate_terminus_class(value) unless value.nil?
       @terminus_class = Puppet::ThreadLocal.new(value)
     when :terminus_setting
       @terminus_setting = Puppet::ThreadLocal.new(value)
@@ -135,13 +135,13 @@ class Puppet::Indirector::Indirection
 
   # Set up our request object.
   def request(*args)
-    Puppet::Indirector::Request.new(self.name, *args)
+    Puppet::Indirector::Request.new(name, *args)
   end
 
   # Return the singleton terminus for this indirection.
   def terminus(terminus_name = nil)
     # Get the name of the terminus.
-    raise Puppet::DevError, _("No terminus specified for %{name}; cannot redirect") % { name: self.name } unless terminus_name ||= terminus_class
+    raise Puppet::DevError, _("No terminus specified for %{name}; cannot redirect") % { name: name } unless terminus_name ||= terminus_class
 
     termini[terminus_name] ||= make_terminus(terminus_name)
   end
@@ -158,11 +158,11 @@ class Puppet::Indirector::Indirection
   # Determine the terminus class.
   def terminus_class
     unless @terminus_class.value
-      setting = self.terminus_setting
+      setting = terminus_setting
       if setting
         self.terminus_class = Puppet.settings[setting]
       else
-        raise Puppet::DevError, _("No terminus class nor terminus setting was provided for indirection %{name}") % { name: self.name }
+        raise Puppet::DevError, _("No terminus class nor terminus setting was provided for indirection %{name}") % { name: name }
       end
     end
     @terminus_class.value
@@ -184,9 +184,9 @@ class Puppet::Indirector::Indirection
       raise ArgumentError, _("Invalid terminus name %{terminus_class}") % { terminus_class: terminus_class.inspect }
     end
 
-    unless Puppet::Indirector::Terminus.terminus_class(self.name, terminus_class)
+    unless Puppet::Indirector::Terminus.terminus_class(name, terminus_class)
       raise ArgumentError, _("Could not find terminus %{terminus_class} for indirection %{name}") %
-                           { terminus_class: terminus_class, name: self.name }
+                           { terminus_class: terminus_class, name: name }
     end
   end
 
@@ -201,7 +201,7 @@ class Puppet::Indirector::Indirection
     instance = cache.find(request(:find, key, nil, options))
     return nil unless instance
 
-    Puppet.info _("Expiring the %{cache} cache of %{instance}") % { cache: self.name, instance: instance.name }
+    Puppet.info _("Expiring the %{cache} cache of %{instance}") % { cache: name, instance: instance.name }
 
     # Set an expiration date in the past
     instance.expiration = Time.now - 60
@@ -220,7 +220,7 @@ class Puppet::Indirector::Indirection
     terminus = prepare(request)
 
     result = find_in_cache(request)
-    if not result.nil?
+    if !result.nil?
       result
     elsif request.ignore_terminus?
       nil
@@ -228,10 +228,10 @@ class Puppet::Indirector::Indirection
       # Otherwise, return the result from the terminus, caching if
       # appropriate.
       result = terminus.find(request)
-      if not result.nil?
-        result.expiration ||= self.expiration if result.respond_to?(:expiration)
+      unless result.nil?
+        result.expiration ||= expiration if result.respond_to?(:expiration)
         if cache? && !request.ignore_cache_save?
-          Puppet.info _("Caching %{indirection} for %{request}") % { indirection: self.name, request: request.key }
+          Puppet.info _("Caching %{indirection} for %{request}") % { indirection: name, request: request.key }
           begin
             cache.save request(:save, key, result, options)
           rescue => detail
@@ -242,13 +242,11 @@ class Puppet::Indirector::Indirection
 
         filtered = result
         if terminus.respond_to?(:filter)
-          Puppet::Util::Profiler.profile(_("Filtered result for %{indirection} %{request}") % { indirection: self.name, request: request.key }, [:indirector, :filter, self.name, request.key]) do
-            begin
-              filtered = terminus.filter(result)
-            rescue Puppet::Error => detail
-              Puppet.log_exception(detail)
-              raise detail
-            end
+          Puppet::Util::Profiler.profile(_("Filtered result for %{indirection} %{request}") % { indirection: name, request: request.key }, [:indirector, :filter, name, request.key]) do
+            filtered = terminus.filter(result)
+          rescue Puppet::Error => detail
+            Puppet.log_exception(detail)
+            raise detail
           end
         end
         filtered
@@ -273,14 +271,14 @@ class Puppet::Indirector::Indirection
     return nil unless cached
 
     if cached.expired?
-      Puppet.info _("Not using expired %{indirection} for %{request} from cache; expired at %{expiration}") % { indirection: self.name, request: request.key, expiration: cached.expiration }
+      Puppet.info _("Not using expired %{indirection} for %{request} from cache; expired at %{expiration}") % { indirection: name, request: request.key, expiration: cached.expiration }
       return nil
     end
 
-    Puppet.debug { "Using cached #{self.name} for #{request.key}" }
+    Puppet.debug { "Using cached #{name} for #{request.key}" }
     cached
   rescue => detail
-    Puppet.log_exception(detail, _("Cached %{indirection} for %{request} failed: %{detail}") % { indirection: self.name, request: request.key, detail: detail })
+    Puppet.log_exception(detail, _("Cached %{indirection} for %{request} failed: %{detail}") % { indirection: name, request: request.key, detail: detail })
     nil
   end
 
@@ -311,9 +309,9 @@ class Puppet::Indirector::Indirection
       result.each do |instance|
         next unless instance.respond_to? :expiration
 
-        instance.expiration ||= self.expiration
+        instance.expiration ||= expiration
       end
-      return result
+      result
     end
   end
 
@@ -323,7 +321,7 @@ class Puppet::Indirector::Indirection
     request = request(:save, key, instance, options)
     terminus = prepare(request)
 
-    result = terminus.save(request) if !request.ignore_terminus?
+    result = terminus.save(request) unless request.ignore_terminus?
 
     # If caching is enabled, save our document there
     cache.save(request) if cache? && !request.ignore_cache_save?
@@ -373,9 +371,9 @@ class Puppet::Indirector::Indirection
   # Create a new terminus instance.
   def make_terminus(terminus_class)
     # Load our terminus class.
-    klass = Puppet::Indirector::Terminus.terminus_class(self.name, terminus_class)
+    klass = Puppet::Indirector::Terminus.terminus_class(name, terminus_class)
     unless klass
-      raise ArgumentError, _("Could not find terminus %{terminus_class} for indirection %{indirection}") % { terminus_class: terminus_class, indirection: self.name }
+      raise ArgumentError, _("Could not find terminus %{terminus_class} for indirection %{indirection}") % { terminus_class: terminus_class, indirection: name }
     end
 
     klass.new

data/lib/puppet/indirector/json.rb

@@ -16,16 +16,16 @@ class Puppet::Indirector::JSON < Puppet::Indirector::Terminus
     filename = path(request.key)
     FileUtils.mkdir_p(File.dirname(filename))
 
-    Puppet::FileSystem.replace_file(filename, 0660) { |f| f.print to_json(request.instance).force_encoding(Encoding::BINARY) }
+    Puppet::FileSystem.replace_file(filename, 0o660) { |f| f.print to_json(request.instance).force_encoding(Encoding::BINARY) }
   rescue TypeError => detail
-    Puppet.log_exception(detail, _("Could not save %{json} %{request}: %{detail}") % { json: self.name, request: request.key, detail: detail })
+    Puppet.log_exception(detail, _("Could not save %{json} %{request}: %{detail}") % { json: name, request: request.key, detail: detail })
   end
 
   def destroy(request)
     Puppet::FileSystem.unlink(path(request.key))
   rescue => detail
     unless detail.is_a? Errno::ENOENT
-      raise Puppet::Error, _("Could not destroy %{json} %{request}: %{detail}") % { json: self.name, request: request.key, detail: detail }, detail.backtrace
+      raise Puppet::Error, _("Could not destroy %{json} %{request}: %{detail}") % { json: name, request: request.key, detail: detail }, detail.backtrace
     end
 
     1 # emulate success...
@@ -66,7 +66,7 @@ class Puppet::Indirector::JSON < Puppet::Indirector::Terminus
     end
 
     begin
-      return from_json(json)
+      from_json(json)
     rescue => detail
       raise Puppet::Error, _("Could not parse JSON data for %{name} %{key}: %{detail}") % { name: indirection.name, key: key, detail: detail }, detail.backtrace
     end

data/lib/puppet/indirector/memory.rb

@@ -13,7 +13,7 @@ class Puppet::Indirector::Memory < Puppet::Indirector::Terminus
   end
 
   def destroy(request)
-    raise ArgumentError.new(_("Could not find %{request} to destroy") % { request: request.key }) unless @instances.include?(request.key)
+    raise ArgumentError, _("Could not find %{request} to destroy") % { request: request.key } unless @instances.include?(request.key)
 
     @instances.delete(request.key)
   end
@@ -28,7 +28,7 @@ class Puppet::Indirector::Memory < Puppet::Indirector::Terminus
   end
 
   def head(request)
-    not find(request).nil?
+    !find(request).nil?
   end
 
   def save(request)

data/lib/puppet/indirector/msgpack.rb

@@ -9,7 +9,7 @@ require_relative '../../puppet/util'
 # implementations, since it is ~ 30 times faster
 class Puppet::Indirector::Msgpack < Puppet::Indirector::Terminus
   def initialize(*args)
-    if !Puppet.features.msgpack?
+    unless Puppet.features.msgpack?
       raise _("MessagePack terminus not supported without msgpack library")
     end
 
@@ -24,16 +24,16 @@ class Puppet::Indirector::Msgpack < Puppet::Indirector::Terminus
     filename = path(request.key)
     FileUtils.mkdir_p(File.dirname(filename))
 
-    Puppet::FileSystem.replace_file(filename, 0660) { |f| f.print to_msgpack(request.instance) }
+    Puppet::FileSystem.replace_file(filename, 0o660) { |f| f.print to_msgpack(request.instance) }
   rescue TypeError => detail
-    Puppet.log_exception(detail, _("Could not save %{name} %{request}: %{detail}") % { name: self.name, request: request.key, detail: detail })
+    Puppet.log_exception(detail, _("Could not save %{name} %{request}: %{detail}") % { name: name, request: request.key, detail: detail })
   end
 
   def destroy(request)
     Puppet::FileSystem.unlink(path(request.key))
   rescue => detail
     unless detail.is_a? Errno::ENOENT
-      raise Puppet::Error, _("Could not destroy %{name} %{request}: %{detail}") % { name: self.name, request: request.key, detail: detail }, detail.backtrace
+      raise Puppet::Error, _("Could not destroy %{name} %{request}: %{detail}") % { name: name, request: request.key, detail: detail }, detail.backtrace
     end
 
     1 # emulate success...
@@ -71,7 +71,7 @@ class Puppet::Indirector::Msgpack < Puppet::Indirector::Terminus
     end
 
     begin
-      return from_msgpack(msgpack)
+      from_msgpack(msgpack)
     rescue => detail
       raise Puppet::Error, _("Could not parse MessagePack data for %{indirection} %{key}: %{detail}") % { indirection: indirection.name, key: key, detail: detail }, detail.backtrace
     end

data/lib/puppet/indirector/node/store_configs.rb

@@ -4,5 +4,5 @@ require_relative '../../../puppet/indirector/store_configs'
 require_relative '../../../puppet/node'
 
 class Puppet::Node::StoreConfigs < Puppet::Indirector::StoreConfigs
-  desc %q{Part of the "storeconfigs" feature. Should not be directly set by end users.}
+  desc 'Part of the "storeconfigs" feature. Should not be directly set by end users.'
 end

data/lib/puppet/indirector/none.rb

@@ -5,6 +5,6 @@ require_relative '../../puppet/indirector/terminus'
 # A none terminus type, meant to always return nil
 class Puppet::Indirector::None < Puppet::Indirector::Terminus
   def find(request)
-    return nil
+    nil
   end
 end

data/lib/puppet/indirector/report/json.rb

@@ -30,7 +30,7 @@ class Puppet::Transaction::Report::Json < Puppet::Indirector::JSON
         fh.print JSON.dump(request.instance)
       end
     rescue TypeError => detail
-      Puppet.err _("Could not save %{indirection} %{request}: %{detail}") % { indirection: self.name, request: request.key, detail: detail }
+      Puppet.err _("Could not save %{indirection} %{request}: %{detail}") % { indirection: name, request: request.key, detail: detail }
     end
   end
 end

data/lib/puppet/indirector/report/yaml.rb

@@ -30,7 +30,7 @@ class Puppet::Transaction::Report::Yaml < Puppet::Indirector::Yaml
         fh.print YAML.dump(request.instance)
       end
     rescue TypeError => detail
-      Puppet.err _("Could not save %{indirection} %{request}: %{detail}") % { indirection: self.name, request: request.key, detail: detail }
+      Puppet.err _("Could not save %{indirection} %{request}: %{detail}") % { indirection: name, request: request.key, detail: detail }
     end
   end
 end

data/lib/puppet/indirector/request.rb

@@ -80,7 +80,7 @@ class Puppet::Indirector::Request
       # info out in the REST class, but it seemed bad design for the REST
       # class to rewrite the key.
 
-      if key.to_s =~ /^\w+:\// and not Puppet::Util.absolute_path?(key.to_s) # it's a URI
+      if key.to_s =~ %r{^\w+:/} and !Puppet::Util.absolute_path?(key.to_s) # it's a URI
         set_uri_key(key)
       else
         @key = key
@@ -140,11 +140,11 @@ class Puppet::Indirector::Request
   end
 
   def description
-    return(uri ? uri : "/#{indirection_name}/#{key}")
+    uri || "/#{indirection_name}/#{key}"
   end
 
   def remote?
-    self.node or self.ip
+    node or ip
   end
 
   private
@@ -192,6 +192,6 @@ class Puppet::Indirector::Request
       @protocol = uri.scheme
     end
 
-    @key = Puppet::Util.uri_unescape(uri.path.sub(/^\//, ''))
+    @key = Puppet::Util.uri_unescape(uri.path.sub(%r{^/}, ''))
   end
 end

data/lib/puppet/indirector/resource/ral.rb

@@ -14,7 +14,7 @@ class Puppet::Resource::Ral < Puppet::Indirector::Code
   def find(request)
     # find by name
     res   = type(request).instances.find { |o| o.name == resource_name(request) }
-    res ||= type(request).new(:name => resource_name(request), :audit => type(request).properties.collect { |s| s.name })
+    res ||= type(request).new(:name => resource_name(request), :audit => type(request).properties.collect(&:name))
 
     res.to_resource
   end
@@ -23,9 +23,7 @@ class Puppet::Resource::Ral < Puppet::Indirector::Code
     conditions = request.options.dup
     conditions[:name] = resource_name(request) if resource_name(request)
 
-    type(request).instances.map do |res|
-      res.to_resource
-    end.find_all do |res|
+    type(request).instances.map(&:to_resource).find_all do |res|
       conditions.all? do |property, value|
         # even though `res` is an instance of Puppet::Resource, calling
         # `res[:name]` on it returns nil, and for some reason it is necessary

data/lib/puppet/indirector/resource/store_configs.rb

@@ -6,7 +6,7 @@ require_relative '../../../puppet/indirector/resource/validator'
 class Puppet::Resource::StoreConfigs < Puppet::Indirector::StoreConfigs
   include Puppet::Resource::Validator
 
-  desc %q{Part of the "storeconfigs" feature. Should not be directly set by end users.}
+  desc 'Part of the "storeconfigs" feature. Should not be directly set by end users.'
 
   def allow_remote_requests?
     false

data/lib/puppet/indirector/terminus.rb

@@ -24,7 +24,7 @@ class Puppet::Indirector::Terminus
 
     # Convert a constant to a short name.
     def const2name(const)
-      const.sub(/^[A-Z]/) { |i| i.downcase }.gsub(/[A-Z]/) { |i| "_#{i.downcase}" }.intern
+      const.sub(/^[A-Z]/, &:downcase).gsub(/[A-Z]/) { |i| "_#{i.downcase}" }.intern
     end
 
     # Look up the indirection if we were only provided a name.
@@ -57,7 +57,7 @@ class Puppet::Indirector::Terminus
       names = longname.split("::")
 
       # Convert everything to a lower-case symbol, converting camelcase to underscore word separation.
-      name = names.pop.sub(/^[A-Z]/) { |i| i.downcase }.gsub(/[A-Z]/) { |i| "_#{i.downcase}" }.intern
+      name = names.pop.sub(/^[A-Z]/, &:downcase).gsub(/[A-Z]/) { |i| "_#{i.downcase}" }.intern
 
       subclass.name = name
 
@@ -75,7 +75,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}" }
+      processed_name = names.pop.sub(/^[A-Z]/, &:downcase).gsub(/[A-Z]/) { |i| "_#{i.downcase}" }
 
       if processed_name.empty?
         raise Puppet::DevError, _("Could not discern indirection model from class constant")
@@ -101,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| ::Regexp.last_match(1).upcase }
     end
 
     # Register a class, probably autoloaded.

data/lib/puppet/indirector/yaml.rb

@@ -11,7 +11,7 @@ class Puppet::Indirector::Yaml < Puppet::Indirector::Terminus
     return nil unless Puppet::FileSystem.exist?(file)
 
     begin
-      return load_file(file)
+      load_file(file)
     rescue Puppet::Util::Yaml::YamlLoadError => detail
       raise Puppet::Error, _("Could not parse YAML data for %{indirection} %{request}: %{detail}") % { indirection: indirection.name, request: request.key, detail: detail }, detail.backtrace
     end
@@ -19,7 +19,7 @@ class Puppet::Indirector::Yaml < Puppet::Indirector::Terminus
 
   # Convert our object to YAML and store it to the disk.
   def save(request)
-    raise ArgumentError.new(_("You can only save objects that respond to :name")) unless request.instance.respond_to?(:name)
+    raise ArgumentError, _("You can only save objects that respond to :name") unless request.instance.respond_to?(:name)
 
     file = path(request.key)
 
@@ -31,7 +31,7 @@ class Puppet::Indirector::Yaml < Puppet::Indirector::Terminus
     begin
       Puppet::Util::Yaml.dump(request.instance, file)
     rescue TypeError => detail
-      Puppet.err _("Could not save %{indirection} %{request}: %{detail}") % { indirection: self.name, request: request.key, detail: detail }
+      Puppet.err _("Could not save %{indirection} %{request}: %{detail}") % { indirection: name, request: request.key, detail: detail }
     end
   end
 

data/lib/puppet/info_service/class_information_service.rb

@@ -74,7 +74,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[:type] = typeexpr_to_string(p.name, p.type_expr)
     structure
   end
 
@@ -88,13 +88,10 @@ class Puppet::InfoService::ClassInformationService
     structure
   end
 
-  def typeexpr_to_string(type_expr)
-    begin
-      type_parser.interpret_any(type_expr, nil).to_s
-    rescue Puppet::ParseError
-      # type is to complex - contains expressions that are not literal
-      nil
-    end
+  def typeexpr_to_string(name, type_expr)
+    type_parser.interpret_any(type_expr, nil).to_s
+  rescue Puppet::ParseError => e
+    raise Puppet::Error, "The parameter '$#{name}' is invalid: #{e.message}", e.backtrace
   end
 
   def value_as_literal(value_expr)

data/lib/puppet/info_service/task_information_service.rb

@@ -10,13 +10,12 @@ class Puppet::InfoService::TaskInformationService
     env.modules.map do |mod|
       mod.tasks.map do |task|
         # If any task is malformed continue to list other tasks in module
-        begin
-          task.validate
-          { :module => { :name => task.module.name }, :name => task.name, :metadata => task.metadata }
-        rescue Puppet::Module::Task::Error => err
-          Puppet.log_exception(err)
-          nil
-        end
+
+        task.validate
+        { :module => { :name => task.module.name }, :name => task.name, :metadata => task.metadata }
+      rescue Puppet::Module::Task::Error => err
+        Puppet.log_exception(err)
+        nil
       end
     end.flatten.compact
   end

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