puppet 8.2.0-x86-mingw32 → 8.4.0-x86-mingw32

data/lib/puppet/pops/evaluator/runtime3_converter.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Puppet::Pops::Evaluator
 # Converts nested 4x supported values to 3x values. This is required because
 # resources and other objects do not know about the new type system, and does not support
@@ -8,7 +9,7 @@ module Puppet::Pops::Evaluator
 # Users should not create instances of this class. Instead the class methods {Runtime3Converter.convert},
 # {Runtime3Converter.map_args}, or {Runtime3Converter.instance} should be used
 class Runtime3Converter
-  MAX_INTEGER =  Puppet::Pops::MAX_INTEGER
+  MAX_INTEGER = Puppet::Pops::MAX_INTEGER
   MIN_INTEGER = Puppet::Pops::MIN_INTEGER
 
   # Converts 4x supported values to a 3x values. Same as calling Runtime3Converter.instance.map_args(...)
@@ -67,6 +68,7 @@ class Runtime3Converter
 
   def convert_Integer(o, scope, undef_value)
     return o unless o < MIN_INTEGER || o > MAX_INTEGER
+
     range_end = o > MAX_INTEGER ? 'max' : 'min'
     raise Puppet::Error, "Use of a Ruby Integer outside of Puppet Integer #{range_end} range, got '#{"0x%x" % o}'"
   end
@@ -75,6 +77,7 @@ class Runtime3Converter
     # transform to same value float value if possible without any rounding error
     f = o.to_f
     return f unless f != o
+
     raise Puppet::Error, "Use of a Ruby BigDecimal value outside Puppet Float range, got '#{o}'"
   end
 
@@ -107,6 +110,7 @@ class Runtime3Converter
 
   def convert_Symbol(o, scope, undef_value)
     return o unless o == :undef
+
     !@inner ? undef_value : nil
   end
 
@@ -133,23 +137,23 @@ class Runtime3Converter
   def catalog_type_to_split_type_title(catalog_type)
     split_type = catalog_type.is_a?(Puppet::Pops::Types::PTypeType) ? catalog_type.type : catalog_type
     case split_type
-      when Puppet::Pops::Types::PClassType
-        class_name = split_type.class_name
-        ['class', class_name.nil? ? nil : class_name.sub(/^::/, '')]
-      when Puppet::Pops::Types::PResourceType
-        type_name = split_type.type_name
-        title = split_type.title
-        if type_name =~ /^(::)?[Cc]lass$/
-          ['class', title.nil? ? nil : title.sub(/^::/, '')]
-        else
-          # Ensure that title is '' if nil
-          # Resources with absolute name always results in error because tagging does not support leading ::
-          [type_name.nil? ? nil : type_name.sub(/^::/, '').downcase, title.nil? ? '' : title]
-        end
+    when Puppet::Pops::Types::PClassType
+      class_name = split_type.class_name
+      ['class', class_name.nil? ? nil : class_name.sub(/^::/, '')]
+    when Puppet::Pops::Types::PResourceType
+      type_name = split_type.type_name
+      title = split_type.title
+      if type_name =~ /^(::)?[Cc]lass$/
+        ['class', title.nil? ? nil : title.sub(/^::/, '')]
       else
-        #TRANSLATORS 'PClassType' and 'PResourceType' are Puppet types and should not be translated
-        raise ArgumentError, _("Cannot split the type %{class_name}, it represents neither a PClassType, nor a PResourceType.") %
-            { class_name: catalog_type.class }
+        # Ensure that title is '' if nil
+        # Resources with absolute name always results in error because tagging does not support leading ::
+        [type_name.nil? ? nil : type_name.sub(/^::/, '').downcase, title.nil? ? '' : title]
+      end
+    else
+      # TRANSLATORS 'PClassType' and 'PResourceType' are Puppet types and should not be translated
+      raise ArgumentError, _("Cannot split the type %{class_name}, it represents neither a PClassType, nor a PResourceType.") %
+          { class_name: catalog_type.class }
     end
   end
 
@@ -168,7 +172,6 @@ end
 # converter ensures that they are converted to String format
 # @api private
 class Runtime3FunctionArgumentConverter < Runtime3Converter
-
   def convert_Regexp(o, scope, undef_value)
     # Puppet 3x cannot handle parameter values that are regular expressions. Turn into regexp string in
     # source form
