puppet 8.5.1-x64-mingw32 → 8.6.0-x64-mingw32

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

@@ -26,7 +26,7 @@ class CollectorTransformer
 
     fail "Resource type #{type} doesn't exist" unless resource_type
 
-    if !o.operations.empty?
+    unless o.operations.empty?
       overrides = {
         :parameters => o.operations.map { |x| @@evaluator.evaluate(x, scope) }.flatten,
         :file => o.file,
@@ -182,19 +182,19 @@ class CollectorTransformer
   def match_AndExpression(o, scope)
     left_match = match(o.left_expr, scope)
     right_match = match(o.right_expr, scope)
-    return [left_match, 'and', right_match]
+    [left_match, 'and', right_match]
   end
 
   def match_OrExpression(o, scope)
     left_match = match(o.left_expr, scope)
     right_match = match(o.right_expr, scope)
-    return [left_match, 'or', right_match]
+    [left_match, 'or', right_match]
   end
 
   def match_ComparisonExpression(o, scope)
     left_match = match(o.left_expr, scope)
     right_match = match(o.right_expr, scope)
-    return [left_match, o.operator.to_s, right_match]
+    [left_match, o.operator.to_s, right_match]
   end
 
   def match_VariableExpression(o, scope)

data/lib/puppet/pops/evaluator/collectors/abstract_collector.rb

@@ -28,7 +28,7 @@ class Puppet::Pops::Evaluator::Collectors::AbstractCollector
     @collected = {}
     @scope = scope
 
-    if !(overrides.nil? || overrides[:parameters])
+    unless overrides.nil? || overrides[:parameters]
       raise ArgumentError, _("Exported resource try to override without parameters")
     end
 
@@ -50,12 +50,12 @@ class Puppet::Pops::Evaluator::Collectors::AbstractCollector
       overrides[:source].override = true
 
       objects.each do |res|
-        unless @collected.include?(res.ref)
-          t = res.type
-          t = Puppet::Pops::Evaluator::Runtime3ResourceSupport.find_resource_type(scope, t)
-          newres = Puppet::Parser::Resource.new(t, res.title, @overrides)
-          scope.compiler.add_override(newres)
-        end
+        next if @collected.include?(res.ref)
+
+        t = res.type
+        t = Puppet::Pops::Evaluator::Runtime3ResourceSupport.find_resource_type(scope, t)
+        newres = Puppet::Parser::Resource.new(t, res.title, @overrides)
+        scope.compiler.add_override(newres)
       end
     end
 

data/lib/puppet/pops/evaluator/collectors/fixed_set_collector.rb

@@ -18,14 +18,14 @@ class Puppet::Pops::Evaluator::Collectors::FixedSetCollector < Puppet::Pops::Eva
     resolved = []
     result = @resources.each_with_object([]) do |ref, memo|
       res = @scope.findresource(ref.to_s)
-      if res
-        res.virtual = false
-        memo << res
-        resolved << ref
-      end
+      next unless res
+
+      res.virtual = false
+      memo << res
+      resolved << ref
     end
 
-    @resources = @resources - resolved
+    @resources -= resolved
 
     @scope.compiler.delete_collection(self) if @resources.empty?
 

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

@@ -50,7 +50,7 @@ class CompareOperator
   def cmp_String(a, b)
     return a.casecmp(b) if b.is_a?(String)
 
-    raise ArgumentError.new(_("A String is not comparable to a non String"))
+    raise ArgumentError, _("A String is not comparable to a non String")
   end
 
   # Equality is case independent.
@@ -67,7 +67,7 @@ class CompareOperator
     when Time::Timespan, Time::Timestamp
       -(b <=> a) # compare other way and invert result
     else
-      raise ArgumentError.new(_("A Numeric is not comparable to non Numeric"))
+      raise ArgumentError, _("A Numeric is not comparable to non Numeric")
     end
   end
 
@@ -97,30 +97,30 @@ class CompareOperator
     if b.is_a?(Symbol)
       a <=> b
     else
-      raise ArgumentError.new(_("Symbol not comparable to non Symbol"))
+      raise ArgumentError, _("Symbol not comparable to non Symbol")
     end
   end
 
   def cmp_Timespan(a, b)
-    raise ArgumentError.new(_('Timespans are only comparable to Timespans, Integers, and Floats')) unless b.is_a?(Time::Timespan) || b.is_a?(Integer) || b.is_a?(Float)
+    raise ArgumentError, _('Timespans are only comparable to Timespans, Integers, and Floats') unless b.is_a?(Time::Timespan) || b.is_a?(Integer) || b.is_a?(Float)
 
     a <=> b
   end
 
   def cmp_Timestamp(a, b)
-    raise ArgumentError.new(_('Timestamps are only comparable to Timestamps, Integers, and Floats')) unless b.is_a?(Time::Timestamp) || b.is_a?(Integer) || b.is_a?(Float)
+    raise ArgumentError, _('Timestamps are only comparable to Timestamps, Integers, and Floats') unless b.is_a?(Time::Timestamp) || b.is_a?(Integer) || b.is_a?(Float)
 
     a <=> b
   end
 
   def cmp_Version(a, b)
-    raise ArgumentError.new(_('Versions not comparable to non Versions')) unless b.is_a?(SemanticPuppet::Version)
+    raise ArgumentError, _('Versions not comparable to non Versions') unless b.is_a?(SemanticPuppet::Version)
 
     a <=> b
   end
 
   def cmp_Object(a, b)
-    raise ArgumentError.new(_('Only Strings, Numbers, Timespans, Timestamps, and Versions are comparable'))
+    raise ArgumentError, _('Only Strings, Numbers, Timespans, Timestamps, and Versions are comparable')
   end
 
   def equals_Object(a, b)
@@ -183,15 +183,15 @@ class CompareOperator
       end
       # Always set match data, a "not found" should not keep old match data visible
       set_match_data(matched, scope) # creates ephemeral
-      return !!matched
+      !!matched
     when String, SemanticPuppet::Version
       a.any? { |element| match(b, element, scope) }
     when Types::PAnyType
       a.each { |element| return true if b.instance?(element) }
-      return false
+      false
     else
       a.each { |element| return true if equals(element, b) }
-      return false
+      false
     end
   end
 

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

@@ -172,7 +172,7 @@ class DeferredResolver
     else
       # call the function later
       DeferredValue.new(
-        Proc.new {
+        proc {
           # deferred functions can have nested deferred arguments
           resolved_arguments = mapped_arguments.map { |arg| resolve_lazy_args(arg) }
           @scope.call_function(func_name, resolved_arguments)

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

@@ -31,7 +31,7 @@ class Puppet::Pops::Evaluator::EppEvaluator
 
     unless Puppet::FileSystem.exist?(file)
       unless file =~ /\.epp$/
-        file = file + ".epp"
+        file += ".epp"
       end
     end
 
@@ -82,7 +82,7 @@ class Puppet::Pops::Evaluator::EppEvaluator
     end
 
     # filter out all qualified names and set them in qualified_variables
-    # only pass unqualified (filtered) variable names to the the template
+    # only pass unqualified (filtered) variable names to the template
     filtered_args = {}
     template_args.each_pair do |k, v|
       if k =~ /::/

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

@@ -74,46 +74,44 @@ class EvaluatorImpl
   # @api public
   #
   def evaluate(target, scope)
-    begin
-      @@eval_visitor.visit_this_1(self, target, scope)
-    rescue SemanticError => e
-      # A raised issue may not know the semantic target, use errors call stack, but fill in the
-      # rest from a supplied semantic object, or the target instruction if there is not semantic
-      # object.
-      #
-      fail(e.issue, e.semantic || target, e.options, e)
-    rescue Puppet::PreformattedError => e
-      # Already formatted with location information, and with the wanted call stack.
-      # Note this is currently a specialized ParseError, so rescue-order is important
-      #
-      raise e
-    rescue Puppet::ParseError => e
-      # ParseError may be raised in ruby code without knowing the location
-      # in puppet code.
-      # Accept a ParseError that has file or line information available
-      # as an error that should be used verbatim. (Tests typically run without
-      # setting a file name).
-      # ParseError can supply an original - it is impossible to determine which
-      # call stack that should be propagated, using the ParseError's backtrace.
-      #
-      if e.file || e.line
-        raise e
-      else
-        # Since it had no location information, treat it as user intended a general purpose
-        # error. Pass on its call stack.
-        fail(Issues::RUNTIME_ERROR, target, { :detail => e.message }, e)
-      end
-    rescue Puppet::Error => e
-      # PuppetError has the ability to wrap an exception, if so, use the wrapped exception's
-      # call stack instead
-      fail(Issues::RUNTIME_ERROR, target, { :detail => e.message }, e.original || e)
-    rescue StopIteration => e
-      # Ensure these are not rescued as StandardError
+    @@eval_visitor.visit_this_1(self, target, scope)
+  rescue SemanticError => e
+    # A raised issue may not know the semantic target, use errors call stack, but fill in the
+    # rest from a supplied semantic object, or the target instruction if there is not semantic
+    # object.
+    #
+    fail(e.issue, e.semantic || target, e.options, e)
+  rescue Puppet::PreformattedError => e
+    # Already formatted with location information, and with the wanted call stack.
+    # Note this is currently a specialized ParseError, so rescue-order is important
+    #
+    raise e
+  rescue Puppet::ParseError => e
+    # ParseError may be raised in ruby code without knowing the location
+    # in puppet code.
+    # Accept a ParseError that has file or line information available
+    # as an error that should be used verbatim. (Tests typically run without
+    # setting a file name).
+    # ParseError can supply an original - it is impossible to determine which
+    # call stack that should be propagated, using the ParseError's backtrace.
+    #
+    if e.file || e.line
       raise e
-    rescue StandardError => e
-      # All other errors, use its message and call stack
+    else
+      # Since it had no location information, treat it as user intended a general purpose
+      # error. Pass on its call stack.
       fail(Issues::RUNTIME_ERROR, target, { :detail => e.message }, e)
     end
+  rescue Puppet::Error => e
+    # PuppetError has the ability to wrap an exception, if so, use the wrapped exception's
+    # call stack instead
+    fail(Issues::RUNTIME_ERROR, target, { :detail => e.message }, e.original || e)
+  rescue StopIteration => e
+    # Ensure these are not rescued as StandardError
+    raise e
+  rescue StandardError => e
+    # All other errors, use its message and call stack
+    fail(Issues::RUNTIME_ERROR, target, { :detail => e.message }, e)
   end
 
   # Assigns the given _value_ to the given _target_. The additional argument _o_ is the instruction that
@@ -693,7 +691,7 @@ class EvaluatorImpl
       the_default = nil
       if o.options.find do |co|
         # the first case option that matches
-        if co.values.find do |c|
+        next unless co.values.find do |c|
           c = unwind_parentheses(c)
           case c
           when Model::LiteralDefault
@@ -707,9 +705,9 @@ class EvaluatorImpl
             is_match?(test, evaluate(c, scope), c, co, scope)
           end
         end
-          result = evaluate(co.then_expr, scope)
-          true # the option was picked
-        end
+
+        result = evaluate(co.then_expr, scope)
+        true # the option was picked
       end
         result # an option was picked, and produced a result
       else
@@ -746,17 +744,15 @@ class EvaluatorImpl
   end
 
   def eval_Program(o, scope)
-    begin
-      file = o.locator.file
-      line = 0
-      # Add stack frame for "top scope" logic. See Puppet::Pops::PuppetStack
-      return Puppet::Pops::PuppetStack.stack(file, line, self, 'evaluate', [o.body, scope])
-      # evaluate(o.body, scope)
-    rescue Puppet::Pops::Evaluator::PuppetStopIteration => ex
-      # breaking out of a file level program is not allowed
-      # TRANSLATOR break() is a method that should not be translated
-      raise Puppet::ParseError.new(_("break() from context where this is illegal"), ex.file, ex.line)
-    end
+    file = o.locator.file
+    line = 0
+    # Add stack frame for "top scope" logic. See Puppet::Pops::PuppetStack
+    Puppet::Pops::PuppetStack.stack(file, line, self, 'evaluate', [o.body, scope])
+    # evaluate(o.body, scope)
+  rescue Puppet::Pops::Evaluator::PuppetStopIteration => ex
+    # breaking out of a file level program is not allowed
+    # TRANSLATOR break() is a method that should not be translated
+    raise Puppet::ParseError.new(_("break() from context where this is illegal"), ex.file, ex.line)
   end
 
   # Produces Array[PAnyType], an array of resource references
@@ -811,7 +807,7 @@ class EvaluatorImpl
 
     # This is a runtime check - the model is valid, but will have runtime issues when evaluated
     # and storeconfigs is not set.
-    if (o.exported)
+    if o.exported
       optionally_fail(Issues::RT_NO_STORECONFIGS_EXPORT, o);
     end
 
@@ -1068,10 +1064,10 @@ class EvaluatorImpl
   # Evaluates Puppet DSL `unless`
   def eval_UnlessExpression o, scope
     scope.with_guarded_scope do
-      unless is_true?(evaluate(o.test, scope), o.test)
-        evaluate(o.then_expr, scope)
-      else
+      if is_true?(evaluate(o.test, scope), o.test)
         evaluate(o.else_expr, scope)
+      else
+        evaluate(o.then_expr, scope)
       end
     end
   end
@@ -1236,15 +1232,15 @@ class EvaluatorImpl
               Hash[*y]
             end
           else
-            raise ArgumentError.new(_('Can only append Array or Hash to a Hash'))
+            raise ArgumentError, _('Can only append Array or Hash to a Hash')
           end
       x.merge y # new hash with overwrite
     when URI
-      raise ArgumentError.new(_('An URI can only be merged with an URI or String')) unless y.is_a?(String) || y.is_a?(URI)
+      raise ArgumentError, _('An URI can only be merged with an URI or String') unless y.is_a?(String) || y.is_a?(URI)
 
       x + y
     when Types::PBinaryType::Binary
-      raise ArgumentError.new(_('Can only append Binary to a Binary')) unless y.is_a?(Types::PBinaryType::Binary)
+      raise ArgumentError, _('Can only append Binary to a Binary') unless y.is_a?(Types::PBinaryType::Binary)
 
       Types::PBinaryType::Binary.from_binary_string(x.binary_buffer + y.binary_buffer)
     else
@@ -1276,7 +1272,7 @@ class EvaluatorImpl
           end
       y.each { |e| result.delete(e) }
     else
-      raise ArgumentError.new(_("Can only delete from an Array or Hash."))
+      raise ArgumentError, _("Can only delete from an Array or Hash.")
     end
     result
   end

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

@@ -47,7 +47,7 @@ class RelationshipOperator
   # Catch all non transformable objects
   # @api private
   def transform_Object(o, scope)
-    raise IllegalRelationshipOperandError.new(o)
+    raise IllegalRelationshipOperandError, o
   end
 
   # A Resource is by definition a Catalog type, but of 3.x type
@@ -98,7 +98,7 @@ class RelationshipOperator
   #
   def assert_catalog_type(o, scope)
     unless @type_calculator.assignable?(@catalog_type, o)
-      raise NotCatalogTypeError.new(o)
+      raise NotCatalogTypeError, o
     end
 
     # TODO must check if this is an abstract PResourceType (i.e. without a type_name) - which should fail ?

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

@@ -70,7 +70,7 @@ class Runtime3Converter
     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}'"
+    raise Puppet::Error, "Use of a Ruby Integer outside of Puppet Integer #{range_end} range, got '#{'0x%x' % o}'"
   end
 
   def convert_BigDecimal(o, scope, undef_value)
@@ -165,7 +165,7 @@ class Runtime3Converter
     @convert_visitor = Puppet::Pops::Visitor.new(self, 'convert', 2, 2)
   end
 
-  @instance = self.new
+  @instance = new
 end
 
 # A Ruby function written for the 3.x API cannot be expected to handle extended data types. This
@@ -220,6 +220,6 @@ class Runtime3FunctionArgumentConverter < Runtime3Converter
     end
   end
 
-  @instance = self.new
+  @instance = new
 end
 end

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

@@ -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
       rescue EvaluationError => e
         except = e
       end

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

@@ -62,15 +62,15 @@ class Puppet::Pops::Functions::Dispatcher
     # make a copy to make sure it can be contained by someone else (even if it is not contained here, it
     # should be treated as immutable).
     #
-    callables = dispatchers.map { |dispatch| dispatch.type }
+    callables = dispatchers.map(&:type)
 
     # multiple signatures, produce a Variant type of Callable1-n (must copy them)
     # single signature, produce single Callable
-    callables.size > 1 ?  Puppet::Pops::Types::TypeFactory.variant(*callables) : callables.pop
+    callables.size > 1 ? Puppet::Pops::Types::TypeFactory.variant(*callables) : callables.pop
   end
 
   # @api private
   def signatures
-    @dispatchers.reject { |dispatcher| dispatcher.argument_mismatch_handler? }
+    @dispatchers.reject(&:argument_mismatch_handler?)
   end
 end

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

@@ -40,23 +40,21 @@ class Puppet::Pops::Functions::Function
   #
   # @api public
   def call(scope, *args, &block)
+    result = catch(:return) do
+      return self.class.dispatcher.dispatch(self, scope, args, &block)
+    end
+    result.value
+  rescue Puppet::Pops::Evaluator::Next => jumper
     begin
-      result = catch(:return) do
-        return self.class.dispatcher.dispatch(self, scope, args, &block)
-      end
-      return result.value
-    rescue Puppet::Pops::Evaluator::Next => jumper
-      begin
-        throw :next, jumper.value
-      rescue Puppet::Parser::Scope::UNCAUGHT_THROW_EXCEPTION
-        raise Puppet::ParseError.new("next() from context where this is illegal", jumper.file, jumper.line)
-      end
-    rescue Puppet::Pops::Evaluator::Return => jumper
-      begin
-        throw :return, jumper
-      rescue Puppet::Parser::Scope::UNCAUGHT_THROW_EXCEPTION
-        raise Puppet::ParseError.new("return() from context where this is illegal", jumper.file, jumper.line)
-      end
+      throw :next, jumper.value
+    rescue Puppet::Parser::Scope::UNCAUGHT_THROW_EXCEPTION
+      raise Puppet::ParseError.new("next() from context where this is illegal", jumper.file, jumper.line)
+    end
+  rescue Puppet::Pops::Evaluator::Return => jumper
+    begin
+      throw :return, jumper
+    rescue Puppet::Parser::Scope::UNCAUGHT_THROW_EXCEPTION
+      raise Puppet::ParseError.new("return() from context where this is illegal", jumper.file, jumper.line)
     end
   end
 

data/lib/puppet/pops/issue_reporter.rb

@@ -48,7 +48,7 @@ class IssueReporter
     errors = acceptor.errors
     if errors.size > 0
       unless emit_errors
-        raise emit_exception.new(emit_message)
+        raise emit_exception, emit_message
       end
 
       formatter = Validation::DiagnosticFormatterPuppetStyle.new
@@ -70,7 +70,7 @@ class IssueReporter
         emitted += 1
         break if emitted >= max_errors
       end
-      giving_up_message = if (emit_warnings && warnings.size > 0)
+      giving_up_message = if emit_warnings && warnings.size > 0
                             _("Language validation logged %{error_count} errors, and %{warning_count} warnings. Giving up") %
                               { error_count: errors.size, warning_count: warnings.size }
                           else

data/lib/puppet/pops/label_provider.rb

@@ -4,8 +4,8 @@
 # This simple implementation calls #to_s on the given object, and handles articles 'a/an/the'.
 #
 module Puppet::Pops::LabelProvider
-  VOWELS = %w{a e i o u y}
-  SKIPPED_CHARACTERS = %w{" '}
+  VOWELS = %w[a e i o u y]
+  SKIPPED_CHARACTERS = %w[" ']
   A = "a"
   AN = "an"
 

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

@@ -44,7 +44,7 @@ class Puppet::Pops::Loader::DependencyLoader < Puppet::Pops::Loader::BaseLoader
       # (Note: superclass caches the result in this loader as it would have to repeat this search for every
       # lookup otherwise).
       loaded = @dependency_loaders.reduce(nil) do |previous, loader|
-        break previous if !previous.nil?
+        break previous unless previous.nil?
 
         loader.load_typed(typed_name)
       end
@@ -62,7 +62,7 @@ class Puppet::Pops::Loader::DependencyLoader < Puppet::Pops::Loader::BaseLoader
   end
 
   def to_s
-    "(DependencyLoader '#{@loader_name}' [" + @dependency_loaders.map { |loader| loader.to_s }.join(' ,') + "])"
+    "(DependencyLoader '#{@loader_name}' [" + @dependency_loaders.map(&:to_s).join(' ,') + "])"
   end
 
   private
@@ -81,7 +81,7 @@ class Puppet::Pops::Loader::DependencyLoader < Puppet::Pops::Loader::BaseLoader
       # (Note: superclass caches the result in this loader as it would have to repeat this search for every
       # lookup otherwise).
       @dependency_loaders.reduce(nil) do |previous, loader|
-        break previous if !previous.nil?
+        break previous unless previous.nil?
 
         loader.loaded_entry(typed_name, check_dependencies)
       end

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

@@ -54,7 +54,7 @@ class Loader
   # @yieldreturn [Boolean] `true` to keep the entry, `false` to discard it.
   # @return [Array<TypedName>] the list of names of discovered values
   def discover(type, error_collector = nil, name_authority = Pcore::RUNTIME_NAME_AUTHORITY, &block)
-    return EMPTY_ARRAY
+    EMPTY_ARRAY
   end
 
   # Produces the value associated with the given name if already loaded, or available for loading
@@ -164,7 +164,7 @@ class Loader
   # @api private
   #
   def set_entry(type, name, value, origin = nil)
-    raise NotImplementedError.new
+    raise NotImplementedError
   end
 
   # Produces a NamedEntry if a value is bound to the given name, or nil if nothing is bound.
@@ -175,7 +175,7 @@ class Loader
   # @api private
   #
   def get_entry(typed_name)
-    raise NotImplementedError.new
+    raise NotImplementedError
   end
 
   # A loader is by default a loader for all kinds of loadables. An implementation may override
@@ -199,7 +199,7 @@ class Loader
   # at this point to inspect (ie children would print out `loader_name`
   # rather than their version of to_s if they chose to implement it).
   def inspect
-    self.to_s
+    to_s
   end
 
   # An entry for one entity loaded by the loader.

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

@@ -108,11 +108,11 @@ module LoaderPaths
     end
 
     def relative_path
-      raise NotImplementedError.new
+      raise NotImplementedError
     end
 
     def instantiator
-      raise NotImplementedError.new
+      raise NotImplementedError
     end
   end
 
@@ -234,7 +234,7 @@ module LoaderPaths
   # match more than one path with one name
   class TaskPath < PuppetSmartPath
     TASKS_PATH = 'tasks'
-    FORBIDDEN_EXTENSIONS = %w{.conf .md}.freeze
+    FORBIDDEN_EXTENSIONS = %w[.conf .md].freeze
 
     def extension
       EMPTY_STRING