puppet 7.4.0-universal-darwin → 7.8.0-universal-darwin

data/lib/puppet/configurer/downloader.rb

@@ -1,5 +1,5 @@
-require 'puppet/configurer'
-require 'puppet/resource/catalog'
+require_relative '../../puppet/configurer'
+require_relative '../../puppet/resource/catalog'
 
 class Puppet::Configurer::Downloader
   attr_reader :name, :path, :source, :ignore
@@ -73,7 +73,8 @@ class Puppet::Configurer::Downloader
       :purge => true,
       :force => true,
       :backup => false,
-      :noop => false
+      :noop => false,
+      :max_files => -1
     }
     if !Puppet::Util::Platform.windows?
       defargs[:owner] = Process.uid

data/lib/puppet/configurer/fact_handler.rb

@@ -1,7 +1,7 @@
-require 'puppet/indirector/facts/facter'
+require_relative '../../puppet/indirector/facts/facter'
 
-require 'puppet/configurer'
-require 'puppet/configurer/downloader'
+require_relative '../../puppet/configurer'
+require_relative '../../puppet/configurer/downloader'
 
 # Break out the code related to facts.  This module is
 # just included into the agent, but having it here makes it

data/lib/puppet/configurer/plugin_handler.rb

@@ -1,7 +1,7 @@
 # Break out the code related to plugins.  This module is
 # just included into the agent, but having it here makes it
 # easier to test.
-require 'puppet/configurer'
+require_relative '../../puppet/configurer'
 
 class Puppet::Configurer::PluginHandler
   SUPPORTED_LOCALES_MOUNT_AGENT_VERSION = Gem::Version.new("5.3.4")

data/lib/puppet/confine.rb

@@ -1,6 +1,6 @@
 # The class that handles testing whether our providers
 # actually work or not.
-require 'puppet/util'
+require_relative '../puppet/util'
 
 class Puppet::Confine
   include Puppet::Util

data/lib/puppet/confine/boolean.rb

@@ -1,4 +1,4 @@
-require 'puppet/confine'
+require_relative '../../puppet/confine'
 
 # Common module for the Boolean confines. It currently
 # contains just enough code to implement PUP-9336.

data/lib/puppet/confine/exists.rb

@@ -1,4 +1,4 @@
-require 'puppet/confine'
+require_relative '../../puppet/confine'
 
 class Puppet::Confine::Exists < Puppet::Confine
   def self.summarize(confines)

data/lib/puppet/confine/false.rb

@@ -1,4 +1,4 @@
-require 'puppet/confine/boolean'
+require_relative '../../puppet/confine/boolean'
 
 class Puppet::Confine::False < Puppet::Confine
   include Puppet::Confine::Boolean

data/lib/puppet/confine/feature.rb

@@ -1,4 +1,4 @@
-require 'puppet/confine'
+require_relative '../../puppet/confine'
 
 class Puppet::Confine::Feature < Puppet::Confine
   def self.summarize(confines)

data/lib/puppet/confine/true.rb

@@ -1,4 +1,4 @@
-require 'puppet/confine/boolean'
+require_relative '../../puppet/confine/boolean'
 
 class Puppet::Confine::True < Puppet::Confine
   include Puppet::Confine::Boolean

data/lib/puppet/confine/variable.rb

@@ -1,4 +1,4 @@
-require 'puppet/confine'
+require_relative '../../puppet/confine'
 
 # Require a specific value for a variable, either a Puppet setting
 # or a Facter value.  This class is a bit weird because the name

data/lib/puppet/confine_collection.rb

@@ -1,6 +1,6 @@
 # Manage a collection of confines, returning a boolean or
 # helpful information.
-require 'puppet/confine'
+require_relative '../puppet/confine'
 
 class Puppet::ConfineCollection
   def confine(hash)

data/lib/puppet/confiner.rb

@@ -1,4 +1,4 @@
-require 'puppet/confine_collection'
+require_relative '../puppet/confine_collection'
 
 # The Confiner module contains methods for managing a Provider's confinement (suitability under given
 # conditions). The intent is to include this module in an object where confinement management is wanted.

data/lib/puppet/context.rb

@@ -1,4 +1,4 @@
-require 'puppet/thread_local'
+require_relative '../puppet/thread_local'
 
 # Puppet::Context is a system for tracking services and contextual information
 # that puppet needs to be able to run. Values are "bound" in a context when it is created
