puppet 8.4.0-universal-darwin → 8.5.0-universal-darwin

data/lib/puppet/test/test_helper.rb

@@ -35,7 +35,7 @@ module Puppet::Test
     # Call this method once, as early as possible, such as before loading tests
     # that call Puppet.
     # @return nil
-    def self.initialize()
+    def self.initialize
       # This meta class instance variable is used as a guard to ensure that
       # before_each, and after_each are only called once. This problem occurs
       # when there are more than one puppet test infrastructure orchestrator in use.
@@ -69,7 +69,7 @@ module Puppet::Test
     # Call this method once, when beginning a test run--prior to running
     #  any individual tests.
     # @return nil
-    def self.before_all_tests()
+    def self.before_all_tests
       # The process environment is a shared, persistent resource.
       $old_env = ENV.to_hash
     end
@@ -77,7 +77,7 @@ module Puppet::Test
     # Call this method once, at the end of a test run, when no more tests
     #  will be run.
     # @return nil
-    def self.after_all_tests()
+    def self.after_all_tests
     end
 
     # The name of the rollback mark used in the Puppet.context. This is what
@@ -87,7 +87,7 @@ module Puppet::Test
 
     # Call this method once per test, prior to execution of each individual test.
     # @return nil
-    def self.before_each_test()
+    def self.before_each_test
       # When using both rspec-puppet and puppet-rspec-helper, there are two packages trying
       # to be helpful and orchestrate the callback sequence. We let only the first win, the
       # second callback results in a no-op.
@@ -137,7 +137,8 @@ module Puppet::Test
           ssl_context: Puppet::SSL::SSLContext.new(cacerts: []).freeze,
           http_session: proc { Puppet.runtime[:http].create_session }
         },
-        "Context for specs")
+        "Context for specs"
+      )
 
       # trigger `require 'facter'`
       Puppet.runtime[:facter]
@@ -155,7 +156,7 @@ module Puppet::Test
 
     # Call this method once per test, after execution of each individual test.
     # @return nil
-    def self.after_each_test()
+    def self.after_each_test
       # Ensure that a matching tear down only happens once per completed setup
       # (see #before_each_test).
       return unless @@reentry_count == 1
@@ -194,7 +195,7 @@ module Puppet::Test
 
       # Restore the load_path late, to avoid messing with stubs from the test.
       $LOAD_PATH.clear
-      $old_load_path.each {|x| $LOAD_PATH << x }
+      $old_load_path.each { |x| $LOAD_PATH << x }
 
       Puppet.rollback_context(ROLLBACK_MARK)
     end
@@ -204,7 +205,7 @@ module Puppet::Test
     #  of this class!)
     #########################################################################################
 
