puppet 4.7.1-x64-mingw32 → 4.8.0-x64-mingw32

data/lib/puppet/pops/parser/heredoc_support.rb

@@ -6,7 +6,7 @@ module HeredocSupport
   # Pattern for heredoc `@(endtag[:syntax][/escapes])
   # Produces groups for endtag (group 1), syntax (group 2), and escapes (group 3)
   #
-  PATTERN_HEREDOC = %r{@\(([^:/\r\n\)]+)(?::[:blank:]*([a-z][a-zA-Z0-9_+]+)[:blank:]*)?(?:/((?:\w|[$])*)[:blank:]*)?\)}
+  PATTERN_HEREDOC = %r{@\(([^:/\r\n\)]+)(?::[[:blank:]]*([a-z][a-zA-Z0-9_+]+)[[:blank:]]*)?(?:/((?:\w|[$])*)[[:blank:]]*)?\)}
 
 
   def heredoc
@@ -19,7 +19,6 @@ module HeredocSupport
     # find end of the heredoc spec
     str = scn.scan_until(/\)/) || lex_error(Issues::HEREDOC_UNCLOSED_PARENTHESIS, :followed_by => followed_by)
     pos_after_heredoc = scn.pos
-
     # Note: allows '+' as separator in syntax, but this needs validation as empty segments are not allowed
     md = str.match(PATTERN_HEREDOC)
     lex_error(Issues::HEREDOC_INVALID_SYNTAX) unless md

data/lib/puppet/pops/pcore.rb

@@ -34,6 +34,7 @@ module Pcore
     add_type(Types::PTypeSetType.new(ast_ts_i12n), loader)
 
     Resource.register_ptypes(loader, ir)
+    Lookup::Context.register_ptype(loader, ir);
   end
 
   # Create and register a new `Object` type in the Puppet Type System and map it to an implementation class

data/lib/puppet/pops/puppet_stack.rb

@@ -32,12 +32,12 @@ module PuppetStack
   end
 
   def self.stacktrace
-    result = caller().reduce([]) do |memo, loc|
-      if loc =~ /^(.*\.pp)?:([0-9]+):in `stack'/
+    caller().reduce([]) do |memo, loc|
+      if loc =~ /^(.*\.pp)?:([0-9]+):in (`stack'|`block in call_function')/
         memo << [$1.nil? ? 'unknown' : $1, $2.to_i]
       end
       memo
-    end.reverse
+    end
   end
 end
 end

data/lib/puppet/pops/resource/param.rb

@@ -10,7 +10,7 @@
 # This implementation does not support
 # * setting 'strict' - strictness (must refer to an existing type) is always true
 # * does not support the indirector
-# 
+#
 #
 module Puppet::Pops
 module Resource
@@ -43,6 +43,10 @@ class Param
     @name_var = name_var
   end
 
+  def to_s
+    name
+  end
+
   def self._ptype
     @ptype
   end

data/lib/puppet/pops/resource/resource_type_impl.rb

@@ -47,6 +47,10 @@ class ResourceTypeImpl
           Types::KEY_TYPE => Types::PBooleanType::DEFAULT,
           Types::KEY_VALUE => true
         },
+        'capability' => {
+          Types::KEY_TYPE => Types::PBooleanType::DEFAULT,
+          Types::KEY_VALUE => false
+        },
       },
       EMPTY_HASH,
       [Types::KEY_NAME]
@@ -96,14 +100,14 @@ class ResourceTypeImpl
   attr_reader :parameters
   attr_reader :title_patterns_hash
   attr_reader :title_patterns
-  attr_reader :isomorphic
 
-  def initialize(name, properties = EMPTY_ARRAY, parameters = EMPTY_ARRAY, title_patterns_hash = nil, isomorphic = true)
+  def initialize(name, properties = EMPTY_ARRAY, parameters = EMPTY_ARRAY, title_patterns_hash = nil, isomorphic = true, capability = false)
     @name = name
     @properties = properties
     @parameters = parameters
     @title_patterns_hash = title_patterns_hash
     @isomorphic = isomorphic
+    @capability = capability
 
     # Compute attributes hash
     # Compute key_names (possibly compound key if there are multiple name vars).
@@ -172,7 +176,7 @@ class ResourceTypeImpl
   end
 
   def is_capability?
-    false
+    @capability
   end
 
   # Answers if the parameter name is a parameter/attribute of this type
@@ -259,7 +263,7 @@ class ResourceTypeImpl
 
   # Answers :property, :param or :meta depending on the type of the attribute
   # According to original version, this is called millions of times
-  # and a cache is required. 
+  # and a cache is required.
   # @param name [Symbol]
   def attrtype(name)
     raise NotImplementedError, "attrtype() - returns the kind (:meta, :param, or :property) of the parameter"

data/lib/puppet/pops/resource/resource_type_set.pcore

@@ -15,6 +15,7 @@ type Puppet::Resource::ResourceType3 = Object[{
     parameters     => { type => Array[Puppet::Resource::Param], value = []},
     title_patterns => { type => Optional[Hash[Regexp, Array[String[1]]], value => nil },
     isomorphic     => { type => Boolean, value => true },
+    capability     => { type => Boolean, value => false },
   },
   equality => [name],
 }]

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

