puppet 8.4.0-x86-mingw32 → 8.5.0-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e88cacff0db55960a98629cae92ed78d6d0bbaf50a3e3b42af1f38efb3f1c6af
-  data.tar.gz: 7cd7c8eed9692b698345817323a70943798d31323b4abfe2e92d51e979da0dd2
+  metadata.gz: 3684e49bf8151c60adfc6948d1cfbdc8c07cdd44ba3fba681d61d5fdbff3f2ca
+  data.tar.gz: 977244f0f02a41cd94ba2a6e65ad12b17a4080307f0b3ae01ed3a91b00bef22d
 SHA512:
-  metadata.gz: 0f46a900befb378db5d2de4521dce81bb6f5ecae3920bbed75983a09a0c3a00fef510378b88bdb7021809fb3cd5702fcd633a454a37c24c4241c0b8af48bf72e
-  data.tar.gz: 2461b4d328e8543a8e491a526d3689c866bd27bd12890ec835ba4e8bee541b73680b36b1ab23cef82665dab29c84636b57f69c32eb7a1be6d6ed7f94b0efd87a
+  metadata.gz: fa82791c7167faefed8be20174e1a7cbc1a3a0873ee903661c24a44bc493ff64c7efdf5aeb6a760ecc926c2132c66900f0d0fe398c722156e5ce1ab49d7afb77
+  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,21 +1,7 @@
-GIT
-  remote: https://github.com/puppetlabs/packaging
-  revision: 6c91ebc40b07f2041aa39b21becde6a06684e1b9
-  branch: 1.0.x
-  specs:
-    packaging (0)
-      apt_stage_artifacts
-      artifactory (~> 3)
-      csv (>= 3.1.5)
-      google-cloud-storage
-      googleauth
-      rake (>= 12.3)
-      release-metrics
-
 PATH
   remote: .
   specs:
-    puppet (8.4.0)
+    puppet (8.5.0)
       CFPropertyList (~> 2.2)
       concurrent-ruby (~> 1.0)
       deep_merge (~> 1.0)
@@ -31,26 +17,28 @@ GEM
   remote: https://artifactory.delivery.puppetlabs.net/artifactory/api/gems/rubygems/
   specs:
     CFPropertyList (2.3.6)
-    abbrev (0.1.2)
     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.2.0)
+    bigdecimal (3.1.6)
     coderay (1.1.3)
     concurrent-ruby (1.2.3)
-    crack (0.4.5)
+    crack (1.0.0)
+      bigdecimal
       rexml
     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.1)
+    facter (4.6.0)
       hocon (~> 1.3)
       thor (>= 1.0.1, < 2.0)
     faraday (2.9.0)
@@ -70,33 +58,34 @@ GEM
       fast_gettext (~> 2.1)
       gettext (~> 3.4)
       locale
-    google-apis-core (0.11.3)
+    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
-    google-apis-iamcredentials_v1 (0.17.0)
-      google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-storage_v1 (0.31.0)
-      google-apis-core (>= 0.11.0, < 2.a)
+    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 (2.1.0)
+    google-cloud-env (2.1.1)
       faraday (>= 1.0, < 3.a)
     google-cloud-errors (1.3.1)
-    google-cloud-storage (1.47.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.31.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.9.1)
+    googleauth (1.11.0)
       faraday (>= 1.0, < 3.a)
       google-cloud-env (~> 2.1)
       jwt (>= 1.4, < 3.0)
@@ -107,14 +96,16 @@ GEM
     hiera-eyaml (3.4.0)
       highline
       optimist
-    highline (3.0.0)
-      abbrev
+    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)
@@ -127,8 +118,16 @@ GEM
       uri
     optimist (3.1.0)
     os (1.1.4)
+    packaging (0.115.0)
+      apt_stage_artifacts
+      artifactory (~> 3)
+      csv (>= 3.1.5)
+      google-cloud-storage
+      googleauth
+      rake (>= 12.3)
+      release-metrics
     parallel (1.24.0)
-    parser (3.3.0.4)
+    parser (3.3.0.5)
       ast (~> 2.4.1)
       racc
     prime (0.1.2)
@@ -140,7 +139,7 @@ GEM
     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)
@@ -161,40 +160,55 @@ 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)
+    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)
     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)
@@ -207,7 +221,7 @@ GEM
     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)
@@ -228,7 +242,7 @@ DEPENDENCIES
   memory_profiler
   minitar (~> 0.9)
   msgpack (~> 1.2)
-  packaging!
+  packaging (~> 0.113)
   pry
   puppet!
   puppet-resource_api (~> 1.5)
@@ -240,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/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

@@ -18,7 +18,7 @@ class WindowsDaemon < Puppet::Util::Windows::Daemon
   @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__), '..'))
@@ -141,7 +141,7 @@ 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")
@@ -161,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")
@@ -174,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}")
@@ -203,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

@@ -16,12 +16,12 @@ 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
     end
@@ -64,8 +64,8 @@ class Hiera::PuppetFunction < Puppet::Functions::InternalFunction
     unless Puppet[:strict] == :off
       # 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

@@ -20,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)
@@ -46,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

data/lib/hiera_puppet.rb

@@ -76,4 +76,3 @@ module HieraPuppet
     end
   end
 end
-

data/lib/puppet/agent/disabler.rb

@@ -23,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)

data/lib/puppet/agent.rb

@@ -24,7 +24,7 @@ class Puppet::Agent
 
   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
@@ -99,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 })