puppet 5.0.0-universal-darwin → 5.0.1-universal-darwin

data/man/man8/puppet.8

@@ -1,10 +1,19 @@
 .\" generated with Ronn/v0.7.3
-.\" https://github.com/rtomayko/ronn/tree/0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "PUPPET" "8" "May 2015" "Puppet Labs, LLC" "Puppet manual"
+.TH "PUPPET" "8" "June 2017" "Puppet Labs, LLC" "Puppet manual"
 .
 .SH "NAME"
 \fBpuppet\fR
 .
 .P
-[1;31mError: Could not parse application options: invalid option: \-\-help[0m
+Usage: puppet \fIsubcommand\fR [options] \fIaction\fR [options]
+.
+.P
+Available subcommands:
+.
+.P
+agent The puppet agent daemon apply Apply Puppet manifests locally ca Local Puppet Certificate Authority management\. (Deprecated) catalog Compile, save, view, and convert catalogs\. cert Manage certificates and requests certificate Provide access to the CA for certificate management\. certificate_request Manage certificate requests\. (Deprecated) certificate_revocation_list Manage the list of revoked certificates\. (Deprecated) config Interact with Puppet\'s settings\. describe Display help about resource types device Manage remote network devices doc Generate Puppet references epp Interact directly with the EPP template parser/renderer\. facts Retrieve and store facts\. filebucket Store and retrieve files in a filebucket generate Generates Puppet code from Ruby definitions\. help Display Puppet help\. key Create, save, and remove certificate keys\. (Deprecated) lookup Interactive Hiera lookup man Display Puppet manual pages\. master The puppet master daemon module Creates, installs and searches for modules on the Puppet Forge\. node View and manage node definitions\. parser Interact directly with the parser\. plugin Interact with the Puppet plugin system\. report Create, display, and submit reports\. resource The resource abstraction layer shell status View puppet server status\. (Deprecated)
+.
+.P
+See \'puppet help \fIsubcommand\fR \fIaction\fR\' for help on a specific subcommand action\. See \'puppet help \fIsubcommand\fR\' for help on a specific subcommand\. Puppet v5\.0\.0

data/spec/integration/util/execution_spec.rb

@@ -15,6 +15,14 @@ describe Puppet::Util::Execution do
       Puppet::Util::Execution.execpipe('echo $LC_ALL'){ |line| out << line.read.chomp }
       expect(out).to eq("C")
     end
+
+    it "should raise an ExecutionFailure with a missing command and :failonfail set to true" do
+      expect {
+        failonfail = true
+        # NOTE: critical to return l in the block for `output` in method to be #<IO:(closed)>
+        Puppet::Util::Execution.execpipe('conan_the_librarion', failonfail) { |l| l }
+      }.to raise_error(Puppet::ExecutionFailure)
+    end
   end
 
   describe "#execute (non-Windows)", :if => !Puppet.features.microsoft_windows? do

data/spec/unit/application/lookup_spec.rb

@@ -59,7 +59,7 @@ describe Puppet::Application::Lookup do
       lookup.command_line.stubs(:args).returns(['atton', 'kreia'])
       lookup.stubs(:generate_scope).yields('scope')
 
-      expected_merge = { "strategy" => "deep", "sort_merge_arrays" => false, "merge_hash_arrays" => true }
+      expected_merge = { "strategy" => "deep", "sort_merged_arrays" => false, "merge_hash_arrays" => true }
 
       (Puppet::Pops::Lookup).expects(:lookup).with(['atton', 'kreia'], nil, nil, false, expected_merge, anything).returns('rand')
 

data/spec/unit/face/epp_face_spec.rb

@@ -237,6 +237,15 @@ describe Puppet::Face[:epp, :current] do
       expect(eppface.render({ :e => 'trusted is hash: <%= $trusted =~ Hash %>' })).to eql("trusted is hash: true")
     end
 
+    it 'initializes the 4x loader' do
+      expect(eppface.render({ :e => <<-EPP.unindent })).to eql("\nString\n\nInteger\n\nBoolean\n")
+        <% $data = [type('a',generalized), type(2,generalized), type(true)] -%>
+        <% $data.each |$value| { %>
+        <%= $value %>
+        <% } -%>
+      EPP
+    end
+
     it "facts can be added to" do
       expect(eppface.render({
         :facts => {'the_crux' => 'biscuit'},

data/spec/unit/face/module/search_spec.rb

@@ -176,7 +176,7 @@ describe "puppet module search" do
       searcher = mock("Searcher")
       options[:module_repository] = "http://forge.example.com"
 
-      Puppet::Forge.expects(:new).with().returns(forge)
+      Puppet::Forge.expects(:new).with("http://forge.example.com", false).returns(forge)
       Puppet::ModuleTool::Applications::Searcher.expects(:new).with("puppetlabs-apache", forge, has_entries(options)).returns(searcher)
       searcher.expects(:run)
 

data/spec/unit/functions/lookup_spec.rb

@@ -951,6 +951,8 @@ describe "The lookup function" do
                 bab: bab (from environment)
               bc:
                 bca: bca (from environment)
+            sa:
+              sa1: ['e', 'd', '--f']
             YAML
           'second.yaml' => <<-YAML.unindent,
             a:
@@ -964,6 +966,8 @@ describe "The lookup function" do
             c:
               ca:
                 cab: c.ca.cab
+            sa:
+              sa1: ['b', 'a', 'f', 'c']
             YAML
         }
       end
@@ -1044,6 +1048,28 @@ describe "The lookup function" do
           expect(lookup('a')).to eql({'aa' => { 'aaa' => 'a.aa.aaa', 'aab' => 'a.aa.aab' }})
         end
       end
+
+      context 'and lookup options use a hash' do
+
+        let(:env_lookup_options) { <<-YAML.unindent }
+          lookup_options:
+            'sa':
+              merge:
+                strategy: deep
+                knockout_prefix: --
+                sort_merged_arrays: true
+        YAML
+
+        it 'applies knockout_prefix and sort_merged_arrays' do
+          expect(lookup('sa')).to eql({ 'sa1' => %w(a b c d e) })
+        end
+
+        it 'overrides knockout_prefix and sort_merged_arrays with explicitly given values' do
+          expect(
+            lookup('sa', 'merge' => { 'strategy' => 'deep', 'knockout_prefix' => '##', 'sort_merged_arrays' => false })).to(
+              eql({ 'sa1' => %w(b a f c e d --f) }))
+        end
+      end
     end
 
     context 'and an environment Hiera v5 configuration using globs' do

data/spec/unit/indirector/file_bucket_file/file_spec.rb

@@ -41,16 +41,16 @@ describe Puppet::FileBucketFile::File, :uses_checksums => true do
       end
 
       it "fails if the contents collide with existing contents" do
-        # This is the shortest known MD5 collision. See https://eprint.iacr.org/2010/643.pdf
+        # This is the shortest known MD5 collision (little endian). See https://eprint.iacr.org/2010/643.pdf
         first_contents = [0x6165300e,0x87a79a55,0xf7c60bd0,0x34febd0b,
                           0x6503cf04,0x854f709e,0xfb0fc034,0x874c9c65,
                           0x2f94cc40,0x15a12deb,0x5c15f4a3,0x490786bb,
-                          0x6d658673,0xa4341f7d,0x8fd75920,0xefd18d5a].pack("I" * 16)
+                          0x6d658673,0xa4341f7d,0x8fd75920,0xefd18d5a].pack("V" * 16)
 
         collision_contents = [0x6165300e,0x87a79a55,0xf7c60bd0,0x34febd0b,
                               0x6503cf04,0x854f749e,0xfb0fc034,0x874c9c65,
                               0x2f94cc40,0x15a12deb,0xdc15f4a3,0x490786bb,
-                              0x6d658673,0xa4341f7d,0x8fd75920,0xefd18d5a].pack("I" * 16)
+                              0x6d658673,0xa4341f7d,0x8fd75920,0xefd18d5a].pack("V" * 16)
 
         checksum_value = save_bucket_file(first_contents, "/foo/bar")
 

data/spec/unit/module_spec.rb

@@ -819,4 +819,68 @@ describe Puppet::Module do
       }
     ])
   end
