puppet 6.0.5-x64-mingw32 → 8.8.1-x64-mingw32

data/lib/puppet/provider.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # A Provider is an implementation of the actions that manage resources (of some type) on a system.
 # This class is the base class for all implementation of a Puppet Provider.
 #
@@ -40,8 +42,8 @@ class Puppet::Provider
   include Puppet::Util::Warnings
   extend Puppet::Util::Warnings
 
-  require 'puppet/confiner'
-  require 'puppet/provider/command'
+  require_relative '../puppet/confiner'
+  require_relative 'provider/command'
 
   extend Puppet::Confiner
 
@@ -117,19 +119,6 @@ class Puppet::Provider
     Puppet::Util::Execution.execpipe(*args, &block)
   end
 
-  # Convenience methods - see class method with the same name.
-  # @return (see self.execfail)
-  # @deprecated
-  def execfail(*args)
-    Puppet::Util::Execution.execfail(*args)
-  end
-
-  # (see Puppet::Util::Execution.execfail)
-  # @deprecated
-  def self.execfail(*args)
-    Puppet::Util::Execution.execfail(*args)
-  end
-
   # Returns the absolute path to the executable for the command referenced by the given name.
   # @raise [Puppet::DevError] if the name does not reference an existing command.
   # @return [String] the absolute path to the found executable for the command
@@ -138,11 +127,10 @@ class Puppet::Provider
   def self.command(name)
     name = name.intern
 
-    if defined?(@commands) and command = @commands[name]
-      # nothing
-    elsif superclass.respond_to? :command and command = superclass.command(name)
-      # nothing
-    else
+    command = @commands[name] if defined?(@commands)
+    command = superclass.command(name) if !command && superclass.respond_to?(:command)
+
+    unless command
       raise Puppet::DevError, _("No command %{command} defined for provider %{provider}") % { command: name, provider: self.name }
     end
 
@@ -207,11 +195,11 @@ class Puppet::Provider
   # @param name [Symbol] The name of the command (will become the name of the generated method that executes the command)
   # @param path [String] The path to the executable for the command
   # @yield [ ] A block that configures the command (see {Puppet::Provider::Command})
-  # @comment a yield [ ] produces {|| ...} in the signature, do not remove the space.
+  # @comment a yield [ ] produces { ... } in the signature, do not remove the space.
   # @note the name ´has_command´ looks odd in an API context, but makes more sense when seen in the internal
   #   DSL context where a Provider is declaratively defined.
   # @api public
-  #
+  # rubocop:disable Naming/PredicateName
   def self.has_command(name, path, &block)
     name = name.intern
     command = CommandDefiner.define(name, path, self, &block)
@@ -223,6 +211,7 @@ class Puppet::Provider
       return command.execute(*args)
     end
   end
+  # rubocop:enable Naming/PredicateName
 
   # Internal helper class when creating commands - undocumented.
   # @api private
@@ -243,7 +232,7 @@ class Puppet::Provider
       @custom_environment = {}
     end
 
-    def is_optional
+    def is_optional # rubocop:disable Naming/PredicateName
       @optional = true
     end
 
@@ -252,7 +241,7 @@ class Puppet::Provider
     end
 
     def command
-      if not @optional
+      unless @optional
         @confiner.confine :exists => @path, :for_binary => true
       end
 
@@ -279,18 +268,14 @@ class Puppet::Provider
   # @api private
   def self.default_match
     return nil if some_default_match(@notdefaults) # Blacklist means this provider cannot be a default
+
     some_default_match(@defaults)
   end
 
   def self.some_default_match(defaultlist)
     defaultlist.find do |default|
       default.all? do |key, values|
-        case key
-          when :feature
-            feature_match(values)
-          else
-            fact_match(key, values)
-        end
+        key == :feature ? feature_match(values) : fact_match(key, values)
       end
     end
   end
@@ -303,9 +288,9 @@ class Puppet::Provider
   #   values. Given one or more Regexp instances, fact is compared via the basic
   #   pattern-matching operator.
   def self.fact_match(fact, values)
