puppet 7.6.1 → 7.7.0

data/lib/puppet/module_tool/install_directory.rb

@@ -1,5 +1,5 @@
-require 'puppet/module_tool'
-require 'puppet/module_tool/errors'
+require_relative '../../puppet/module_tool'
+require_relative '../../puppet/module_tool/errors'
 
 module Puppet
   module ModuleTool

data/lib/puppet/module_tool/installed_modules.rb

@@ -1,7 +1,7 @@
 require 'pathname'
 
-require 'puppet/forge'
-require 'puppet/module_tool'
+require_relative '../../puppet/forge'
+require_relative '../../puppet/module_tool'
 
 module Puppet::ModuleTool
   class InstalledModules < SemanticPuppet::Dependency::Source

data/lib/puppet/module_tool/local_tarball.rb

@@ -1,8 +1,8 @@
 require 'pathname'
 require 'tmpdir'
 
-require 'puppet/forge'
-require 'puppet/module_tool'
+require_relative '../../puppet/forge'
+require_relative '../../puppet/module_tool'
 
 module Puppet::ModuleTool
   class LocalTarball < SemanticPuppet::Dependency::Source

data/lib/puppet/module_tool/metadata.rb

@@ -1,7 +1,7 @@
-require 'puppet/module_tool'
-require 'puppet/network/format_support'
+require_relative '../../puppet/module_tool'
+require_relative '../../puppet/network/format_support'
 require 'uri'
-require 'puppet/util/json'
+require_relative '../../puppet/util/json'
 require 'set'
 
 module Puppet::ModuleTool

data/lib/puppet/module_tool/tar.rb

@@ -1,9 +1,9 @@
-require 'puppet/module_tool'
-require 'puppet/util'
+require_relative '../../puppet/module_tool'
+require_relative '../../puppet/util'
 
 module Puppet::ModuleTool::Tar
-  require 'puppet/module_tool/tar/gnu'
-  require 'puppet/module_tool/tar/mini'
+  require_relative 'tar/gnu'
+  require_relative 'tar/mini'
 
   def self.instance
     if Puppet.features.minitar? && Puppet.features.zlib?

data/lib/puppet/network/format.rb

@@ -1,4 +1,4 @@
-require 'puppet/confiner'
+require_relative '../../puppet/confiner'
 
 # A simple class for modeling encoding formats for moving
 # instances around the network.

data/lib/puppet/network/format_handler.rb

@@ -1,6 +1,6 @@
 require 'yaml'
-require 'puppet/network'
-require 'puppet/network/format'
+require_relative '../../puppet/network'
+require_relative '../../puppet/network/format'
 
 module Puppet::Network::FormatHandler
   class FormatError < Puppet::Error; end
@@ -105,4 +105,4 @@ module Puppet::Network::FormatHandler
   end
 end
 
-require 'puppet/network/formats'
+require_relative '../../puppet/network/formats'

data/lib/puppet/network/format_support.rb

@@ -1,4 +1,4 @@
-require 'puppet/network/format_handler'
+require_relative '../../puppet/network/format_handler'
 
 # Provides network serialization support when included
 # @api public

data/lib/puppet/network/formats.rb

@@ -1,5 +1,5 @@
-require 'puppet/network/format_handler'
-require 'puppet/util/json'
+require_relative '../../puppet/network/format_handler'
+require_relative '../../puppet/util/json'
 
 Puppet::Network::FormatHandler.create_serialized_formats(:msgpack, :weight => 20, :mime => "application/x-msgpack", :required_methods => [:render_method, :intern_method], :intern_method => :from_data_hash) do
 

data/lib/puppet/network/http.rb

@@ -12,17 +12,17 @@ module Puppet::Network::HTTP
   CA_URL_PREFIX = "/puppet-ca"
   CA_URL_VERSIONS = "v1"
 
-  require 'puppet/network/authconfig'
-  require 'puppet/network/authorization'
+  require_relative '../../puppet/network/authconfig'
+  require_relative '../../puppet/network/authorization'
 
