puppet 8.3.1-universal-darwin → 8.5.0-universal-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d51ea29c50817dfb98273a22e10809cabc461017bed352035b000b29fcdb81bd
-  data.tar.gz: 4fef0c63a2a0c6d3be51e7b5f969ca85b8be50a58623badb4dc8efd10b488954
+  metadata.gz: 6bd7a97b31aa28e37dd3aaf968bb8ad6e32c5faffb896447317563552ac97cf5
+  data.tar.gz: 977244f0f02a41cd94ba2a6e65ad12b17a4080307f0b3ae01ed3a91b00bef22d
 SHA512:
-  metadata.gz: 111d4cebd83393c97a92fc40a09f441bedaac2bca73a0e8b51e793dfacf1bf8de1754c9d0a1aa1a165d49618e3332c460f2e290f025b4ca97b9b6fdfd7d23da9
-  data.tar.gz: cae4b82154cca6f2c2aa3a8c19f94306061020b3fa94bc206170491b98777aa8602bd065d0a577135ad1a461da4e3ba29893e52e87f5cc3a824d6f7a96e3ace7
+  metadata.gz: 9b82808e4a6ab2dbfc12eb6af005ce9d7789bcc53bcdd34755ce035bac9c5c456086dfe704aeff4982f1331ee16d39e27063d73efcc7a93fa2869bc65e8c0a2e
+  data.tar.gz: '07091bf9f8fc6c3fb4ab9e25e0d7864ea6990d0e50a7a274b719528468379f2951e28aec672f8515079cd775c7aec83673d63cfaf25ebef149d0fb86ec1392b3'

data/Gemfile

@@ -47,8 +47,11 @@ group(:test) do
   gem 'webrick', '~> 1.7', require: false
   gem 'yard', require: false
 
-  gem 'rubocop', '1.28.0', require: false, platforms: [:ruby]
+  gem 'rubocop', '~> 1.0', require: false, platforms: [:ruby]
   gem 'rubocop-i18n', '~> 3.0', require: false, platforms: [:ruby]
+  gem 'rubocop-performance', '~> 1.0', require: false, platforms: [:ruby]
+  gem 'rubocop-rake', '~> 0.6', require: false, platforms: [:ruby]
+  gem 'rubocop-rspec', '~> 2.0', require: false, platforms: [:ruby]
 end
 
 group(:development, optional: true) do

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    puppet (8.3.1)
+    puppet (8.5.0)
       CFPropertyList (~> 2.2)
       concurrent-ruby (~> 1.0)
       deep_merge (~> 1.0)
@@ -17,33 +17,34 @@ GEM
   remote: https://artifactory.delivery.puppetlabs.net/artifactory/api/gems/rubygems/
   specs:
     CFPropertyList (2.3.6)
-    addressable (2.8.5)
+    addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     apt_stage_artifacts (0.11.0)
       docopt
     artifactory (3.0.15)
     ast (2.4.2)
-    base64 (0.1.1)
+    base64 (0.2.0)
+    bigdecimal (3.1.6)
     coderay (1.1.3)
-    concurrent-ruby (1.2.2)
-    crack (0.4.5)
+    concurrent-ruby (1.2.3)
+    crack (1.0.0)
+      bigdecimal
       rexml
-    csv (3.2.7)
+    csv (3.2.8)
     declarative (0.0.20)
     deep_merge (1.2.2)
-    diff-lcs (1.5.0)
+    diff-lcs (1.5.1)
     digest-crc (0.6.5)
       rake (>= 12.0.0, < 14.0.0)
     docopt (0.6.1)
     erubi (1.12.0)
-    facter (4.5.0)
+    facter (4.6.0)
       hocon (~> 1.3)
       thor (>= 1.0.1, < 2.0)
-    faraday (2.7.11)
-      base64
-      faraday-net_http (>= 2.0, < 3.1)
-      ruby2_keywords (>= 0.0.4)
-    faraday-net_http (3.0.2)
+    faraday (2.9.0)
+      faraday-net_http (>= 2.0, < 3.2)
+    faraday-net_http (3.1.0)
+      net-http
     fast_gettext (2.3.0)
     ffi (1.15.5)
     forwardable (1.3.3)
@@ -57,50 +58,54 @@ GEM
       fast_gettext (~> 2.1)
       gettext (~> 3.4)
       locale
