puppet 7.6.1 → 7.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfacc8975faf19f44aa68a49b50e63896e7fc27106e946415c13b0cf600df328
-  data.tar.gz: 360336c8c5139037ca2afe94c986fcc1b37e902561cecf93e59b08add064d062
+  metadata.gz: '05951232f5875c134c0334797ae29444327333084c4fe8260e5c2e6c71251633'
+  data.tar.gz: 81ec4d7dca3f2c1858993c4feb1fe03dffb83b790e5b6d9c4eb087a6d50308c4
 SHA512:
-  metadata.gz: 7273c42d5d758f8eb4acf807f563771ae4a05cf44d4b8c14debe8e83a1be425cbd3cba4c8bf4daa9c22a5677f3e388b3b75badaef8a21819356c4deaef0933c5
-  data.tar.gz: 6eb1a41e1910ab15f297a6fee50b3de7c572394aab25baa8820adc78cc150fb25615d473caa5f11bd1c78cdbee237fc5358c1e20e4f5049ebf1d24c87fbe28f1
+  metadata.gz: d2110fc36c2a0be3a11126cd90af46d05f208adc10800bfa3d5377dc6eced7e08d020a4be7434e6b8250591fe09c0b468db690585f498acec02887856756f5d8
+  data.tar.gz: '08306b72933e81f87cc49fdca65154cc13b1545f63d7159316c6aa93c550e6b5105ac0f4ec3a1f7c2aa30a197f6b7dc9e0e173e37f196d12719e93e392148da1'

data/Gemfile.lock

@@ -1,9 +1,9 @@
 GIT
-  remote: git://github.com/ciprianbadescu/packaging
-  revision: 5f8d2bda941abfeeb8fb1731c9b1dd4d108f5d33
-  branch: maint/windows-signing
+  remote: git://github.com/puppetlabs/packaging
+  revision: 36e0078116659d6fc7a9312c8465ec9b183b8f26
+  branch: 1.0.x
   specs:
-    packaging (0.99.49.171.g5f8d2bd)
+    packaging (0.99.76.12.g36e0078)
       artifactory (~> 2)
       csv (= 3.1.5)
       rake (>= 12.3)
@@ -12,7 +12,7 @@ GIT
 PATH
   remote: .
   specs:
-    puppet (7.6.1)
+    puppet (7.7.0)
       CFPropertyList (~> 2.2)
       concurrent-ruby (~> 1.0)
       deep_merge (~> 1.0)
@@ -44,7 +44,7 @@ GEM
       hocon (~> 1.3)
       thor (>= 1.0.1, < 2.0)
     fast_gettext (1.1.2)
-    ffi (1.15.0)
+    ffi (1.15.1)
     gettext (3.2.9)
       locale (>= 2.0.5)
       text (>= 1.3.0)
@@ -54,7 +54,7 @@ GEM
       locale
     hashdiff (1.0.1)
     hiera (3.7.0)
-    hiera-eyaml (3.2.1)
+    hiera-eyaml (3.2.2)
       highline
       optimist
     highline (2.0.3)
@@ -87,7 +87,7 @@ GEM
       rake
     rake (12.3.3)
     rdiscount (2.2.0.2)
-    rdoc (6.3.0)
+    rdoc (6.3.1)
     release-metrics (1.1.0)
       csv
       docopt
@@ -129,7 +129,7 @@ GEM
     thor (1.1.0)
     unicode-display_width (1.7.0)
     vcr (5.1.0)
-    webmock (3.12.2)
+    webmock (3.13.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)

data/install.rb