+
+  context 'when parsing VersionRange' do
+    let(:logs) { [] }
+    let(:notices) { logs.select { |log| log.level == :notice }.map { |log| log.message } }
+
+    it 'can parse a strict range' do
+      expect(Puppet::Module.parse_range('>=1.0.0', true).include?(SemanticPuppet::Version.parse('1.0.1-rc1'))).to be_falsey
+    end
+
+    it 'can parse a non-strict range' do
+      expect(Puppet::Module.parse_range('>=1.0.0', false).include?(SemanticPuppet::Version.parse('1.0.1-rc1'))).to be_truthy
+    end
+
+    context 'using parse method with an arity of 1' do
+      around(:each) do |example|
+        begin
+          example.run
+        ensure
+          Puppet::Module.instance_variable_set(:@semver_gem_version, nil)
+          Puppet::Module.instance_variable_set(:@parse_range_method, nil)
+        end
+      end
+
+      it 'will notify when non-strict ranges cannot be parsed' do
+        Puppet::Module.instance_variable_set(:@semver_gem_version, SemanticPuppet::Version.parse('1.0.0'))
+        Puppet::Module.instance_variable_set(:@parse_range_method, Proc.new { |str| SemanticPuppet::VersionRange.parse(str, true) })
+
+        Puppet::Util::Log.with_destination(Puppet::Test::LogCollector.new(logs)) do
+          expect(Puppet::Module.parse_range('>=1.0.0', false).include?(SemanticPuppet::Version.parse('1.0.1-rc1'))).to be_falsey
+        end
+        expect(notices).to include(/VersionRanges will always be strict when using non-vendored SemanticPuppet gem, version 1\.0\.0/)
+      end
+
+      it 'will notify when strict ranges cannot be parsed' do
+        Puppet::Module.instance_variable_set(:@semver_gem_version, SemanticPuppet::Version.parse('0.1.4'))
+        Puppet::Module.instance_variable_set(:@parse_range_method, Proc.new { |str| SemanticPuppet::VersionRange.parse(str, false) })
+
+        Puppet::Util::Log.with_destination(Puppet::Test::LogCollector.new(logs)) do
+          expect(Puppet::Module.parse_range('>=1.0.0', true).include?(SemanticPuppet::Version.parse('1.0.1-rc1'))).to be_truthy
+        end
+        expect(notices).to include(/VersionRanges will never be strict when using non-vendored SemanticPuppet gem, version 0\.1\.4/)
+      end
+
+      it 'will not notify when strict ranges can be parsed' do
+        Puppet::Module.instance_variable_set(:@semver_gem_version, SemanticPuppet::Version.parse('1.0.0'))
+        Puppet::Module.instance_variable_set(:@parse_range_method, Proc.new { |str| SemanticPuppet::VersionRange.parse(str, true) })
+
+        Puppet::Util::Log.with_destination(Puppet::Test::LogCollector.new(logs)) do
+          expect(Puppet::Module.parse_range('>=1.0.0', true).include?(SemanticPuppet::Version.parse('1.0.1-rc1'))).to be_falsey
+        end
+        expect(notices).to be_empty
+      end
+
+      it 'will not notify when non-strict ranges can be parsed' do
+        Puppet::Module.instance_variable_set(:@semver_gem_version, SemanticPuppet::Version.parse('0.1.4'))
+        Puppet::Module.instance_variable_set(:@parse_range_method, Proc.new { |str| SemanticPuppet::VersionRange.parse(str, false) })
+
+        Puppet::Util::Log.with_destination(Puppet::Test::LogCollector.new(logs)) do
+          expect(Puppet::Module.parse_range('>=1.0.0', false).include?(SemanticPuppet::Version.parse('1.0.1-rc1'))).to be_truthy
+        end
+        expect(notices).to be_empty
+      end
+    end
+  end
 end

