puppet 8.3.1-x86-mingw32 → 8.4.0-x86-mingw32

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

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
+
 require_relative 'extension'
 
 module Puppet::Pops
 module Serialization
-
 MAX_INTEGER =  0x7fffffffffffffff
 MIN_INTEGER = -0x8000000000000000
 
@@ -100,8 +100,9 @@ class AbstractWriter
   #
   # @api private
   def write_tpl(ep, value)
-    #TRANSLATORS 'Integers' is a Ruby class for numbers and should not be translated
+    # TRANSLATORS 'Integers' is a Ruby class for numbers and should not be translated
     raise ArgumentError, _('Internal error. Integers cannot be tabulated in extension payload') if value.is_a?(Integer)
+
     if @tabulate
       index = @written[value]
       if index.nil?
@@ -150,7 +151,7 @@ class AbstractWriter
 
     # 0x20 - 0x2f reserved for special extension objects
 
-    register_type(Extension::DEFAULT, Extension::Default) do |o|
+    register_type(Extension::DEFAULT, Extension::Default) do |_o|
       build_payload { |ep| }
     end
 
@@ -158,7 +159,7 @@ class AbstractWriter
       build_payload { |ep| ep.write(o.comment) }
     end
 
-    register_type(Extension::SENSITIVE_START, Extension::SensitiveStart) do |o|
+    register_type(Extension::SENSITIVE_START, Extension::SensitiveStart) do |_o|
       build_payload { |ep| }
     end
 

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative 'extension'
 
 module Puppet::Pops
@@ -45,6 +46,7 @@ module Serialization
         type_name = val.type_name
         type = Types::TypeParser.singleton.parse(type_name, @loader)
         raise SerializationError, _("No implementation mapping found for Puppet Type %{type_name}") % { type_name: type_name } if type.is_a?(Types::PTypeReferenceType)
+
         result = type.read(val.attribute_count, self)
         if result.is_a?(Types::PObjectType)
           existing_type = loader.load(:type, result.name)

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Puppet::Pops
 module Serialization
 module Extension
@@ -49,6 +50,7 @@ module Extension
   class Tabulation
     include NotTabulated
     attr_reader :index
+
     def initialize(index)
       @index = index
     end
@@ -63,6 +65,7 @@ module Extension
     include NotTabulated
     include SequenceStart
     attr_reader :size
+
     def initialize(size)
       @size = size
     end
@@ -78,6 +81,7 @@ module Extension
     include NotTabulated
     include SequenceStart
     attr_reader :size
+
     def initialize(size)
       @size = size
     end
@@ -98,6 +102,7 @@ module Extension
   class PcoreObjectStart
     include SequenceStart
     attr_reader :type_name, :attribute_count
+
     def initialize(type_name, attribute_count)
       @type_name = type_name
       @attribute_count = attribute_count
@@ -120,6 +125,7 @@ module Extension
   class ObjectStart
     include SequenceStart
     attr_reader :attribute_count
+
     def initialize(attribute_count)
       @attribute_count = attribute_count
     end
@@ -141,6 +147,7 @@ module Extension
   # The class that triggers the use of the COMMENT extension. The payload is comment text
   class Comment
     attr_reader :comment
+
     def initialize(comment)
       @comment = comment
     end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Puppet::Pops
 module Serialization
   class Builder
@@ -124,6 +125,7 @@ module Serialization
           type = without_value { convert(type_value) }
           if type.is_a?(Hash)
             raise SerializationError, _('Unable to deserialize type from %{type}') % { type: type } unless @allow_unresolved
+
             hash
           else
             pcore_type_hash_to_value(type, value)
@@ -134,6 +136,7 @@ module Serialization
             unless @allow_unresolved
               raise SerializationError, _('No implementation mapping found for Puppet Type %{type_name}') % { type_name: type_value }
             end
+
             hash
           else
             # not a string

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Puppet::Pops
 module Serialization
   # An InstanceReader is responsible for reading an instance of a complex object using a deserializer. The read involves creating the

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Puppet::Pops
 module Serialization
   # An instance writer is responsible for writing complex objects using a {Serializer}

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

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/util/json'
 
 module Puppet::Pops
 module Serialization
-
 require_relative 'time_factory'
 require_relative 'abstract_reader'
 require_relative 'abstract_writer'
