puppet 7.5.0-x86-mingw32 → 7.9.0-x86-mingw32

data/lib/puppet/indirector/memory.rb

@@ -1,4 +1,4 @@
-require 'puppet/indirector/terminus'
+require_relative '../../puppet/indirector/terminus'
 
 # Manage a memory-cached list of instances.
 class Puppet::Indirector::Memory < Puppet::Indirector::Terminus

data/lib/puppet/indirector/msgpack.rb

@@ -1,5 +1,5 @@
-require 'puppet/indirector/terminus'
-require 'puppet/util'
+require_relative '../../puppet/indirector/terminus'
+require_relative '../../puppet/util'
 
 # The base class for MessagePack indirection terminus implementations.
 #

data/lib/puppet/indirector/node/exec.rb

@@ -1,5 +1,5 @@
-require 'puppet/node'
-require 'puppet/indirector/exec'
+require_relative '../../../puppet/node'
+require_relative '../../../puppet/indirector/exec'
 
 class Puppet::Node::Exec < Puppet::Indirector::Exec
   desc "Call an external program to get node information.  See

data/lib/puppet/indirector/node/json.rb

@@ -1,5 +1,5 @@
-require 'puppet/node'
-require 'puppet/indirector/json'
+require_relative '../../../puppet/node'
+require_relative '../../../puppet/indirector/json'
 
 class Puppet::Node::Json < Puppet::Indirector::JSON
   desc "Store node information as flat files, serialized using JSON,

data/lib/puppet/indirector/node/memory.rb

@@ -1,5 +1,5 @@
-require 'puppet/node'
-require 'puppet/indirector/memory'
+require_relative '../../../puppet/node'
+require_relative '../../../puppet/indirector/memory'
 
 class Puppet::Node::Memory < Puppet::Indirector::Memory
   desc "Keep track of nodes in memory but nowhere else.  This is used for

data/lib/puppet/indirector/node/msgpack.rb

@@ -1,5 +1,5 @@
-require 'puppet/node'
-require 'puppet/indirector/msgpack'
+require_relative '../../../puppet/node'
+require_relative '../../../puppet/indirector/msgpack'
 
 class Puppet::Node::Msgpack < Puppet::Indirector::Msgpack
   desc "Store node information as flat files, serialized using MessagePack,

data/lib/puppet/indirector/node/plain.rb

@@ -1,5 +1,5 @@
-require 'puppet/node'
-require 'puppet/indirector/plain'
+require_relative '../../../puppet/node'
+require_relative '../../../puppet/indirector/plain'
 
 class Puppet::Node::Plain < Puppet::Indirector::Plain
   desc "Always return an empty node object. Assumes you keep track of nodes

data/lib/puppet/indirector/node/rest.rb

@@ -1,5 +1,5 @@
-require 'puppet/node'
-require 'puppet/indirector/rest'
+require_relative '../../../puppet/node'
+require_relative '../../../puppet/indirector/rest'
 
 class Puppet::Node::Rest < Puppet::Indirector::REST
   desc "Get a node via REST. Puppet agent uses this to allow the puppet master

data/lib/puppet/indirector/node/store_configs.rb

@@ -1,5 +1,5 @@
-require 'puppet/indirector/store_configs'
-require 'puppet/node'
+require_relative '../../../puppet/indirector/store_configs'
+require_relative '../../../puppet/node'
 
 class Puppet::Node::StoreConfigs < Puppet::Indirector::StoreConfigs
 

data/lib/puppet/indirector/node/yaml.rb

@@ -1,5 +1,5 @@
-require 'puppet/node'
-require 'puppet/indirector/yaml'
+require_relative '../../../puppet/node'
+require_relative '../../../puppet/indirector/yaml'
 
 class Puppet::Node::Yaml < Puppet::Indirector::Yaml
   desc "Store node information as flat files, serialized using YAML,

data/lib/puppet/indirector/none.rb

@@ -1,4 +1,4 @@
-require 'puppet/indirector/terminus'
+require_relative '../../puppet/indirector/terminus'
 
 # A none terminus type, meant to always return nil
 class Puppet::Indirector::None < Puppet::Indirector::Terminus

data/lib/puppet/indirector/plain.rb

@@ -1,4 +1,4 @@
-require 'puppet/indirector/terminus'
+require_relative '../../puppet/indirector/terminus'
 
 # An empty terminus type, meant to just return empty objects.
 class Puppet::Indirector::Plain < Puppet::Indirector::Terminus

data/lib/puppet/indirector/report/json.rb