@@ -218,5 +221,4 @@ class Runtime3FunctionArgumentConverter < Runtime3Converter
 
   @instance = self.new
 end
-
 end

data/lib/puppet/pops/evaluator/runtime3_resource_support.rb

@@ -1,13 +1,12 @@
 # frozen_string_literal: true
+
 module Puppet::Pops
 module Evaluator
-
 # @api private
 module Runtime3ResourceSupport
   CLASS_STRING = 'class'
 
   def self.create_resources(file, line, scope, virtual, exported, type_name, resource_titles, evaluated_parameters)
-
     env = scope.environment
     #    loader = Adapters::LoaderAdapter.loader_for_model_object(o, scope)
 
@@ -15,7 +14,7 @@ module Runtime3ResourceSupport
       # Resolve a 'class' and its titles
       resource_titles = resource_titles.collect do |a_title|
         hostclass = env.known_resource_types.find_hostclass(a_title)
-        hostclass ?  hostclass.name : a_title
+        hostclass ? hostclass.name : a_title
       end
       # resolved type is just the string CLASS
       resolved_type = CLASS_STRING
@@ -36,35 +35,35 @@ module Runtime3ResourceSupport
     # as this makes the created resource retain the type instance.
     #
     resource_titles.map do |resource_title|
-        resource = Puppet::Parser::Resource.new(
-          resolved_type, resource_title,
-          :parameters => evaluated_parameters,
-          :file => file,
-          :line => line,
-          :kind => Puppet::Resource.to_kind(resolved_type),
-          :exported => exported,
-          :virtual => virtual,
-          # WTF is this? Which source is this? The file? The name of the context ?
-          :source => scope.source,
-          :scope => scope,
-          :strict => true
-        )
-
-        # If this resource type supports inheritance (e.g. 'class') the parent chain must be walked
-        # This impl delegates to the resource type to figure out what is needed.
-        #
-        if resource.resource_type.is_a? Puppet::Resource::Type
-          resource.resource_type.instantiate_resource(scope, resource)
-        end
-
-        scope.compiler.add_resource(scope, resource)
-
-        # Classes are evaluated immediately
-        scope.compiler.evaluate_classes([resource_title], scope, false) if resolved_type == CLASS_STRING
-
-        # Turn the resource into a PTypeType (a reference to a resource type)
-        # weed out nil's
-        resource_to_ptype(resource)
+      resource = Puppet::Parser::Resource.new(
+        resolved_type, resource_title,
+        :parameters => evaluated_parameters,
+        :file => file,
+        :line => line,
+        :kind => Puppet::Resource.to_kind(resolved_type),
+        :exported => exported,
+        :virtual => virtual,
+        # WTF is this? Which source is this? The file? The name of the context ?
+        :source => scope.source,
+        :scope => scope,
+        :strict => true
+      )
+
+      # If this resource type supports inheritance (e.g. 'class') the parent chain must be walked
+      # This impl delegates to the resource type to figure out what is needed.
+      #
+      if resource.resource_type.is_a? Puppet::Resource::Type
+        resource.resource_type.instantiate_resource(scope, resource)
+      end
+
+      scope.compiler.add_resource(scope, resource)
+
+      # Classes are evaluated immediately
+      scope.compiler.evaluate_classes([resource_title], scope, false) if resolved_type == CLASS_STRING
+
+      # Turn the resource into a PTypeType (a reference to a resource type)
+      # weed out nil's
+      resource_to_ptype(resource)
     end
   end
 
@@ -114,7 +113,6 @@ module Runtime3ResourceSupport
     krt.find_definition(type_name)
   end
   private_class_method :find_defined_resource_type
-
 end
 end
 end

data/lib/puppet/pops/evaluator/runtime3_support.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Puppet::Pops
 module Evaluator
 # A module with bindings between the new evaluator and the 3x runtime.
@@ -7,7 +8,6 @@ module Evaluator
 #
 # @api private
 module Runtime3Support
-
   NAME_SPACE_SEPARATOR = '::'
 
   # Fails the evaluation of _semantic_ with a given issue.
@@ -37,7 +37,7 @@ module Runtime3Support
     if except.nil? && diagnostic_producer.severity_producer[issue] == :error
       # Want a stacktrace, and it must be passed as an exception
       begin