@@ -60,7 +60,7 @@ def do_configs(configs, target, strip = 'conf/')
   Dir.mkdir(target) unless File.directory? target
   configs.each do |cf|
     ocf = File.join(InstallOptions.config_dir, cf.gsub(/#{strip}/, ''))
-    FileUtils.install(cf, ocf, {:mode => 0644, :preserve => true, :verbose => true})
+    FileUtils.install(cf, ocf, mode: 0644, preserve: true, verbose: true)
   end
 end
 
@@ -77,9 +77,9 @@ def do_libs(libs, strip = 'lib/')
     next if File.directory? lf
     olf = File.join(InstallOptions.site_dir, lf.sub(/^#{strip}/, ''))
     op = File.dirname(olf)
-    FileUtils.makedirs(op, {:mode => 0755, :verbose => true})
+    FileUtils.makedirs(op, mode: 0755, verbose: true)
     FileUtils.chmod(0755, op)
-    FileUtils.install(lf, olf, {:mode => 0644, :preserve => true, :verbose => true})
+    FileUtils.install(lf, olf, mode: 0644, preserve: true, verbose: true)
   end
 end
 
@@ -87,9 +87,9 @@ def do_man(man, strip = 'man/')
   man.each do |mf|
     omf = File.join(InstallOptions.man_dir, mf.gsub(/#{strip}/, ''))
     om = File.dirname(omf)
-    FileUtils.makedirs(om, {:mode => 0755, :verbose => true})
+    FileUtils.makedirs(om, mode: 0755, verbose: true)
     FileUtils.chmod(0755, om)
-    FileUtils.install(mf, omf, {:mode => 0644, :preserve => true, :verbose => true})
+    FileUtils.install(mf, omf, mode: 0644, preserve: true, verbose: true)
     # Solaris does not support gzipped man pages. When called with
     # --no-check-prereqs/without facter the default gzip behavior still applies
     unless $operatingsystem == "Solaris"
@@ -105,9 +105,9 @@ def do_locales(locale, strip = 'locales/')
     next if File.directory? lf
     olf = File.join(InstallOptions.locale_dir, lf.sub(/^#{strip}/, ''))
     op = File.dirname(olf)
-    FileUtils.makedirs(op, {:mode => 0755, :verbose => true})
+    FileUtils.makedirs(op, mode: 0755, verbose: true)
     FileUtils.chmod(0755, op)
-    FileUtils.install(lf, olf, {:mode => 0644, :preserve => true, :verbose => true})
+    FileUtils.install(lf, olf, mode: 0644, preserve: true, verbose: true)
   end
 end
 
@@ -443,12 +443,12 @@ def install_binfile(from, op_file, target)
 
     unless File.extname(from) =~ /\.(cmd|bat)/
       if File.exist?("#{from}.bat")
-        FileUtils.install("#{from}.bat", File.join(target, "#{op_file}.bat"), :mode => 0755, :preserve => true, :verbose => true)
+        FileUtils.install("#{from}.bat", File.join(target, "#{op_file}.bat"), mode: 0755, preserve: true, verbose: true)
         installed_wrapper = true
       end
 
       if File.exist?("#{from}.cmd")
-        FileUtils.install("#{from}.cmd", File.join(target, "#{op_file}.cmd"), :mode => 0755, :preserve => true, :verbose => true)
+        FileUtils.install("#{from}.cmd", File.join(target, "#{op_file}.cmd"), mode: 0755, preserve: true, verbose: true)
         installed_wrapper = true
       end
 
@@ -465,13 +465,13 @@ if exist "%~dp0environment.bat" (
 ruby.exe -S -- puppet %*
 EOS
         File.open(tmp_file2.path, "w") { |cw| cw.puts cwv }
-        FileUtils.install(tmp_file2.path, File.join(target, "#{op_file}.bat"), :mode => 0755, :preserve => true, :verbose => true)
+        FileUtils.install(tmp_file2.path, File.join(target, "#{op_file}.bat"), mode: 0755, preserve: true, verbose: true)
 
         tmp_file2.unlink
       end
     end
   end
-  FileUtils.install(tmp_file.path, File.join(target, op_file), :mode => 0755, :preserve => true, :verbose => true)
+  FileUtils.install(tmp_file.path, File.join(target, op_file), mode: 0755, preserve: true, verbose: true)
   tmp_file.unlink
 end
 

data/lib/hiera_puppet.rb

@@ -1,6 +1,6 @@
 require 'hiera'
 require 'hiera/scope'
-require 'puppet'
+require_relative 'puppet'
 
 module HieraPuppet
   module_function

data/lib/puppet.rb

@@ -1,5 +1,5 @@
-require 'puppet/version'
-require 'puppet/concurrent/synchronized'
+require_relative 'puppet/version'
+require_relative 'puppet/concurrent/synchronized'
 
 if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new("2.5.0")
   raise LoadError, "Puppet #{Puppet.version} requires Ruby 2.5.0 or greater, found Ruby #{RUBY_VERSION.dup}."
@@ -13,19 +13,19 @@ $LOAD_PATH.extend(Puppet::Concurrent::Synchronized)
 # Also see the new Vendor support - towards the end
 #
 require 'facter'
-require 'puppet/error'
-require 'puppet/util'
-require 'puppet/util/autoload'
-require 'puppet/settings'
-require 'puppet/util/feature'
-require 'puppet/util/suidmanager'
-require 'puppet/util/run_mode'
+require_relative 'puppet/error'
+require_relative 'puppet/util'
+require_relative 'puppet/util/autoload'
+require_relative 'puppet/settings'
+require_relative 'puppet/util/feature'
+require_relative 'puppet/util/suidmanager'
+require_relative 'puppet/util/run_mode'
 # PSON is deprecated, use JSON instead
-require 'puppet/external/pson/common'
-require 'puppet/external/pson/version'
-require 'puppet/external/pson/pure'
-require 'puppet/gettext/config'
-require 'puppet/defaults'
+require_relative 'puppet/external/pson/common'
+require_relative 'puppet/external/pson/version'
+require_relative 'puppet/external/pson/pure'
+require_relative 'puppet/gettext/config'
+require_relative 'puppet/defaults'
 
 # Defines the `Puppet` module. There are different entry points into Puppet
 # depending on your use case.
@@ -40,10 +40,10 @@ require 'puppet/defaults'
 #
 # @api public
 module Puppet
-  require 'puppet/file_system'
-  require 'puppet/etc'
-  require 'puppet/context'
-  require 'puppet/environments'
+  require_relative 'puppet/file_system'
+  require_relative 'puppet/etc'
+  require_relative 'puppet/context'
+  require_relative 'puppet/environments'
 
   class << self
     Puppet::GettextConfig.setup_locale
@@ -85,7 +85,7 @@ module Puppet
     end
   end
 
-  require 'puppet/util/logging'
+  require_relative 'puppet/util/logging'
   extend Puppet::Util::Logging
 
   # Setup facter's logging
@@ -95,7 +95,7 @@ module Puppet
   @features = Puppet::Util::Feature.new('puppet/feature')
 
   # Load the base features.
-  require 'puppet/feature/base'
+  require_relative 'puppet/feature/base'
 
   # setting access and stuff
   def self.[]=(param,value)
@@ -208,7 +208,7 @@ module Puppet
 
   # Load vendored (setup paths, and load what is needed upfront).
   # See the Vendor class for how to add additional vendored gems/code
-  require "puppet/vendor"
+  require_relative 'puppet/vendor'
   Puppet::Vendor.load_vendored
 
   # The bindings used for initialization of puppet
@@ -332,12 +332,12 @@ module Puppet
     @runtime
   end
 
-  require 'puppet/node'
+  require_relative 'puppet/node'
 
   # The single instance used for normal operation
   @context = Puppet::Context.new(bootstrap_context)
 
-  require 'puppet/runtime'
+  require_relative 'puppet/runtime'
   @runtime = Puppet::Runtime.instance
 end
 
@@ -345,17 +345,17 @@ end
 #  anywhere besides the very top of a file.  That would not be possible at the moment without a great deal of
 #  effort, but I think we should strive for it and revisit this at some point.  --cprice 2012-03-16
 
-require 'puppet/indirector'
-require 'puppet/compilable_resource_type'
-require 'puppet/type'
-require 'puppet/resource'
-require 'puppet/parser'
-require 'puppet/network'
-require 'puppet/x509'
-require 'puppet/ssl'
-require 'puppet/module'
-require 'puppet/data_binding'
-require 'puppet/util/storage'
-require 'puppet/file_bucket/file'
-require 'puppet/plugins/configuration'
-require 'puppet/pal/pal_api'
+require_relative 'puppet/indirector'
+require_relative 'puppet/compilable_resource_type'
+require_relative 'puppet/type'
+require_relative 'puppet/resource'
+require_relative 'puppet/parser'
+require_relative 'puppet/network'
+require_relative 'puppet/x509'
+require_relative 'puppet/ssl'
+require_relative 'puppet/module'
+require_relative 'puppet/data_binding'
+require_relative 'puppet/util/storage'
+require_relative 'puppet/file_bucket/file'
+require_relative 'puppet/plugins/configuration'
+require_relative 'puppet/pal/pal_api'

data/lib/puppet/agent.rb

@@ -1,19 +1,19 @@
-require 'puppet/application'
-require 'puppet/error'
-require 'puppet/util/at_fork'
+require_relative '../puppet/application'
+require_relative '../puppet/error'
+require_relative '../puppet/util/at_fork'
 
 require 'timeout'
 
 # A general class for triggering a run of another
 # class.
 class Puppet::Agent
-  require 'puppet/agent/locker'
+  require_relative 'agent/locker'
   include Puppet::Agent::Locker
 
-  require 'puppet/agent/disabler'
+  require_relative 'agent/disabler'
   include Puppet::Agent::Disabler
 
-  require 'puppet/util/splayer'
+  require_relative '../puppet/util/splayer'
   include Puppet::Util::Splayer
 
   # Special exception class used to signal an agent run has timed out.

data/lib/puppet/agent/disabler.rb

@@ -1,4 +1,4 @@
-require 'puppet/util/json_lockfile'
+require_relative '../../puppet/util/json_lockfile'
 
 # This module is responsible for encapsulating the logic for
 #  "disabling" the puppet agent during a run; in other words,

data/lib/puppet/agent/locker.rb

@@ -1,5 +1,5 @@
-require 'puppet/util/pidlock'
-require 'puppet/error'
+require_relative '../../puppet/util/pidlock'
+require_relative '../../puppet/error'
 
 # This module is responsible for encapsulating the logic for "locking" the
 # puppet agent during a catalog run; in other words, keeping track of enough

data/lib/puppet/application.rb

@@ -1,8 +1,8 @@
 require 'optparse'
-require 'puppet/util/command_line'
-require 'puppet/util/constant_inflector'
-require 'puppet/error'
-require 'puppet/application_support'
+require_relative '../puppet/util/command_line'
+require_relative '../puppet/util/constant_inflector'
+require_relative '../puppet/error'
+require_relative '../puppet/application_support'
 
 module Puppet
 
@@ -105,7 +105,7 @@ module Puppet
 # @abstract
 # @api public
 class Application
-  require 'puppet/util'
+  require_relative '../puppet/util'
   include Puppet::Util
 
   DOCPATTERN = ::File.expand_path(::File.dirname(__FILE__) + "/util/command_line/*" )
@@ -284,7 +284,7 @@ class Application
 
       return @run_mode if @run_mode and not mode_name
 
-      require 'puppet/util/run_mode'
+      require_relative '../puppet/util/run_mode'
       @run_mode = Puppet::Util::RunMode[ mode_name || Puppet.settings.preferred_run_mode ]
     end
 

data/lib/puppet/application/agent.rb

@@ -1,9 +1,9 @@
-require 'puppet/application'
-require 'puppet/daemon'
-require 'puppet/util/pidlock'
-require 'puppet/agent'
-require 'puppet/configurer'
-require 'puppet/ssl/oids'
+require_relative '../../puppet/application'
+require_relative '../../puppet/daemon'
+require_relative '../../puppet/util/pidlock'
+require_relative '../../puppet/agent'
+require_relative '../../puppet/configurer'
+require_relative '../../puppet/ssl/oids'
 
 class Puppet::Application::Agent < Puppet::Application
 
@@ -133,9 +133,12 @@ Some flags are meant specifically for interactive use --- in particular,
 'test', 'tags' and 'fingerprint' are useful.
 
 '--test' runs once in the foreground with verbose logging, then exits.
-It also exits if it can't get a valid catalog. `--test` includes the '--detailed-exitcodes' option by default and exits with one of the following exit codes:
+It also exits if it can't get a valid catalog. `--test` includes the 
+'--detailed-exitcodes' option by default and exits with one of the following 
+exit codes:
 
-* 0: The run succeeded with no changes or failures; the system was already in the desired state.
+* 0: The run succeeded with no changes or failures; the system was already in 
+     the desired state.
 * 1: The run failed, or wasn't attempted due to another run already in progress.
 * 2: The run succeeded, and some resources were changed.
 * 4: The run succeeded, and some resources failed.
@@ -246,7 +249,9 @@ generated by running puppet agent with '--genconfig'.
   'puppet agent' exits after executing this.
   
 *  --evaltrace:
-  Logs each resource as it is being evaluated. This allows you to interactively see exactly what is being done. (This is a Puppet setting, and can go in puppet.conf. Note the special 'no-' prefix for boolean settings on the command line.)
+  Logs each resource as it is being evaluated. This allows you to interactively
+  see exactly what is being done. (This is a Puppet setting, and can go in
+  puppet.conf. Note the special 'no-' prefix for boolean settings on the command line.)
 
 * --fingerprint:
   Display the current certificate or certificate signing request
@@ -267,7 +272,8 @@ generated by running puppet agent with '--genconfig'.
   service), 'eventlog' (the Windows Event Log), 'console', or the path to a log
   file. If debugging or verbosity is enabled, this defaults to 'console'.
   Otherwise, it defaults to 'syslog' on POSIX systems and 'eventlog' on Windows.
-  Multiple destinations can be set using a comma separated list (eg: `/path/file1,console,/path/file2`)"
+  Multiple destinations can be set using a comma separated list 
+  (eg: `/path/file1,console,/path/file2`)"
 
   A path ending with '.json' will receive structured output in JSON format. The
   log file will not have an ending ']' automatically written to it due to the
@@ -310,7 +316,8 @@ generated by running puppet agent with '--genconfig'.
   'no-splay', and 'show_diff'.
   
 * --trace
-  Prints stack traces on some errors. (This is a Puppet setting, and can go in puppet.conf. Note the special 'no-' prefix for boolean settings on the command line.)
+  Prints stack traces on some errors. (This is a Puppet setting, and can go in
+  puppet.conf. Note the special 'no-' prefix for boolean settings on the command line.)
 
 * --verbose:
   Turn on verbose reporting.

data/lib/puppet/application/apply.rb

@@ -1,9 +1,9 @@
-require 'puppet/application'
-require 'puppet/configurer'
-require 'puppet/util/profiler/aggregate'
+require_relative '../../puppet/application'
+require_relative '../../puppet/configurer'
+require_relative '../../puppet/util/profiler/aggregate'
 
 class Puppet::Application::Apply < Puppet::Application
-  require 'puppet/util/splayer'
+  require_relative '../../puppet/util/splayer'
   include Puppet::Util::Splayer
 
   option("--debug","-d")
@@ -113,7 +113,8 @@ configuration options by running puppet with
   Where to send log messages. Choose between 'syslog' (the POSIX syslog
   service), 'eventlog' (the Windows Event Log), 'console', or the path to a log
   file. Defaults to 'console'.
-  Multiple destinations can be set using a comma separated list (eg: `/path/file1,console,/path/file2`)"
+  Multiple destinations can be set using a comma separated list
+  (eg: `/path/file1,console,/path/file2`)"
 
   A path ending with '.json' will receive structured output in JSON format. The
   log file will not have an ending ']' automatically written to it due to the

data/lib/puppet/application/catalog.rb

@@ -1,4 +1,4 @@
-require 'puppet/application/indirection_base'
+require_relative '../../puppet/application/indirection_base'
 
 class Puppet::Application::Catalog < Puppet::Application::IndirectionBase
 end

data/lib/puppet/application/config.rb

@@ -1,4 +1,4 @@
-require 'puppet/application/face_base'
+require_relative '../../puppet/application/face_base'
 
 class Puppet::Application::Config < Puppet::Application::FaceBase
   environment_mode :not_required