puppet 7.4.0-x86-mingw32 → 7.8.0-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a24dbcc15abdd7388e35bb8bed347c18766807e9b1252d38e29e30726e5d497d
-  data.tar.gz: 3d2919c025c426718c0d324abfbe53207497fde44834c132611ba079d11fc0d9
+  metadata.gz: 4b94cb3c9f43e9a96a2688ded63ad21417983031abd2d82f045cf167d83d8f5d
+  data.tar.gz: c78ade38c84935391e4d1eae61befd466fb1b409855e1665853cf8c6305f9806
 SHA512:
-  metadata.gz: 9b45f7859862eb7a7c71a6daa44cd2d3cab6f3a6b59ff24290ce9186695cfaa6d845f8a46c0d5898c2153ea6b36011ef030f198531a640629c83732be7e133d0
-  data.tar.gz: d9c2729b39961031c70d4344ac67ef556c98b248257fd22253d3125647f8e3498ae46765c27fbdfe98e978063eac7f8fcdd8841bd56973f40a52b1015cebf632
+  metadata.gz: d4c5e446ccce1bea372840316c3b459032fdc6ef2be591d6858b0670ffac990ccfbd0ef6d552191a6ea85202561bd825feaa9639e6353abce707542948fb8726
+  data.tar.gz: 1416f56f40511147b1187d232354eaf1b17a9e82506744fe456305e08b7e5529a5a538f1b5f5ec84d191068292ee340bebd58b1866ae926a630aa8ea22b61270

data/CONTRIBUTING.md

@@ -114,7 +114,7 @@ respectively.
 
 ## Submitting Changes
 