data/spec/unit/module_tool_spec.rb

@@ -229,6 +229,28 @@ TREE
       end
     end
 
+    describe ':strict_semver' do
+      context 'when set' do
+        let(:options) do
+          { :strict_semver => true }
+        end
+
+        it 'is not overridden by default' do
+          expect(subject).to include :strict_semver => true
+        end
+      end
+
+      context 'when unset' do
+        let(:options) do
+          { }
+        end
+
+        it 'defaults to false' do
+          expect(subject).to include :strict_semver => false
+        end
+      end
+    end
+
     describe ':target_dir' do
       let(:options) do
         { :target_dir => 'foo' }

data/spec/unit/parser/scope_spec.rb

@@ -210,7 +210,7 @@ describe Puppet::Parser::Scope do
     end
 
     it "warns once for a non found variable" do
-      Puppet.expects(:warning).once
+      Puppet.expects(:send_log).with(:warning, is_a(String)).once
       expect([@scope["santa_claus"],@scope["santa_claus"]]).to eq([nil, nil])
     end
 

data/spec/unit/pops/types/p_timestamp_type_spec.rb

@@ -51,7 +51,7 @@ describe 'Timestamp type' do
     end
 
     context 'a Timestamp instance' do
-      it 'can be created from a string' do
+      it 'can be created from a string with just a date' do
         code = <<-CODE
             $o = Timestamp('2015-03-01')
             notice($o)
