puppet 7.6.1-x86-mingw32 → 7.10.0-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6442c3f806a5eb07b56355b043f1201428a30bf92643aff9dd6464ad6c38174a
-  data.tar.gz: ea7da444c3d65a60206c6daffa03020942dce1f5131df9a836a6c63c2dbb2f80
+  metadata.gz: 20b023930a13e00c408aa8e4ac8d76845ed066c8aebc13064b30e65543e92e10
+  data.tar.gz: 7943ad8710ee392c6be91e9322a19231bcd9eba8869d23b816c7c9a13301cd2b
 SHA512:
-  metadata.gz: 7410020185753f6cfd05e073437dda1ed6e64018a48231c4c0df76bd1a9ac8c8674ebc6806cb56c1964a5d63cb270d91e4d032bed408fe3c31c9620a465b5dd8
-  data.tar.gz: 35be35c2d99f1e1f38bd8b6a5cbf2894b7f7b01ec56356ca4b0d3ca6414f62743667a534472523db2ced3fd39831690bd412a3f1bd41ae6f5b7e7a05b8f76dae
+  metadata.gz: 371dbcf8fefac57ca259eb1ff8b63bf30f6792de177df0296c748ea56ed52a422d8270b4a85c1260cd1007ea96839bff6bf64861fa52c580509229bc787073ea
+  data.tar.gz: 6339f75b96125a8d1b2357c7f38d42daf26b1423af87fe89f413d6f3ed6d9bc3f67c409598dcc3b4031cf513ad156c36cc0f598c6d82d70969f4a34e858ff859

data/CONTRIBUTING.md