-       raise EvaluationError.new()
+        raise EvaluationError.new()
       rescue EvaluationError => e
         except = e
       end
@@ -60,7 +60,7 @@ module Runtime3Support
 
     # Use a SemanticError as the sourcepos
     semantic = Puppet::Pops::SemanticError.new(issue, nil, options.merge({:file => file, :line => line}))
-    optionally_fail(issue,  semantic)
+    optionally_fail(issue, semantic)
     nil
   end
 
@@ -147,6 +147,7 @@ module Runtime3Support
     # is in the source.
     #
     raise ArgumentError, _("Internal error - attempt to create a local scope without a hash") unless hash.is_a?(Hash)
+
     scope.ephemeral_from(hash)
   end
 
@@ -253,10 +254,12 @@ module Runtime3Support
     if v.is_a?(Numeric)
       return v
     end
+
     n = Utils.to_n(v)
     unless n
       fail(Issues::NOT_NUMERIC, o, {:value => v})
     end
+
     # this point is reached if there was a conversion
     optionally_fail(Issues::NUMERIC_COERCION, o, {:before => v, :after => n})
     n
@@ -320,10 +323,10 @@ module Runtime3Support
   def create_resource_parameter(o, scope, name, value, operator)
     file, line = extract_file_line(o)
     Puppet::Parser::Resource::Param.new(
-      :name   => name,
-      :value  => convert(value, scope, nil), # converted to 3x since 4x supports additional objects / types
+      :name => name,
+      :value => convert(value, scope, nil), # converted to 3x since 4x supports additional objects / types
       :source => scope.source, :line => line, :file => file,
-      :add    => operator == '+>'
+      :add => operator == '+>'
     )
   end
 
@@ -374,6 +377,7 @@ module Runtime3Support
       unless r.is_a?(Types::PResourceType) && r.type_name != 'class'
         fail(Issues::ILLEGAL_OVERRIDDEN_TYPE, o, {:actual => r} )
       end
+
       t = Runtime3ResourceSupport.find_resource_type(scope, r.type_name)
       resource = Puppet::Parser::Resource.new(
         t, r.title, {
@@ -435,6 +439,7 @@ module Runtime3Support
   #
   def is_parameter_of_resource?(scope, resource, name)
     return false unless name.is_a?(String)
+
     resource.valid_parameter?(name)
   end
 
@@ -460,12 +465,6 @@ module Runtime3Support
     end
   end
 
-  # Utility method for TrueClass || FalseClass
-  # @param x [Object] the object to test if it is instance of TrueClass or FalseClass
-  def is_boolean? x
-    x.is_a?(TrueClass) || x.is_a?(FalseClass)
-  end
-
   def extract_file_line(o)
     o.is_a?(Model::Positioned) ? [o.file, o.line] : [nil, -1]
   end
@@ -473,15 +472,13 @@ module Runtime3Support
   # Creates a diagnostic producer
   def diagnostic_producer
     Validation::DiagnosticProducer.new(
-      ExceptionRaisingAcceptor.new(),                   # Raises exception on all issues
+      ExceptionRaisingAcceptor.new(), # Raises exception on all issues
       SeverityProducer.new(), # All issues are errors
       Model::ModelLabelProvider.new())
   end
 
   # Configure the severity of failures
   class SeverityProducer < Validation::SeverityProducer
-    Issues = Issues
-
     def initialize
       super
       p = self
@@ -519,10 +516,10 @@ module Runtime3Support
     def accept(diagnostic)
       super
       IssueReporter.assert_and_report(self, {
-        :message => "Evaluation Error:",
-        :emit_warnings => true,  # log warnings
-        :exception_class => Puppet::PreformattedError
-      })
+                                        :message => "Evaluation Error:",
+                                        :emit_warnings => true,  # log warnings
+                                        :exception_class => Puppet::PreformattedError
+                                      })
       if errors?
         raise ArgumentError, _("Internal Error: Configuration of runtime error handling wrong: should have raised exception")
       end

data/lib/puppet/pops/functions/dispatch.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Puppet::Pops
 module Functions
 # Defines a connection between a implementation method and the signature that

data/lib/puppet/pops/functions/dispatcher.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Evaluate the dispatches defined as {Puppet::Pops::Functions::Dispatch}
 # instances to call the appropriate method on the
 # {Puppet::Pops::Functions::Function} instance.