-  require 'puppet/network/http/issues'
-  require 'puppet/network/http/error'
-  require 'puppet/network/http/route'
-  require 'puppet/network/http/api'
-  require 'puppet/network/http/api/master'
-  require 'puppet/network/http/api/master/v3'
-  require 'puppet/network/http/handler'
-  require 'puppet/network/http/response'
-  require 'puppet/network/http/request'
-  require 'puppet/network/http/memory_response'
+  require_relative 'http/issues'
+  require_relative 'http/error'
+  require_relative 'http/route'
+  require_relative 'http/api'
+  require_relative 'http/api/master'
+  require_relative 'http/api/master/v3'
+  require_relative 'http/handler'
+  require_relative 'http/response'
+  require_relative 'http/request'
+  require_relative 'http/memory_response'
 end

data/lib/puppet/network/http/api.rb

@@ -1,5 +1,5 @@
 class Puppet::Network::HTTP::API
-  require 'puppet/version'
+  require_relative '../../../puppet/version'
 
   def self.not_found
     Puppet::Network::HTTP::Route.

data/lib/puppet/network/http/api/indirected_routes.rb

@@ -1,4 +1,4 @@
-require 'puppet/network/http/api/indirection_type'
+require_relative '../../../../puppet/network/http/api/indirection_type'
 
 class Puppet::Network::HTTP::API::IndirectedRoutes
 

data/lib/puppet/network/http/api/master.rb

@@ -1,3 +1,3 @@
-require 'puppet/network/http/api/server'
+require_relative '../../../../puppet/network/http/api/server'
 
 Puppet::Network::HTTP::API::Master = Puppet::Network::HTTP::API::Server

data/lib/puppet/network/http/api/master/v3.rb

@@ -1,3 +1,3 @@
-require 'puppet/network/http/api/master'
-require 'puppet/network/http/api/server/v3'
+require_relative '../../../../../puppet/network/http/api/master'
+require_relative '../../../../../puppet/network/http/api/server/v3'
 

data/lib/puppet/network/http/api/master/v3/environments.rb

@@ -1,3 +1,3 @@
-require 'puppet/network/http/api/master'
-require 'puppet/network/http/api/server/v3/environments'
+require_relative '../../../../../../puppet/network/http/api/master'
+require_relative '../../../../../../puppet/network/http/api/server/v3/environments'
 

data/lib/puppet/network/http/api/server/v3.rb

@@ -1,5 +1,5 @@
-require 'puppet/network/http/api/server/v3/environments'
-require 'puppet/network/http/api/indirected_routes'
+require_relative 'v3/environments'
+require_relative '../../../../../puppet/network/http/api/indirected_routes'
 
 module Puppet
   module Network

data/lib/puppet/network/http/api/server/v3/environments.rb

@@ -1,4 +1,4 @@
-require 'puppet/util/json'
+require_relative '../../../../../../puppet/util/json'
 
 module Puppet
   module Network

data/lib/puppet/network/http/connection.rb

@@ -1,4 +1,4 @@
-require 'puppet/http'
+require_relative '../../../puppet/http'
 
 # This will be raised if too many redirects happen for a given HTTP request
 class Puppet::Network::HTTP::RedirectionLimitExceededException < Puppet::Error ; end

data/lib/puppet/network/http/error.rb

@@ -1,4 +1,4 @@
-require 'puppet/util/json'
+require_relative '../../../puppet/util/json'
 
 module Puppet::Network::HTTP::Error
   Issues = Puppet::Network::HTTP::Issues

data/lib/puppet/network/http/handler.rb

@@ -1,9 +1,9 @@
 module Puppet::Network::HTTP
 end
 
-require 'puppet/network/http'
-require 'puppet/util/profiler'
-require 'puppet/util/profiler/aggregate'
+require_relative '../../../puppet/network/http'
+require_relative '../../../puppet/util/profiler'
+require_relative '../../../puppet/util/profiler/aggregate'
 require 'resolv'
 
 module Puppet::Network::HTTP::Handler

data/lib/puppet/network/http_pool.rb

@@ -1,4 +1,4 @@
-require 'puppet/network/http/connection'
+require_relative '../../puppet/network/http/connection'
 
 module Puppet::Network; end
 

data/lib/puppet/node.rb

@@ -1,9 +1,9 @@
-require 'puppet/indirector'
+require_relative '../puppet/indirector'
 
 # A class for managing nodes, including their facts and environment.
 class Puppet::Node
-  require 'puppet/node/facts'
-  require 'puppet/node/environment'
+  require_relative 'node/facts'
+  require_relative 'node/environment'
 
   # Set up indirection, so that nodes can be looked for in
   # the node sources.

data/lib/puppet/node/environment.rb

@@ -1,7 +1,7 @@
-require 'puppet/util'
+require_relative '../../puppet/util'
 require 'monitor'