-    fact_val = Facter.value(fact).to_s.downcase
+    fact_val = Puppet.runtime[:facter].value(fact).to_s.downcase
     if fact_val.empty?
-      return false
+      false
     else
       values = [values] unless values.is_a?(Array)
       values.any? do |value|
@@ -395,7 +380,7 @@ class Puppet::Provider
   # @raise [Puppet::DevError] Error indicating that the method should have been implemented by subclass.
   # @see prefetch
   def self.instances
-    raise Puppet::DevError, _("Provider %{provider} has not defined the 'instances' class method") % { provider: self.name }
+    raise Puppet::DevError, _("To support listing resources of this type the '%{provider}' provider needs to implement an 'instances' class method returning the current set of resources. We recommend porting your module to the simpler Resource API instead: https://puppet.com/search/docs?keys=resource+api") % { provider: name }
   end
 
   # Creates getter- and setter- methods for each property supported by the resource type.
@@ -415,6 +400,7 @@ class Puppet::Provider
     [resource_type.validproperties, resource_type.parameters].flatten.each do |attr|
       attr = attr.intern
       next if attr == :name
+
       define_method(attr) do
         if @property_hash[attr].nil?
           :absent
@@ -429,7 +415,7 @@ class Puppet::Provider
     end
   end
 
-  self.initvars
+  initvars
 
   # This method is used to generate a method for a command.
   # @return [void]
@@ -451,7 +437,7 @@ class Puppet::Provider
   # @return [String] Returns the data source, which is the provider name if no other source has been set.
   # @todo Unclear what "the source" is used for?
   def self.source
-    @source ||= self.name
+    @source ||= name
   end
 
   # Returns true if the given attribute/parameter is supported by the provider.
@@ -466,11 +452,13 @@ class Puppet::Provider
     if param.is_a?(Class)
       klass = param
     else
-      unless klass = resource_type.attrclass(param)
+      klass = resource_type.attrclass(param)
+      unless klass
         raise Puppet::DevError, _("'%{parameter_name}' is not a valid parameter for %{resource_type}") % { parameter_name: param, resource_type: resource_type.name }
       end
     end
-    return true unless features = klass.required_features
+    features = klass.required_features
+    return true unless features
 
     !!satisfies?(*features)
   end
@@ -487,7 +475,7 @@ class Puppet::Provider
 
   dochook(:commands) do
     if @commands.length > 0
-      return "Required binaries: " + @commands.collect do |n, c|
+      return "Required binaries: " + @commands.collect do |_n, c|
         "`#{c}`"
       end.sort.join(", ") + "."
     end
@@ -546,9 +534,10 @@ class Puppet::Provider
   # @raise [Puppet::DevError] if no resource is set, or no name defined.
   #
   def name
-    if n = @property_hash[:name]
-      return n
-    elsif self.resource
+    n = @property_hash[:name]
+    if n
+      n
+    elsif resource
       resource.name
     else
       raise Puppet::DevError, _("No resource and no name in property hash in %{class_name} instance") % { class_name: self.class.name }
@@ -588,8 +577,9 @@ class Puppet::Provider
   def <=>(other)
     # We can only have ordering against other providers.
     return nil unless other.is_a? Puppet::Provider
+
     # Otherwise, order by the providers class name.
-    return self.class.name <=> other.class.name
+    self.class.name <=> other.class.name
   end
 
   # @comment Document prefetch here as it does not exist anywhere else (called from transaction if implemented)
@@ -621,4 +611,3 @@ class Puppet::Provider
   # @return [void]
   # @api public
 end
-

data/lib/puppet/reference/configuration.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 config = Puppet::Util::Reference.newreference(:configuration, :depth => 1, :doc => "A reference for all settings") do
   docs = {}
   Puppet.settings.each do |name, object|
     docs[name] = object
   end
 
-  str = ""
+  str = ''.dup
   docs.sort { |a, b|
     a[0].to_s <=> b[0].to_s
   }.each do |name, object|