@@ -60,6 +60,35 @@ describe 'Timestamp type' do
         expect(eval_and_collect_notices(code)).to eq(['2015-03-01T00:00:00.000000000 UTC', "Timestamp['2015-03-01T00:00:00.000000000 UTC']"])
       end
 
+      it 'can be created from a string and time separated by "T"' do
+        code = <<-CODE
+            notice(Timestamp('2015-03-01T11:12:13'))
+        CODE
+        expect(eval_and_collect_notices(code)).to eq(['2015-03-01T11:12:13.000000000 UTC'])
+      end
+
+      it 'can be created from a string and time separated by space' do
+        code = <<-CODE
+            notice(Timestamp('2015-03-01 11:12:13'))
+        CODE
+        expect(eval_and_collect_notices(code)).to eq(['2015-03-01T11:12:13.000000000 UTC'])
+      end
+
+      it 'should error when none of the default formats can parse the string' do
+        code = <<-CODE
+            notice(Timestamp('2015#03#01 11:12:13'))
+        CODE
+        expect { eval_and_collect_notices(code) }.to raise_error(/Unable to parse/)
+      end
+
+      it 'should error when only part of the string is parsed' do
+        pending("Requires full rewrite of Timestamp parse since there's no way to detect trailing garbage using DateTime#strptime")
+        code = <<-CODE
+            notice(Timestamp('2015-03-01T11:12:13 bogus after'))
+        CODE
+        expect { eval_and_collect_notices(code) }.to raise_error(/Unable to parse/)
+      end
+
       it 'can be created from a string and format' do
         code = <<-CODE
             $o = Timestamp('Sunday, 28 August, 2016', '%A, %d %B, %Y')

data/spec/unit/puppet_spec.rb

@@ -38,6 +38,39 @@ describe Puppet do
     expect($LOAD_PATH).to include two
   end
 
+  it 'should propagate --modulepath to base environment' do
+    Puppet::Node::Environment.expects(:create).with(
+      is_a(Symbol), ['/my/modules'], Puppet::Node::Environment::NO_MANIFEST)
+
+    Puppet.base_context({
+      :environmentpath => '/envs',
+      :basemodulepath => '/base/modules',
+      :modulepath => '/my/modules'
+    })
+  end
+
+  it 'empty modulepath does not override basemodulepath' do
+    Puppet::Node::Environment.expects(:create).with(
+      is_a(Symbol), ['/base/modules'], Puppet::Node::Environment::NO_MANIFEST)
+
+    Puppet.base_context({
+      :environmentpath => '/envs',
+      :basemodulepath => '/base/modules',
+      :modulepath => ''
+    })
+  end
+
+  it 'nil modulepath does not override basemodulepath' do
+    Puppet::Node::Environment.expects(:create).with(
+      is_a(Symbol), ['/base/modules'], Puppet::Node::Environment::NO_MANIFEST)
+
+    Puppet.base_context({
+      :environmentpath => '/envs',
+      :basemodulepath => '/base/modules',
+      :modulepath => nil
+    })
+  end
+
   context "Puppet::OLDEST_RECOMMENDED_RUBY_VERSION" do
     it "should have an oldest recommended ruby version constant" do
       expect(Puppet::OLDEST_RECOMMENDED_RUBY_VERSION).not_to be_nil

data/spec/unit/util/logging_spec.rb

@@ -184,30 +184,39 @@ describe Puppet::Util::Logging do
     after(:each) {
       # this is required because of bugs in Mocha whe tearing down expectations for each test
       # why it works elsewhere is a mystery.
-      @logger.unstub(:warning)
+      @logger.unstub(:send_log)
     }
 
     it "warns with file when only file is given" do