@@ -33,7 +34,6 @@ class Puppet::Pops::Functions::Dispatcher
   #
   # @api private
   def dispatch(instance, calling_scope, args, &block)
-
     dispatcher = find_matching_dispatcher(args, &block)
     unless dispatcher
       args_type = Puppet::Pops::Types::TypeCalculator.singleton.infer_set(block_given? ? args + [block] : args)

data/lib/puppet/pops/functions/function.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # @note WARNING: This new function API is still under development and may change at
 #   any time
 #
@@ -105,7 +106,6 @@ class Puppet::Pops::Functions::Function
   #
   # @api public
   def internal_call_function(scope, function_name, args, &block)
-
     the_loader = loader
     unless the_loader
       raise ArgumentError, _("Function %{class_name}(): cannot call function '%{function_name}' - no loader specified") %
@@ -136,5 +136,4 @@ class Puppet::Pops::Functions::Function
     # Prevent non r-value functions from leaking their result (they are not written to care about this)
     Puppet::Parser::Functions.rvalue?(function_name) ? result : nil
   end
-
 end

data/lib/puppet/pops/issue_reporter.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
+
 module Puppet::Pops
 class IssueReporter
-
   # @param acceptor [Validation::Acceptor] the acceptor containing reported issues
   # @option options [String] :message (nil) A message text to use as prefix in
   #   a single Error message
@@ -50,6 +50,7 @@ class IssueReporter
       unless emit_errors
         raise emit_exception.new(emit_message)
       end
+
       formatter = Validation::DiagnosticFormatterPuppetStyle.new
       if errors.size == 1 || max_errors <= 1
         # raise immediately
@@ -84,19 +85,20 @@ class IssueReporter
 
   def self.format_with_prefix(prefix, message)
     return message unless prefix
+
     [prefix, message].join(' ')
   end
 
   def self.warning(semantic, issue, args)
     Puppet::Util::Log.create({
-      :level => :warning,
-      :message => issue.format(args),
-      :arguments => args,
-      :issue_code => issue.issue_code,
-      :file => semantic.file,
-      :line => semantic.line,
-      :pos => semantic.pos,
-    })
+                               :level => :warning,
+                               :message => issue.format(args),
+                               :arguments => args,
+                               :issue_code => issue.issue_code,
+                               :file => semantic.file,
+                               :line => semantic.line,
+                               :pos => semantic.pos,
+                             })
   end
 
   def self.error(exception_class, semantic, issue, args)
@@ -124,14 +126,14 @@ class IssueReporter
       pos = diagnostic.source_pos.pos
     end
     Puppet::Util::Log.create({
-        :level => severity,
-        :message => formatter.format_message(diagnostic),
-        :arguments => diagnostic.arguments,
-        :issue_code => diagnostic.issue.issue_code,
-        :file => file,
-        :line => line,
-        :pos => pos,
-      })
+                               :level => severity,
+                               :message => formatter.format_message(diagnostic),
+                               :arguments => diagnostic.arguments,
+                               :issue_code => diagnostic.issue.issue_code,
+                               :file => file,
+                               :line => line,
+                               :pos => pos,
+                             })
   end
   private_class_method :log_message
 end

data/lib/puppet/pops/issues.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Defines classes to deal with issues, and message formatting and defines constants with Issues.
 # @api public
 #
@@ -23,6 +24,7 @@ module Issues
 
     # If this issue can have its severity lowered to :warning, :deprecation, or :ignored
     attr_writer :demotable
+
     # Configures the Issue with required arguments (bound by occurrence), and a block producing a message.
     def initialize issue_code, *args, &block
       @issue_code = issue_code
@@ -90,16 +92,18 @@ module Issues
     # @raise [Puppet::Error] if no label provider is found
     def label_provider
       label_provider = @data[:label]
-      #TRANSLATORS ":label" is a keyword and should not be translated
+      # TRANSLATORS ":label" is a keyword and should not be translated
       raise Puppet::Error, _('Label provider key :label must be set to produce the text of the message!') unless label_provider
+
       label_provider
     end
 
     # Returns the label provider given as a key in the hash passed to #format.
     #
     def semantic
-      #TRANSLATORS ":semantic" is a keyword and should not be translated
+      # TRANSLATORS ":semantic" is a keyword and should not be translated
       raise Puppet::Error, _('Label provider key :semantic must be set to produce the text of the message!') unless @data[:semantic]
