puppet 8.3.1-x64-mingw32 → 8.4.0-x64-mingw32

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
+
 module Puppet::Pops
 module Evaluator
 class CollectorTransformer
-
   def initialize
     @@query_visitor    ||= Visitor.new(nil, "query", 1, 1)
     @@match_visitor    ||= Visitor.new(nil, "match", 1, 1)
@@ -11,10 +11,11 @@ class CollectorTransformer
   end
 
   def transform(o, scope)
-    #TRANSLATORS 'CollectExpression' is a class name and should not be translated
+    # TRANSLATORS 'CollectExpression' is a class name and should not be translated
     raise ArgumentError, _("Expected CollectExpression") unless o.is_a? Model::CollectExpression
 
     raise "LHS is not a type" unless o.type_expr.is_a? Model::QualifiedReference
+
     type = o.type_expr.value().downcase()
 
     if type == 'class'
@@ -28,10 +29,10 @@ class CollectorTransformer
     if !o.operations.empty?
       overrides = {
         :parameters => o.operations.map{ |x| @@evaluator.evaluate(x, scope)}.flatten,
-        :file       => o.file,
-        :line       => o.line,
-        :source     => scope.source,
-        :scope      => scope
+        :file => o.file,
+        :line => o.line,
+        :source => scope.source,
+        :scope => scope
       }
     end
 
@@ -50,7 +51,7 @@ class CollectorTransformer
     newcoll
   end
 
-protected
+  protected
 
   def query(o, scope)
     @@query_visitor.visit_this_1(self, o, scope)
@@ -104,6 +105,7 @@ protected
         end
         tags = tags.collect do |t|
           raise ArgumentError, _('Cannot transform a number to a tag') if t.is_a?(Numeric)
+
           t.to_s.downcase
         end
         proc do |resource|
@@ -162,7 +164,7 @@ protected
   end
 
   def query_ParenthesizedExpression(o, scope)
-   query(o.expr, scope)
+    query(o.expr, scope)
   end
 
   def query_Object(o, scope)
@@ -224,7 +226,7 @@ protected
   end
 
   def match_ParenthesizedExpression(o, scope)
-   match(o.expr, scope)
+    match(o.expr, scope)
   end
 
   def match_Object(o, scope)

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Puppet::Pops::Evaluator::Collectors::AbstractCollector
   attr_reader :scope
 

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
-class Puppet::Pops::Evaluator::Collectors::CatalogCollector < Puppet::Pops::Evaluator::Collectors::AbstractCollector
 
+class Puppet::Pops::Evaluator::Collectors::CatalogCollector < Puppet::Pops::Evaluator::Collectors::AbstractCollector
   # Creates a CatalogCollector using the AbstractCollector's 
   # constructor to set the scope and overrides
   #
@@ -20,7 +20,7 @@ class Puppet::Pops::Evaluator::Collectors::CatalogCollector < Puppet::Pops::Eval
     q = @query
 
     scope.compiler.resources.find_all do |resource|
-      resource.type == t && (q ?  q.call(resource) : true)
+      resource.type == t && (q ? q.call(resource) : true)
     end
   end
 

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
-class Puppet::Pops::Evaluator::Collectors::ExportedCollector < Puppet::Pops::Evaluator::Collectors::AbstractCollector
 
+class Puppet::Pops::Evaluator::Collectors::ExportedCollector < Puppet::Pops::Evaluator::Collectors::AbstractCollector
   # Creates an ExportedCollector using the AbstractCollector's
   # constructor to set the scope and overrides
   #
@@ -39,8 +39,8 @@ class Puppet::Pops::Evaluator::Collectors::ExportedCollector < Puppet::Pops::Eva
         resource.type == t && resource.exported? && (q.nil? || q.call(resource))
       end
 
-      found = Puppet::Resource.indirection.
-        search(@type, :host => @scope.compiler.node.name, :filter => @equery, :scope => @scope)
+      found = Puppet::Resource.indirection
+        .search(@type, :host => @scope.compiler.node.name, :filter => @equery, :scope => @scope)
 
       found_resources = found.map {|x| x.is_a?(Puppet::Parser::Resource) ? x : x.to_resource(@scope)}
 
