puppet 5.0.1-universal-darwin → 5.1.0-universal-darwin

data/tasks/generate_ast_model.rake

@@ -22,7 +22,7 @@ else
         ruby = Types::RubyGenerator.new.module_definition_from_typeset(ast_model)
 
         # Replace ref() constructs to known Pcore types with directly initialized types. ref() cannot be used
-        # since it requires a parser (hen and egg problem)
+        # since it requires a parser (chicken-and-egg problem)
         ruby.gsub!(/^module Parser\nmodule Locator\n.*\nend\nend\nmodule Model\n/m, "module Model\n")
 
         # Remove generated RubyMethod annotations. The ruby methods are there now, no need to also have
@@ -34,7 +34,11 @@ else
         ruby.gsub!(/ref\('Array\[([0-9A-Za-z_]+)\]'\)/, 'Types::PArrayType.new(Types::P\1Type::DEFAULT)')
         ruby.gsub!(/ref\('Optional\[Array\[([0-9A-Za-z_]+)\]\]'\)/,
             'Types::POptionalType.new(Types::PArrayType.new(Types::P\1Type::DEFAULT))')
-        ruby.gsub!(/ref\("Enum(\[[^\]]+\])"\)/, 'Types::PEnumType.new(\1)')
+        ruby.gsub!(/ref\('Enum(\[[^\]]+\])'\)/) do |match|
+          params = $1
+          params.gsub!(/\\'/, '\'')
+          "Types::PEnumType.new(#{params})"
+        end
 
         # Replace ref() constructs with references to _pcore_type of the types in the module namespace
         ruby.gsub!(/ref\('Puppet::AST::Locator'\)/, 'Parser::Locator::Locator19._pcore_type')
@@ -47,10 +51,14 @@ else
         # Remove the generated ref() method. It's not needed by this model
         ruby.gsub!(/  def self\.ref\(type_string\)\n.*\n  end\n\n/, '')
 
+        # Add Program#current method for backward compatibility
+        ruby.gsub!(/(attr_reader :body\n  attr_reader :definitions\n  attr_reader :locator)/, "\\1\n\n  def current\n    self\n  end")
+
         # Replace the generated registration with a registration that uses the static loader. This will
         # become part of the Puppet bootstrap code and there will be no other loader until we have a
         # parser.
         ruby.gsub!(/^Puppet::Pops::Pcore.register_implementations\((\[[^\]]+\])\)/, <<-RUBY)
+
 module Model
 @@pcore_ast_initialized = false
 def self.register_pcore_types

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.1.0
 platform: universal-darwin
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-18 00:00:00.000000000 Z
+date: 2017-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter
@@ -408,7 +408,9 @@ files:
 - lib/puppet/forge/repository.rb
 - lib/puppet/functions.rb
 - lib/puppet/functions/alert.rb
+- lib/puppet/functions/all.rb
 - lib/puppet/functions/annotate.rb
+- lib/puppet/functions/any.rb
 - lib/puppet/functions/assert_type.rb
 - lib/puppet/functions/binary_file.rb
 - lib/puppet/functions/break.rb
@@ -453,6 +455,7 @@ files:
 - lib/puppet/functions/step.rb
 - lib/puppet/functions/strftime.rb
 - lib/puppet/functions/then.rb
+- lib/puppet/functions/tree_each.rb
 - lib/puppet/functions/type.rb
 - lib/puppet/functions/unique.rb
 - lib/puppet/functions/unwrap.rb
@@ -866,6 +869,7 @@ files:
 - lib/puppet/pops/types/implementation_registry.rb
 - lib/puppet/pops/types/iterable.rb
 - lib/puppet/pops/types/p_binary_type.rb
+- lib/puppet/pops/types/p_init_type.rb
 - lib/puppet/pops/types/p_meta_type.rb
 - lib/puppet/pops/types/p_object_type.rb
 - lib/puppet/pops/types/p_runtime_type.rb
@@ -880,6 +884,7 @@ files:
 - lib/puppet/pops/types/ruby_generator.rb
 - lib/puppet/pops/types/ruby_method.rb
 - lib/puppet/pops/types/string_converter.rb
+- lib/puppet/pops/types/tree_iterators.rb
 - lib/puppet/pops/types/type_acceptor.rb
 - lib/puppet/pops/types/type_asserter.rb
 - lib/puppet/pops/types/type_assertion_error.rb
@@ -1972,7 +1977,9 @@ files:
 - spec/unit/forge/module_release_spec.rb
 - spec/unit/forge/repository_spec.rb
 - spec/unit/forge_spec.rb
+- spec/unit/functions/all_spec.rb
 - spec/unit/functions/annotate_spec.rb
+- spec/unit/functions/any_spec.rb
 - spec/unit/functions/assert_type_spec.rb
 - spec/unit/functions/binary_file_spec.rb
 - spec/unit/functions/break_spec.rb
@@ -2007,6 +2014,7 @@ files:
 - spec/unit/functions/step_spec.rb
 - spec/unit/functions/strftime_spec.rb
 - spec/unit/functions/then_spec.rb
+- spec/unit/functions/tree_each_spec.rb
 - spec/unit/functions/type_spec.rb
 - spec/unit/functions/unique_spec.rb
 - spec/unit/functions/unwrap_spec.rb
@@ -2266,6 +2274,7 @@ files:
 - spec/unit/pops/types/enumeration_spec.rb
 - spec/unit/pops/types/iterable_spec.rb
 - spec/unit/pops/types/p_binary_type_spec.rb
+- spec/unit/pops/types/p_init_type_spec.rb
 - spec/unit/pops/types/p_object_type_spec.rb
 - spec/unit/pops/types/p_sem_ver_type_spec.rb
 - spec/unit/pops/types/p_sensitive_type_spec.rb
@@ -3242,7 +3251,9 @@ test_files:
 - spec/unit/forge/module_release_spec.rb
 - spec/unit/forge/repository_spec.rb
 - spec/unit/forge_spec.rb
+- spec/unit/functions/all_spec.rb
 - spec/unit/functions/annotate_spec.rb
+- spec/unit/functions/any_spec.rb
 - spec/unit/functions/assert_type_spec.rb
 - spec/unit/functions/binary_file_spec.rb
 - spec/unit/functions/break_spec.rb
@@ -3277,6 +3288,7 @@ test_files:
 - spec/unit/functions/step_spec.rb
 - spec/unit/functions/strftime_spec.rb
 - spec/unit/functions/then_spec.rb
+- spec/unit/functions/tree_each_spec.rb
 - spec/unit/functions/type_spec.rb
 - spec/unit/functions/unique_spec.rb
 - spec/unit/functions/unwrap_spec.rb
@@ -3536,6 +3548,7 @@ test_files:
 - spec/unit/pops/types/enumeration_spec.rb
 - spec/unit/pops/types/iterable_spec.rb
 - spec/unit/pops/types/p_binary_type_spec.rb
+- spec/unit/pops/types/p_init_type_spec.rb
 - spec/unit/pops/types/p_object_type_spec.rb
 - spec/unit/pops/types/p_sem_ver_type_spec.rb
 - spec/unit/pops/types/p_sensitive_type_spec.rb