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

data/lib/puppet/pops/loader/static_loader.rb

@@ -122,6 +122,10 @@ class StaticLoader < Loader
   def create_resource_type_reference(name)
     add_type(name, Types::TypeFactory.resource(name))
   end
+
+  def synchronize(&block)
+    yield
+  end
 end
 end
 end

data/lib/puppet/pops/loader/task_instantiator.rb

@@ -1,6 +1,6 @@
 # The TypeDefinitionInstantiator instantiates a type alias or a type definition
 #
-require 'puppet/module/task'
+require_relative '../../../puppet/module/task'
 module Puppet::Pops
 module Loader
 class TaskInstantiator

data/lib/puppet/pops/loaders.rb

@@ -398,7 +398,7 @@ class Loaders
 
       if env_path.nil?
         # Not a real directory environment, cannot work as a module TODO: Drop when legacy env are dropped?
-        loader = add_loader_by_name(Loader::SimpleEnvironmentLoader.new(@runtime3_type_loader, Loader::ENVIRONMENT))
+        loader = add_loader_by_name(Loader::SimpleEnvironmentLoader.new(@runtime3_type_loader, Loader::ENVIRONMENT, environment))
       else
         # View the environment as a module to allow loading from it - this module is always called 'environment'
         loader = Loader::ModuleLoaders.environment_loader_from(@runtime3_type_loader, self, env_path)
@@ -413,7 +413,7 @@ class Loaders
     # Code in the environment gets to see all modules (since there is no metadata for the environment)
     # but since this is not given to the module loaders, they can not load global code (since they can not
     # have prior knowledge about this
-    loader = add_loader_by_name(Loader::DependencyLoader.new(loader, Loader::ENVIRONMENT_PRIVATE, @module_resolver.all_module_loaders()))
+    loader = add_loader_by_name(Loader::DependencyLoader.new(loader, Loader::ENVIRONMENT_PRIVATE, @module_resolver.all_module_loaders(), environment))
 
     # The module loader gets the private loader via a lazy operation to look up the module's private loader.
     # This does not work for an environment since it is not resolved the same way.
@@ -529,13 +529,13 @@ class Loaders
     private
 
     def create_loader_with_all_modules_visible(from_module_data)
-      @loaders.add_loader_by_name(Loader::DependencyLoader.new(from_module_data.public_loader, "#{from_module_data.name} private", all_module_loaders()))
+      @loaders.add_loader_by_name(Loader::DependencyLoader.new(from_module_data.public_loader, "#{from_module_data.name} private", all_module_loaders(), @loaders.environment))
     end
 
     def create_loader_with_dependencies_first(from_module_data)
       dependency_loaders = from_module_data.dependency_names.collect { |name| @index[name].public_loader }
       visible_loaders = dependency_loaders + (all_module_loaders() - dependency_loaders)
-      @loaders.add_loader_by_name(Loader::DependencyLoader.new(from_module_data.public_loader, "#{from_module_data.name} private", visible_loaders))
+      @loaders.add_loader_by_name(Loader::DependencyLoader.new(from_module_data.public_loader, "#{from_module_data.name} private", visible_loaders, @loaders.environment))
     end
   end
 end

data/lib/puppet/pops/lookup/invocation.rb

@@ -1,4 +1,4 @@
-require 'puppet/thread_local'
+require_relative '../../../puppet/thread_local'
 
 require_relative 'explainer'
 

data/lib/puppet/pops/model/ast_transformer.rb

@@ -1,4 +1,4 @@
-require 'puppet/parser/ast'
+require_relative '../../../puppet/parser/ast'
 
 # The receiver of `import(file)` calls; once per imported file, or nil if imports are ignored
 #

data/lib/puppet/pops/model/pn_transformer.rb

@@ -1,4 +1,4 @@
-require 'puppet/concurrent/thread_local_singleton'
+require_relative '../../../puppet/concurrent/thread_local_singleton'
 
 module Puppet::Pops
 module Model

data/lib/puppet/pops/parser/eparser.rb

@@ -6,8 +6,8 @@
 
 require 'racc/parser.rb'
 
-require 'puppet'
-require 'puppet/pops'
+require_relative '../../../puppet'
+require_relative '../../../puppet/pops'
 
 module Puppet
   class ParseError < Puppet::Error; end

data/lib/puppet/pops/parser/evaluating_parser.rb

@@ -1,4 +1,4 @@
-require 'puppet/concurrent/thread_local_singleton'
+require_relative '../../../puppet/concurrent/thread_local_singleton'
 
 module Puppet::Pops
 module Parser