-    def self.app_defaults_for_tests()
+    def self.app_defaults_for_tests
       {
         :logdir => "/dev/null",
         :confdir => "/dev/null",
@@ -217,7 +218,7 @@ module Puppet::Test
     end
     private_class_method :app_defaults_for_tests
 
-    def self.initialize_settings_before_each()
+    def self.initialize_settings_before_each
       Puppet.settings.preferred_run_mode = "user"
       # Initialize "app defaults" settings to a good set of test values
       Puppet.settings.initialize_app_defaults(app_defaults_for_tests)

data/lib/puppet/transaction/additional_resource_generator.rb

@@ -68,7 +68,7 @@ class Puppet::Transaction::AdditionalResourceGenerator
     end
     add_resources(generated, resource)
 
-    made = Hash[generated.map(&:name).zip(generated)]
+    made = generated.map(&:name).zip(generated).to_h
     contain_generated_resources_in(resource, made)
     connect_resources_to_ancestors(resource, made)
 
@@ -134,7 +134,7 @@ class Puppet::Transaction::AdditionalResourceGenerator
     end
   end
 
-  def add_resource(res, parent_resource, priority=nil)
+  def add_resource(res, parent_resource, priority = nil)
     if @catalog.resource(res.ref).nil?
       res.merge_tags_from(parent_resource)
       if parent_resource.depthfirst?
@@ -157,7 +157,7 @@ class Puppet::Transaction::AdditionalResourceGenerator
   # add correct edge for depth- or breadth- first traversal of
   # generated resource. Skip generating the edge if there is already
   # some sort of edge between the two resources.
-  def add_generated_directed_dependency(parent, child, label=nil)
+  def add_generated_directed_dependency(parent, child, label = nil)
     if parent.depthfirst?
       source = child
       target = parent
@@ -213,13 +213,13 @@ class Puppet::Transaction::AdditionalResourceGenerator
 
   # Copy an important relationships from the parent to the newly-generated
   # child resource.
-  def add_conditional_directed_dependency(parent, child, label=nil)
+  def add_conditional_directed_dependency(parent, child, label = nil)
     @relationship_graph.add_vertex(child)
     edge = parent.depthfirst? ? [child, parent] : [parent, child]
     if @relationship_graph.edge?(*edge.reverse)
       parent.debug "Skipping automatic relationship to #{child}"
     else
-      @relationship_graph.add_relationship(edge[0],edge[1],label)
+      @relationship_graph.add_relationship(edge[0], edge[1], label)
     end
   end
 end

data/lib/puppet/transaction/event_manager.rb

@@ -54,10 +54,9 @@ class Puppet::Transaction::EventManager
 
     # Do some basic normalization so we're not doing so many
     # graph queries for large sets of events.
-    events.inject({}) do |collection, event|
+    events.each_with_object({}) do |event, collection|
       collection[event.name] ||= []
       collection[event.name] << event
-      collection
     end.collect do |_name, list|
       # It doesn't matter which event we use - they all have the same source
       # and name here.
@@ -77,7 +76,7 @@ class Puppet::Transaction::EventManager
       end
       @events << event if received
 
-      queue_events_for_resource(resource, resource, :refresh, [event]) if resource.self_refresh? and ! resource.deleting?
+      queue_events_for_resource(resource, resource, :refresh, [event]) if resource.self_refresh? and !resource.deleting?
     end
 
     dequeue_events_for_resource(resource, :refresh) if events.detect { |e| e.invalidate_refreshes }

data/lib/puppet/transaction/persistence.rb

@@ -29,7 +29,7 @@ class Puppet::Transaction::Persistence
 
   def initialize
     @old_data = {}
-    @new_data = {"resources" => {}}
+    @new_data = { "resources" => {} }
   end
 
   # Obtain the full raw data from the persistence store.

data/lib/puppet/transaction/report.rb

@@ -206,7 +206,7 @@ class Puppet::Transaction::Report
 
   # @api private
   def prune_internal_data
-    resource_statuses.delete_if {|_name,res| res.resource_type == 'Whit'}
+    resource_statuses.delete_if { |_name, res| res.resource_type == 'Whit' }
   end
 
   # @api private
@@ -217,14 +217,14 @@ class Puppet::Transaction::Report
     resource_metrics = add_metric(:resources, calculate_resource_metrics)
     add_metric(:time, calculate_time_metrics)
     change_metric = calculate_change_metric
-    add_metric(:changes, {TOTAL => change_metric})
+    add_metric(:changes, { TOTAL => change_metric })
     add_metric(:events, calculate_event_metrics)
     @status = compute_status(resource_metrics, change_metric)
-    @noop_pending = @resource_statuses.any? { |_name,res| has_noop_events?(res) }
+    @noop_pending = @resource_statuses.any? { |_name, res| has_noop_events?(res) }
   end
 
   # @api private
-  def initialize(configuration_version=nil, environment=nil, transaction_uuid=nil, job_id=nil, start_time=Time.now)
+  def initialize(configuration_version = nil, environment = nil, transaction_uuid = nil, job_id = nil, start_time = Time.now)
     @metrics = {}
     @logs = []
     @resource_statuses = {}
@@ -305,14 +305,12 @@ class Puppet::Transaction::Report
       @resource_statuses[key] =
         if rs == Puppet::Resource::EMPTY_HASH
           nil
-        else
+        elsif rs.is_a?(Puppet::Resource::Status)
           # Older versions contain tags that causes Psych to create instances
           # directly
-          if rs.is_a?(Puppet::Resource::Status)
-            rs
-          else
-            Puppet::Resource::Status.from_data_hash(rs)
-          end
+          rs
+        else
+          Puppet::Resource::Status.from_data_hash(rs)
         end
     end
   end
@@ -330,7 +328,7 @@ class Puppet::Transaction::Report
                         else
                           @resource_statuses
                         end
-    Hash[resource_statuses.map { |key, rs| [key, rs.nil? ? nil : rs.to_data_hash] }]
+    resource_statuses.transform_values { |rs| rs.nil? ? nil : rs.to_data_hash }
   end
 
   def to_data_hash
@@ -347,7 +345,7 @@ class Puppet::Transaction::Report
       'noop_pending' => @noop_pending,
       'environment' => @environment,
       'logs' => @logs.map { |log| log.to_data_hash },
-      'metrics' => Hash[@metrics.map { |key, metric| [key, metric.to_data_hash] }],
+      'metrics' => @metrics.transform_values { |metric| metric.to_data_hash },
       'resource_statuses' => calculate_resource_statuses,
       'corrective_change' => @corrective_change,
     }