@@ -1,5 +1,5 @@
-require 'puppet/transaction/report'
-require 'puppet/indirector/json'
+require_relative '../../../puppet/transaction/report'
+require_relative '../../../puppet/indirector/json'
 
 class Puppet::Transaction::Report::Json < Puppet::Indirector::JSON
   include Puppet::Util::SymbolicFileMode

data/lib/puppet/indirector/report/msgpack.rb

@@ -1,5 +1,5 @@
-require 'puppet/transaction/report'
-require 'puppet/indirector/msgpack'
+require_relative '../../../puppet/transaction/report'
+require_relative '../../../puppet/indirector/msgpack'
 
 class Puppet::Transaction::Report::Msgpack < Puppet::Indirector::Msgpack
   desc "Store last report as a flat file, serialized using MessagePack."

data/lib/puppet/indirector/report/processor.rb

@@ -1,6 +1,6 @@
-require 'puppet/transaction/report'
-require 'puppet/indirector/code'
-require 'puppet/reports'
+require_relative '../../../puppet/transaction/report'
+require_relative '../../../puppet/indirector/code'
+require_relative '../../../puppet/reports'
 
 class Puppet::Transaction::Report::Processor < Puppet::Indirector::Code
   desc "Puppet's report processor.  Processes the report with each of

data/lib/puppet/indirector/report/rest.rb

@@ -1,4 +1,4 @@
-require 'puppet/indirector/rest'
+require_relative '../../../puppet/indirector/rest'
 require 'semantic_puppet'
 
 class Puppet::Transaction::Report::Rest < Puppet::Indirector::REST

data/lib/puppet/indirector/report/yaml.rb

@@ -1,5 +1,5 @@
-require 'puppet/transaction/report'
-require 'puppet/indirector/yaml'
+require_relative '../../../puppet/transaction/report'
+require_relative '../../../puppet/indirector/yaml'
 
 class Puppet::Transaction::Report::Yaml < Puppet::Indirector::Yaml
   include Puppet::Util::SymbolicFileMode

data/lib/puppet/indirector/request.rb

@@ -1,8 +1,8 @@
 require 'cgi'
 require 'uri'
-require 'puppet/indirector'
-require 'puppet/util/psych_support'
-require 'puppet/util/warnings'
+require_relative '../../puppet/indirector'
+require_relative '../../puppet/util/psych_support'
+require_relative '../../puppet/util/warnings'
 
 # This class encapsulates all of the information you need to make an
 # Indirection call, and as a result also handles REST calls.  It's somewhat

data/lib/puppet/indirector/resource/ral.rb

@@ -1,4 +1,4 @@
-require 'puppet/indirector/resource/validator'
+require_relative '../../../puppet/indirector/resource/validator'
 
 class Puppet::Resource::Ral < Puppet::Indirector::Code
   include Puppet::Resource::Validator
@@ -24,7 +24,12 @@ class Puppet::Resource::Ral < Puppet::Indirector::Code
     type(request).instances.map do |res|
       res.to_resource
     end.find_all do |res|
-      conditions.all? {|property, value| res.to_resource[property].to_s == value.to_s}
+      conditions.all? do |property, value|
+        # even though `res` is an instance of Puppet::Resource, calling
+        # `res[:name]` on it returns nil, and for some reason it is necessary
+        # to invoke the Puppet::Resource#copy_as_resource copy constructor...
+        res.copy_as_resource[property].to_s == value.to_s
+      end
     end.sort_by(&:title)
   end
 

data/lib/puppet/indirector/resource/store_configs.rb

@@ -1,5 +1,5 @@
-require 'puppet/indirector/store_configs'
-require 'puppet/indirector/resource/validator'
+require_relative '../../../puppet/indirector/store_configs'
+require_relative '../../../puppet/indirector/resource/validator'
 
 class Puppet::Resource::StoreConfigs < Puppet::Indirector::StoreConfigs
   include Puppet::Resource::Validator

data/lib/puppet/indirector/terminus.rb

@@ -1,11 +1,11 @@
-require 'puppet/indirector'
-require 'puppet/indirector/errors'
-require 'puppet/indirector/indirection'
-require 'puppet/util/instance_loader'
+require_relative '../../puppet/indirector'
+require_relative '../../puppet/indirector/errors'
+require_relative '../../puppet/indirector/indirection'
+require_relative '../../puppet/util/instance_loader'
 
 # A simple class that can function as the base class for indirected types.
 class Puppet::Indirector::Terminus
-  require 'puppet/util/docs'
+  require_relative '../../puppet/util/docs'
   extend Puppet::Util::Docs
 
   class << self

data/lib/puppet/indirector/yaml.rb