@@ -124,7 +124,7 @@ module JSON
         @io << '[]'
       else
         @io << '['
-        @nested <<  [false, n]
+        @nested << [false, n]
       end
     end
 
@@ -133,7 +133,7 @@ module JSON
         @io << '{}'
       else
         @io << '{'
-        @nested <<  [true, n * 2]
+        @nested << [true, n * 2]
       end
     end
 
@@ -250,6 +250,7 @@ module JSON
     def re_initialize(io)
       parsed = parse_io(io)
       raise SerializationError, _("JSON stream is not an array. It is a %{klass}") % { klass: io.class.name } unless parsed.is_a?(Array)
+
       @etor_stack = [parsed.each]
     end
 
@@ -257,6 +258,7 @@ module JSON
       obj = nil
       loop do
         raise SerializationError, _('Unexpected end of input') if @etor_stack.empty?
+
         etor = @etor_stack.last
         begin
           obj = etor.next
@@ -271,6 +273,7 @@ module JSON
         ext_no = ext_etor.next
         ext_block = @type_registry[ext_no]
         raise SerializationError, _("Invalid input. %{ext_no} is not a valid extension number") % { ext_no: ext_no } if ext_block.nil?
+
         obj = ext_block.call(nil)
       end
       obj

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/concurrent/thread_local_singleton'
 
 module Puppet::Pops

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

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
+
 require_relative 'instance_reader'
 require_relative 'instance_writer'
 
 module Puppet::Pops
 module Serialization
-
 # Instance reader for objects that implement {Types::PuppetObject}
 # @api private
 class ObjectReader
@@ -16,6 +16,7 @@ class ObjectReader
     unless value_count >= required_count && value_count <= max
       raise Serialization::SerializationError, _("Feature count mismatch for %{value0}. Expected %{required_count} - %{max}, actual %{value_count}") % { value0: impl_class.name, required_count: required_count, max: max, value_count: value_count }
     end
+
     # Deserializer must know about this instance before we read its attributes
     val = deserializer.remember(impl_class.allocate)
     args = Array.new(value_count) { deserializer.read }
@@ -26,6 +27,7 @@ class ObjectReader
       else
         attr = type[names[index]]
         raise Serialization::SerializationError, _("Missing default value for %{type_name}[%{name}]") % { type_name: type.name, name: names[index] } unless attr && attr.value?
+
         args << attr.value
       end
     end
@@ -49,6 +51,7 @@ class ObjectWriter
     # Pop optional arguments that are default
     while args.size > required_count
       break unless type[names[args.size-1]].default_value?(args.last)
+
       args.pop
     end
 

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative 'extension'
 
 module Puppet::Pops
@@ -16,6 +17,8 @@ module Serialization
     # @option options [Boolean] :type_by_reference `true` if Object types are serialized by name only.
     # @api public
     def initialize(writer, options = EMPTY_HASH)
+      # Hash#compare_by_identity is intentionally not used since we only need to map
+      # object ids to their size and we don't want to store entire objects in memory
       @written = {}
       @writer = writer
       @options = options
@@ -37,7 +40,7 @@ module Serialization
       when :default
         @writer.write(Extension::Default::INSTANCE)
       else
-        index = @written[value.object_id]
+        index = @written[value.object_id] # rubocop:disable Lint/HashCompareByIdentity
         if index.nil?
           write_tabulated_first_time(value)
         else
@@ -76,7 +79,7 @@ module Serialization
     end
 
     def push_written(value)
-      @written[value.object_id] = @written.size
+      @written[value.object_id] = @written.size # rubocop:disable Lint/HashCompareByIdentity
     end
 
     # Write the start of a sensitive object
@@ -133,6 +136,7 @@ module Serialization
         impl_class = value.class
         type = Loaders.implementation_registry.type_for_module(impl_class)
         raise SerializationError, _("No Puppet Type found for %{klass}") % { klass: impl_class.name } unless type.is_a?(Types::PObjectType)
+
         type.write(value, self)
       end
     end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Puppet::Pops
 module Serialization
   # Implements all the constructors found in the Time class and ensures that
@@ -8,7 +9,6 @@ module Serialization
   # @deprecated No longer in use. Functionality replaced by Timestamp
   # @api private
   class TimeFactory
-
     NANO_DENOMINATOR = 10**9
 
     def self.at(*args)

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Puppet::Pops
 module Serialization
   # Class that can process an arbitrary object into a value that is assignable to `Data`.