@@ -38,12 +38,12 @@ the [puppet-dev mailing list](https://groups.google.com/forum/#!forum/puppet-dev
 ## Making Changes
 
 * Create a topic branch from where you want to base your work.
-  * This is usually the master branch.
+  * This is usually the main branch.
   * Only target release branches if you are certain your fix must be on that
     branch.
-  * To quickly create a topic branch based on master, run `git checkout -b
-    fix/master/my_contribution master`. Please avoid working directly on the
-    `master` branch.
+  * To quickly create a topic branch based on main, run `git checkout -b
+    fix/main/my_contribution main`. Please avoid working directly on the
+    `main` branch.
 * Make commits of logical and atomic units.
 * Check for unnecessary whitespace with `git diff --check` before committing.
 * Make sure your commit messages are in the proper format. If the commit
@@ -65,7 +65,7 @@ the [puppet-dev mailing list](https://groups.google.com/forum/#!forum/puppet-dev
       why this is a problem, and how the patch fixes the problem when applied.
   ```
 * Make sure you have added the necessary tests for your changes.
-* For details on how to run tests, please see [the quickstart guide](https://github.com/puppetlabs/puppet/blob/master/docs/quickstart.md)
+* For details on how to run tests, please see [the quickstart guide](https://github.com/puppetlabs/puppet/blob/main/docs/quickstart.md)
 
 ## Writing Translatable Code
 
@@ -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,9 +1,9 @@
 GIT
-  remote: git://github.com/ciprianbadescu/packaging
-  revision: 5f8d2bda941abfeeb8fb1731c9b1dd4d108f5d33
-  branch: maint/windows-signing
+  remote: git://github.com/puppetlabs/packaging
+  revision: 804ad19a32455079917eaabd73fcec65078e8cee
+  branch: 1.0.x
   specs:
-    packaging (0.99.49.171.g5f8d2bd)
+    packaging (0.99.79.2.g804ad19)
       artifactory (~> 2)
       csv (= 3.1.5)
       rake (>= 12.3)
@@ -12,7 +12,7 @@ GIT
 PATH
   remote: .
   specs:
-    puppet (7.6.1)
+    puppet (7.10.0)
       CFPropertyList (~> 2.2)
       concurrent-ruby (~> 1.0)
       deep_merge (~> 1.0)
@@ -28,23 +28,23 @@ GEM
   remote: https://artifactory.delivery.puppetlabs.net/artifactory/api/gems/rubygems/
   specs:
     CFPropertyList (2.3.6)
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     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.1.1)
+    facter (4.2.2)
       hocon (~> 1.3)
       thor (>= 1.0.1, < 2.0)
     fast_gettext (1.1.2)
-    ffi (1.15.0)
+    ffi (1.15.3)
     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)
@@ -78,16 +78,16 @@ GEM
       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.1.0)
+    puppetserver-ca (2.3.1)
       facter (>= 2.0.1, < 5)
     racc (1.4.9)
     rainbow (2.2.2)
       rake
-    rake (12.3.3)
+    rake (13.0.6)
     rdiscount (2.2.0.2)
-    rdoc (6.3.0)
+    rdoc (6.3.2)
     release-metrics (1.1.0)
       csv
       docopt
@@ -124,13 +124,13 @@ GEM
     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.12.2)
-      addressable (>= 2.3.6)
+    webmock (3.14.0)
+      addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
     yard (0.9.26)
@@ -154,7 +154,7 @@ DEPENDENCIES
   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/README.md

@@ -33,16 +33,16 @@ see the [Quick Start to Developing on Puppet](docs/quickstart.md) guide.
 
 We'd love to get contributions from you! For a quick guide to getting your
 system setup for developing, take a look at our [Quickstart
-Guide](https://github.com/puppetlabs/puppet/blob/master/docs/quickstart.md). Once you are up and running, take a look at the
-[Contribution Documents](https://github.com/puppetlabs/puppet/blob/master/CONTRIBUTING.md) to see how to get your changes merged
+Guide](https://github.com/puppetlabs/puppet/blob/main/docs/quickstart.md). Once you are up and running, take a look at the
+[Contribution Documents](https://github.com/puppetlabs/puppet/blob/main/CONTRIBUTING.md) to see how to get your changes merged
 in.
 
 For more complete docs on developing with Puppet, take a look at the
-rest of the [developer documents](https://github.com/puppetlabs/puppet/blob/master/docs/index.md).
+rest of the [developer documents](https://github.com/puppetlabs/puppet/blob/main/docs/index.md).
 
 ## Licensing
 
-See [LICENSE](https://github.com/puppetlabs/puppet/blob/master/LICENSE) file. Puppet is licensed by Puppet, Inc. under the Apache license. Puppet, Inc. can be contacted at: info@puppet.com
+See [LICENSE](https://github.com/puppetlabs/puppet/blob/main/LICENSE) file. Puppet is licensed by Puppet, Inc. under the Apache license. Puppet, Inc. can be contacted at: info@puppet.com
 
 ## Support
 

data/{ext → examples}/nagios/check_puppet.rb

@@ -11,8 +11,8 @@ class CheckPuppet
 
   # default options
   OPTIONS = {
-    :statefile => "/var/lib/puppet/state/state.yaml",
-    :process   => "puppetd",
+    :statefile => "/opt/puppetlabs/puppet/cache/state/state.yaml",
+    :process   => "puppet",
     :interval  => 30,
   }
 

data/ext/README.md

@@ -0,0 +1,13 @@
+# `ext/` directory details 
+This directory contains files used internally when packaging [puppet](https://github.com/puppetlabs/puppet) and [puppet-agent](https://github.com/puppetlabs/puppet-agent)
+What follows is a more detailed description of each directory/file:
+* `debian/` - init scripts for puppet (used for Debian-based platforms that do not support systemd)
+* `hiera/hiera.yaml` - installed to `$codedir/environments/production`as a default Hiera configuration file
+* `osx/puppet.plist` - puppet launchd plist for macOS
+* `redhat/` -  init scripts for puppet (used for EL-based platforms that do not support systemd)
+* `solaris/smf/` - service manifests for Solaris 11
+* `suse/client.init` - init script for puppet (used for SUSE-based platforms that do not support systemd) 
+* `systemd/puppet.service` - systemd unit file for puppet
+* `windows/` - the puppet daemon for Windows, and other useful `.bat` helper wrappers
+* `build_defaults.yaml` - information pertaining to the puppetlabs build automation
+* `project_data.yaml` - information used when packaging the puppet gem

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/ext/project_data.yaml

@@ -13,6 +13,7 @@ gem_files: '[A-Z]* install.rb bin lib conf man examples ext tasks spec locales'
 gem_test_files: 'spec/**/*'
 gem_executables: 'puppet'
 gem_default_executables: 'puppet'
+gem_license: 'Apache-2.0'
 gem_forge_project: 'puppet'
 gem_required_ruby_version: '>= 2.5.0'
 gem_required_rubygems_version: '> 1.3.1'

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
 
@@ -159,10 +159,6 @@ def prepare_installation
     opts.on('--[no-]ri', 'Prevents the creation of RI output.', 'Default off on mswin32.') do |onri|
       InstallOptions.ri = onri
     end
-    opts.on('--[no-]tests', 'Prevents the execution of unit tests.', 'Default off.') do |ontest|
-      InstallOptions.tests = ontest
-      warn "The tests flag is no longer functional in Puppet and is deprecated as of Dec 19, 2012. It will be removed in a future version of Puppet."
-    end
     opts.on('--[no-]configs', 'Prevents the installation of config files', 'Default off.') do |ontest|
       InstallOptions.configs = ontest
     end
@@ -443,12 +439,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 +461,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)
@@ -199,16 +199,16 @@ module Puppet
 
     Facter.add(:agent_specified_environment) do
       setcode do
-        if Puppet.settings.set_by_config?(:environment)
-          Puppet[:environment]
-        end
+        Puppet.settings.set_by_cli(:environment) ||
+          Puppet.settings.set_in_section(:environment, :agent) ||
+          Puppet.settings.set_in_section(:environment, :main)
       end
     end
   end
 
   # 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'