@@ -380,7 +378,7 @@ class Puppet::Transaction::Report
     report.keys.sort_by(&:to_s).each do |key|
       ret += "#{Puppet::Util::Metric.labelize(key)}:\n"
 
-      report[key].keys.sort { |a,b|
+      report[key].keys.sort { |a, b|
         # sort by label
         if a == TOTAL
           1
@@ -442,8 +440,8 @@ class Puppet::Transaction::Report
   def exit_status
     status = 0
     if @metrics["changes"] && @metrics["changes"][TOTAL] &&
-        @metrics["resources"] && @metrics["resources"]["failed"] &&
-        @metrics["resources"]["failed_to_restart"]
+       @metrics["resources"] && @metrics["resources"]["failed"] &&
+       @metrics["resources"]["failed_to_restart"]
       status |= 2 if @metrics["changes"][TOTAL] > 0
       status |= 4 if @metrics["resources"]["failed"] > 0
       status |= 4 if @metrics["resources"]["failed_to_restart"] > 0
@@ -463,7 +461,7 @@ class Puppet::Transaction::Report
   end
 
   def calculate_change_metric
-    resource_statuses.map { |_name, status| status.change_count || 0 }.inject(0) { |a,b| a+b }
+    resource_statuses.map { |_name, status| status.change_count || 0 }.inject(0) { |a, b| a + b }
   end
 
   def calculate_event_metrics

data/lib/puppet/transaction/resource_harness.rb

@@ -22,7 +22,7 @@ class Puppet::Transaction::ResourceHarness
       context = ResourceApplicationContext.from_resource(resource, status)
       perform_changes(resource, context)
 
-      if status.changed? && ! resource.noop?
+      if status.changed? && !resource.noop?
         cache(resource, :synced, Time.now)
         resource.flush if resource.respond_to?(:flush)
       end
@@ -313,7 +313,7 @@ class Puppet::Transaction::ResourceHarness
                                      (resource[:audit] || []).map { |p| p.to_sym },
                                      [],
                                      status,
-                                     resource.parameters.select { |_n,p| p.is_a?(Puppet::Property) && !p.sensitive })
+                                     resource.parameters.select { |_n, p| p.is_a?(Puppet::Property) && !p.sensitive })
     end
 
     def resource_present?

data/lib/puppet/transaction.rb

@@ -55,9 +55,9 @@ class Puppet::Transaction
 
     @resource_harness = Puppet::Transaction::ResourceHarness.new(self)
 
-    @prefetched_providers = Hash.new { |h,k| h[k] = {} }
+    @prefetched_providers = Hash.new { |h, k| h[k] = {} }
 
-    @prefetch_failed_providers = Hash.new { |h,k| h[k] = {} }
+    @prefetch_failed_providers = Hash.new { |h, k| h[k] = {} }
 
     # With merge_dependency_warnings, notify and warn about class dependency failures ... just once per class. TJK 2019-09-09
     @merge_dependency_warnings = Puppet[:merge_dependency_warnings]
@@ -107,7 +107,7 @@ class Puppet::Transaction
 
     Puppet.info _("Applying configuration version '%{version}'") % { version: catalog.version } if catalog.version
 