@@ -1,5 +1,5 @@
-require 'puppet/indirector/terminus'
-require 'puppet/util/yaml'
+require_relative '../../puppet/indirector/terminus'
+require_relative '../../puppet/util/yaml'
 
 # The base class for YAML indirection termini.
 class Puppet::Indirector::Yaml < Puppet::Indirector::Terminus

data/lib/puppet/info_service.rb

@@ -1,8 +1,8 @@
 
 module Puppet::InfoService
-  require 'puppet/info_service/class_information_service'
-  require 'puppet/info_service/task_information_service'
-  require 'puppet/info_service/plan_information_service'
+  require_relative 'info_service/class_information_service'
+  require_relative 'info_service/task_information_service'
+  require_relative 'info_service/plan_information_service'
 
   def self.classes_per_environment(env_file_hash)
     Puppet::InfoService::ClassInformationService.new.classes_per_environment(env_file_hash)

data/lib/puppet/info_service/class_information_service.rb

@@ -1,6 +1,6 @@
-require 'puppet'
-require 'puppet/pops'
-require 'puppet/pops/evaluator/json_strict_literal_evaluator'
+require_relative '../../puppet'
+require_relative '../../puppet/pops'
+require_relative '../../puppet/pops/evaluator/json_strict_literal_evaluator'
 
 class Puppet::InfoService::ClassInformationService
 

data/lib/puppet/info_service/plan_information_service.rb

@@ -1,5 +1,5 @@
 class Puppet::InfoService::PlanInformationService
-  require 'puppet/module'
+  require_relative '../../puppet/module'
 
   def self.plans_per_environment(environment_name)
     # get the actual environment object, raise error if the named env doesn't exist

data/lib/puppet/info_service/task_information_service.rb

@@ -1,5 +1,5 @@
 class Puppet::InfoService::TaskInformationService
-  require 'puppet/module'
+  require_relative '../../puppet/module'
 
   def self.tasks_per_environment(environment_name)
     # get the actual environment object, raise error if the named env doesn't exist

data/lib/puppet/interface.rb

@@ -1,19 +1,19 @@
-require 'puppet'
-require 'puppet/util/autoload'
+require_relative '../puppet'
+require_relative '../puppet/util/autoload'
 require 'prettyprint'
 
 # @api public
 class Puppet::Interface
-  require 'puppet/interface/documentation'
-  require 'puppet/interface/face_collection'
+  require_relative 'interface/documentation'
+  require_relative 'interface/face_collection'
 
-  require 'puppet/interface/action'
-  require 'puppet/interface/action_builder'
-  require 'puppet/interface/action_manager'
+  require_relative 'interface/action'
+  require_relative 'interface/action_builder'
+  require_relative 'interface/action_manager'
 
-  require 'puppet/interface/option'
-  require 'puppet/interface/option_builder'
-  require 'puppet/interface/option_manager'
+  require_relative 'interface/option'
+  require_relative 'interface/option_builder'
+  require_relative 'interface/option_manager'
 
 
   include FullDocs

data/lib/puppet/interface/documentation.rb

@@ -1,7 +1,7 @@
 class Puppet::Interface
   # @api private
   module DocGen
-    require 'puppet/util/docs'
+    require_relative '../../puppet/util/docs'
 
     # @api private
     def self.strip_whitespace(text)
@@ -76,6 +76,7 @@ class Puppet::Interface
         s.text(" ")
 
         options.each do |option|
+          next if option == :extra
           option = get_option(option)
           wrap = option.required? ? %w{ < > } : %w{ [ ] }
 

data/lib/puppet/loaders.rb

@@ -1,33 +1,29 @@
-require 'puppet/concurrent/synchronized'
+require_relative '../puppet/concurrent/synchronized'
 
 module Puppet
   module Pops
-    require 'puppet/pops/loaders'
+    require_relative '../puppet/pops/loaders'
 
     module Loader