data/lib/puppet/pops/parser/lexer2.rb

@@ -6,11 +6,11 @@
 # or Token.new([token], locator) with the same API x[0] = token_symbol, x[1] = self, x[:key] = (:value, :file, :line, :pos) etc
 
 require 'strscan'
-require 'puppet/pops/parser/lexer_support'
-require 'puppet/pops/parser/heredoc_support'
-require 'puppet/pops/parser/interpolation_support'
-require 'puppet/pops/parser/epp_support'
-require 'puppet/pops/parser/slurp_support'
+require_relative '../../../puppet/pops/parser/lexer_support'
+require_relative '../../../puppet/pops/parser/heredoc_support'
+require_relative '../../../puppet/pops/parser/interpolation_support'
+require_relative '../../../puppet/pops/parser/epp_support'
+require_relative '../../../puppet/pops/parser/slurp_support'
 
 module Puppet::Pops
 module Parser
@@ -134,10 +134,6 @@ class Lexer2
     'type'     => [:TYPE,     'type',     4],
     'attr'     => [:ATTR,     'attr',     4],
     'private'  => [:PRIVATE,  'private',  7],
-    'application' => [:APPLICATION, 'application',  11], # reserved
-    'consumes'    => [:CONSUMES,    'consumes',  8], # reserved
-    'produces'    => [:PRODUCES,    'produces',  8], # reserved
-    'site'        => [:SITE,        'site',  4], # reserved
   }
 
   KEYWORDS.each {|k,v| v[1].freeze; v.freeze }

data/lib/puppet/pops/parser/lexer_support.rb

@@ -2,7 +2,7 @@
 module Puppet::Pops
 module Parser
 
-require 'puppet/util/multi_match'
+require_relative '../../../puppet/util/multi_match'
 
 # This is an integral part of the Lexer. It is broken out into a separate module
 # for maintainability of the code, and making the various parts of the lexer focused.

data/lib/puppet/pops/parser/parser_support.rb

@@ -1,7 +1,7 @@
-require 'puppet/parser/functions'
-require 'puppet/parser/files'
-require 'puppet/resource/type_collection'
-require 'puppet/resource/type'
+require_relative '../../../puppet/parser/functions'
+require_relative '../../../puppet/parser/files'
+require_relative '../../../puppet/resource/type_collection'
+require_relative '../../../puppet/resource/type'
 require 'monitor'
 
 module Puppet::Pops

data/lib/puppet/pops/puppet_stack.rb

@@ -1,4 +1,4 @@
-require 'puppet/thread_local'
+require_relative '../../puppet/thread_local'
 
 module Puppet
   module Pops

data/lib/puppet/pops/serialization/json.rb

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

data/lib/puppet/pops/serialization/json_path.rb

@@ -1,4 +1,4 @@
-require 'puppet/concurrent/thread_local_singleton'
+require_relative '../../../puppet/concurrent/thread_local_singleton'
 
 module Puppet::Pops
 module Serialization

data/lib/puppet/pops/time/timespan.rb

@@ -1,4 +1,4 @@
-require 'puppet/concurrent/thread_local_singleton'
+require_relative '../../../puppet/concurrent/thread_local_singleton'
 
 module Puppet::Pops
 module Time

data/lib/puppet/pops/types/p_sem_ver_type.rb

@@ -95,16 +95,22 @@ class PSemVerType < PScalarType
       end
 
       def from_args(major, minor, patch, prerelease = nil, build = nil)
-        SemanticPuppet::Version.new(major, minor, patch, prerelease, build)
+        SemanticPuppet::Version.new(major, minor, patch, to_array(prerelease), to_array(build))
       end
 
       def from_hash(hash)
-        SemanticPuppet::Version.new(hash['major'], hash['minor'], hash['patch'], hash['prerelease'], hash['build'])
+        SemanticPuppet::Version.new(hash['major'], hash['minor'], hash['patch'], to_array(hash['prerelease']), to_array(hash['build']))
       end
 
       def on_error(str)
         _("The string '%{str}' cannot be converted to a SemVer") % { str: str }
       end
+
+      private
+
+      def to_array(component)
+        component ? [component] : nil
+      end
     end
   end
 

data/lib/puppet/pops/types/p_sensitive_type.rb

@@ -24,6 +24,16 @@ class PSensitiveType < PTypeWithContainedType
     def inspect
       "#<#{self}>"
     end
+
+    def hash
+      @value.hash
+    end
+
+    def ==(other)
+      other.is_a?(Sensitive) &&
+        other.hash == hash
+    end
+    alias eql? ==
   end
 
   def self.register_ptype(loader, ir)