@@ -16,6 +16,7 @@ module Serialization
 # - Regexp
 # - Version
 # - VersionRange
+# - Timespan
 # - Timestamp
 # - Default
 #
@@ -132,7 +133,15 @@ class AbstractReader
       read_payload(data) do |ep|
         sec = ep.read
         nsec = ep.read
-        TimeFactory.from_sec_nsec(sec, nsec)
+        Time::Timestamp.new(sec * 1000000000 + nsec)
+      end
+    end
+
+    register_type(Extension::TIMESPAN) do |data|
+      read_payload(data) do |ep|
+        sec = ep.read
+        nsec = ep.read
+        Time::Timespan.new(sec * 1000000000 + nsec)
       end
     end
 
@@ -143,7 +152,15 @@ class AbstractReader
     register_type(Extension::VERSION_RANGE) do |data|
       read_payload(data) { |ep| Semantic::VersionRange.parse(ep.read) }
     end
+
+    register_type(Extension::SENSITIVE) do |data|
+      read_payload(data) { |ep| Types::PSensitiveType::Sensitive.new(ep.read) }
+    end
+
+    register_type(Extension::BINARY) do |data|
+      read_payload(data) { |ep| Types::PBinaryType::Binary.from_base64_strict(ep.read) }
+    end
   end
 end
 end
-end
+end

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

@@ -19,6 +19,7 @@ MIN_INTEGER = -0x8000000000000000
 # - Regexp
 # - Version
 # - VersionRange
+# - Timespan
 # - Timestamp
 # - Default
 #
@@ -52,7 +53,7 @@ class AbstractWriter
     when Integer
       # not tabulated, but integers larger than 64-bit cannot be allowed.
       raise SerializationError, 'Integer out of bounds' if value > MAX_INTEGER || value < MIN_INTEGER
-    when Numeric, Symbol, Extension::NotTabulated, true, false, nil
+    when Numeric, Symbol, Types::PSensitiveType::Sensitive, Extension::NotTabulated, true, false, nil
       # not tabulated
     else
       if @tabulate
@@ -161,8 +162,12 @@ class AbstractWriter
       build_payload { |ep| ep.write(o.to_s) }
     end
 
-    register_type(Extension::TIME, Time) do |o|
-      build_payload { |ep| ep.write(o.tv_sec); ep.write(o.tv_nsec) }
+    register_type(Extension::TIME, Time::Timestamp) do |o|
+      build_payload { |ep| nsecs = o.nsecs; ep.write(nsecs / 1000000000); ep.write(nsecs % 1000000000) }
+    end
+
+    register_type(Extension::TIMESPAN, Time::Timespan) do |o|
+      build_payload { |ep| nsecs = o.nsecs; ep.write(nsecs / 1000000000); ep.write(nsecs % 1000000000) }
     end
 
     register_type(Extension::VERSION, Semantic::Version) do |o|
@@ -172,6 +177,14 @@ class AbstractWriter
     register_type(Extension::VERSION_RANGE, Semantic::VersionRange) do |o|
       build_payload { |ep| ep.write(o.to_s) }
     end
+
+    register_type(Extension::SENSITIVE, Types::PSensitiveType::Sensitive) do |o|
+      build_payload { |ep| ep.write(o.unwrap) }
+    end
+
+    register_type(Extension::BINARY, Types::PBinaryType::Binary) do |o|
+      build_payload { |ep| ep.write(o.to_s) }
+    end
   end
 end
 end

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

@@ -6,6 +6,10 @@ module Serialization
   # resolving tabulations and assembling complex objects. The type of the complex objects are resolved using a loader.
   # @api public
   class Deserializer
+    # Provides access to the reader.
+    # @api private
+    attr_reader :reader
+
     # @param [AbstractReader] reader the reader used when reading primitive objects from a stream
     # @param [Loader::Loader] loader the loader used when resolving names of types
     # @api public
@@ -57,4 +61,4 @@ module Serialization
     end
   end
 end
-end
+end

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

@@ -26,6 +26,8 @@ module Extension
   TIMESPAN = 0x34
   VERSION = 0x35
   VERSION_RANGE = 0x36
+  SENSITIVE = 0x37
+  BINARY = 0x38
 
   # Marker module indicating whether or not an instance is tabulated or not
   module NotTabulated; end

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

@@ -15,6 +15,13 @@ module JSON
       super(Packer.new(io, options), options)
     end
 
+    # Clear the underlying io stream but does not clear tabulation cache
+    # Specifically designed to enable tabulation to span more than one
+    # separately deserialized object.
+    def clear_io
+      @packer.clear_io
+    end
+
     def extension_packer
       @packer
     end
@@ -27,6 +34,10 @@ module JSON
       yield(@packer)
     end
 
+    def to_a
+      @packer.to_a
+    end
+
     def to_json
       @packer.to_json
     end
@@ -39,6 +50,10 @@ module JSON
       super(Unpacker.new(io))
     end
 
+    def re_initialize(io)
+      @unpacker.re_initialize(io)
+    end
+
     def read_payload(data)
       yield(@unpacker)
     end