-    google-apis-core (0.11.1)
+    google-apis-core (0.14.0)
       addressable (~> 2.5, >= 2.5.1)
-      googleauth (>= 0.16.2, < 2.a)
+      googleauth (~> 1.9)
       httpclient (>= 2.8.1, < 3.a)
       mini_mime (~> 1.0)
       representable (~> 3.0)
       retriable (>= 2.0, < 4.a)
       rexml
-      webrick
-    google-apis-iamcredentials_v1 (0.17.0)
-      google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-storage_v1 (0.19.0)
-      google-apis-core (>= 0.9.0, < 2.a)
-    google-cloud-core (1.6.0)
-      google-cloud-env (~> 1.0)
+    google-apis-iamcredentials_v1 (0.19.0)
+      google-apis-core (>= 0.14.0, < 2.a)
+    google-apis-storage_v1 (0.34.0)
+      google-apis-core (>= 0.14.0, < 2.a)
+    google-cloud-core (1.6.1)
+      google-cloud-env (>= 1.0, < 3.a)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (1.6.0)
-      faraday (>= 0.17.3, < 3.0)
+    google-cloud-env (2.1.1)
+      faraday (>= 1.0, < 3.a)
     google-cloud-errors (1.3.1)
-    google-cloud-storage (1.44.0)
+    google-cloud-storage (1.49.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
-      google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.19.0)
+      google-apis-core (~> 0.13)
+      google-apis-iamcredentials_v1 (~> 0.18)
+      google-apis-storage_v1 (~> 0.33)
       google-cloud-core (~> 1.6)
-      googleauth (>= 0.16.2, < 2.a)
+      googleauth (~> 1.9)
       mini_mime (~> 1.0)
-    googleauth (1.8.1)
-      faraday (>= 0.17.3, < 3.a)
+    googleauth (1.11.0)
+      faraday (>= 1.0, < 3.a)
+      google-cloud-env (~> 2.1)
       jwt (>= 1.4, < 3.0)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
-    hashdiff (1.0.1)
+    hashdiff (1.1.0)
     hiera-eyaml (3.4.0)
       highline
       optimist
-    highline (2.1.0)
+    highline (3.0.1)
     hocon (1.4.0)
     hpricot (0.8.6)
     httpclient (2.8.3)
+    json (2.7.1)
     json-schema (2.8.1)
       addressable (>= 2.4)
-    jwt (2.7.1)
+    jwt (2.8.0)
+      base64
+    language_server-protocol (3.17.0.3)
     locale (2.1.3)
     memory_profiler (1.0.1)
     method_source (1.0.0)
@@ -109,9 +114,11 @@ GEM
     msgpack (1.7.2)
     multi_json (1.15.0)
     mustache (1.1.1)
+    net-http (0.4.1)
+      uri
     optimist (3.1.0)
     os (1.1.4)
-    packaging (0.111.0)
+    packaging (0.115.0)
       apt_stage_artifacts
       artifactory (~> 3)
       csv (>= 3.1.5)
@@ -119,8 +126,8 @@ GEM
       googleauth
       rake (>= 12.3)
       release-metrics
-    parallel (1.23.0)
-    parser (3.2.2.4)
+    parallel (1.24.0)
+    parser (3.3.0.5)
       ast (~> 2.4.1)
       racc
     prime (0.1.2)
@@ -129,17 +136,17 @@ GEM
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (5.0.3)
+    public_suffix (5.0.4)
     puppet-resource_api (1.9.0)
       hocon (>= 1.0)
-    puppetserver-ca (2.6.0)
+    puppetserver-ca (2.7.0)
       facter (>= 2.0.1, < 5)
     racc (1.5.2)
     rainbow (3.1.1)
-    rake (13.0.6)
-    rdiscount (2.2.7.1)
+    rake (13.1.0)
+    rdiscount (2.2.7.3)
     rdoc (6.3.3)
-    regexp_parser (2.8.2)
+    regexp_parser (2.9.0)
     release-metrics (1.1.0)
       csv
       docopt
@@ -153,53 +160,68 @@ GEM
       hpricot (>= 0.8.2)
       mustache (>= 0.7.0)
       rdiscount (>= 1.5.8)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