-    continue_while = lambda { !stop_processing? }
+    continue_while = -> { !stop_processing? }
 
     post_evalable_providers = Set.new
     pre_process = lambda do |resource|
@@ -247,8 +247,8 @@ class Puppet::Transaction
   def prefetch_if_necessary(resource)
     provider_class = resource.provider.class
     if !provider_class.respond_to?(:prefetch) or
-        prefetched_providers[resource.type][provider_class.name] or
-        prefetch_failed_providers[resource.type][provider_class.name]
+       prefetched_providers[resource.type][provider_class.name] or
+       prefetch_failed_providers[resource.type][provider_class.name]
       return
     end
 
@@ -256,7 +256,7 @@ class Puppet::Transaction
 
     if provider_class == resource.class.defaultprovider
       providerless_resources = resources_by_provider(resource.type, nil)
-      providerless_resources.values.each {|res| res.provider = provider_class.name}
+      providerless_resources.values.each { |res| res.provider = provider_class.name }
       resources.merge! providerless_resources
     end
 
@@ -299,7 +299,7 @@ class Puppet::Transaction
     # explosion of edges, we also ended up reporting failures for containers
     # like class and stage.  This is undesirable; while just skipping the
     # output isn't perfect, it is RC-safe. --daniel 2011-06-07
-    is_puppet_class = resource.class == Puppet::Type.type(:whit)
+    is_puppet_class = resource.instance_of?(Puppet::Type.type(:whit))
     # With merge_dependency_warnings, notify about class dependency failures ... just once per class. TJK 2019-09-09
     s = resource_status(resource)
     if s && s.dependency_failed?
@@ -355,7 +355,7 @@ class Puppet::Transaction
 
   # Should we ignore tags?
   def ignore_tags?
-    ! @catalog.host_config?
+    !@catalog.host_config?
   end
 
   def resources_by_provider(type_name, provider_name)
@@ -378,7 +378,7 @@ class Puppet::Transaction
   def prefetch(provider_class, resources)
     type_name = provider_class.resource_type.name
     return if @prefetched_providers[type_name][provider_class.name] ||
-      @prefetch_failed_providers[type_name][provider_class.name]
+              @prefetch_failed_providers[type_name][provider_class.name]
 
     Puppet.debug { "Prefetching #{provider_class.name} resources for #{type_name}" }
     begin
@@ -407,7 +407,7 @@ class Puppet::Transaction
       resource.debug "Skipping with skip tags #{skip_tags.join(", ")}"
     elsif missing_tags?(resource)
       resource.debug "Not tagged with #{tags.join(", ")}"
-    elsif ! scheduled?(resource)
+    elsif !scheduled?(resource)
       resource.debug "Not scheduled"
     elsif failed_dependencies?(resource)
       # When we introduced the :whit into the graph, to reduce the combinatorial
@@ -415,7 +415,7 @@ class Puppet::Transaction
       # like class and stage.  This is undesirable; while just skipping the
       # output isn't perfect, it is RC-safe. --daniel 2011-06-07
       # With merge_dependency_warnings, warn about class dependency failures ... just once per class. TJK 2019-09-09
-      unless resource.class == Puppet::Type.type(:whit)
+      unless resource.instance_of?(Puppet::Type.type(:whit))
         if @merge_dependency_warnings && resource.parent && failed_dependencies?(resource.parent)
           ps = resource_status(resource.parent)
           ps.failed_dependencies.find_all { |d| !(@failed_class_dependencies_already_warned.include?(d.ref)) }.each do |dep|

data/lib/puppet/trusted_external.rb

@@ -6,7 +6,7 @@ module Puppet::TrustedExternal
     command = Puppet[:trusted_external_command]
     return nil unless command
 
-    Puppet.debug { _("Retrieving trusted external data from %{command}") % {command: command} }
+    Puppet.debug { _("Retrieving trusted external data from %{command}") % { command: command } }
     setting_type = Puppet.settings.setting(:trusted_external_command).type
     if setting_type == :file
       return fetch_data(command, certname)

data/lib/puppet/type/exec.rb