+
       @data[:semantic]
     end
   end
@@ -542,7 +546,7 @@ module Issues
     _("Illegal Resource Type expression, expected result to be a type name, or untitled Resource, got %{actual}") % { actual: actual }
   end
 
-  DUPLICATE_TITLE = issue :DUPLICATE_TITLE, :title  do
+  DUPLICATE_TITLE = issue :DUPLICATE_TITLE, :title do
     _("The title '%{title}' has already been used in this resource expression") % { title: title }
   end
 
@@ -592,7 +596,7 @@ module Issues
   end
 
   DISCONTINUED_IMPORT = hard_issue :DISCONTINUED_IMPORT do
-    #TRANSLATORS "import" is a function name and should not be translated
+    # TRANSLATORS "import" is a function name and should not be translated
     _("Use of 'import' has been discontinued in favor of a manifest directory. See http://links.puppet.com/puppet-import-deprecation")
   end
 

data/lib/puppet/pops/label_provider.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Provides a label for an object.
 # This simple implementation calls #to_s on the given object, and handles articles 'a/an/the'.
 #

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Puppet::Pops
 module Loader
 # BaseLoader
@@ -10,7 +11,6 @@ module Loader
 # @api private
 #
 class BaseLoader < Loader
-
   # The parent loader
   attr_reader :parent
 
@@ -85,7 +85,7 @@ class BaseLoader < Loader
       if typed_name.type == :type && !allow_shadowing?
         entry = loaded_entry(typed_name)
         if entry
-          fail_redefine(entry) unless entry.value.nil? #|| entry.value == value
+          fail_redefine(entry) unless entry.value.nil? # || entry.value == value
         end
       end
 

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # =DependencyLoader
 # This loader provides visibility into a set of other loaders. It is used as a child of a ModuleLoader (or other
 # loader) to make its direct dependencies visible for loading from contexts that have access to this dependency loader.
@@ -44,6 +45,7 @@ class Puppet::Pops::Loader::DependencyLoader < Puppet::Pops::Loader::BaseLoader
       # lookup otherwise).
       loaded = @dependency_loaders.reduce(nil) do |previous, loader|
         break previous if !previous.nil?
+
         loader.load_typed(typed_name)
       end
       if loaded
@@ -80,6 +82,7 @@ class Puppet::Pops::Loader::DependencyLoader < Puppet::Pops::Loader::BaseLoader
       # lookup otherwise).
       @dependency_loaders.reduce(nil) do |previous, loader|
         break previous if !previous.nil?
+
         loader.loaded_entry(typed_name, check_dependencies)
       end
     end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # GemSupport offers methods to find a gem's location by name or gem://gemname URI.
 #
 # TODO: The Puppet 3x, uses Puppet::Util::RubyGems to do this, and obtain paths, and avoids using ::Gems
@@ -9,7 +10,6 @@
 # and then trying to access those.
 #
 module Puppet::Pops::Loader::GemSupport
-
   # Produces the root directory of a gem given as an URI (gem://gemname/optional/path), or just the
   # gemname as a string.
   #
@@ -31,6 +31,7 @@ module Puppet::Pops::Loader::GemSupport
     unless spec
       raise ArgumentError, _("Gem not found %{uri}") % { uri: uri }
     end
+
     # if path given append that, else append given subdir
     if uri.path.empty?
       spec.gem_dir
@@ -47,6 +48,7 @@ module Puppet::Pops::Loader::GemSupport
     unless spec
       raise ArgumentError, _("Gem not found '%{gem_name}'") % { gem_name: gem_name }
     end
+
     spec.full_gem_path
   end
 end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Puppet::Pops
 module Loader
 # The GenericPlanInstantiator dispatches to either PuppetPlanInstantiator or a

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Loader
 # ===
 # A Loader is responsible for loading "entities" ("instantiable and executable objects in the puppet language" which
@@ -22,7 +23,6 @@
 #
 module Puppet::Pops
 module Loader
-
 ENVIRONMENT = 'environment'
 ENVIRONMENT_PRIVATE = 'environment private'
 
@@ -202,7 +202,6 @@ class Loader
     self.to_s
   end
 
-
   # An entry for one entity loaded by the loader.
   #
   class NamedEntry