puppet 8.3.1-x86-mingw32 → 8.5.0-x86-mingw32

data/lib/puppet/reference/configuration.rb

@@ -1,4 +1,5 @@
 # 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|
@@ -23,28 +24,29 @@ 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 == 'publicdir'
+    when 'publicdir'
       val = 'Unix/Linux: /opt/puppetlabs/puppet/public -- Windows: C:\ProgramData\PuppetLabs\puppet\public -- Non-root user: ~/.puppetlabs/opt/puppet/public'
-    elsif name.to_s == 'confdir'
+    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'
+    when 'hiera_config'
       val = '$confdir/hiera.yaml. However, for backwards compatibility, if a file exists at $codedir/hiera.yaml, Puppet uses that instead.'
-    elsif name.to_s == 'certname'
+    when 'certname'
       val = "the Host's fully qualified domain name, as determined by Facter"
-    elsif name.to_s == 'srv_domain'
+    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"
     end
@@ -54,45 +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
-  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.
+  * 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,4 +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,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/indirector/indirection'
 require_relative '../../puppet/util/checksums'
 require_relative '../../puppet/file_serving/content'
@@ -28,45 +29,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:
 
-    node = Puppet::Node.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,4 +1,5 @@
 # frozen_string_literal: true
+
 Puppet::Util::Reference.newreference :metaparameter, :doc => "All Puppet metaparameters and all their details" do
   str = %{
 

data/lib/puppet/reference/providers.rb

@@ -1,15 +1,17 @@
 # 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"
 

data/lib/puppet/reference/report.rb

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

data/lib/puppet/reference/type.rb

@@ -1,4 +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
@@ -6,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
   }
 
@@ -50,8 +52,7 @@ Puppet::Util::Reference.newreference :type, :doc => "All Puppet resource types a
 
   }
 