data/lib/puppet/pops/types/p_type_set_type.rb

@@ -15,7 +15,7 @@ class PTypeSetType < PMetaType
   # @api private
   class TypeSetLoader < Loader::BaseLoader
     def initialize(type_set, parent)
-      super(parent, "(TypeSetFirstLoader '#{type_set.name}')")
+      super(parent, "(TypeSetFirstLoader '#{type_set.name}')", parent.environment)
       @type_set = type_set
     end
 

data/lib/puppet/pops/types/string_converter.rb

@@ -1,4 +1,4 @@
-require 'puppet/concurrent/thread_local_singleton'
+require_relative '../../../puppet/concurrent/thread_local_singleton'
 
 module Puppet::Pops
 module Types

data/lib/puppet/pops/types/type_calculator.rb

@@ -1,4 +1,4 @@
-require 'puppet/concurrent/thread_local_singleton'
+require_relative '../../../puppet/concurrent/thread_local_singleton'
 
 module Puppet::Pops
 module Types

data/lib/puppet/pops/types/type_formatter.rb

@@ -1,4 +1,4 @@
-require 'puppet/concurrent/thread_local_singleton'
+require_relative '../../../puppet/concurrent/thread_local_singleton'
 
 module Puppet::Pops
 module Types

data/lib/puppet/pops/types/type_parser.rb

@@ -1,4 +1,4 @@
-require 'puppet/concurrent/thread_local_singleton'
+require_relative '../../../puppet/concurrent/thread_local_singleton'
 
 # This class provides parsing of Type Specification from a string into the Type
 # Model that is produced by the TypeFactory.

data/lib/puppet/pops/types/types.rb

@@ -3610,7 +3610,7 @@ end
 end
 end
 
-require 'puppet/pops/pcore'
+require_relative '../../../puppet/pops/pcore'
 
 require_relative 'annotatable'
 require_relative 'p_meta_type'

data/lib/puppet/pops/validation/checker4_0.rb

@@ -1,4 +1,4 @@
-require 'puppet/pops/evaluator/external_syntax_support'
+require_relative '../../../puppet/pops/evaluator/external_syntax_support'
 
 module Puppet::Pops
 module Validation
@@ -236,7 +236,6 @@ class Checker4_0 < Evaluator::LiteralEvaluator
     case p
     when Model::AbstractResource
     when Model::CollectExpression
-      acceptor.accept(Issues::UNSUPPORTED_OPERATOR_IN_CONTEXT, p, :operator=>'* =>')
     else
       # protect against just testing a snippet that has no parent, error message will be a bit strange
       # but it is not for a real program.

data/lib/puppet/property.rb

@@ -1,8 +1,8 @@
 # The virtual base class for properties, which are the self-contained building
 # blocks for actually doing work on the system.
 
-require 'puppet'
-require 'puppet/parameter'
+require_relative '../puppet'
+require_relative '../puppet/parameter'
 
 # The Property class is the implementation of a resource's attributes of _property_ kind.
 # A Property is a specialized Resource Type Parameter that has both an 'is' (current) state, and
@@ -39,7 +39,7 @@ require 'puppet/parameter'
 # @api public
 #
 class Puppet::Property < Puppet::Parameter
-  require 'puppet/property/ensure'
+  require_relative 'property/ensure'
 
   # Returns the original wanted value(s) _(should)_ unprocessed by munging/unmunging.
   # The original values are set by {#value=} or {#should=}.

data/lib/puppet/property/boolean.rb

@@ -1,4 +1,4 @@
-require 'puppet/coercion'
+require_relative '../../puppet/coercion'
 
 class Puppet::Property::Boolean < Puppet::Property
   def unsafe_munge(value)

data/lib/puppet/property/ensure.rb

@@ -1,4 +1,4 @@
-require 'puppet/property'
+require_relative '../../puppet/property'
 
 # This property is automatically added to any {Puppet::Type} that responds
 # to the methods 'exists?', 'create', and 'destroy'.

data/lib/puppet/property/keyvalue.rb

@@ -1,4 +1,4 @@
-require 'puppet/property'
+require_relative '../../puppet/property'
 
 module Puppet
   class Property

data/lib/puppet/property/list.rb

@@ -1,4 +1,4 @@
-require 'puppet/property'
+require_relative '../../puppet/property'
 
 module Puppet
   class Property

data/lib/puppet/property/ordered_list.rb

@@ -1,4 +1,4 @@
-require 'puppet/property/list'
+require_relative '../../puppet/property/list'
 
 module Puppet
   class Property