@@ -11,7 +11,7 @@ require 'puppet/thread_local'
 #
 # @api private
 class Puppet::Context
-  require 'puppet/context/trusted_information'
+  require_relative 'context/trusted_information'
 
   class UndefinedBindingError < Puppet::Error; end
   class StackUnderflow < Puppet::Error; end

data/lib/puppet/context/trusted_information.rb

@@ -1,4 +1,4 @@
-require 'puppet/trusted_external'
+require_relative '../../puppet/trusted_external'
 
 # @api private
 class Puppet::Context::TrustedInformation

data/lib/puppet/daemon.rb

@@ -1,5 +1,5 @@
-require 'puppet/application'
-require 'puppet/scheduler'
+require_relative '../puppet/application'
+require_relative '../puppet/scheduler'
 
 # Run periodic actions in a daemonized process.
 #

data/lib/puppet/data_binding.rb

@@ -1,4 +1,4 @@
-require 'puppet/indirector'
+require_relative '../puppet/indirector'
 
 # A class for managing data lookups
 class Puppet::DataBinding

data/lib/puppet/datatypes/error.rb

@@ -15,7 +15,7 @@ Puppet::DataTypes.create_type('Error') do
     }
     PUPPET
 
-  require 'puppet/datatypes/impl/error'
+  require_relative '../../puppet/datatypes/impl/error'
 
   implementation_class Puppet::DataTypes::Error
 end

data/lib/puppet/defaults.rb

@@ -1,4 +1,4 @@
-require 'puppet/util/platform'
+require_relative '../puppet/util/platform'
 
 module Puppet
 
@@ -219,7 +219,7 @@ module Puppet
         as well as any translations in the report and CLI.",
       :hook    => proc do |value|
         if value
-          require 'puppet/gettext/stubs'
+          require_relative '../puppet/gettext/stubs'
           Puppet::GettextConfig.disable_gettext
         end
       end
@@ -837,8 +837,8 @@ names.
 **Note:** The list of alternate names is locked in when the server's
 certificate is signed. If you need to change the list later, you can't just
 change this setting; you also need to regenerate the certificate. For more
-information on that process, see the [cert regen docs]
-(https://puppet.com/docs/puppet/latest/ssl_regenerate_certificates.html).
+information on that process, see the 
+[cert regen docs](https://puppet.com/docs/puppet/latest/ssl_regenerate_certificates.html).
 
 To see all the alternate names your servers are using, log into your CA server
 and run `puppetserver ca list --all`, then check the output for `(alt names: ...)`.
@@ -1033,6 +1033,14 @@ EOT
           certificate revocation checking and does not attempt to download the CRL.
         EOT
     },
+    :ciphers => {
+      :default => 'ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-SHA256:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256',
+      :type => :string,
+      :desc => "The list of ciphersuites for TLS connections initiated by puppet. The
+                default value is chosen to support TLS 1.0 and up, but can be made
+                more restrictive if needed. The ciphersuites must be specified in OpenSSL
+                format, not IANA."
+    },
     :key_type => {
       :default => 'rsa',
       :type    => :enum,
@@ -1418,7 +1426,9 @@ EOT
         See the report reference for information on the built-in report
         handlers; custom report handlers can also be loaded from modules.
         (Report handlers are loaded from the lib directory, at
-        `puppet/reports/NAME.rb`.)",
+        `puppet/reports/NAME.rb`.)
+
+        To turn off reports entirely, set this to `none`",
     },
     :reportdir => {
       :default => "$vardir/reports",
@@ -1664,7 +1674,7 @@ EOT
     },
     :agent_disabled_lockfile => {
         :default    => "$statedir/agent_disabled.lock",
-        :type       => :file,
+        :type       => :string,
         :desc       => "A lock file to indicate that puppet agent runs have been administratively
           disabled.  File contains a JSON object with state information.",
     },
@@ -2074,8 +2084,8 @@ EOT
       # Call our hook with the default value, so we always get the libdir set.
       :call_hook => :on_initialize_and_write,
       :hook => proc do |value|
-        require 'puppet/node'
-        require 'puppet/node/facts'
+        require_relative '../puppet/node'
+        require_relative '../puppet/node/facts'
         if value
           Puppet::Resource::Catalog.indirection.set_global_setting(:cache_class, :store_configs)
           settings.override_default(:catalog_cache_terminus, :store_configs)