@@ -49,7 +49,7 @@ class Puppet::Pops::Evaluator::Collectors::ExportedCollector < Puppet::Pops::Eva
         if existing
           unless existing.collector_id == item.collector_id
             raise Puppet::ParseError,
-              _("A duplicate resource was found while collecting exported resources, with the type and title %{title}") % { title: item.ref }
+                  _("A duplicate resource was found while collecting exported resources, with the type and title %{title}") % { title: item.ref }
           end
         else
           item.exported = false

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
-class Puppet::Pops::Evaluator::Collectors::FixedSetCollector < Puppet::Pops::Evaluator::Collectors::AbstractCollector
 
+class Puppet::Pops::Evaluator::Collectors::FixedSetCollector < Puppet::Pops::Evaluator::Collectors::AbstractCollector
   # Creates a FixedSetCollector using the AbstractCollector constructor
   # to set the scope. It is not possible for a collection to have
   # overrides in this case, since we have a fixed set of resources that

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Puppet::Pops
 module Evaluator
 # Compares the puppet DSL way
@@ -48,12 +49,14 @@ 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"))
   end
 
   # Equality is case independent.
   def equals_String(a, b)
     return false unless b.is_a?(String)
+
     a.casecmp(b) == 0
   end
 
@@ -77,12 +80,14 @@ class CompareOperator
 
   def equals_Array(a, b)
     return false unless b.is_a?(Array) && a.size == b.size
+
     a.each_index {|i| return false unless equals(a.slice(i), b.slice(i)) }
     true
   end
 
   def equals_Hash(a, b)
     return false unless b.is_a?(Hash) && a.size == b.size
+
     a.each {|ak, av| return false unless equals(b[ak], av)}
     true
   end