+      rspec-support (~> 3.13.0)
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.12.6)
+    rspec-mocks (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.1)
-    rubocop (1.28.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    rubocop (1.60.2)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.1.0.0)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.17.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.30.0)
       parser (>= 3.2.1.0)
+    rubocop-capybara (2.20.0)
+      rubocop (~> 1.41)
+    rubocop-factory_bot (2.25.1)
+      rubocop (~> 1.41)
     rubocop-i18n (3.0.0)
       rubocop (~> 1.0)
-    ruby-prof (1.6.3)
+    rubocop-performance (1.20.2)
+      rubocop (>= 1.48.1, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)
+    rubocop-rspec (2.26.1)
+      rubocop (~> 1.40)
+      rubocop-capybara (~> 2.17)
+      rubocop-factory_bot (~> 2.22)
+    ruby-prof (1.7.0)
     ruby-progressbar (1.13.0)
-    ruby2_keywords (0.0.5)
     scanf (1.0.0)
     semantic_puppet (1.1.0)
-    signet (0.18.0)
+    signet (0.19.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
-    singleton (0.1.1)
+    singleton (0.2.0)
     text (1.3.1)
     thor (1.3.0)
     trailblazer-option (0.1.2)
     uber (0.1.0)
     unicode-display_width (2.5.0)
+    uri (0.13.0)
     vcr (6.2.0)
-    webmock (3.19.1)
+    webmock (3.23.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -220,7 +242,7 @@ DEPENDENCIES
   memory_profiler
   minitar (~> 0.9)
   msgpack (~> 1.2)
-  packaging (= 0.111.0)
+  packaging (~> 0.113)
   pry
   puppet!
   puppet-resource_api (~> 1.5)
@@ -232,8 +254,11 @@ DEPENDENCIES
   rspec (~> 3.1)
   rspec-expectations (~> 3.9, != 3.9.3)
   rspec-its (~> 1.1)
-  rubocop (= 1.28.0)
+  rubocop (~> 1.0)
   rubocop-i18n (~> 3.0)
+  rubocop-performance (~> 1.0)
+  rubocop-rake (~> 0.6)
+  rubocop-rspec (~> 2.0)
   ruby-prof (>= 0.16.0)
   semantic_puppet (~> 1.0)
   vcr (~> 6.1)

data/README.md

@@ -46,7 +46,7 @@ See [LICENSE](https://github.com/puppetlabs/puppet/blob/main/LICENSE) file. Pupp
 
 ## Support
 
-Please log tickets and issues at our [JIRA tracker](https://tickets.puppetlabs.com). A [mailing
+Please log issues in this project's [GitHub Issues](https://github.com/puppetlabs/puppet/issues). A [mailing
 list](https://groups.google.com/forum/?fromgroups#!forum/puppet-users) is
 available for asking questions and getting help from others, or if you prefer chat, we also have a [Puppet Community slack.](https://puppetcommunity.slack.com/)
 
@@ -58,9 +58,9 @@ Bug fixes and ongoing development will occur in minor releases for the current
 major version. Security fixes will be backported to a previous major version on
 a best-effort basis, until the previous major version is no longer maintained.
 
-For example: If a security vulnerability is discovered in Puppet 6.1.1, we
-would fix it in the 6 series, most likely as 6.1.2. Maintainers would then make
-a best effort to backport that fix onto the latest Puppet 5 release.
+For example: If a security vulnerability is discovered in Puppet 8.1.1, we
+would fix it in the 8 series, most likely as 8.1.2. Maintainers would then make
+a best effort to backport that fix onto the latest Puppet 7 release.
 
 Long-term support, including security patches and bug fixes, is available for
 commercial customers. Please see the following page for more details:

data/Rakefile

@@ -58,33 +58,6 @@ task(:rubocop) do
   raise "RuboCop detected offenses" if exit_code != 0
 end
 
-desc "verify that commit messages match CONTRIBUTING.md requirements"
-task(:commits) do
-  # This rake task looks at the summary from every commit from this branch not
-  # in the branch targeted for a PR.
-  commit_range = 'HEAD^..HEAD'
-  puts "Checking commits #{commit_range}"
-  %x{git log --no-merges --pretty=%s #{commit_range}}.each_line do |commit_summary|
-    # This regex tests for the currently supported commit summary tokens: maint, doc, packaging, or pup-<number>.
-    # The exception tries to explain it in more full.
-    if /^\((maint|doc|docs|packaging|l10n|pup-\d+)\)|revert/i.match(commit_summary).nil?
-      raise "\n\n\n\tThis commit summary didn't match CONTRIBUTING.md guidelines:\n" \
-        "\n\t\t#{commit_summary}\n" \
-        "\tThe commit summary (i.e. the first line of the commit message) should start with one of:\n"  \
-        "\t\t(PUP-<digits>) # this is most common and should be a ticket at tickets.puppet.com\n" \
-        "\t\t(docs)\n" \
-        "\t\t(docs)(DOCUMENT-<digits>)\n" \
-        "\t\t(maint)\n" \
-        "\t\t(packaging)\n" \
-        "\t\t(L10n)\n" \
-        "\n\tThis test for the commit summary is case-insensitive.\n\n\n"
-    else
-      puts "#{commit_summary}"
-    end
-    puts "...passed"
-  end
-end
-
 desc "verify that changed files are clean of Ruby warnings"
 task(:warnings) do
   # This rake task looks at all files modified in this branch.

data/examples/enc/regexp_nodes/regexp_nodes.rb

@@ -133,7 +133,7 @@ class ExternalNode
     patternlist = []
 
     begin
-      open(filepath).each do |l|
+      File.open(filepath).each do |l|
         l.chomp!
 
         next if l =~ /^$/

data/ext/project_data.yaml

@@ -7,10 +7,10 @@ summary: 'Puppet, an automated configuration management tool'
 description: 'Puppet, an automated configuration management tool'
 version_file: 'lib/puppet/version.rb'
 # files and gem_files are space separated lists
-files: '[A-Z]* install.rb bin lib conf man examples ext tasks spec locales'
-# Make sure these gem requirements are in sync with the gempspec and Gemfile
-gem_files: '[A-Z]* install.rb bin lib conf man examples ext tasks spec locales'
-gem_test_files: 'spec/**/*'
+files: '[A-Z]* install.rb bin lib conf man examples ext tasks locales'
+# Make sure these gem requirements are in sync with the gemspec and Gemfile
+gem_files: '[A-Z]* install.rb bin lib conf man examples ext tasks locales'
+gem_test_files:
 gem_executables: 'puppet'
 gem_default_executables: 'puppet'
 gem_license: 'Apache-2.0'

data/ext/windows/service/daemon.rb

@@ -13,12 +13,12 @@ require 'puppet/util/windows/eventlog'
 require 'puppet/util/windows/monkey_patches/process'
 
 class WindowsDaemon < Puppet::Util::Windows::Daemon
-  CREATE_NEW_CONSOLE          = 0x00000010
+  CREATE_NEW_CONSOLE = 0x00000010
 
   @run_thread = nil
   @LOG_TO_FILE = false
   @loglevel = 0
-  LOG_FILE =  File.expand_path(File.join(ENV['ALLUSERSPROFILE'], 'PuppetLabs', 'puppet', 'var', 'log', 'windows.log'))
+  LOG_FILE =  File.expand_path(File.join(ENV.fetch('ALLUSERSPROFILE', nil), 'PuppetLabs', 'puppet', 'var', 'log', 'windows.log'))
   LEVELS = [:debug, :info, :notice, :warning, :err, :alert, :emerg, :crit]
   LEVELS.each do |level|
     define_method("log_#{level}") do |msg|
@@ -38,7 +38,7 @@ class WindowsDaemon < Puppet::Util::Windows::Daemon
 
     if (@LOG_TO_FILE)
       FileUtils.mkdir_p(File.dirname(LOG_FILE))
-      args = args.gsub("--logtofile","")
+      args = args.gsub("--logtofile", "")
     end
 
     base_dir = File.expand_path(File.join(File.dirname(__FILE__), '..'))
@@ -96,7 +96,6 @@ class WindowsDaemon < Puppet::Util::Windows::Daemon
       end
     end
     @run_thread.join
-
   rescue Exception => e
     log_exception(e)
   ensure
@@ -142,14 +141,14 @@ class WindowsDaemon < Puppet::Util::Windows::Daemon
     end
   end
 
-  def report_windows_event(type,id,message)
+  def report_windows_event(type, id, message)
     begin
       eventlog = nil
       eventlog = Puppet::Util::Windows::EventLog.open("Puppet")
       eventlog.report_event(
-        :event_type  => type,   # EVENTLOG_ERROR_TYPE, etc
-        :event_id    => id,     # 0x01 or 0x02, 0x03 etc.
-        :data        => message # "the message"
+        :event_type => type, # EVENTLOG_ERROR_TYPE, etc
+        :event_id => id, # 0x01 or 0x02, 0x03 etc.
+        :data => message # "the message"
       )
     rescue Exception
       # Ignore all errors
@@ -162,7 +161,7 @@ class WindowsDaemon < Puppet::Util::Windows::Daemon
 
   def parse_runinterval(puppet_path)
     begin
-      runinterval = %x{ #{puppet_path} config --section agent --log_level notice print runinterval }.to_i
+      runinterval = %x{#{puppet_path} config --section agent --log_level notice print runinterval}.to_i
       if runinterval == 0
         runinterval = 1800
         log_err("Failed to determine runinterval, defaulting to #{runinterval} seconds")
@@ -175,9 +174,9 @@ class WindowsDaemon < Puppet::Util::Windows::Daemon
     runinterval
   end
 
-  def parse_log_level(puppet_path,cmdline_debug)
+  def parse_log_level(puppet_path, cmdline_debug)
     begin
-      loglevel = %x{ #{puppet_path} config --section agent --log_level notice print log_level }.chomp
+      loglevel = %x{#{puppet_path} config --section agent --log_level notice print log_level}.chomp
       unless loglevel && respond_to?("log_#{loglevel}")
         loglevel = :notice
         log_err("Failed to determine loglevel, defaulting to #{loglevel}")
@@ -204,10 +203,10 @@ class WindowsDaemon < Puppet::Util::Windows::Daemon
       ENV['Path'] = [
         File.join(base_dir, 'puppet', 'bin'),
         File.join(base_dir, 'bin'),
-      ].join(';').tr('/', '\\') + ';' + ENV['Path']
+      ].join(';').tr('/', '\\') + ';' + ENV.fetch('Path', nil)
 
       # ENV that uses forward slashes
-      ENV['RUBYLIB'] = "#{File.join(base_dir, 'puppet','lib')};#{ENV['RUBYLIB']}"
+      ENV['RUBYLIB'] = "#{File.join(base_dir, 'puppet', 'lib')};#{ENV.fetch('RUBYLIB', nil)}"
     rescue => e
       log_exception(e)
     end

data/lib/hiera/puppet_function.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'hiera_puppet'
 
 # Provides the base class for the puppet functions hiera, hiera_array, hiera_hash, and hiera_include.
@@ -15,14 +16,14 @@ class Hiera::PuppetFunction < Puppet::Functions::InternalFunction
 
     dispatch :hiera_no_default do
       scope_param
-      param 'String',:key
+      param 'String', :key
     end
 
     dispatch :hiera_with_default do
       scope_param
-      param 'String',:key
+      param 'String', :key
       param 'Any',   :default
-      optional_param 'Any',   :override
+      optional_param 'Any', :override
     end
 
     dispatch :hiera_block1 do
@@ -61,10 +62,10 @@ class Hiera::PuppetFunction < Puppet::Functions::InternalFunction
 
   def lookup(scope, key, default, has_default, override, &default_block)
     unless Puppet[:strict] == :off
-      #TRANSLATORS 'lookup' is a puppet function and should not be translated
+      # TRANSLATORS 'lookup' is a puppet function and should not be translated
       message = _("The function '%{class_name}' is deprecated in favor of using 'lookup'.") % { class_name: self.class.name }
-      message += ' '+ _("See https://puppet.com/docs/puppet/%{minor_version}/deprecated_language.html") %
-          { minor_version: Puppet.minor_version }
+      message += ' ' + _("See https://puppet.com/docs/puppet/%{minor_version}/deprecated_language.html") %
+                       { minor_version: Puppet.minor_version }
       Puppet.warn_once('deprecations', self.class.name, message)
     end
     lookup_invocation = Puppet::Pops::Lookup::Invocation.new(scope, {}, {})

data/lib/hiera/scope.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'forwardable'
 class Hiera
   class Scope
@@ -19,11 +20,12 @@ class Hiera
     end
 
     def [](key)
-      if key == CALLING_CLASS
+      case key
+      when CALLING_CLASS
         ans = find_hostclass(@real)
-      elsif key == CALLING_CLASS_PATH
+      when CALLING_CLASS_PATH
         ans = find_hostclass(@real).gsub(/::/, '/')
-      elsif key == CALLING_MODULE
+      when CALLING_MODULE
         ans = safe_lookupvar(MODULE_NAME)
       else
         ans = safe_lookupvar(key)
@@ -45,7 +47,7 @@ class Hiera
         # do nothing
       when :warning
         Puppet.warn_once(Puppet::Parser::Scope::UNDEFINED_VARIABLES_KIND, _("Variable: %{name}") % { name: key },
-        _("Undefined variable '%{name}'; %{reason}") % { name: key, reason: reason } )
+                         _("Undefined variable '%{name}'; %{reason}") % { name: key, reason: reason })
       when :error
         raise ArgumentError, _("Undefined variable '%{name}'; %{reason}") % { name: key, reason: reason }
       end
@@ -86,6 +88,5 @@ class Hiera
 
     # This is needed for type conversion to work
     def_delegators :@real, :call_function
-
   end
 end

data/lib/hiera_puppet.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Puppet.features.hiera?
 require 'hiera/scope'
 require_relative 'puppet'
@@ -49,9 +50,6 @@ module HieraPuppet
     return [key, default, override]
   end
 
-  private
-  module_function
-
   def hiera
     @hiera ||= Hiera.new(:config => hiera_config)
   end
@@ -78,4 +76,3 @@ module HieraPuppet
     end
   end
 end
-

data/lib/puppet/agent/disabler.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/util/json_lockfile'
 
 # This module is responsible for encapsulating the logic for
@@ -22,10 +23,10 @@ module Puppet::Agent::Disabler
   end
 
   # Stop the daemon from making any catalog runs.
-  def disable(msg=nil)
+  def disable(msg = nil)
     data = {}
     Puppet.notice _("Disabling Puppet.")
-    if (! msg.nil?)
+    if (!msg.nil?)
       data[DISABLED_MESSAGE_JSON_KEY] = msg
     end
     disable_lockfile.lock(data)
@@ -41,10 +42,10 @@ module Puppet::Agent::Disabler
     if data.has_key?(DISABLED_MESSAGE_JSON_KEY)
       return data[DISABLED_MESSAGE_JSON_KEY]
     end
+
     nil
   end
 
-
   def disable_lockfile
     @disable_lockfile ||= Puppet::Util::JsonLockfile.new(Puppet[:agent_disabled_lockfile])
 

data/lib/puppet/agent/locker.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/util/pidlock'
 require_relative '../../puppet/error'
 
@@ -42,6 +43,4 @@ module Puppet::Agent::Locker
     @lockfile
   end
   private :lockfile
-
-
 end

data/lib/puppet/agent.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../puppet/application'
 require_relative '../puppet/error'
 require_relative '../puppet/util/at_fork'
@@ -18,12 +19,12 @@ class Puppet::Agent
   include Puppet::Util::Splayer
 
   # Special exception class used to signal an agent run has timed out.
-  class RunTimeoutError < Exception
+  class RunTimeoutError < Exception # rubocop:disable Lint/InheritException
   end
 
   attr_reader :client_class, :client, :should_fork
 
-  def initialize(client_class, should_fork=true)
+  def initialize(client_class, should_fork = true)
     @should_fork = can_fork? && should_fork
     @client_class = client_class
   end
@@ -98,13 +99,13 @@ class Puppet::Agent
               nil
             else
               Puppet.info _("Another puppet instance is already running; --waitforlock flag used, waiting for running instance to finish.")
-              Puppet.info _("Will try again in %{time} seconds.") % {time: Puppet[:waitforlock]}
+              Puppet.info _("Will try again in %{time} seconds.") % { time: Puppet[:waitforlock] }
               sleep Puppet[:waitforlock]
               retry
             end
           rescue RunTimeoutError => detail
             Puppet.log_exception(detail, _("Execution of %{client_class} did not complete within %{runtimeout} seconds and was terminated.") %
-              {client_class: client_class, runtimeout: Puppet[:runtimeout]})
+              { client_class: client_class, runtimeout: Puppet[:runtimeout] })
             nil
           rescue StandardError => detail
             Puppet.log_exception(detail, _("Could not run %{client_class}: %{detail}") % { client_class: client_class, detail: detail })