-      @logger.expects(:warning).with(regexp_matches(/wet paint.*\(in aFile\)/m))
+      @logger.expects(:send_log).with(:warning, regexp_matches(/wet paint.*\(in aFile\)/m))
       @logger.warn_once('kind', 'wp', "wet paint", 'aFile')
     end
 
     it "warns with unknown file and line when only line is given" do
-      @logger.expects(:warning).with(regexp_matches(/wet paint.*\(in unknown file, line 5\)/m))
+      @logger.expects(:send_log).with(:warning, regexp_matches(/wet paint.*\(in unknown file, line 5\)/m))
       @logger.warn_once('kind', 'wp', "wet paint", nil, 5)
     end
 
     it "warns with file and line when both are given" do
-      @logger.expects(:warning).with(regexp_matches(/wet paint.*\(at aFile:5\)/m))
+      @logger.expects(:send_log).with(:warning, regexp_matches(/wet paint.*\(at aFile:5\)/m))
       @logger.warn_once('kind', 'wp', "wet paint",'aFile', 5)
     end
 
     it "warns once per key" do
-      @logger.expects(:warning).with(regexp_matches(/wet paint.*/m)).once
+      @logger.expects(:send_log).with(:warning, regexp_matches(/wet paint.*/m)).once
       5.times do
         @logger.warn_once('kind', 'wp', "wet paint")
       end
     end
+
+    Puppet::Util::Log.eachlevel do |level|
+      it "can use log level #{level}" do
+        @logger.expects(:send_log).with(level, regexp_matches(/wet paint.*/m)).once
+        5.times do
+          @logger.warn_once('kind', 'wp', "wet paint", nil, nil, level)
+        end
+      end
+    end
   end
 
   describe "does not warn about undefined variables when disabled_warnings says so" do
@@ -219,11 +228,11 @@ describe Puppet::Util::Logging do
       Puppet[:disable_warnings] = ['undefined_variables']
       example.run
       Puppet[:disable_warnings] = []
-      logger.unstub(:warning)
+      logger.unstub(:send_log)
     end
 
     it "does not produce warning if kind is disabled" do
-      logger.expects(:warning).never
+      logger.expects(:send_log).never
       logger.warn_once('undefined_variables', 'wp', "wet paint")
     end
   end
@@ -237,11 +246,11 @@ describe Puppet::Util::Logging do
       Puppet[:disable_warnings] = ['deprecations']
       example.run
       Puppet[:disable_warnings] = []
-      logger.unstub(:warning)
+      logger.unstub(:send_log)
     end
 
     it "produces warning even if deprecation warnings are disabled " do
-      logger.expects(:warning).once
+      logger.expects(:send_log).with(:warning, regexp_matches(/wet paint/)).once
       logger.warn_once('undefined_variables', 'wp', "wet paint")
     end
   end

data/tasks/generate_ast_model.rake

@@ -1,53 +1,56 @@
-require 'puppet'
-
-desc "Generate the Pcore model that represents the AST for the Puppet Language"
-task :gen_pcore_ast do
-  Puppet::Pops.generate_ast
-end
+begin
+  require 'puppet'
+rescue LoadError
+  #nothing to see here
+else
+  desc "Generate the Pcore model that represents the AST for the Puppet Language"
+  task :gen_pcore_ast do
+    Puppet::Pops.generate_ast
+  end
 
-module Puppet::Pops
-  def self.generate_ast
-    Puppet.initialize_settings
-    env = Puppet.lookup(:environments).get(Puppet[:environment])
-    loaders = Loaders.new(env)
-    ast_pp = Pathname(__FILE__).parent.parent + 'lib/puppet/pops/model/ast.pp'
-    Puppet.override(:current_environment => env, :loaders => loaders) do
-      ast_factory = Parser::Parser.new.parse_file(ast_pp.expand_path.to_s)
-      ast_model = Types::TypeParser.singleton.interpret(
-        ast_factory.model.body, Loader::PredefinedLoader.new(loaders.find_loader(nil), 'TypeSet loader'))
+  module Puppet::Pops
+    def self.generate_ast
+      Puppet.initialize_settings
+      env = Puppet.lookup(:environments).get(Puppet[:environment])
+      loaders = Loaders.new(env)
+      ast_pp = Pathname(__FILE__).parent.parent + 'lib/puppet/pops/model/ast.pp'
+      Puppet.override(:current_environment => env, :loaders => loaders) do
+        ast_factory = Parser::Parser.new.parse_file(ast_pp.expand_path.to_s)
+        ast_model = Types::TypeParser.singleton.interpret(
+          ast_factory.model.body, Loader::PredefinedLoader.new(loaders.find_loader(nil), 'TypeSet loader'))
 