data/lib/puppet/provider.rb

@@ -40,8 +40,8 @@ class Puppet::Provider
   include Puppet::Util::Warnings
   extend Puppet::Util::Warnings
 
-  require 'puppet/confiner'
-  require 'puppet/provider/command'
+  require_relative '../puppet/confiner'
+  require_relative 'provider/command'
 
   extend Puppet::Confiner
 

data/lib/puppet/provider/confine.rb

@@ -1,6 +1,6 @@
 # Confines have been moved out of the provider as they are also used for other things.
 # This provides backwards compatibility for people still including this old location.
-require 'puppet/provider'
-require 'puppet/confine'
+require_relative '../../puppet/provider'
+require_relative '../../puppet/confine'
 
 Puppet::Provider::Confine = Puppet::Confine

data/lib/puppet/provider/exec.rb

@@ -1,5 +1,5 @@
-require 'puppet/provider'
-require 'puppet/util/execution'
+require_relative '../../puppet/provider'
+require_relative '../../puppet/util/execution'
 
 class Puppet::Provider::Exec < Puppet::Provider
   include Puppet::Util::Execution

data/lib/puppet/provider/exec/posix.rb

@@ -1,4 +1,4 @@
-require 'puppet/provider/exec'
+require_relative '../../../puppet/provider/exec'
 
 Puppet::Type.type(:exec).provide :posix, :parent => Puppet::Provider::Exec do
   has_feature :umask

data/lib/puppet/provider/exec/windows.rb

@@ -1,4 +1,4 @@
-require 'puppet/provider/exec'
+require_relative '../../../puppet/provider/exec'
 
 Puppet::Type.type(:exec).provide :windows, :parent => Puppet::Provider::Exec do
 

data/lib/puppet/provider/file/posix.rb

@@ -8,7 +8,7 @@ Puppet::Type.type(:file).provide :posix do
   include Puppet::Util::Warnings
 
   require 'etc'
-  require 'puppet/util/selinux'
+  require_relative '../../../puppet/util/selinux'
 
   def self.post_resource_eval
     Selinux.matchpathcon_fini if Puppet::Util::SELinux.selinux_support?

data/lib/puppet/provider/file/windows.rb

@@ -7,7 +7,7 @@ Puppet::Type.type(:file).provide :windows do
   include Puppet::Util::Warnings
 
   if Puppet::Util::Platform.windows?
-    require 'puppet/util/windows'
+    require_relative '../../../puppet/util/windows'
     include Puppet::Util::Windows::Security
   end
 

data/lib/puppet/provider/group/aix.rb

@@ -1,6 +1,6 @@
 # Group Puppet provider for AIX. It uses standard commands to manage groups:
 #  mkgroup, rmgroup, lsgroup, chgroup
-require 'puppet/provider/aix_object'
+require_relative '../../../puppet/provider/aix_object'
 
 Puppet::Type.type(:group).provide :aix, :parent => Puppet::Provider::AixObject do
   desc "Group management for AIX."

data/lib/puppet/provider/group/directoryservice.rb

@@ -1,4 +1,4 @@
-require 'puppet/provider/nameservice/directoryservice'
+require_relative '../../../puppet/provider/nameservice/directoryservice'
 
 Puppet::Type.type(:group).provide :directoryservice, :parent => Puppet::Provider::NameService::DirectoryService do
   desc "Group management using DirectoryService on OS X.

data/lib/puppet/provider/group/groupadd.rb

@@ -1,5 +1,5 @@
-require 'puppet/provider/nameservice/objectadd'
-require 'puppet/util/libuser'
+require_relative '../../../puppet/provider/nameservice/objectadd'
+require_relative '../../../puppet/util/libuser'
 
 Puppet::Type.type(:group).provide :groupadd, :parent => Puppet::Provider::NameService::ObjectAdd do
   desc "Group management via `groupadd` and its ilk. The default for most platforms."

data/lib/puppet/provider/group/ldap.rb

@@ -1,4 +1,4 @@
-require 'puppet/provider/ldap'
+require_relative '../../../puppet/provider/ldap'
 
 Puppet::Type.type(:group).provide :ldap, :parent => Puppet::Provider::Ldap do
   desc "Group management via LDAP.

data/lib/puppet/provider/group/pw.rb

@@ -1,4 +1,4 @@
-require 'puppet/provider/nameservice/pw'
+require_relative '../../../puppet/provider/nameservice/pw'
 
 Puppet::Type.type(:group).provide :pw, :parent => Puppet::Provider::NameService::PW do
   desc "Group management via `pw` on FreeBSD and DragonFly BSD."