-  types.sort_by(&:to_s).each { |name,type|
-
+  types.sort_by(&:to_s).each { |name, type|
     str << "
 
 ----------------
@@ -86,11 +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_by(&:to_s).each { |type_name, param|
+    type.parameters.sort_by(&:to_s).each { |type_name, _param|
       docs[type_name] = scrub(type.paramdoc(type_name))
     }
 

data/lib/puppet/relationship.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # subscriptions are permanent associations determining how different
 # objects react to an event
 
@@ -6,7 +7,6 @@
 # It used to be a subclass of GRATR::Edge, but that class has weird hash
 # overrides that dramatically slow down the graphing.
 class Puppet::Relationship
-
   # FormatSupport for serialization methods
   include Puppet::Network::FormatSupport
   include Puppet::Util::PsychSupport
@@ -27,15 +27,16 @@ class Puppet::Relationship
   end
 
   def event=(event)
-    #TRANSLATORS 'NONE' should not be translated
-    raise ArgumentError, _("You must pass a callback for non-NONE events") if event != :NONE and ! callback
+    # TRANSLATORS 'NONE' should not be translated
+    raise ArgumentError, _("You must pass a callback for non-NONE events") if event != :NONE and !callback
+
     @event = event
   end
 
   def initialize(source, target, options = {})
     @source, @target = source, target
 
-    options = (options || {}).inject({}) { |h,a| h[a[0].to_sym] = a[1]; h }
+    options = (options || {}).each_with_object({}) { |a, h| h[a[0].to_sym] = a[1]; }
     [:callback, :event].each do |option|
       value = options[option]
       send(option.to_s + "=", value) if value

data/lib/puppet/reports/http.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet'
 require_relative '../../puppet/network/http_pool'
 require 'uri'
 
 Puppet::Reports.register_report(:http) do
-
   desc <<-DESC
     Send reports via HTTP or HTTPS. This report processor submits reports as
     POST requests to the address in the `reporturl` setting. When a HTTPS URL

data/lib/puppet/reports/log.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/reports'
 
 Puppet::Reports.register_report(:log) do
@@ -12,4 +13,3 @@ Puppet::Reports.register_report(:log) do
     end
   end
 end
-

data/lib/puppet/reports/store.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet'
 require 'fileutils'
 require_relative '../../puppet/util'
@@ -18,7 +19,7 @@ Puppet::Reports.register_report(:store) do
 
     dir = File.join(Puppet[:reportdir], host)
 
-    if ! Puppet::FileSystem.exist?(dir)
+    if !Puppet::FileSystem.exist?(dir)
       FileUtils.mkdir_p(dir)
       FileUtils.chmod_R(0750, dir)
     end
@@ -37,7 +38,7 @@ Puppet::Reports.register_report(:store) do
         fh.print to_yaml
       end
     rescue => detail
-       Puppet.log_exception(detail, "Could not write report for #{host} at #{file}: #{detail}")
+      Puppet.log_exception(detail, "Could not write report for #{host} at #{file}: #{detail}")
     end
 
     # Only testing cares about the return value
@@ -52,7 +53,8 @@ Puppet::Reports.register_report(:store) do
 
     if Puppet::FileSystem.exist?(dir)
       Dir.entries(dir).each do |file|
-        next if ['.','..'].include?(file)
+        next if ['.', '..'].include?(file)
+
         file = File.join(dir, file)
         Puppet::FileSystem.unlink(file) if File.file?(file)
       end

data/lib/puppet/reports.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../puppet/util/instance_loader'
 
 # This class is an implementation of a simple mechanism for loading and returning reports.
@@ -56,10 +57,10 @@ class Puppet::Reports
     name = name.intern
 
     mod = genmodule(name,
-                    :extend    => Puppet::Util::Docs,
-                    :hash      => instance_hash(:report),
+                    :extend => Puppet::Util::Docs,
+                    :hash => instance_hash(:report),
                     :overwrite => true,
-                    :block     => block)
+                    :block => block)
 
     mod.useyaml = true if options[:useyaml]
 

data/lib/puppet/resource/catalog.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/node'
 require_relative '../../puppet/indirector'
 require_relative '../../puppet/transaction'
@@ -84,11 +85,11 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
   # Returns [typename, title] when given a String with "Type[title]".
   # Returns [nil, nil] if '[' ']' not detected.
   #
-  def title_key_for_ref( ref )
+  def title_key_for_ref(ref)
     s = ref.index('[')
     e = ref.rindex(']')
     if s && e && e > s
-      a = [ref[0, s], ref[s+1, e-s-1]]
+      a = [ref[0, s], ref[s + 1, e - s - 1]]
     else
       a = [nil, nil]
     end
@@ -101,7 +102,7 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
       idx = @resources.index(other_title_key)
       if idx.nil?
         raise ArgumentError, _("Cannot add resource %{resource_1} before %{resource_2} because %{resource_2} is not yet in the catalog") %
-            { resource_1: resource.ref, resource_2: other.ref }
+                             { resource_1: resource.ref, resource_2: other.ref }
       end
       add_one_resource(resource, idx)
     end
@@ -116,9 +117,9 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
       idx = @resources.index(other_title_key)
       if idx.nil?
         raise ArgumentError, _("Cannot add resource %{resource_1} after %{resource_2} because %{resource_2} is not yet in the catalog") %
-            { resource_1: resource.ref, resource_2: other.ref }
+                             { resource_1: resource.ref, resource_2: other.ref }
       end
-      add_one_resource(resource, idx+1)
+      add_one_resource(resource, idx + 1)
     end
   end
 
@@ -135,7 +136,7 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
     adjacent(resource, :direction => :in)[0]
   end
 
-  def add_one_resource(resource, idx=-1)
+  def add_one_resource(resource, idx = -1)
     title_key = title_key_for_ref(resource.ref)
     if @resource_table[title_key]
       fail_on_duplicate_type_and_title(resource, title_key)
@@ -166,7 +167,7 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
     # The alias setting logic checks, and does not error if the alias is set to an already set alias
     # for the same resource (i.e. it is ok if alias == title
     explicit_aliases = [resource[:alias]].flatten.compact
-    explicit_aliases.each {| given_alias | self.alias(resource, given_alias) }
+    explicit_aliases.each { |given_alias| self.alias(resource, given_alias) }
 
     # Skip creating uniqueness key alias and checking collisions for non-isomorphic resources.
     return unless resource.respond_to?(:isomorphic?) and resource.isomorphic?
@@ -199,15 +200,16 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
     existing = @resource_table[newref]
     if existing
       return if existing == resource
+
       resource_declaration = Puppet::Util::Errors.error_location(resource.file, resource.line)
       msg = if resource_declaration.empty?
-              #TRANSLATORS 'alias' should not be translated
+              # TRANSLATORS 'alias' should not be translated
               _("Cannot alias %{resource} to %{key}; resource %{newref} already declared") %
-                  { resource: ref, key: key.inspect, newref: newref.inspect }
+                { resource: ref, key: key.inspect, newref: newref.inspect }
             else
-              #TRANSLATORS 'alias' should not be translated
+              # TRANSLATORS 'alias' should not be translated
               _("Cannot alias %{resource} to %{key} at %{resource_declaration}; resource %{newref} already declared") %
-                  { resource: ref, key: key.inspect, resource_declaration: resource_declaration, newref: newref.inspect }
+                { resource: ref, key: key.inspect, resource_declaration: resource_declaration, newref: newref.inspect }
             end
       msg += Puppet::Util::Errors.error_location_with_space(existing.file, existing.line)
       raise ArgumentError, msg
@@ -290,6 +292,7 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
     unless klass
       raise ArgumentError, _("Unknown resource type %{type}") % { type: type }
     end
+
     resource = klass.new(options)
     return unless resource
 
@@ -377,7 +380,7 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
     type_name = type.is_a?(Puppet::CompilableResourceType) || type.is_a?(Puppet::Resource::Type) ? type.name : type
     type_name, title = Puppet::Resource.type_and_title(type_name, title)
     type = type_name if type.is_a?(String)
-    title_key   = [type_name, title.to_s]
+    title_key = [type_name, title.to_s]
     result = @resource_table[title_key]
     if result.nil?
       # an instance has to be created in order to construct the unique key used when
@@ -392,7 +395,7 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
   end
 
   def resource_refs
-    resource_keys.collect{ |type, name| name.is_a?( String ) ? "#{type}[#{name}]" : nil}.compact
+    resource_keys.filter_map { |type, name| name.is_a?(String) ? "#{type}[#{name}]" : nil }
   end
 
   def resource_keys
@@ -408,7 +411,7 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
   def self.from_data_hash(data)
     result = new(data['name'], Puppet::Node::Environment::NONE)
 
-    result.tag(*data['tags']) if data['tags'] 
+    result.tag(*data['tags']) if data['tags']
     result.version = data['version'] if data['version']
     result.code_id = data['code_id'] if data['code_id']
     result.catalog_uuid = data['catalog_uuid'] if data['catalog_uuid']
@@ -432,14 +435,14 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
         source = result.resource(edge.source)
         unless source
           raise ArgumentError, _("Could not intern from data: Could not find relationship source %{source} for %{target}") %
-              { source: edge.source.inspect, target: edge.target.to_s }
+                               { source: edge.source.inspect, target: edge.target.to_s }
         end
         edge.source = source
 
         target = result.resource(edge.target)
         unless target
           raise ArgumentError, _("Could not intern from data: Could not find relationship target %{target} for %{source}") %
-              { target: edge.target.inspect, source: edge.source.to_s }
+                               { target: edge.target.inspect, source: edge.source.to_s }
         end
         edge.target = target
 
@@ -449,16 +452,14 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
 
     result.add_class(*data['classes']) if data['classes']
 
-    result.metadata = data['metadata'].inject({}) { |h, (k, v)| h[k] = Puppet::FileServing::Metadata.from_data_hash(v); h } if data['metadata']
+    result.metadata = data['metadata'].transform_values { |v| Puppet::FileServing::Metadata.from_data_hash(v); } if data['metadata']
 
     recursive_metadata = data['recursive_metadata']
     if recursive_metadata
-      result.recursive_metadata = recursive_metadata.inject({}) do |h, (title, source_to_meta_hash)|
-        h[title] = source_to_meta_hash.inject({}) do |inner_h, (source, metas)|
-          inner_h[source] = metas.map {|meta| Puppet::FileServing::Metadata.from_data_hash(meta)}
-          inner_h
+      result.recursive_metadata = recursive_metadata.transform_values do |source_to_meta_hash|
+        source_to_meta_hash.transform_values do |metas|
+          metas.map { |meta| Puppet::FileServing::Metadata.from_data_hash(meta) }
         end
-        h
       end
     end
 
@@ -466,29 +467,27 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
   end
 
   def to_data_hash
-    metadata_hash = metadata.inject({}) { |h, (k, v)| h[k] = v.to_data_hash; h }
-    recursive_metadata_hash = recursive_metadata.inject({}) do |h, (title, source_to_meta_hash)|
-      h[title] = source_to_meta_hash.inject({}) do |inner_h, (source, metas)|
-        inner_h[source] = metas.map {|meta| meta.to_data_hash}
-        inner_h
+    metadata_hash = metadata.transform_values { |v| v.to_data_hash; }
+    recursive_metadata_hash = recursive_metadata.transform_values do |source_to_meta_hash|
+      source_to_meta_hash.transform_values do |metas|
+        metas.map { |meta| meta.to_data_hash }
       end
-      h
     end
 
     {
-      'tags'      => tags.to_a,
-      'name'      => name,
-      'version'   => version,
-      'code_id'   => code_id,
+      'tags' => tags.to_a,
+      'name' => name,
+      'version' => version,
+      'code_id' => code_id,
       'catalog_uuid' => catalog_uuid,
       'catalog_format' => catalog_format,
-      'environment'  => environment.to_s,
+      'environment' => environment.to_s,
       'resources' => @resources.map { |v| @resource_table[v].to_data_hash },
-      'edges'     => edges.map { |e| e.to_data_hash },
-      'classes'   => classes,
+      'edges' => edges.map { |e| e.to_data_hash },
+      'classes' => classes,
     }.merge(metadata_hash.empty? ?
-      {} : {'metadata' => metadata_hash}).merge(recursive_metadata_hash.empty? ?
-        {} : {'recursive_metadata' => recursive_metadata_hash})
+      {} : { 'metadata' => metadata_hash }).merge(recursive_metadata_hash.empty? ?
+        {} : { 'recursive_metadata' => recursive_metadata_hash })
   end
 
   # Convert our catalog into a RAL catalog.
@@ -509,7 +508,7 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
     # environment set in the catalog (if it is set)
     # See PUP-3755
     if environment_instance
-      Puppet.override({:current_environment => environment_instance}) do
+      Puppet.override({ :current_environment => environment_instance }) do
         to_catalog :to_resource, &block
       end
     else
@@ -537,10 +536,11 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
     # https://puppet.com/docs/puppet/latest/configuration.html#resourcefile
     resourcefile = Puppet.settings.setting(:resourcefile)
     Puppet::FileSystem.open(resourcefile.value, resourcefile.mode.to_i(8), "w:UTF-8") do |f|
-      to_print = resources.map do |resource|
+      to_print = resources.filter_map do |resource|
         next unless resource.managed?
+
         "#{resource.ref.downcase}"
-      end.compact
+      end
       f.puts to_print.join("\n")
     end
   rescue => detail

data/lib/puppet/resource/status.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
+
 require 'time'
 require_relative '../../puppet/network/format_support'
 require_relative '../../puppet/util/psych_support'
 
 module Puppet
   class Resource
-
     # This class represents the result of evaluating a given resource. It
     # contains file and line information about the source, events generated
     # while evaluating the resource, timing information, and the status of the
@@ -110,7 +110,7 @@ module Puppet
       # Provide a boolean method for each of the states.
       STATES.each do |attr|
         define_method("#{attr}?") do
-          !! send(attr)
+          !!send(attr)
         end
       end
 
@@ -121,9 +121,10 @@ module Puppet
 
       def add_event(event)
         @events << event
-        if event.status == 'failure'
+        case event.status
+        when 'failure'
           self.failed = true
-        elsif event.status == 'success'
+        when 'success'
           @change_count += 1
           @changed = true
         end