-      ruby = Types::RubyGenerator.new.module_definition_from_typeset(ast_model)
+        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)
-      ruby.gsub!(/^module Parser\nmodule Locator\n.*\nend\nend\nmodule Model\n/m, "module Model\n")
+        # Replace ref() constructs to known Pcore types with directly initialized types. ref() cannot be used
+        # since it requires a parser (hen 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
-      # the annotations present.
-      ruby.gsub!(/^\s+'annotations' => \{\n\s+ref\('RubyMethod'\) => \{\n.*\n\s+\}\n\s+\},\n/, '')
+        # Remove generated RubyMethod annotations. The ruby methods are there now, no need to also have
+        # the annotations present.
+        ruby.gsub!(/^\s+'annotations' => \{\n\s+ref\('RubyMethod'\) => \{\n.*\n\s+\}\n\s+\},\n/, '')
 
-      ruby.gsub!(/ref\('([A-Za-z]+)'\)/, 'Types::P\1Type::DEFAULT')
-      ruby.gsub!(/ref\('Optional\[([0-9A-Za-z_]+)\]'\)/, 'Types::POptionalType.new(Types::P\1Type::DEFAULT)')
-      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\('([A-Za-z]+)'\)/, 'Types::P\1Type::DEFAULT')
+        ruby.gsub!(/ref\('Optional\[([0-9A-Za-z_]+)\]'\)/, 'Types::POptionalType.new(Types::P\1Type::DEFAULT)')
+        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)')
 
-      # 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')
-      ruby.gsub!(/ref\('Puppet::AST::([0-9A-Za-z_]+)'\)/, '\1._pcore_type')
-      ruby.gsub!(/ref\('Optional\[Puppet::AST::([0-9A-Za-z_]+)\]'\)/, 'Types::POptionalType.new(\1._pcore_type)')
-      ruby.gsub!(/ref\('Array\[Puppet::AST::([0-9A-Za-z_]+)\]'\)/, 'Types::PArrayType.new(\1._pcore_type)')
-      ruby.gsub!(/ref\('Array\[Puppet::AST::([0-9A-Za-z_]+), 1, default\]'\)/,
-          'Types::PArrayType.new(\1._pcore_type, Types::PCollectionType::NOT_EMPTY_SIZE)')
+        # 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')
+        ruby.gsub!(/ref\('Puppet::AST::([0-9A-Za-z_]+)'\)/, '\1._pcore_type')
+        ruby.gsub!(/ref\('Optional\[Puppet::AST::([0-9A-Za-z_]+)\]'\)/, 'Types::POptionalType.new(\1._pcore_type)')
+        ruby.gsub!(/ref\('Array\[Puppet::AST::([0-9A-Za-z_]+)\]'\)/, 'Types::PArrayType.new(\1._pcore_type)')
+        ruby.gsub!(/ref\('Array\[Puppet::AST::([0-9A-Za-z_]+), 1, default\]'\)/,
+            'Types::PArrayType.new(\1._pcore_type, Types::PCollectionType::NOT_EMPTY_SIZE)')
 
-      # Remove the generated ref() method. It's not needed by this model
-      ruby.gsub!(/  def self\.ref\(type_string\)\n.*\n  end\n\n/, '')
+        # Remove the generated ref() method. It's not needed by this model
+        ruby.gsub!(/  def self\.ref\(type_string\)\n.*\n  end\n\n/, '')
 
-      # 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)
+        # 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
@@ -71,8 +74,9 @@ def self.register_pcore_types
 end
 end
 RUBY
-      ast_rb = Pathname(__FILE__).parent.parent + 'lib/puppet/pops/model/ast.rb'
-      File.open(ast_rb.to_s, 'w') { |f| f.write(ruby) }
+        ast_rb = Pathname(__FILE__).parent.parent + 'lib/puppet/pops/model/ast.rb'
+        File.open(ast_rb.to_s, 'w') { |f| f.write(ruby) }
+      end
     end
   end
 end