-      require 'puppet/pops/loader/typed_name'
-      require 'puppet/pops/loader/loader'
-      require 'puppet/pops/loader/base_loader'
-      require 'puppet/pops/loader/gem_support'
-      require 'puppet/pops/loader/module_loaders'
-      require 'puppet/pops/loader/dependency_loader'
-      require 'puppet/pops/loader/static_loader'
-      require 'puppet/pops/loader/runtime3_type_loader'
-      require 'puppet/pops/loader/ruby_function_instantiator'
-      require 'puppet/pops/loader/ruby_legacy_function_instantiator'
-      require 'puppet/pops/loader/ruby_data_type_instantiator'
-      require 'puppet/pops/loader/puppet_function_instantiator'
-      require 'puppet/pops/loader/type_definition_instantiator'
-      require 'puppet/pops/loader/puppet_resource_type_impl_instantiator'
-      require 'puppet/pops/loader/loader_paths'
-      require 'puppet/pops/loader/simple_environment_loader'
-      require 'puppet/pops/loader/predefined_loader'
-      require 'puppet/pops/loader/generic_plan_instantiator'
-      require 'puppet/pops/loader/puppet_plan_instantiator'
-
-      # The implementation of synchronized applies it to all subclasses so we
-      # want to add it to be base class after any subclasses are created
-      Loader.include Puppet::Concurrent::Synchronized
+      require_relative '../puppet/pops/loader/typed_name'
+      require_relative '../puppet/pops/loader/loader'
+      require_relative '../puppet/pops/loader/base_loader'
+      require_relative '../puppet/pops/loader/gem_support'
+      require_relative '../puppet/pops/loader/module_loaders'
+      require_relative '../puppet/pops/loader/dependency_loader'
+      require_relative '../puppet/pops/loader/static_loader'
+      require_relative '../puppet/pops/loader/runtime3_type_loader'
+      require_relative '../puppet/pops/loader/ruby_function_instantiator'
+      require_relative '../puppet/pops/loader/ruby_legacy_function_instantiator'
+      require_relative '../puppet/pops/loader/ruby_data_type_instantiator'
+      require_relative '../puppet/pops/loader/puppet_function_instantiator'
+      require_relative '../puppet/pops/loader/type_definition_instantiator'
+      require_relative '../puppet/pops/loader/puppet_resource_type_impl_instantiator'
+      require_relative '../puppet/pops/loader/loader_paths'
+      require_relative '../puppet/pops/loader/simple_environment_loader'
+      require_relative '../puppet/pops/loader/predefined_loader'
+      require_relative '../puppet/pops/loader/generic_plan_instantiator'
+      require_relative '../puppet/pops/loader/puppet_plan_instantiator'
     end
   end
 

data/lib/puppet/metatype/manager.rb

@@ -1,6 +1,6 @@
-require 'puppet'
-require 'puppet/util/classgen'
-require 'puppet/node/environment'
+require_relative '../../puppet'
+require_relative '../../puppet/util/classgen'
+require_relative '../../puppet/node/environment'
 
 # This module defines methods dealing with Type management.
 # This module gets included into the Puppet::Type class, it's just split out here for clarity.

data/lib/puppet/module.rb

@@ -1,7 +1,7 @@
-require 'puppet/util/logging'
-require 'puppet/module/task'
-require 'puppet/module/plan'
-require 'puppet/util/json'
+require_relative '../puppet/util/logging'
+require_relative 'module/task'
+require_relative 'module/plan'
+require_relative '../puppet/util/json'
 require 'semantic_puppet/gem_version'
 
 # Support for modules
@@ -25,6 +25,7 @@ class Puppet::Module
     "plugins" => "lib",
     "pluginfacts" => "facts.d",
     "locales" => "locales",
+    "scripts" => "scripts",
   }
 
   # Find and return the +module+ that +path+ belongs to. If +path+ is

data/lib/puppet/module/plan.rb

@@ -1,4 +1,4 @@
-require 'puppet/util/logging'
+require_relative '../../puppet/util/logging'
 
 class Puppet::Module
   class Plan

data/lib/puppet/module/task.rb

@@ -1,4 +1,4 @@
-require 'puppet/util/logging'
+require_relative '../../puppet/util/logging'
 
 class Puppet::Module
   class Task

data/lib/puppet/module_tool.rb

@@ -2,11 +2,11 @@
 # Load standard libraries
 require 'pathname'
 require 'fileutils'
-require 'puppet/util/colors'
+require_relative '../puppet/util/colors'
 
 module Puppet
   module ModuleTool
-    require 'puppet/module_tool/tar'
+    require_relative 'module_tool/tar'
     extend Puppet::Util::Colors
 
     # Directory and names that should not be checksummed.
@@ -184,11 +184,11 @@ module Puppet
 end
 
 # Load remaining libraries
-require 'puppet/module_tool/errors'
-require 'puppet/module_tool/applications'
-require 'puppet/module_tool/checksums'
-require 'puppet/module_tool/contents_description'
-require 'puppet/module_tool/dependency'
-require 'puppet/module_tool/metadata'
-require 'puppet/forge/cache'
-require 'puppet/forge'
+require_relative 'module_tool/errors'
+require_relative 'module_tool/applications'
+require_relative 'module_tool/checksums'
+require_relative 'module_tool/contents_description'
+require_relative 'module_tool/dependency'
+require_relative 'module_tool/metadata'
+require_relative '../puppet/forge/cache'
+require_relative '../puppet/forge'