@@ -19,18 +19,18 @@ module Puppet
         during a noop Puppet run.
       * The exec has `refreshonly => true`, which allows Puppet to run the
         command only when some other resource is changed. (See the notes on refreshing
-        below.) 
-        
+        below.)
+
       The state managed by an `exec` resource represents whether the specified command
       _needs to be_ executed during the catalog run. The target state is always that
       the command does not need to be executed. If the initial state is that the
       command _does_ need to be executed, then successfully executing the command
       transitions it to the target state.
-      
+
       The `unless`, `onlyif`, and `creates` properties check the initial state of the
       resource. If one or more of these properties is specified, the exec might not
       need to run. If the exec does not need to run, then the system is already in
-      the target state. In such cases, the exec is considered successful without 
+      the target state. In such cases, the exec is considered successful without
       actually executing its command.
 
       A caution: There's a widespread tendency to use collections of execs to
@@ -146,7 +146,7 @@ module Puppet
         begin
           tries.times do |try|
             # Only add debug messages for tries > 1 to reduce log spam.
-            debug("Exec try #{try+1}/#{tries}") if tries > 1
+            debug("Exec try #{try + 1}/#{tries}") if tries > 1
             @output, @status = provider.run(self.resource[:command])
             break if self.should.include?(@status.exitstatus.to_s)
 
@@ -415,11 +415,7 @@ module Puppet
       # on refresh.
       def check(value)
         # We have to invert the values.
-        if value == :true
-          false
-        else
-          true
-        end
+        value != :true
       end
     end
 
@@ -451,7 +447,7 @@ module Puppet
       def check(value)
         # TRANSLATORS 'creates' is a parameter name and should not be translated
         debug(_("Checking that 'creates' path '%{creates_path}' exists") % { creates_path: value })
-        ! Puppet::FileSystem.exist?(value)
+        !Puppet::FileSystem.exist?(value)
       end
     end
 

data/lib/puppet/type/file/checksum_value.rb

@@ -9,7 +9,7 @@ module Puppet
     include Puppet::DataSync
 
     desc "The checksum of the source contents. Only md5, sha256, sha224, sha384 and sha512
-      are supported when specifying this parameter. If this parameter is set, 
+      are supported when specifying this parameter. If this parameter is set,
       source_permissions will be assumed to be false, and ownership and permissions
       will not be read from source."
 
@@ -20,7 +20,7 @@ module Puppet
         return true
       end
 
-      checksum_insync?(resource.parameter(:source), is, true) {|inner| super(inner)}
+      checksum_insync?(resource.parameter(:source), is, true) { |inner| super(inner) }
     end
 
     def property_matches?(current, desired)

data/lib/puppet/type/file/content.rb

@@ -59,10 +59,10 @@ module Puppet
           _('The literal value of the "content" property will be written to the file.'),
           # TRANSLATORS "static catalogs" should not be translated.
           _('The checksum retrieval functionality is being replaced by the use of static catalogs.'),
-          _('See https://puppet.com/docs/puppet/latest/static_catalogs.html for more information.')].join(" "),
+          _('See https://puppet.com/docs/puppet/latest/static_catalogs.html for more information.')
+        ].join(" "),
                                           :file => @resource.file,
-                                          :line => @resource.line
-                                         ) if !@actual_content && !resource.parameter(:source)
+                                          :line => @resource.line) if !@actual_content && !resource.parameter(:source)
         value
       else
         @actual_content = value.is_a?(Puppet::Pops::Types::PBinaryType::Binary) ? value.binary_buffer : value
@@ -73,7 +73,7 @@ module Puppet
     # Checksums need to invert how changes are printed.
     def change_to_s(currentvalue, newvalue)
       # Our "new" checksum value is provided by the source.
-      source = resource.parameter(:source) 
+      source = resource.parameter(:source)
       tmp = source.checksum if source
       if tmp
         newvalue = tmp
@@ -105,7 +105,7 @@ module Puppet
       end
 
       contents_prop = resource.parameter(:source) || self
-      checksum_insync?(contents_prop, is, !resource[:content].nil?) {|inner| super(inner)}
+      checksum_insync?(contents_prop, is, !resource[:content].nil?) { |inner| super(inner) }
     end
 
     def property_matches?(current, desired)