-require 'puppet/parser/parser_factory'
-require 'puppet/concurrent/lock'
+require_relative '../../puppet/parser/parser_factory'
+require_relative '../../puppet/concurrent/lock'
 
 # Just define it, so this class has fewer load dependencies.
 class Puppet::Node

data/lib/puppet/node/facts.rb

@@ -1,8 +1,8 @@
 require 'time'
 
-require 'puppet/node'
-require 'puppet/indirector'
-require 'puppet/util/psych_support'
+require_relative '../../puppet/node'
+require_relative '../../puppet/indirector'
+require_relative '../../puppet/util/psych_support'
 
 
 # Manage a given node's facts.  This either accepts facts and stores them, or

data/lib/puppet/pal/pal_api.rb

@@ -1,15 +1,15 @@
 module Puppet
-  require 'puppet/parser/script_compiler'
-  require 'puppet/parser/catalog_compiler'
+  require_relative '../../puppet/parser/script_compiler'
+  require_relative '../../puppet/parser/catalog_compiler'
 
   module Pal
-    require 'puppet/pal/json_catalog_encoder'
-    require 'puppet/pal/function_signature'
-    require 'puppet/pal/task_signature'
-    require 'puppet/pal/plan_signature'
-    require 'puppet/pal/compiler'
-    require 'puppet/pal/script_compiler'
-    require 'puppet/pal/catalog_compiler'
-    require 'puppet/pal/pal_impl'
+    require_relative '../../puppet/pal/json_catalog_encoder'
+    require_relative '../../puppet/pal/function_signature'
+    require_relative '../../puppet/pal/task_signature'
+    require_relative '../../puppet/pal/plan_signature'
+    require_relative '../../puppet/pal/compiler'
+    require_relative '../../puppet/pal/script_compiler'
+    require_relative '../../puppet/pal/catalog_compiler'
+    require_relative '../../puppet/pal/pal_impl'
   end
 end

data/lib/puppet/pal/pal_impl.rb

@@ -1,9 +1,9 @@
 # Puppet as a Library "PAL"
 
 # Yes, this requires all of puppet for now because 'settings' and many other things...
-require 'puppet'
-require 'puppet/parser/script_compiler'
-require 'puppet/parser/catalog_compiler'
+require_relative '../../puppet'
+require_relative '../../puppet/parser/script_compiler'
+require_relative '../../puppet/parser/catalog_compiler'
 
 module Puppet
 # This is the main entry point for "Puppet As a Library" PAL.

data/lib/puppet/parameter.rb

@@ -1,5 +1,5 @@
-require 'puppet/util/logging'
-require 'puppet/util/docs'
+require_relative '../puppet/util/logging'
+require_relative '../puppet/util/docs'
 
 # The Parameter class is the implementation of a resource's attributes of _parameter_ kind.
 # The Parameter class is also the base class for {Puppet::Property}, and is used to describe meta-parameters
@@ -22,7 +22,7 @@ class Puppet::Parameter
   include Puppet::Util::Errors
   include Puppet::Util::Logging
 
-  require 'puppet/parameter/value_collection'
+  require_relative 'parameter/value_collection'
 
   class << self
     include Puppet::Util
@@ -571,4 +571,4 @@ class Puppet::Parameter
   #   @see Puppet::Parser::Compiler#finish
 end
 
-require 'puppet/parameter/path'
+require_relative 'parameter/path'

data/lib/puppet/parameter/boolean.rb

@@ -1,4 +1,4 @@
-require 'puppet/coercion'
+require_relative '../../puppet/coercion'
 
 # This specialized {Puppet::Parameter} handles Boolean options, accepting lots
 # of strings and symbols for both truth and falsehood.

data/lib/puppet/parameter/package_options.rb

@@ -1,4 +1,4 @@
-require 'puppet/parameter'
+require_relative '../../puppet/parameter'
 
 # This specialized {Puppet::Parameter} handles munging of package options.
 # Package options are passed as an array of key value pairs. Special munging is

data/lib/puppet/parameter/path.rb

@@ -1,4 +1,4 @@
-require 'puppet/parameter'
+require_relative '../../puppet/parameter'
 
 # This specialized {Puppet::Parameter} handles validation and munging of paths.
 # By default, a single path is accepted, and by calling {accept_arrays} it is possible to

data/lib/puppet/parameter/value.rb