@@ -96,17 +101,20 @@ class CompareOperator
   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.new(_('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.new(_('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)
+
     a <=> b
   end
 
@@ -114,7 +122,6 @@ class CompareOperator
     raise ArgumentError.new(_('Only Strings, Numbers, Timespans, Timestamps, and Versions are comparable'))
   end
 
-
   def equals_Object(a, b)
     a == b
   end
@@ -169,6 +176,7 @@ class CompareOperator
       matched = nil
       a.each do |element|
         next unless element.is_a? String
+
         matched = element.match(b) # nil, or MatchData
         break if matched
       end
@@ -202,6 +210,7 @@ class CompareOperator
   # Matches only against strings
   def match_Regexp(regexp, left, scope)
     return false unless left.is_a? String
+
     matched = regexp.match(left)
     set_match_data(matched, scope) unless scope.nil? # creates or clears ephemeral
     !!matched # convert to boolean
@@ -238,16 +247,19 @@ class CompareOperator
   def match_Array(array, left, scope)
     return false unless left.is_a?(Array)
     return false unless left.length == array.length
+
     array.each_with_index.all? { | pattern, index| match(left[index], pattern, scope) }
   end
 
   def match_Hash(hash, left, scope)
     return false unless left.is_a?(Hash)
+
     hash.all? {|x,y| match(left[x], y, scope) }
   end
 
   def match_Symbol(symbol, left, scope)
     return true if symbol == :default
+
     equals(left, default)
   end
 end

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

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/parser/script_compiler'
 
 module Puppet::Pops
 module Evaluator
-
 class DeferredValue
   def initialize(proc)
     @proc = proc
@@ -181,10 +181,10 @@ class DeferredResolver
 
   def map_arguments(args)
     return [] if args.nil?
+
     args.map {|v| resolve(v) }
   end
   private :map_arguments
-
 end
 end
 end

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

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
+
 # Handler of Epp call/evaluation from the epp and inline_epp functions
 #
 class Puppet::Pops::Evaluator::EppEvaluator
-
   def self.inline_epp(scope, epp_source, template_args = nil)
     unless epp_source.is_a?(String)
-      #TRANSLATORS 'inline_epp()' is a method name and 'epp' refers to 'Embedded Puppet (EPP) template' and should not be translated
+      # TRANSLATORS 'inline_epp()' is a method name and 'epp' refers to 'Embedded Puppet (EPP) template' and should not be translated
       raise ArgumentError, _("inline_epp(): the first argument must be a String with the epp source text, got a %{class_name}") %
           { class_name: epp_source.class }
     end
@@ -15,7 +15,7 @@ class Puppet::Pops::Evaluator::EppEvaluator
     begin
       result = parser.parse_string(epp_source, 'inlined-epp-text')
     rescue Puppet::ParseError => e
-      #TRANSLATORS 'inline_epp()' is a method name and 'EPP' refers to 'Embedded Puppet (EPP) template' and should not be translated
+      # TRANSLATORS 'inline_epp()' is a method name and 'EPP' refers to 'Embedded Puppet (EPP) template' and should not be translated
       raise ArgumentError, _("inline_epp(): Invalid EPP: %{detail}") % { detail: e.message }
     end
 
@@ -25,7 +25,7 @@ class Puppet::Pops::Evaluator::EppEvaluator
 
   def self.epp(scope, file, env_name, template_args = nil)
     unless file.is_a?(String)
-      #TRANSLATORS 'epp()' is a method name and should not be translated
+      # TRANSLATORS 'epp()' is a method name and should not be translated
       raise ArgumentError, _("epp(): the first argument must be a String with the filename, got a %{class_name}") % { class_name: file.class }
     end
 
@@ -37,7 +37,7 @@ class Puppet::Pops::Evaluator::EppEvaluator
 
     scope.debug "Retrieving epp template #{file}"
     template_file = Puppet::Parser::Files.find_template(file, env_name)
-    if template_file.nil? ||  !Puppet::FileSystem.exist?(template_file)
+    if template_file.nil? || !Puppet::FileSystem.exist?(template_file)
       raise Puppet::ParseError, _("Could not find template '%{file}'") % { file: file }
     end
 
@@ -46,7 +46,7 @@ class Puppet::Pops::Evaluator::EppEvaluator
     begin
       result = parser.parse_file(template_file)
     rescue Puppet::ParseError => e
-      #TRANSLATORS 'epp()' is a method name and 'EPP' refers to 'Embedded Puppet (EPP) template' and should not be translated
+      # TRANSLATORS 'epp()' is a method name and 'EPP' refers to 'Embedded Puppet (EPP) template' and should not be translated
       raise ArgumentError, _("epp(): Invalid EPP: %{detail}") % { detail: e.message }
     end
 
@@ -59,17 +59,17 @@ class Puppet::Pops::Evaluator::EppEvaluator
 
     body = parse_result.body
     unless body.is_a?(Puppet::Pops::Model::LambdaExpression)
-      #TRANSLATORS 'LambdaExpression' is a class name and should not be translated
+      # TRANSLATORS 'LambdaExpression' is a class name and should not be translated
       raise ArgumentError, _("%{function_name}(): the parser did not produce a LambdaExpression, got '%{class_name}'") %
           { function_name: func_name, class_name: body.class }
     end
     unless body.body.is_a?(Puppet::Pops::Model::EppExpression)
-      #TRANSLATORS 'EppExpression' is a class name and should not be translated
+      # TRANSLATORS 'EppExpression' is a class name and should not be translated
       raise ArgumentError, _("%{function_name}(): the parser did not produce an EppExpression, got '%{class_name}'") %
           { function_name: func_name, class_name: body.body.class }
     end
     unless parse_result.definitions.empty?
-      #TRANSLATORS 'EPP' refers to 'Embedded Puppet (EPP) template'
+      # TRANSLATORS 'EPP' refers to 'Embedded Puppet (EPP) template'
       raise ArgumentError, _("%{function_name}(): The EPP template contains illegal expressions (definitions)") %
           { function_name: func_name }
     end
@@ -110,7 +110,7 @@ class Puppet::Pops::Evaluator::EppEvaluator
       [{}, false]
     else
       unless template_args.is_a?(Hash)
-        #TRANSLATORS 'template_args' is a variable name and should not be translated
+        # TRANSLATORS 'template_args' is a variable name and should not be translated
         raise ArgumentError, _("%{function_name}(): the template_args must be a Hash, got a %{class_name}") %
             { function_name: func_name, class_name: template_args.class }
       end