data/lib/puppet/type/file/ctime.rb

@@ -20,4 +20,3 @@ module Puppet
     end
   end
 end
-

data/lib/puppet/type/file/data_sync.rb

@@ -30,12 +30,12 @@ module Puppet
       else
         if resource[:ensure] == :present && has_contents && (s = resource.stat)
           # TRANSLATORS 'Ensure' is an attribute and ':present' is a value and should not be translated
-          resource.warning _("Ensure set to :present but file type is %{file_type} so no content will be synced") % { file_type: s.ftype}
+          resource.warning _("Ensure set to :present but file type is %{file_type} so no content will be synced") % { file_type: s.ftype }
         end
         return true
       end
 
-      return true if ! resource.replace?
+      return true if !resource.replace?
 
       is_insync = yield(is)
 

data/lib/puppet/type/file/ensure.rb

@@ -113,7 +113,7 @@ module Puppet
 
     munge do |value|
       value = super(value)
-      value,resource[:target] = :link,value unless value.is_a? Symbol
+      value, resource[:target] = :link, value unless value.is_a? Symbol
       resource[:links] = :manage if value == :link and resource[:links] != :follow
       value
     end
@@ -145,10 +145,10 @@ module Puppet
     def check
       basedir = File.dirname(@resource[:path])
 
-      if ! Puppet::FileSystem.exist?(basedir)
+      if !Puppet::FileSystem.exist?(basedir)
         raise Puppet::Error,
               "Can not create #{@resource.title}; parent directory does not exist"
-      elsif ! FileTest.directory?(basedir)
+      elsif !FileTest.directory?(basedir)
         raise Puppet::Error,
               "Can not create #{@resource.title}; #{dirname} is not a directory"
       end
@@ -172,12 +172,10 @@ module Puppet
       stat = @resource.stat
       if stat
         return stat.ftype.intern
+      elsif self.should == :false
+        return :false
       else
-        if self.should == :false
-          return :false
-        else
-          return :absent
-        end
+        return :absent
       end
     end
 
@@ -193,4 +191,3 @@ module Puppet
     end
   end
 end
-

data/lib/puppet/type/file/owner.rb

@@ -50,4 +50,3 @@ module Puppet
     end
   end
 end
-

data/lib/puppet/type/file/selcontext.rb

@@ -140,4 +140,3 @@ module Puppet
     defaultto { self.retrieve_default_context(:selrange) }
   end
 end
-

data/lib/puppet/type/file/source.rb

@@ -251,7 +251,7 @@ module Puppet
     end
 
     def found?
-      ! (metadata.nil? or metadata.ftype.nil?)
+      !(metadata.nil? or metadata.ftype.nil?)
     end
 
     def copy_source_value(metadata_method)
@@ -316,7 +316,7 @@ module Puppet
 
     def get_from_http_source(url, &block)
       client = Puppet.runtime[:http]
-      client.get(url, options: {include_system_store: true}) do |response|
+      client.get(url, options: { include_system_store: true }) do |response|
         raise Puppet::HTTP::ResponseError.new(response) unless response.success?
 
         response.read_body(&block)

data/lib/puppet/type/file/target.rb

@@ -25,7 +25,7 @@ module Puppet
 
     # Anything else, basically
     newvalue(/./) do
-      @resource[:ensure] = :link if ! @resource.should(:ensure)
+      @resource[:ensure] = :link if !@resource.should(:ensure)
 
       # Only call mklink if ensure didn't call us in the first place.
       currentensure = @resource.property(:ensure).retrieve
@@ -65,7 +65,7 @@ module Puppet
     def insync?(currentvalue)
       if [:nochange, :notlink].include?(self.should) or @resource.recurse?
         return true
-      elsif ! @resource.replace? and Puppet::FileSystem.exist?(@resource[:path])
+      elsif !@resource.replace? and Puppet::FileSystem.exist?(@resource[:path])
         return true
       else
         return super(currentvalue)
@@ -86,4 +86,3 @@ module Puppet
     end
   end
 end
-

data/lib/puppet/type/file/type.rb

@@ -19,4 +19,3 @@ module Puppet
     end
   end
 end
-