@@ -2149,10 +2159,6 @@ EOT
     :rich_data => {
       :default  => true,
       :type     => :boolean,
-      :hook    => proc do |value|
-        envs = Puppet.lookup(:environments) { nil }
-        envs.clear_all unless envs.nil?
-      end,
       :desc     => <<-'EOT'
         Enables having extended data in the catalog by storing them as a hash with the special key
         `__ptype`. When enabled, resource containing values of the data types `Binary`, `Regexp`,

data/lib/puppet/environments.rb

@@ -1,4 +1,4 @@
-require 'puppet/concurrent/synchronized'
+require_relative '../puppet/concurrent/synchronized'
 
 # @api private
 module Puppet::Environments
@@ -225,6 +225,9 @@ module Puppet::Environments
     private
 
     def create_environment(name)
+      # interpolated modulepaths may be cached from prior environment instances
+      Puppet.settings.clear_environment_settings(name)
+
       env_symbol = name.intern
       setting_values = Puppet.settings.values(env_symbol, Puppet.settings.preferred_run_mode)
       env = Puppet::Node::Environment.create(
@@ -350,7 +353,19 @@ module Puppet::Environments
 
     # @!macro loader_list
     def list
-      @loader.list
+      # Evict all that have expired, in the same way as `get`
+      clear_all_expired
+
+      @loader.list.map do |env|
+        name = env.name
+        old_entry = @cache[name]
+        if old_entry
+          old_entry.value
+        else
+          add_entry(name, entry(env))
+          env
+        end
+      end
     end
 
     # @!macro loader_search_paths

data/lib/puppet/etc.rb

@@ -1,4 +1,4 @@
-require 'puppet/util/character_encoding'
+require_relative '../puppet/util/character_encoding'
 # Wrapper around Ruby Etc module allowing us to manage encoding in a single
 # place.
 # This represents a subset of Ruby's Etc module, only the methods required by Puppet.

data/lib/puppet/external/pson/common.rb

@@ -1,4 +1,4 @@
-require 'puppet/external/pson/version'
+require_relative '../../../puppet/external/pson/version'
 
 # PSON is a vendored version of pure_json v1.1.9 plus puppet patches. It
 # is deprecated and should not be used for future work. Use JSON instead.

data/lib/puppet/external/pson/pure.rb

@@ -1,6 +1,6 @@
-require 'puppet/external/pson/common'
-require 'puppet/external/pson/pure/parser'
-require 'puppet/external/pson/pure/generator'
+require_relative '../../../puppet/external/pson/common'
+require_relative 'pure/parser'
+require_relative 'pure/generator'
 
 module PSON
   # This module holds all the modules/classes that implement PSON's

data/lib/puppet/face.rb

@@ -8,5 +8,5 @@
 #
 # It isn't hidden to gratuitously hide things, just to make it easier to
 # separate out the interests people will have.  --daniel 2011-04-07
-require 'puppet/interface'
+require_relative '../puppet/interface'
 Puppet::Face = Puppet::Interface

data/lib/puppet/face/catalog.rb

@@ -1,4 +1,4 @@
-require 'puppet/indirector/face'
+require_relative '../../puppet/indirector/face'
 
 Puppet::Indirector::Face.define(:catalog, '0.0.1') do
   copyright "Puppet Inc.", 2011

data/lib/puppet/face/config.rb

@@ -1,5 +1,5 @@
-require 'puppet/face'
-require 'puppet/settings/ini_file'
+require_relative '../../puppet/face'
+require_relative '../../puppet/settings/ini_file'
 
 Puppet::Face.define(:config, '0.0.1') do
   extend Puppet::Util::Colors

data/lib/puppet/face/epp.rb

@@ -1,7 +1,7 @@
-require 'puppet/face'
-require 'puppet/pops'
-require 'puppet/parser/files'
-require 'puppet/file_system'
+require_relative '../../puppet/face'
+require_relative '../../puppet/pops'
+require_relative '../../puppet/parser/files'
+require_relative '../../puppet/file_system'
 
 Puppet::Face.define(:epp, '0.0.1') do
   copyright "Puppet Inc.", 2014
@@ -156,7 +156,7 @@ Puppet::Face.define(:epp, '0.0.1') do
     end
 
     when_invoked do |*args|
-      require 'puppet/pops'
+      require_relative '../../puppet/pops'
       options = args.pop
       # pass a dummy node, as facts are not needed for dump
       options[:node] = Puppet::Node.new("testnode", :facts => Puppet::Node::Facts.new("facts", {}))
@@ -382,7 +382,7 @@ Puppet::Face.define(:epp, '0.0.1') do
       if fmt.nil? || fmt == 'old'
         output << Puppet::Pops::Model::ModelTreeDumper.new.dump(parse_result) << "\n"
       else
-        require 'puppet/pops/pn'
+        require_relative '../../puppet/pops/pn'
         pn = Puppet::Pops::Model::PNTransformer.transform(parse_result)
         case fmt
         when 'json'

data/lib/puppet/face/facts.rb

@@ -1,5 +1,5 @@
-require 'puppet/indirector/face'
-require 'puppet/node/facts'
+require_relative '../../puppet/indirector/face'
+require_relative '../../puppet/node/facts'
 
 Puppet::Indirector::Face.define(:facts, '0.0.1') do
   copyright "Puppet Inc.", 2011

data/lib/puppet/face/generate.rb

@@ -1,5 +1,5 @@
-require 'puppet/face'
-require 'puppet/generate/type'
+require_relative '../../puppet/face'
+require_relative '../../puppet/generate/type'
 
 # Create the Generate face
 Puppet::Face.define(:generate, '0.1.0') do

data/lib/puppet/face/help.rb

@@ -1,6 +1,6 @@
-require 'puppet/face'
-require 'puppet/application/face_base'
-require 'puppet/util/constant_inflector'
+require_relative '../../puppet/face'
+require_relative '../../puppet/application/face_base'
+require_relative '../../puppet/util/constant_inflector'
 require 'pathname'
 require 'erb'
 

data/lib/puppet/face/module.rb

@@ -1,6 +1,6 @@
-require 'puppet/face'
-require 'puppet/module_tool'
-require 'puppet/util/colors'
+require_relative '../../puppet/face'
+require_relative '../../puppet/module_tool'
+require_relative '../../puppet/util/colors'
 
 Puppet::Face.define(:module, '1.0.0') do
   extend Puppet::Util::Colors

data/lib/puppet/face/module/install.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
-require 'puppet/forge'
-require 'puppet/module_tool/install_directory'
+require_relative '../../../puppet/forge'
+require_relative '../../../puppet/module_tool/install_directory'
 require 'pathname'
 
 Puppet::Face.define(:module, '1.0.0') do

data/lib/puppet/face/node.rb

@@ -1,4 +1,4 @@
-require 'puppet/indirector/face'
+require_relative '../../puppet/indirector/face'
 Puppet::Indirector::Face.define(:node, '0.0.1') do
   copyright "Puppet Inc.", 2011
   license   _("Apache 2 license; see COPYING")

data/lib/puppet/face/parser.rb

@@ -1,5 +1,5 @@
-require 'puppet/face'
-require 'puppet/parser'
+require_relative '../../puppet/face'
+require_relative '../../puppet/parser'
 
 Puppet::Face.define(:parser, '0.0.1') do
   copyright "Puppet Inc.", 2014
@@ -142,7 +142,7 @@ Puppet::Face.define(:parser, '0.0.1') do
     end
 
     when_invoked do |*args|
-      require 'puppet/pops'
+      require_relative '../../puppet/pops'
       options = args.pop
       if options[:e]
         dump_parse(options[:e], 'command-line-string', options, false)
@@ -189,7 +189,7 @@ Puppet::Face.define(:parser, '0.0.1') do
       if fmt.nil? || fmt == 'old'
         output << Puppet::Pops::Model::ModelTreeDumper.new.dump(parse_result) << "\n"
       else
-        require 'puppet/pops/pn'
+        require_relative '../../puppet/pops/pn'
         pn = Puppet::Pops::Model::PNTransformer.transform(parse_result)
         case fmt
         when 'json'

data/lib/puppet/face/plugin.rb

@@ -1,5 +1,5 @@
-require 'puppet/face'
-require 'puppet/configurer/plugin_handler'
+require_relative '../../puppet/face'
+require_relative '../../puppet/configurer/plugin_handler'
 
 Puppet::Face.define(:plugin, '0.0.1') do
   copyright "Puppet Inc.", 2011