@@ -22,26 +24,31 @@ config = Puppet::Util::Reference.newreference(:configuration, :depth => 1, :doc
 
     # Now print the data about the item.
     val = object.default
-    if name.to_s == 'vardir'
+    case name.to_s
+    when 'vardir'
       val = 'Unix/Linux: /opt/puppetlabs/puppet/cache -- Windows: C:\ProgramData\PuppetLabs\puppet\cache -- Non-root user: ~/.puppetlabs/opt/puppet/cache'
-    elsif name.to_s == 'confdir'
+    when 'publicdir'
+      val = 'Unix/Linux: /opt/puppetlabs/puppet/public -- Windows: C:\ProgramData\PuppetLabs\puppet\public -- Non-root user: ~/.puppetlabs/opt/puppet/public'
+    when 'confdir'
       val = 'Unix/Linux: /etc/puppetlabs/puppet -- Windows: C:\ProgramData\PuppetLabs\puppet\etc -- Non-root user: ~/.puppetlabs/etc/puppet'
-    elsif name.to_s == 'codedir'
+    when 'codedir'
       val = 'Unix/Linux: /etc/puppetlabs/code -- Windows: C:\ProgramData\PuppetLabs\code -- Non-root user: ~/.puppetlabs/etc/code'
-    elsif name.to_s == 'rundir'
+    when 'rundir'
       val = 'Unix/Linux: /var/run/puppetlabs -- Windows: C:\ProgramData\PuppetLabs\puppet\var\run -- Non-root user: ~/.puppetlabs/var/run'
-    elsif name.to_s == 'logdir'
+    when 'logdir'
       val = 'Unix/Linux: /var/log/puppetlabs/puppet -- Windows: C:\ProgramData\PuppetLabs\puppet\var\log -- Non-root user: ~/.puppetlabs/var/log'
-    elsif name.to_s == 'hiera_config'
-      val = '$confdir/hiera.yaml. However, if a file exists at $codedir/hiera.yaml, Puppet uses that instead.'
-    elsif name.to_s == 'certname'
-      val = "the Host's fully qualified domain name, as determined by facter"
+    when 'hiera_config'
+      val = '$confdir/hiera.yaml. However, for backwards compatibility, if a file exists at $codedir/hiera.yaml, Puppet uses that instead.'
+    when 'certname'
+      val = "the Host's fully qualified domain name, as determined by Facter"
+    when 'srv_domain'
+      val = 'example.com'
     end
 
     # Leave out the section information; it was apparently confusing people.
-    #str << "- **Section**: #{object.section}\n"
+    # str << "- **Section**: #{object.section}\n"
     unless val == ""
-      str << "- *Default*: #{val}\n"
+      str << "- *Default*: `#{val}`\n"
     end
     str << "\n"
   end
@@ -49,44 +56,45 @@ config = Puppet::Util::Reference.newreference(:configuration, :depth => 1, :doc
   return str
 end
 
-config.header = <<EOT
-## Configuration settings
+config.header = <<~EOT
+  ## Configuration settings
 
-* Each of these settings can be specified in `puppet.conf` or on the
-  command line.
-* Puppet Enterprise (PE) and open source Puppet share the configuration settings
-  that are documented here. However, PE defaults for some settings differ from
-  the open source Puppet defaults. Some examples of settings that have different
-  PE defaults include `disable18n`, `environment_timeout`, `always_retry_plugins`,
-  and the Puppet Server JRuby `max-active-instances` setting. To verify PE
-  configuration defaults, check the `puppet.conf` file after installation.
-* When using boolean settings on the command line, use `--setting` and
-  `--no-setting` instead of `--setting (true|false)`. (Using `--setting false`
-  results in "Error: Could not parse application options: needless argument".)
-* Settings can be interpolated as `$variables` in other settings; `$environment`
-  is special, in that puppet master will interpolate each agent node's
-  environment instead of its own.
-* Multiple values should be specified as comma-separated lists; multiple
-  directories should be separated with the system path separator (usually
-  a colon).
-* Settings that represent time intervals should be specified in duration format:
-  an integer immediately followed by one of the units 'y' (years of 365 days),
-  'd' (days), 'h' (hours), 'm' (minutes), or 's' (seconds). The unit cannot be
-  combined with other units, and defaults to seconds when omitted. Examples are
-  '3600' which is equivalent to '1h' (one hour), and '1825d' which is equivalent
-  to '5y' (5 years).
-* If you use the `splay` setting, note that the period that it waits changes
-  each time the Puppet agent is restarted.
-* Settings that take a single file or directory can optionally set the owner,
-  group, and mode for their value: `rundir = $vardir/run { owner = puppet,
-  group = puppet, mode = 644 }`
-* The Puppet executables will ignore any setting that isn't relevant to
-  their function.
+  * Each of these settings can be specified in `puppet.conf` or on the
+    command line.
+  * Puppet Enterprise (PE) and open source Puppet share the configuration settings
+    documented here. However, PE defaults differ from open source defaults for some
+    settings, such as `node_terminus`, `storeconfigs`, `always_retry_plugins`,
+    `disable18n`, `environment_timeout` (when Code Manager is enabled), and the
+    Puppet Server JRuby `max-active-instances` setting. To verify PE configuration
+    defaults, check the `puppet.conf` or `pe-puppet-server.conf` file after
+    installation.
+  * When using boolean settings on the command line, use `--setting` and
+    `--no-setting` instead of `--setting (true|false)`. (Using `--setting false`
+    results in "Error: Could not parse application options: needless argument".)
+  * Settings can be interpolated as `$variables` in other settings; `$environment`
+    is special, in that puppet master will interpolate each agent node's
+    environment instead of its own.
+  * Multiple values should be specified as comma-separated lists; multiple
+    directories should be separated with the system path separator (usually
+    a colon).
+  * Settings that represent time intervals should be specified in duration format:
+    an integer immediately followed by one of the units 'y' (years of 365 days),
+    'd' (days), 'h' (hours), 'm' (minutes), or 's' (seconds). The unit cannot be
+    combined with other units, and defaults to seconds when omitted. Examples are
+    '3600' which is equivalent to '1h' (one hour), and '1825d' which is equivalent
+    to '5y' (5 years).
+  * If you use the `splay` setting, note that the period that it waits changes
+    each time the Puppet agent is restarted.
+  * Settings that take a single file or directory can optionally set the owner,
+    group, and mode for their value: `rundir = $vardir/run { owner = puppet,
+    group = puppet, mode = 644 }`
+  * The Puppet executables ignores any setting that isn't relevant to
+    their function.
 
-See the [configuration guide][confguide] for more details.
+  See the [configuration guide][confguide] for more details.
 
-[confguide]: https://puppet.com/docs/puppet/latest/config_about_settings.html
+  [confguide]: https://puppet.com/docs/puppet/latest/config_about_settings.html
 
-* * *
+  * * *
 
 EOT

data/lib/puppet/reference/function.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 function = Puppet::Util::Reference.newreference :function, :doc => "All functions available in the parser" do
   Puppet::Parser::Functions.functiondocs
 end

data/lib/puppet/reference/indirection.rb

@@ -1,18 +1,23 @@
-require 'puppet/indirector/indirection'
-require 'puppet/util/checksums'
-require 'puppet/file_serving/content'
-require 'puppet/file_serving/metadata'
+# frozen_string_literal: true
+
+require_relative '../../puppet/indirector/indirection'
+require_relative '../../puppet/util/checksums'
+require_relative '../../puppet/file_serving/content'
+require_relative '../../puppet/file_serving/metadata'
 
 reference = Puppet::Util::Reference.newreference :indirection, :doc => "Indirection types and their terminus classes" do
-  text = ""
-  Puppet::Indirector::Indirection.instances.sort { |a,b| a.to_s <=> b.to_s }.each do |indirection|
+  text = ''.dup
+  Puppet::Indirector::Indirection.instances.sort_by(&:to_s).each do |indirection|
     ind = Puppet::Indirector::Indirection.instance(indirection)
     name = indirection.to_s.capitalize
     text << "## " + indirection.to_s + "\n\n"
 
     text << Puppet::Util::Docs.scrub(ind.doc) + "\n\n"
 
-    Puppet::Indirector::Terminus.terminus_classes(ind.name).sort { |a,b| a.to_s <=> b.to_s }.each do |terminus|
+    Puppet::Indirector::Terminus.terminus_classes(ind.name).sort_by(&:to_s).each do |terminus|
+      # this is an "abstract" terminus, ignore it
+      next if ind.name == :resource && terminus == :validator
+
       terminus_name = terminus.to_s
       term_class = Puppet::Indirector::Terminus.terminus_class(ind.name, terminus)
       if term_class
@@ -27,45 +32,45 @@ reference = Puppet::Util::Reference.newreference :indirection, :doc => "Indirect
   text
 end
 
-reference.header = <<HEADER
+reference.header = <<~HEADER
 
-## About Indirection
+  ## About Indirection
 
-Puppet's indirector support pluggable backends (termini) for a variety of key-value stores (indirections).
-Each indirection type corresponds to a particular Ruby class (the "Indirected Class" below) and values are instances of that class.
-Each instance's key is available from its `name` method.
-The termini can be local (e.g., on-disk files) or remote (e.g., using a REST interface to talk to a puppet master).
+  Puppet's indirector support pluggable backends (termini) for a variety of key-value stores (indirections).
+  Each indirection type corresponds to a particular Ruby class (the "Indirected Class" below) and values are instances of that class.
+  Each instance's key is available from its `name` method.
+  The termini can be local (e.g., on-disk files) or remote (e.g., using a REST interface to talk to a puppet master).
 
-An indirector has five methods, which are mapped into HTTP verbs for the REST interface:
+  An indirector has five methods, which are mapped into HTTP verbs for the REST interface:
 
-* `find(key)` - get a single value (mapped to GET or POST with a singular endpoint)
-* `search(key)` - get a list of matching values (mapped to GET with a plural endpoint)
-* `head(key)` - return true if the key exists (mapped to HEAD)
-* `destroy(key)` - remove the key and value (mapped to DELETE)
-* `save(instance)` - write the instance to the store, using the instance's name as the key (mapped to PUT)
+  * `find(key)` - get a single value (mapped to GET or POST with a singular endpoint)
+  * `search(key)` - get a list of matching values (mapped to GET with a plural endpoint)
+  * `head(key)` - return true if the key exists (mapped to HEAD)
+  * `destroy(key)` - remove the key and value (mapped to DELETE)
+  * `save(instance)` - write the instance to the store, using the instance's name as the key (mapped to PUT)
 
-These methods are available via the `indirection` class method on the indirected classes.  For example:
+  These methods are available via the `indirection` class method on the indirected classes.  For example:
 
-    foo_cert = Puppet::SSL::Certificate.indirection.find('foo.example.com')
+      node = Puppet::Node.indirection.find('foo.example.com')
 
-At startup, each indirection is configured with a terminus.
-In most cases, this is the default terminus defined by the indirected class, but it can be overridden by the application or face, or overridden with the `route_file` configuration.
-The available termini differ for each indirection, and are listed below.
+  At startup, each indirection is configured with a terminus.
+  In most cases, this is the default terminus defined by the indirected class, but it can be overridden by the application or face, or overridden with the `route_file` configuration.
+  The available termini differ for each indirection, and are listed below.
 
-Indirections can also have a cache, represented by a second terminus.
-This is a write-through cache: modifications are written both to the cache and to the primary terminus.
-Values fetched from the terminus are written to the cache.
+  Indirections can also have a cache, represented by a second terminus.
+  This is a write-through cache: modifications are written both to the cache and to the primary terminus.
+  Values fetched from the terminus are written to the cache.
 
-### Interaction with REST
+  ### Interaction with REST
 
-REST endpoints have the form `/{prefix}/{version}/{indirection}/{key}?environment={environment}`, where the indirection can be singular or plural, following normal English spelling rules.
-On the server side, REST responses are generated from the locally-configured endpoints.
+  REST endpoints have the form `/{prefix}/{version}/{indirection}/{key}?environment={environment}`, where the indirection can be singular or plural, following normal English spelling rules.
+  On the server side, REST responses are generated from the locally-configured endpoints.
 
-### Indirections and Termini
+  ### Indirections and Termini
 
-Below is the list of all indirections, their associated terminus classes, and how you select between them.
+  Below is the list of all indirections, their associated terminus classes, and how you select between them.
 
-In general, the appropriate terminus class is selected by the application for you (e.g., `puppet agent` would always use the `rest`
-terminus for most of its indirected classes), but some classes are tunable via normal settings.  These will have `terminus setting` documentation listed with them.
+  In general, the appropriate terminus class is selected by the application for you (e.g., `puppet agent` would always use the `rest`
+  terminus for most of its indirected classes), but some classes are tunable via normal settings.  These will have `terminus setting` documentation listed with them.
 
 HEADER

data/lib/puppet/reference/metaparameter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Puppet::Util::Reference.newreference :metaparameter, :doc => "All Puppet metaparameters and all their details" do
   str = %{
 
@@ -12,16 +14,14 @@ etc.), prevent Puppet from making changes (`noop`), and change logging verbosity
 
 ## Available Metaparameters
 
-}
+  }.dup
   begin
     params = []
     Puppet::Type.eachmetaparam { |param|
       params << param
     }
 