@@ -1,4 +1,4 @@
-require 'puppet/parameter/value_collection'
+require_relative '../../puppet/parameter/value_collection'
 
 # Describes an acceptable value for a parameter or property.
 # An acceptable value is either specified as a literal value or a regular expression.

data/lib/puppet/parameter/value_collection.rb

@@ -1,4 +1,4 @@
-require 'puppet/parameter/value'
+require_relative '../../puppet/parameter/value'
 
 # A collection of values and regular expressions, used for specifying allowed values
 # in a given parameter.

data/lib/puppet/parser.rb

@@ -1,20 +1,20 @@
 # is only needed to create the name space
 module Puppet::Parser; end
 
-require 'puppet/parser/ast'
-require 'puppet/parser/abstract_compiler'
-require 'puppet/parser/compiler'
-require 'puppet/parser/compiler/catalog_validator'
-require 'puppet/resource/type_collection'
+require_relative 'parser/ast'
+require_relative 'parser/abstract_compiler'
+require_relative 'parser/compiler'
+require_relative 'parser/compiler/catalog_validator'
+require_relative '../puppet/resource/type_collection'
 
-require 'puppet/parser/functions'
-require 'puppet/parser/files'
-require 'puppet/parser/relationship'
+require_relative 'parser/functions'
+require_relative 'parser/files'
+require_relative 'parser/relationship'
 
-require 'puppet/resource/type'
+require_relative '../puppet/resource/type'
 require 'monitor'
 
-Dir[File.dirname(__FILE__) + '/parser/compiler/catalog_validator/*.rb'].each { |f| require f }
+require_relative 'parser/compiler/catalog_validator/relationship_validator.rb'
 
 # PUP-3274 This should probably go someplace else
 class Puppet::LexError < RuntimeError; end

data/lib/puppet/parser/ast.rb

@@ -51,11 +51,11 @@ class Puppet::Parser::AST
 end
 
 # And include all of the AST subclasses.
-require 'puppet/parser/ast/branch'
-require 'puppet/parser/ast/leaf'
-require 'puppet/parser/ast/block_expression'
-require 'puppet/parser/ast/hostclass'
-require 'puppet/parser/ast/node'
-require 'puppet/parser/ast/resource'
-require 'puppet/parser/ast/resource_instance'
-require 'puppet/parser/ast/resourceparam'
+require_relative 'ast/branch'
+require_relative 'ast/leaf'
+require_relative 'ast/block_expression'
+require_relative 'ast/hostclass'
+require_relative 'ast/node'
+require_relative 'ast/resource'
+require_relative 'ast/resource_instance'
+require_relative 'ast/resourceparam'

data/lib/puppet/parser/ast/hostclass.rb

@@ -1,4 +1,4 @@
-require 'puppet/parser/ast/top_level_construct'
+require_relative '../../../puppet/parser/ast/top_level_construct'
 
 class Puppet::Parser::AST::Hostclass < Puppet::Parser::AST::TopLevelConstruct
   attr_accessor :name, :context

data/lib/puppet/parser/ast/pops_bridge.rb

@@ -1,5 +1,5 @@
-require 'puppet/parser/ast/top_level_construct'
-require 'puppet/pops'
+require_relative '../../../puppet/parser/ast/top_level_construct'
+require_relative '../../../puppet/pops'
 
 # The AST::Bridge contains classes that bridges between the new Pops based model
 # and the 3.x AST. This is required to be able to reuse the Puppet::Resource::Type which is

data/lib/puppet/parser/catalog_compiler.rb

@@ -1,5 +1,5 @@
-require 'puppet/loaders'
-require 'puppet/pops'
+require_relative '../../puppet/loaders'
+require_relative '../../puppet/pops'
 
 # A Catalog "compiler" that is like the regular compiler but with an API
 # that is harmonized with the ScriptCompiler

data/lib/puppet/parser/compiler.rb

@@ -1,11 +1,11 @@
 require 'forwardable'
 
-require 'puppet/node'
-require 'puppet/resource/catalog'
-require 'puppet/util/errors'
+require_relative '../../puppet/node'
+require_relative '../../puppet/resource/catalog'
+require_relative '../../puppet/util/errors'
 
-require 'puppet/loaders'
-require 'puppet/pops'
+require_relative '../../puppet/loaders'
+require_relative '../../puppet/pops'
 
 # Maintain a graph of scopes, along with a bunch of data
 # about the individual catalog we're compiling.