@@ -271,6 +272,7 @@ module Serialization
             # Pop optional arguments that are default
             while args.size > required_count
               break unless pcore_type[names[args.size-1]].default_value?(args.last)
+
               args.pop
             end
             result = {
@@ -288,7 +290,7 @@ module Serialization
 
     def pcore_type_to_data(pcore_type)
       type_name = pcore_type.name
-      if @type_by_reference  || type_name.start_with?('Pcore::')
+      if @type_by_reference || type_name.start_with?('Pcore::')
         type_name
       else
         with(PCORE_TYPE_KEY) { to_data(pcore_type) }
@@ -307,7 +309,7 @@ module Serialization
           semantic = Puppet::Pops::SemanticError.new(issue, nil, {:file => file, :line => line})
         end
       end
-      optionally_fail(issue,  semantic, options)
+      optionally_fail(issue, semantic, options)
     end
   end
 end

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
+
 module Puppet::Pops
 module Serialization
-
   # Class that can process an arbitrary object into a value that is assignable to `Data`
   # and where contents is converted from rich data to one of:
   # * Numeric (Integer, Float)
@@ -220,7 +220,7 @@ module Serialization
           semantic = Puppet::Pops::SemanticError.new(issue, nil, {:file => file, :line => line})
         end
       end
-      optionally_fail(issue,  semantic, options)
+      optionally_fail(issue, semantic, options)
     end
   end
 end

data/lib/puppet/pops/serialization.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Puppet::Pops
 module Serialization
   def self.not_implemented(impl, method_name)

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/concurrent/thread_local_singleton'
 
 module Puppet::Pops
@@ -477,6 +478,7 @@ module Time
           # Using %L or %N to parse a string only makes sense when they are considered to be fractions. Using them
           # as a total quantity would introduce ambiguities.
           raise ArgumentError, _('Format specifiers %L and %N denotes fractions and must be used together with a specifier of higher magnitude') if use_total?
+
           n = group.to_i
           p = 9 - group.length
           p <= 0 ? n : n * 10 ** p
@@ -553,12 +555,15 @@ module Time
       def parse(timespan)
         md = regexp.match(timespan)
         raise ArgumentError, _("Unable to parse '%{timespan}' using format '%{format}'") % { timespan: timespan, format: @format } if md.nil?
+
         nanoseconds = 0
         md.captures.each_with_index do |group, index|
           segment = @segments[index]
           next if segment.is_a?(LiteralSegment)
+
           group.lstrip!
           raise ArgumentError, _("Unable to parse '%{timespan}' using format '%{format}'") % { timespan: timespan, format: @format } unless group =~ /\A[0-9]+\z/
+
           nanoseconds += segment.nanoseconds(group)
         end
         Timespan.new(timespan.start_with?('-') ? -nanoseconds : nanoseconds)
@@ -621,12 +626,13 @@ module Time
 
       # States used by the #internal_parser function
       STATE_LITERAL = 0 # expects literal or '%'
-      STATE_PAD  = 1 # expects pad, width, or format character
+      STATE_PAD = 1 # expects pad, width, or format character
       STATE_WIDTH = 2 # expects width, or format character
 
       def internal_parse(str)
         bld = []
         raise ArgumentError, _('Format must be a String') unless str.is_a?(String)
+
         highest = -1
         state = STATE_LITERAL
         padchar = '0'
@@ -654,10 +660,12 @@ module Time
             state = STATE_LITERAL
           when 0x2D # '-'
             raise ArgumentError, bad_format_specifier(str, fstart, position) unless state == STATE_PAD
+
             padchar = nil
             state = STATE_WIDTH
           when 0x5F # '_'
             raise ArgumentError, bad_format_specifier(str, fstart, position) unless state == STATE_PAD
+
             padchar = ' '
             state = STATE_WIDTH
           when 0x44 # 'D'
@@ -686,6 +694,7 @@ module Time
             state = STATE_LITERAL
           else # only digits allowed at this point
             raise ArgumentError, bad_format_specifier(str, fstart, position) unless codepoint >= 0x30 && codepoint <= 0x39
+
             if state == STATE_PAD && codepoint == 0x30
               padchar = '0'
             else
@@ -700,7 +709,8 @@ module Time
           end
         end
 
-        raise ArgumentError, bad_format_specifier(str, fstart, position)  unless state == STATE_LITERAL
+        raise ArgumentError, bad_format_specifier(str, fstart, position) unless state == STATE_LITERAL
+
         unless highest == -1
           hc = SEGMENT_CLASS_BY_ORDINAL[highest]
           bld.find { |s| s.instance_of?(hc) }.set_use_total

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Puppet::Pops
 module Time
 class Timestamp < TimeData
@@ -39,6 +40,7 @@ class Timestamp < TimeData
       hash = DateTime._strptime(timezone, '%z')
       offset = hash.nil? ? nil : hash[:offset]
       raise ArgumentError, _("Illegal timezone '%{timezone}'") % { timezone: timezone } if offset.nil?
+
       offset
     end
   end
@@ -74,6 +76,7 @@ class Timestamp < TimeData
       format.each do |fmt|
         parsed = DateTime._strptime(str, fmt)
         next if parsed.nil?
+
         if parsed.include?(:leftover) || (has_timezone && parsed.include?(:zone))
           parsed = nil
           next
@@ -89,6 +92,7 @@ class Timestamp < TimeData
       if parsed.nil? || parsed.include?(:leftover)
         raise ArgumentError, _("Unable to parse '%{str}' using format '%{format}'") % { str: str, format: format }
       end
+
       if has_timezone && parsed.include?(:zone)
         raise ArgumentError, _(
           'Using a Timezone designator in format specification is mutually exclusive to providing an explicit timezone argument')

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
+
 module Puppet::Pops
 module Types
-
 KEY_ANNOTATIONS = 'annotations'
 
 # Behaviour common to all Pcore annotatable classes

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Puppet::Pops
 module Types
   # Pcore variant of the Adaptable::Adapter. Uses a Pcore Object type instead of a Class

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Puppet::Pops
 module Types
 # The ClassLoader provides a Class instance given a class name or a meta-type.
@@ -37,6 +38,7 @@ class ClassLoader
     case type
     when PRuntimeType
       raise ArgumentError.new("Only Runtime type 'ruby' is supported, got #{type.runtime}") unless type.runtime == :ruby
+
       provide_from_string(type.runtime_type_name)
 
     when PBooleanType
@@ -95,6 +97,7 @@ class ClassLoader
       end
     end
     return nil unless result.is_a?(Module)
+
     result
   end
   private_class_method :provide_from_string
@@ -120,14 +123,13 @@ class ClassLoader
   private_class_method :paths_for_name
 
   def self.de_camel(fq_name)
-    fq_name.to_s.gsub(/::/, '/').
-    gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-    gsub(/([a-z\d])([A-Z])/,'\1_\2').
-    tr("-", "_").
-    downcase
+    fq_name.to_s.gsub(/::/, '/')
+    .gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
+    .gsub(/([a-z\d])([A-Z])/,'\1_\2')
+    .tr("-", "_")
+    .downcase
   end
   private_class_method :de_camel
-
 end
 end
 end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Puppet::Pops
 module Types
   # The {ImplementationRegistry} maps names types in the Puppet Type System to names of corresponding implementation

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
-module Puppet::Pops::Types
 
+module Puppet::Pops::Types
   # Implemented by classes that can produce an iterator to iterate over their contents
   module IteratorProducer
     def iterator
@@ -34,6 +34,7 @@ module Puppet::Pops::Types
     def self.asserted_iterable(my_caller, obj, infer_elements = false)
       iter = self.on(obj, nil, infer_elements)
       raise ArgumentError, "#{my_caller.class}(): wrong argument type (#{obj.class}; is not Iterable." if iter.nil?
+
       iter
     end
 
@@ -84,9 +85,13 @@ module Puppet::Pops::Types
         else
           if element_type.nil? && infer_elements
             tc = TypeCalculator.singleton
-            element_type = PTupleType.new([
-              PVariantType.maybe_create(o.keys.map {|e| tc.infer_set(e) }),
-              PVariantType.maybe_create(o.values.map {|e| tc.infer_set(e) })], PHashType::KEY_PAIR_TUPLE_SIZE)
+            element_type =
+              PTupleType
+                .new([
+                       PVariantType.maybe_create(o.keys.map {|e| tc.infer_set(e) }),
+                       PVariantType.maybe_create(o.values.map {|e| tc.infer_set(e) })
+                     ],
+                     PHashType::KEY_PAIR_TUPLE_SIZE)
           end
           HashIterator.new(element_type, o.each_pair)
         end
@@ -169,6 +174,7 @@ module Puppet::Pops::Types
 
     def to_a
       raise Puppet::Error, 'Attempt to create an Array from an unbounded Iterable' if unbounded?
+
       super
     end
 
@@ -231,16 +237,17 @@ module Puppet::Pops::Types
 
     def step(step, &block)
       raise ArgumentError if step <= 0
+
       r = self
       r = r.step_iterator(step) if step > 1
 
       if block_given?
         begin
-        if block.arity == 1
-          loop { yield(r.next) }
-        else
-          loop { yield(*r.next) }
-        end
+          if block.arity == 1
+            loop { yield(r.next) }
+          else
+            loop { yield(*r.next) }
+          end
         rescue StopIteration
         end
         self
@@ -283,6 +290,7 @@ module Puppet::Pops::Types
     def initialize(element_type, enumeration, step_size)
       super(element_type, enumeration)
       raise ArgumentError if step_size <= 0
+
       @step_size = step_size
     end
 
@@ -314,6 +322,7 @@ module Puppet::Pops::Types
 
     def initialize(range, step = 1)
       raise ArgumentError if step == 0
+
       @range = range
       @step_size = step
       @current = (step < 0 ? range.to : range.from) - step

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
+
 require 'base64'
 module Puppet::Pops
 module Types
-
 # A Puppet Language Type that represents binary data content (a sequence of 8-bit bytes).
 # Instances of this data type can be created from `String` and `Array[Integer[0,255]]`
 # values. Also see the `binary_file` function for reading binary content from a file.
@@ -15,7 +15,6 @@ module Types
 #
 # @api public
 class PBinaryType < PAnyType
-
   # Represents a binary buffer
   # @api public
   class Binary
@@ -77,6 +76,7 @@ class PBinaryType < PAnyType
       unless encoded_string.valid_encoding?
         raise ArgumentError, _("The given string in encoding '%{enc}' is invalid. Cannot create a Binary UTF-8 representation") % { enc: enc }
       end
+
       # Convert to UTF-8 (if not already UTF-8), and then to binary
       encoded_string = (enc == "UTF-8") ? encoded_string.dup : encoded_string.encode('UTF-8')
       encoded_string.force_encoding("ASCII-8BIT")
@@ -227,7 +227,6 @@ class PBinaryType < PAnyType
   def _assignable?(o, guard)
     o.class == self.class
   end
-
 end
 end
 end

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

@@ -1,19 +1,19 @@
 # frozen_string_literal: true
+
 module Puppet::Pops
 module Types
-
 # @api public
 class PInitType < PTypeWithContainedType
   def self.register_ptype(loader, ir)
     create_ptype(loader, ir, 'AnyType',
-      'type' => {
-        KEY_TYPE => POptionalType.new(PTypeType::DEFAULT),
-        KEY_VALUE => nil
-      },
-      'init_args' => {
-        KEY_TYPE => PArrayType::DEFAULT,
-        KEY_VALUE => EMPTY_ARRAY
-      }
+                 'type' => {
+                   KEY_TYPE => POptionalType.new(PTypeType::DEFAULT),
+                   KEY_VALUE => nil
+                 },
+                 'init_args' => {
+                   KEY_TYPE => PArrayType::DEFAULT,
+                   KEY_VALUE => EMPTY_ARRAY
+                 }
     )
   end
 
@@ -25,6 +25,7 @@ class PInitType < PTypeWithContainedType
 
     if type.nil?
       raise ArgumentError, _('Init cannot be parameterized with an undefined type and additional arguments') unless @init_args.empty?
+
       @initialized = true
     else
       @initialized = false
@@ -71,6 +72,7 @@ class PInitType < PTypeWithContainedType
 
   def new_function
     return super if type.nil?
+
     assert_initialized
 
     target_type = type
@@ -153,6 +155,7 @@ class PInitType < PTypeWithContainedType
       if @type.instance_of?(PInitType) || @type.instance_of?(POptionalType) || @type.instance_of?(PNotUndefType)
         raise ArgumentError.new
       end
+
       new_func = @type.new_function
     rescue ArgumentError
       raise ArgumentError, _("Creation of new instance of type '%{type_name}' is not supported") % { type_name: @type.to_s }