-    params.sort { |a,b|
-      a.to_s <=> b.to_s
-    }.each { |param|
+    params.sort_by(&:to_s).each { |param|
       str << markdown_header(param.to_s, 3)
       str << scrub(Puppet::Type.metaparamdoc(param))
       str << "\n\n"

data/lib/puppet/reference/providers.rb

@@ -1,23 +1,25 @@
+# frozen_string_literal: true
+
 providers = Puppet::Util::Reference.newreference :providers, :title => "Provider Suitability Report", :depth => 1, :dynamic => true, :doc => "Which providers are valid for this machine" do
   types = []
   Puppet::Type.loadall
   Puppet::Type.eachtype do |klass|
     next unless klass && klass.providers.length > 0
+
     types << klass
   end
-  types.sort! { |a,b| a.name.to_s <=> b.name.to_s }
+  types.sort! { |a, b| a.name.to_s <=> b.name.to_s }
 
   command_line = Puppet::Util::CommandLine.new
-  types.reject! { |type| ! command_line.args.include?(type.name.to_s) } unless command_line.args.empty?
+  types.reject! { |type| !command_line.args.include?(type.name.to_s) } unless command_line.args.empty?
 
-  ret = "Details about this host:\n\n"
+  ret = "Details about this host:\n\n".dup
 
   # Throw some facts in there, so we know where the report is from.
-  ["Ruby Version", "Puppet Version", "Operating System", "Operating System Release"].each do |label|
-    name = label.gsub(/\s+/, '')
-    value = Facter.value(name)
-    ret << option(label, value)
-  end
+  ret << option('Ruby Version', Facter.value('ruby.version'))
+  ret << option('Puppet Version', Facter.value('puppetversion'))
+  ret << option('Operating System', Facter.value('os.name'))
+  ret << option('Operating System Release', Facter.value('os.release.full'))
   ret << "\n"
 
   count = 1
@@ -28,23 +30,22 @@ providers = Puppet::Util::Reference.newreference :providers, :title => "Provider
     ret << "\n" # add a trailing newline
 
     # Now build up a table of provider suitability.
-    headers = %w{Provider Suitable?} + features.collect { |f| f.to_s }.sort
+    headers = %w[Provider Suitable?] + features.collect(&:to_s).sort
 
     table_data = {}
 
-    functional = false
     notes = []
     default = type.defaultprovider ? type.defaultprovider.name : 'none'
-    type.providers.sort { |a,b| a.to_s <=> b.to_s }.each do |pname|
+    type.providers.sort_by(&:to_s).each do |pname|
       data = []
       table_data[pname] = data
       provider = type.provider(pname)
 
       # Add the suitability note
-      if missing = provider.suitable?(false) and missing.empty?
+      missing = provider.suitable?(false)
+      if missing && missing.empty?
         data << "*X*"
         suit = true
-        functional = true
       else
         data << "[#{count}]_" # A pointer to the appropriate footnote
         suit = false
@@ -62,7 +63,7 @@ providers = Puppet::Util::Reference.newreference :providers, :title => "Provider
               if Puppet.settings.valid?(name)
                 details << _("  - Setting %{name} (currently %{value}) not in list %{facts}\n") % { name: name, value: Puppet.settings.value(name).inspect, facts: facts.join(", ") }
               else
-                details << _("  - Fact %{name} (currently %{value}) not in list %{facts}\n") % { name: name, value: Facter.value(name).inspect, facts: facts.join(", ") }
+                details << _("  - Fact %{name} (currently %{value}) not in list %{facts}\n") % { name: name, value: Puppet.runtime[:facter].value(name).inspect, facts: facts.join(", ") }
               end
             end
           when :true
@@ -70,7 +71,7 @@ providers = Puppet::Util::Reference.newreference :providers, :title => "Provider
           when :false
             details << _("  - Got %{values} false tests that should have been true\n") % { values: values }
           when :feature
-            details << _("  - Missing features %{values}\n") % { values: values.collect { |f| f.to_s }.join(",") }
+            details << _("  - Missing features %{values}\n") % { values: values.collect(&:to_s).join(",") }
           end
         end
         notes << details

data/lib/puppet/reference/report.rb

@@ -1,4 +1,6 @@
-require 'puppet/reports'
+# frozen_string_literal: true
+
+require_relative '../../puppet/reports'
 
 report = Puppet::Util::Reference.newreference :report, :doc => "All available transaction reports" do
   Puppet::Reports.reportdocs

data/lib/puppet/reference/type.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Puppet::Util::Reference.newreference :type, :doc => "All Puppet resource types and all their details" do
   types = {}
   Puppet::Type.loadall
@@ -5,6 +7,7 @@ Puppet::Util::Reference.newreference :type, :doc => "All Puppet resource types a
   Puppet::Type.eachtype { |type|
     next if type.name == :component
     next if type.name == :whit
+
     types[type.name] = type
   }
 
@@ -47,12 +50,9 @@ Puppet::Util::Reference.newreference :type, :doc => "All Puppet resource types a
   Resource types define features they can use, and providers can be tested to see
   which features they provide.
 
-  }
-
-  types.sort { |a,b|
-    a.to_s <=> b.to_s
-  }.each { |name,type|
+  }.dup
 
+  types.sort_by(&:to_s).each { |name, type|
     str << "
 
 ----------------
@@ -63,15 +63,14 @@ Puppet::Util::Reference.newreference :type, :doc => "All Puppet resource types a
     str << scrub(type.doc) + "\n\n"
 
     # Handle the feature docs.
-    if featuredocs = type.featuredocs
+    featuredocs = type.featuredocs
+    if featuredocs
       str << markdown_header("Features", 4)
       str << featuredocs
     end
 
     docs = {}
-    type.validproperties.sort { |a,b|
-      a.to_s <=> b.to_s
-    }.reject { |sname|
+    type.validproperties.sort_by(&:to_s).reject { |sname|
       property = type.propertybyname(sname)
       property.nodoc
     }.each { |sname|
@@ -79,7 +78,8 @@ Puppet::Util::Reference.newreference :type, :doc => "All Puppet resource types a
 
       raise _("Could not retrieve property %{sname} on type %{type_name}") % { sname: sname, type_name: type.name } unless property
 
-      unless doc = property.doc
+      doc = property.doc
+      unless doc
         $stderr.puts _("No docs for %{type}[%{sname}]") % { type: type, sname: sname }
         next
       end
@@ -87,13 +87,11 @@ Puppet::Util::Reference.newreference :type, :doc => "All Puppet resource types a
       tmp = doc
       tmp = scrub(tmp)
 
-      docs[sname]  = tmp
+      docs[sname] = tmp
     }
 
     str << markdown_header("Parameters", 4) + "\n"
-    type.parameters.sort { |a,b|
-      a.to_s <=> b.to_s
-    }.each { |type_name, param|
+    type.parameters.sort_by(&:to_s).each { |type_name, _param|
       docs[type_name] = scrub(type.paramdoc(type_name))
     }