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

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Puppet::Pops
 module Lookup
 module SubLookup
@@ -19,6 +20,7 @@ module SubLookup
   # @api public
   def split_key(key)
     return [key] if key.match(SPECIAL).nil?
+
     segments = key.split(/(\s*"[^"]+"\s*|\s*'[^']+'\s*|[^'".]+)/)
     if segments.empty?
       # Only happens if the original key was an empty string
@@ -29,6 +31,7 @@ module SubLookup
 
       segments.keep_if { |seg| seg != '.' }
       raise yield('Syntax error') unless segments.size * 2 == count + 1
+
       segments.map! do |segment|
         segment.strip!
         if segment.start_with?('"', "'")
@@ -73,8 +76,8 @@ module SubLookup
           else
             unless value.respond_to?(:'[]') && !(value.is_a?(Array) || value.instance_of?(String))
               raise Puppet::DataBinding::LookupError,
-                _("Data Provider type mismatch: Got %{klass} when a hash-like object was expected to access value using '%{segment}' from key '%{key}'") %
-                  { klass: value.class.name, segment: segment, key: key }
+                    _("Data Provider type mismatch: Got %{klass} when a hash-like object was expected to access value using '%{segment}' from key '%{key}'") %
+                      { klass: value.class.name, segment: segment, key: key }
             end
             unless value.include?(segment)
               lookup_invocation.report_not_found(segment)

data/lib/puppet/pops/lookup.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # This class is the backing implementation of the Puppet function 'lookup'.
 # See puppet/functions/lookup.rb for documentation.
 #
@@ -27,22 +28,26 @@ module Lookup
     # with name and value.
     not_found = MergeStrategy::NOT_FOUND
     override_values = lookup_invocation.override_values
-    result_with_name = names.reduce([nil, not_found]) do |memo, key|
+    result_with_name = [nil, not_found]
+    names.each do |key|
       value = override_values.include?(key) ? assert_type(["Value found for key '%s' in override hash", key], value_type, override_values[key]) : not_found
       catch(:no_such_key) { value = search_and_merge(key, lookup_invocation, merge, false) } if value.equal?(not_found)
-      break [key, assert_type('Found value', value_type, value)] unless value.equal?(not_found)
-      memo
+      next if value.equal?(not_found)
+
+      result_with_name = [key, assert_type('Found value', value_type, value)]
+      break
     end
 
     # Use the 'default_values' hash as a last resort if nothing is found
     if result_with_name[1].equal?(not_found)
       default_values = lookup_invocation.default_values
       unless default_values.empty?
-        result_with_name = names.reduce(result_with_name) do |memo, key|
+        names.each do |key|
           value = default_values.include?(key) ? assert_type(["Value found for key '%s' in default values hash", key], value_type, default_values[key]) : not_found
-          memo = [key, value]
-          break memo unless value.equal?(not_found)
-          memo
+          next if value.equal?(not_found)
+
+          result_with_name = [key, value]
+          break
         end
       end
     end
@@ -88,7 +93,7 @@ module Lookup
     raise Puppet::DataBinding::LookupError,
           n_("Function lookup() did not find a value for the name '%{name}'",
              "Function lookup() did not find a value for any of the names [%{name_list}]", names.size
-            ) % { name: names[0], name_list: names.map { |n| "'#{n}'" }.join(', ') }
+          ) % { name: names[0], name_list: names.map { |n| "'#{n}'" }.join(', ') }
   end
   private_class_method :fail_lookup
 end

data/lib/puppet/pops/merge_strategy.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'deep_merge/core'
 
 module Puppet::Pops
@@ -25,9 +26,10 @@ module Puppet::Pops
       if merge.is_a?(Hash)
         merge_strategy = merge['strategy']
         if merge_strategy.nil?
-          #TRANSLATORS 'merge' is a variable name and 'strategy' is a key and should not be translated
+          # TRANSLATORS 'merge' is a variable name and 'strategy' is a key and should not be translated
           raise ArgumentError, _("The hash given as 'merge' must contain the name of a strategy in string form for the key 'strategy'")
         end
+
         merge_options  = merge.size == 1 ? EMPTY_HASH : merge
       else
         merge_strategy = merge
@@ -36,6 +38,7 @@ module Puppet::Pops
       merge_strategy = merge_strategy.to_sym if merge_strategy.is_a?(String)
       strategy_class = strategies[merge_strategy]
       raise ArgumentError, _("Unknown merge strategy: '%{strategy}'") % { strategy: merge_strategy } if strategy_class.nil?
+
       merge_options == EMPTY_HASH ? strategy_class::INSTANCE : strategy_class.new(merge_options)
     end
 
@@ -53,7 +56,7 @@ module Puppet::Pops
     #
     def self.add_strategy(strategy_class)
       unless MergeStrategy > strategy_class
-        #TRANSLATORS 'MergeStrategies.add_strategy' is a method, 'stratgey_class' is a variable and 'MergeStrategy' is a class name and should not be translated
+        # TRANSLATORS 'MergeStrategies.add_strategy' is a method, 'stratgey_class' is a variable and 'MergeStrategy' is a class name and should not be translated
         raise ArgumentError, _("MergeStrategies.add_strategy 'strategy_class' must be a 'MergeStrategy' class. Got %{strategy_class}") %
             { strategy_class: strategy_class }
       end

data/lib/puppet/pops/migration/migration_checker.rb

@@ -1,15 +1,17 @@
 # frozen_string_literal: true
+
 # This class defines the private API of the MigrationChecker support.
 # @api private
 #
 class Puppet::Pops::Migration::MigrationChecker
-
   def initialize()
   end
 
+  # rubocop:disable Naming/MemoizedInstanceVariableName
   def self.singleton
     @null_checker ||= self.new
   end
+  # rubocop:enable Naming/MemoizedInstanceVariableName
 
   # Produces a hash of available migrations; a map from a symbolic name in string form to a brief description.
   # This version has no such supported migrations.