-* Sign the [Contributor License Agreement](https://cla.puppet.com).
+* Sign the [Contributor License Agreement](https://cla-assistant.io/puppetlabs/).
 * Push your changes to a topic branch in your fork of the repository.
 * Submit a pull request to the repository in the puppetlabs organization.
 * Update the related Jira ticket to mark that you have submitted code and are ready
@@ -158,4 +158,4 @@ ensure the issue has been resolved.
 * [General GitHub documentation](https://help.github.com/)
 * [GitHub pull request documentation](https://help.github.com/articles/creating-a-pull-request/)
 * [puppet-dev mailing list](https://groups.google.com/forum/#!forum/puppet-dev)
-* [Puppet community slack](https://slack.puppet.com)
+* [Puppet community slack](https://slack.puppet.com)

data/Gemfile

@@ -37,12 +37,13 @@ end
 group(:test) do
   gem "ffi", require: false
   gem "json-schema", "~> 2.0", require: false
-  gem "rake", *location_for(ENV['RAKE_LOCATION'] || '~> 12.2')
+  gem "rake", *location_for(ENV['RAKE_LOCATION'] || '~> 13.0')
   gem "rspec", "~> 3.1", require: false
   gem "rspec-expectations", ["~> 3.9", "!= 3.9.3"]
   gem "rspec-its", "~> 1.1", require: false
   gem 'vcr', '~> 5.0', require: false
   gem 'webmock', '~> 3.0', require: false
+  gem 'webrick', '~> 1.7', require: false if RUBY_VERSION.to_f >= 3.0
   gem 'yard', require: false
 
   gem 'rubocop', '~> 0.49', require: false, platforms: [:ruby]

data/Gemfile.lock

@@ -1,7 +1,18 @@
+GIT
+  remote: git://github.com/puppetlabs/packaging
+  revision: 56b3c7db09d6cafe878ff4a9dfc048b5a5bea89c
+  branch: 1.0.x
+  specs:
+    packaging (0.99.77.2.g56b3c7d)
+      artifactory (~> 2)
+      csv (= 3.1.5)
+      rake (>= 12.3)
+      release-metrics
+
 PATH
   remote: .
   specs:
-    puppet (7.4.0)
+    puppet (7.8.0)
       CFPropertyList (~> 2.2)
       concurrent-ruby (~> 1.0)
       deep_merge (~> 1.0)
@@ -22,18 +33,18 @@ GEM
     artifactory (2.8.2)
     ast (2.4.2)
     coderay (1.1.3)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.9)
     crack (0.4.5)
       rexml
     csv (3.1.5)
     deep_merge (1.2.1)
     diff-lcs (1.4.4)
     docopt (0.6.1)
-    facter (4.0.50)
+    facter (4.2.1)
       hocon (~> 1.3)
       thor (>= 1.0.1, < 2.0)
     fast_gettext (1.1.2)
-    ffi (1.14.2)
+    ffi (1.15.1)
     gettext (3.2.9)
       locale (>= 2.0.5)
       text (>= 1.3.0)
@@ -42,11 +53,11 @@ GEM
       gettext (>= 3.0.2, < 3.3.0)
       locale
     hashdiff (1.0.1)
-    hiera (3.6.0)
-    hiera-eyaml (3.2.0)
-      highline (~> 1.6.19)
+    hiera (3.7.0)
+    hiera-eyaml (3.2.2)
+      highline
       optimist
-    highline (1.6.21)
+    highline (2.0.3)
     hocon (1.3.1)
     hpricot (0.8.6)
     json-schema (2.8.1)
@@ -59,33 +70,28 @@ GEM
     multi_json (1.15.0)
     mustache (1.1.1)
     optimist (3.0.1)
-    packaging (0.99.75)
-      artifactory (~> 2)
-      csv (= 3.1.5)
-      rake (>= 12.3)
-      release-metrics
     parallel (1.20.1)
     parser (2.7.2.0)
       ast (~> 2.4.1)
     powerpack (0.1.3)
-    pry (0.13.1)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (4.0.6)
-    puppet-resource_api (1.8.13)
+    puppet-resource_api (1.8.14)
       hocon (>= 1.0)
-    puppetserver-ca (2.0.1)
+    puppetserver-ca (2.1.0)
       facter (>= 2.0.1, < 5)
     racc (1.4.9)
     rainbow (2.2.2)
       rake
-    rake (12.3.3)
+    rake (13.0.3)
     rdiscount (2.2.0.2)
-    rdoc (6.3.0)
+    rdoc (6.3.1)
     release-metrics (1.1.0)
       csv
       docopt
-    rexml (3.2.4)
+    rexml (3.2.5)
     ronn (0.7.3)
       hpricot (>= 0.8.2)
       mustache (>= 0.7.0)
@@ -115,15 +121,15 @@ GEM
       unicode-display_width (~> 1.0, >= 1.0.1)
     rubocop-i18n (1.2.0)
       rubocop (~> 0.49.0)
-    ruby-prof (1.4.2)
+    ruby-prof (1.4.3)
     ruby-progressbar (1.11.0)
     scanf (1.0.0)
-    semantic_puppet (1.0.3)
+    semantic_puppet (1.0.4)
     text (1.3.1)
     thor (1.1.0)
     unicode-display_width (1.7.0)
     vcr (5.1.0)
-    webmock (3.11.2)
+    webmock (3.13.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -142,13 +148,13 @@ DEPENDENCIES
   memory_profiler
   minitar (~> 0.9)
   msgpack (~> 1.2)
-  packaging (~> 0.99)
+  packaging!
   pry
   puppet!
   puppet-resource_api (~> 1.5)
   puppetserver-ca (~> 2.0)
   racc (= 1.4.9)
-  rake (~> 12.2)
+  rake (~> 13.0)
   rdoc (~> 6.0)
   ronn (~> 0.7.3)
   rspec (~> 3.1)

data/ext/osx/puppet.plist

@@ -26,5 +26,7 @@
         <string>/var/log/puppetlabs/puppet/puppet.log</string>
         <key>StandardOutPath</key>
         <string>/var/log/puppetlabs/puppet/puppet.log</string>
+        <key>SessionCreate</key>
+        <true />
 </dict>
 </plist>

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