@@ -49,6 +64,7 @@ module JSON
   class Packer
     def initialize(io, options = {})
       @io = io
+      @io << '['
       @type_registry = {}
       @nested = []
       @verbose = options[:verbose]
@@ -60,27 +76,33 @@ module JSON
       @type_registry[klass] = [type, klass, block]
     end
 
+    def clear_io
+      # Truncate everything except leading '['
+      if @io.is_a?(String)
+        @io.slice!(1..-1)
+      else
+        @io.truncate(1)
+      end
+    end
+
     def empty?
-      @io.pos == 0
+      @io.is_a?(String) ? io.length == 1 : @io.pos == 1
     end
 
     def flush
-      pos = @io.pos
-      case pos
-      when 1
-        # Just start marker present.
-      when 0
-        @io << '['
+      # Drop last comma unless just start marker present
+      if @io.is_a?(String)
+        @io.chop! unless @io.length == 1
+        @io << ']'
       else
-        # Drop last comma
-        @io.pos = pos - 1
+        pos = @io.pos
+        @io.pos = pos - 1 unless pos == 1
+        @io << ']'
+        @io.flush
       end
-      @io << ']'
-      @io.flush
     end
 
     def write(obj)
-      assert_started
       case obj
       when Array
         write_array_header(obj.size)
@@ -97,7 +119,6 @@ module JSON
     alias pack write
 
     def write_array_header(n)
-      assert_started
       if n < 1
         @io << '[]'
       else
@@ -107,7 +128,6 @@ module JSON
     end
 
     def write_map_header(n)
-      assert_started
       if n < 1
         @io << '{}'
       else
@@ -117,7 +137,6 @@ module JSON
     end
 
     def write_nil
-      assert_started
       @io << 'null'
       write_delim
     end
@@ -126,13 +145,16 @@ module JSON
       to_json
     end
 
+    def to_a
+      ::JSON.parse(io_string)
+    end
+
     def to_json
-      string = @io.string
       if @indent > 0
-        options = { :indent => ' ' * @indent }
-        string = ::JSON.pretty_unparse(::JSON.parse(string), options)
+        ::JSON.pretty_unparse(to_a, { :indent => ' ' * @indent })
+      else
+        io_string
       end
-      string
     end
 
     # Write a payload object. Not subject to extensions
@@ -140,10 +162,15 @@ module JSON
       @io << obj.to_json << ','
     end
 
-    def assert_started
-      @io << '[' if @io.pos == 0
+    def io_string
+      if @io.is_a?(String)
+        @io
+      else
+        @io.pos = 0
+        @io.read
+      end
     end
-    private :assert_started
+    private :io_string
 
     def write_delim
       nesting = @nested.last
@@ -184,11 +211,17 @@ module JSON
 
     def write_extension(ext, obj)
       @io << '[' << extension_indicator(ext).to_json << ','
+      @nested << nil
       write_extension_payload(ext, obj)
+      @nested.pop
       if obj.is_a?(Extension::SequenceStart) && obj.sequence_size > 0
         @nested << [false, obj.sequence_size]
       else
-        @io.pos -= 1
+        if @io.is_a?(String)
+          @io.chop!
+        else
+          @io.pos -= 1
+        end
         @io << ']'
         write_delim
       end
@@ -208,13 +241,17 @@ module JSON
 
   class Unpacker
     def initialize(io)
-      parsed = ::JSON.parse(io.read(nil))
-      raise SerializationError, "JSON stream is not an array" unless parsed.is_a?(Array)
-      @etor_stack = [parsed.each]
+      re_initialize(io)
       @type_registry = {}
       @nested = []
     end
 
+    def re_initialize(io)
+      parsed = parse_io(io)
+      raise SerializationError, "JSON stream is not an array. It is a #{io.class.name}" unless parsed.is_a?(Array)
+      @etor_stack = [parsed.each]
+    end
+
     def read
       obj = nil
       loop do
@@ -241,6 +278,19 @@ module JSON
     def register_type(extension_number, &block)
       @type_registry[extension_number] = block
     end
+
+    private
+
+    def parse_io(io)
+      case io
+      when IO, StringIO
+        ::JSON.parse(io.read)
+      when String
+        ::JSON.parse(io)
+      else
+        io
+      end
+    end
   end
 end
 end

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

@@ -6,6 +6,10 @@ module Serialization
   # tabulating and disassembling complex objects.
   # @api public
   class Serializer
+    # Provides access to the writer.
+    # @api private
+    attr_reader :writer
+
     # @param [AbstractWriter] writer the writer that is used for writing primitive values
     # @api public
     def initialize(writer)
@@ -67,7 +71,7 @@ module Serialization
     def write_tabulated_first_time(value)
       @written[value.object_id] = @written.size
       case value
-      when Symbol, Regexp, Semantic::Version, Semantic::VersionRange
+      when Symbol, Regexp, Semantic::Version, Semantic::VersionRange, Time::Timestamp, Time::Timespan, Types::PSensitiveType::Sensitive, Types::PBinaryType::Binary
         @writer.write(value)
       when Array
         start_array(value.size)