puppet 4.0.0-x86-mingw32 → 4.1.0-x86-mingw32

data/spec/fixtures/unit/pops/loaders/loaders/single_module/modules/modulea/functions/hello.pp

@@ -0,0 +1,3 @@
+function modulea::hello() {
+  "modulea::hello()"
+}

data/spec/fixtures/unit/pops/loaders/loaders/single_module/modules/modulea/functions/subspace/hello.pp

@@ -0,0 +1,3 @@
+function modulea::subspace::hello() {
+  "modulea::subspace::hello()"
+}

data/spec/fixtures/unit/pops/loaders/loaders/single_module/modules/modulea/metadata.json

@@ -1,19 +1,10 @@
 {
   "name": "test-modulea",
   "author": "test",
-  "description": "",
   "license": "",
   "project_page": "",
   "source": "",
   "summary": "",
   "version": "1.0.0",
-  "checksums": {
-    "Modulefile": "55ef13d250cf6c477561becd8f2edcbe",
-    "functions/func_a.pp": "4a1f48920cd37c487dbf7468a5e78364",
-    "functions/modulea/func_a.pp": "296a3330c602b919ae063d6d6fde2460",
-    "lib/puppet/functions/modulea/rb_func_a.rb": "d5b3b83f77b742292008cd06361d6673",
-    "lib/puppet/functions/rb_func_a.rb": "a255470197127a6e512c9ab9dbd914c1",
-    "manifests/init.pp": "e50d8b91b632fb8357f021e6e0b6e043"
-  },
   "dependencies": []
-}
+}

data/spec/fixtures/unit/provider/mount/parsed/aix.filesystems

@@ -35,110 +35,118 @@
 *
 
 /:
-        dev             = /dev/hd4
-        vfs             = jfs2
-        log             = /dev/hd8
-        mount           = automatic
-        check           = false
-        type            = bootfs
-        vol             = root
-        free            = true
-        quota           = no
+	dev		= /dev/hd4
+	vfs		= jfs2
+	check		= false
+	free		= true
+	log		= NULL
+	mount		= automatic
+	quota		= no
+	type		= bootfs
+	vol		= root
 
 /home:
-        dev             = /dev/hd1
-        vfs             = jfs2
-        log             = /dev/hd8
-        mount           = true
-        check           = true
-        vol             = /home
-        free            = false
-        quota           = no
+	dev		= /dev/hd1
+	vfs		= jfs2
+	check		= true
+	free		= false
+	log		= NULL
+	mount		= true
+	quota		= no
+	vol		= /home
 
 /usr:
-        dev             = /dev/hd2
-        vfs             = jfs2
-        log             = /dev/hd8
-        mount           = automatic
-        check           = false
-        type            = bootfs
-        vol             = /usr
-        free            = false
-        quota           = no
+	dev		= /dev/hd2
+	vfs		= jfs2
+	check		= false
+	free		= false
+	log		= NULL
+	mount		= automatic
+	quota		= no
+	type		= bootfs
+	vol		= /usr
 
 /var:
-        dev             = /dev/hd9var
-        vfs             = jfs2
-        log             = /dev/hd8
-        mount           = automatic
-        check           = false
-        type            = bootfs
-        vol             = /var
-        free            = false
-        quota           = no
+	dev		= /dev/hd9var
+	vfs		= jfs2
+	check		= false
+	free		= false
+	log		= NULL
+	mount		= automatic
+	quota		= no
+	type		= bootfs
+	vol		= /var
 
 /tmp:
-        dev             = /dev/hd3
-        vfs             = jfs2
-        log             = /dev/hd8
-        mount           = automatic
-        check           = false
-        vol             = /tmp
-        free            = false
-        quota           = no
+	dev		= /dev/hd3
+	vfs		= jfs2
+	check		= false
+	free		= false
+	log		= NULL
+	mount		= automatic
+	quota		= no
+	vol		= /tmp
 
 /admin:
-        dev             = /dev/hd11admin
-        vfs             = jfs2
-        log             = /dev/hd8
-        mount           = true
-        check           = false
-        vol             = /admin
-        free            = false
-        quota           = no
+	dev		= /dev/hd11admin
+	vfs		= jfs2
+	check		= false
+	free		= false
+	log		= NULL
+	mount		= true
+	quota		= no
+	vol		= /admin
 
 /proc:
-        dev       = /proc
-        vol       = "/proc"
-        mount     = true
-        check     = false
-        free      = false
-        vfs       = procfs
+	dev		= /proc
+	vol		= "/proc"
+	mount		= true
+	check		= false
+	free		= false
+	vfs		= procfs
 
 /opt:
-        dev             = /dev/hd10opt
-        vfs             = jfs2
-        log             = /dev/hd8
-        mount           = true
-        check           = true
-        vol             = /opt
-        free            = false
-        quota           = no
+	dev		= /dev/hd10opt
+	vfs		= jfs2
+	log		= /dev/hd8
+	mount		= true
+	check		= true
+	vol		= /opt
+	free		= false
+	quota		= no
 
 /var/adm/ras/livedump:
-        dev             = /dev/livedump
-        vfs             = jfs2
-        log             = /dev/hd8
-        mount           = true
-        account         = false
-        quota           = no
+	dev		= /dev/livedump
+	vfs		= jfs2
+	log		= /dev/hd8
+	mount		= true
+	account		= false
+	quota		= no
 
 
 /stage/middleware:
-        dev             = "/stage/middleware"
-        vfs             = nfs
-        nodename        = 192.168.1.11
-        mount           = true
-        type            = nfs
-        options         = ro,bg,hard,intr,sec=sys
-        account         = false
+	dev		= "/stage/middleware"
+	vfs		= nfs
+	nodename	= 192.168.1.11
+	mount		= true
+	type		= nfs
+	options		= ro,bg,hard,intr,sec=sys
+	account		= false
 
 /home/u0010689:
-        dev             = "/userdata/20010689"
-        vfs             = nfs
-        nodename        = 192.168.1.11
-        mount           = true
-        type            = nfs
-        options         = bg,hard,intr
-        account         = false
+	dev		= "/userdata/20010689"
+	vfs		= nfs
+	nodename	= 192.168.1.11
+	mount		= true
+	type		= nfs
+	options		= bg,hard,intr
+	account		= false
 
+/srv/aix:
+	dev		= /srv/aix
+	nodename	= mynode
+	vfs		= nfs
+	account		= false
+	log		= NULL
+	mount		= true
+	options		= vers=2

data/spec/fixtures/unit/provider/mount/parsed/aix.mount

@@ -1,7 +1,11 @@
-node   mounted          mounted over  vfs    date              options   
-----   -------          ------------ ---  ------------   -------------------
-       /dev/hd0         /            jfs   Dec 17 08:04   rw, log  =/dev/hd8
-       /dev/hd3         /tmp         jfs   Dec 17 08:04   rw, log  =/dev/hd8
-       /dev/hd1         /home        jfs   Dec 17 08:06   rw, log  =/dev/hd8
-       /dev/hd2         /usr         jfs   Dec 17 08:06   rw, log  =/dev/hd8
-sue    /home/local/src  /usr/code    nfs   Dec 17 08:06   ro, log  =/dev/hd8
+  node       mounted        mounted over    vfs       date        options
+-------- ---------------  ---------------  ------ ------------ ---------------
+         /dev/hd4         /                jfs2   Feb 05 10:27 rw,log=NULL
+         /dev/hd2         /usr             jfs2   Feb 05 10:28 rw,log=NULL
+         /dev/hd9var      /var             jfs2   Feb 05 10:28 rw,log=NULL
+         /dev/hd3         /tmp             jfs2   Feb 05 10:28 rw,log=NULL
+         /dev/hd1         /home            jfs2   Feb 05 10:28 rw,log=NULL
+         /dev/hd11admin   /admin           jfs2   Feb 05 10:28 rw,log=NULL
+         /proc            /proc            procfs Feb 05 10:28 rw
+         /dev/hd10opt     /opt             jfs2   Feb 05 10:28 rw,log=NULL
+mynode   /srv/aix         /srv/aix         nfs    Mar 19 14:33 vers=2,rw 

data/spec/fixtures/unit/provider/package/pkgng/pkg.info

@@ -0,0 +1,8 @@
+ca_root_nss 3.15.3.1 security/ca_root_nss
+curl 7.33.0 ftp/curl
+gnupg 2.0.22 security/gnupg
+mcollective 2.2.4 sysutils/mcollective
+nmap 6.40 security/nmap
+pkg 1.2.4_1 ports-mgmt/pkg
+zsh 5.0.2_1 shells/zsh
+tac_plus F4.0.4.27a net/tac_plus4

data/spec/fixtures/unit/provider/package/pkgng/pkg.query

@@ -0,0 +1 @@
+zsh-5.0.2                      The Z shell

data/spec/fixtures/unit/provider/package/pkgng/pkg.query_absent

@@ -0,0 +1 @@
+pkg: No package(s) matching bash

data/spec/fixtures/unit/provider/package/pkgng/pkg.version

@@ -0,0 +1,3 @@
+shells/bash-completion             <   needs updating (index has 2.1_3)
+ftp/curl                           <   needs updating (index has 7.33.0_2)
+shells/zsh                         <   needs updating (index has 5.0.4)

data/spec/fixtures/unit/provider/package/zypper/zypper-list-updates-empty.out

@@ -0,0 +1,3 @@
+Loading repository data...
+Reading installed packages...
+No updates found.

data/spec/integration/application/apply_spec.rb

@@ -41,6 +41,18 @@ describe "apply" do
     expect(@logs.map(&:to_s)).to include('it was applied')
   end
 
+  it "adds environment to the $server_facts variable if trusted_server_facts is true" do
+    manifest = file_containing("manifest.pp", "notice(\"$server_facts\")")
+    Puppet[:trusted_server_facts] = true
+
+    puppet = Puppet::Application[:apply]
+    puppet.stubs(:command_line).returns(stub('command_line', :args => [manifest]))
+
+    expect { puppet.run_command }.to exit_with(0)
+
+    expect(@logs.map(&:to_s)).to include(/{environment =>.*/)
+  end
+
   it "applies a given file even when an ENC is configured", :if => !Puppet.features.microsoft_windows? do
     manifest = file_containing("manifest.pp", "notice('specific manifest applied')")
     site_manifest = file_containing("site_manifest.pp", "notice('the site manifest was applied instead')")
@@ -61,6 +73,43 @@ describe "apply" do
     expect(@logs.map(&:to_s)).to include('specific manifest applied')
   end
 
+  context "handles errors" do
+    it "logs compile errors once" do
+      Puppet.initialize_settings([])
+      apply = Puppet::Application.find(:apply).new(stub('command_line', :subcommand_name => :apply, :args => []))
+      apply.options[:code] = '08'
+
+      msg = 'valid octal'
+      callback = Proc.new do |actual|
+        expect(actual.scan(Regexp.new(msg))).to eq([msg])
+      end
+
+      expect do
+        apply.run
+      end.to have_printed(callback).and_exit_with(1)
+    end
+
+    it "logs compile post processing errors once" do
+      Puppet.initialize_settings([])
+      apply = Puppet::Application.find(:apply).new(stub('command_line', :subcommand_name => :apply, :args => []))
+      path = File.expand_path('/tmp/content_file_test.Q634Dlmtime')
+      apply.options[:code] = "file { '#{path}':
+        content => 'This is the test file content',
+        ensure => present,
+        checksum => mtime
+      }"
+
+      msg = 'You cannot specify content when using checksum'
+      callback = Proc.new do |actual|
+        expect(actual.scan(Regexp.new(msg))).to eq([msg])
+      end
+
+      expect do
+        apply.run
+      end.to have_printed(callback).and_exit_with(1)
+    end
+  end
+
   context "with a module" do
     let(:modulepath) { tmpdir('modulepath') }
     let(:execute) { 'include amod' }

data/spec/integration/faces/plugin_spec.rb

@@ -26,7 +26,6 @@ describe "Puppet plugin face" do
   end
 
   before do
-    FileUtils.mkdir(Puppet[:vardir])
     FileUtils.mkdir(File.join(Puppet[:vardir], 'lib'))
     FileUtils.mkdir(File.join(Puppet[:vardir], 'facts.d'))
     @termini_classes = {}
@@ -37,9 +36,6 @@ describe "Puppet plugin face" do
   end
 
   after do
-    FileUtils.rmdir(File.join(Puppet[:vardir],'lib'))
-    FileUtils.rmdir(File.join(Puppet[:vardir],'facts.d'))
-    FileUtils.rmdir(Puppet[:vardir])
     INDIRECTED_CLASSES.each do |indirected|
       indirected.indirection.terminus_class = @termini_classes[indirected]
       indirected.indirection.termini.clear

data/spec/integration/indirector/facts/facter_spec.rb

@@ -1,9 +1,11 @@
 #! /usr/bin/env ruby
 require 'spec_helper'
 
+require 'puppet_spec/files'
 require 'puppet_spec/compiler'
 
 describe Puppet::Node::Facts::Facter do
+  include PuppetSpec::Files
   include PuppetSpec::Compiler
 
   it "preserves case in fact values" do
@@ -19,4 +21,61 @@ describe Puppet::Node::Facts::Facter do
                              Puppet::Node.indirection.find('foo'))
     expect(cat.resource("Notify[AaBbCc]")).to be
   end
+
+  context "resolving file based facts" do
+    let(:factdir) { tmpdir('factdir') }
+
+    it "should resolve custom facts" do
+      test_module = File.join(factdir, 'module', 'lib', 'facter')
+      FileUtils.mkdir_p(test_module)
+
+      File.open(File.join(test_module, 'custom.rb'), 'wb') { |file| file.write(<<-EOF)}
+      Facter.add(:custom) do
+        setcode do
+          Facter.value('puppetversion')
+        end
+      end
+      EOF
+
+      Puppet.initialize_settings(['--modulepath', factdir])
+      apply = Puppet::Application.find(:apply).new(stub('command_line', :subcommand_name => :apply, :args => ['--modulepath', factdir, '-e', 'notify { $custom: }']))
+
+      expect do
+        expect { apply.run }.to exit_with(0)
+      end.to have_printed(Puppet.version)
+    end
+
+    it "should resolve external facts" do
+      external_fact = File.join(factdir, 'external')
+
+      if Puppet.features.microsoft_windows?
+        external_fact += '.bat'
+        File.open(external_fact, 'wb') { |file| file.write(<<-EOF)}
+        @echo foo=bar
+        EOF
+      else
+        File.open(external_fact, 'wb') { |file| file.write(<<-EOF)}
+        #!/bin/sh
+        echo "foo=bar"
+        EOF
+
+        Puppet::FileSystem.chmod(0755, external_fact)
+      end
+
+      Puppet.initialize_settings(['--pluginfactdest', factdir])
+      apply = Puppet::Application.find(:apply).new(stub('command_line', :subcommand_name => :apply, :args => ['--pluginfactdest', factdir, '-e', 'notify { $foo: }']))
+
+      expect do
+        expect { apply.run }.to exit_with(0)
+      end.to have_printed('bar')
+    end
+  end
+
+  it "adds the puppetversion fact" do
+    Facter.stubs(:reset)
+
+    cat = compile_to_catalog('notify { $::puppetversion: }',
+                             Puppet::Node.indirection.find('foo'))
+    expect(cat.resource("Notify[#{Puppet.version.to_s}]")).to be
+  end
 end

data/spec/integration/parser/compiler_spec.rb

@@ -507,6 +507,32 @@ describe Puppet::Parser::Compiler do
 
       expect { @compiler.compile }.to raise_error(Puppet::ParseError, 'Failed to realize virtual resources one, two')
     end
+
+    it 'matches on container inherited tags' do
+      Puppet[:code] = <<-MANIFEST
+      class xport_test {
+        tag('foo_bar')
+        @notify { 'nbr1':
+          message => 'explicitly tagged',
+          tag => 'foo_bar'
+        }
+
+        @notify { 'nbr2':
+          message => 'implicitly tagged'
+        }
+
+        Notify <| tag == 'foo_bar' |> {
+          message => 'overridden'
+        }
+      }
+      include xport_test
+      MANIFEST
+
+      catalog = Puppet::Parser::Compiler.compile(Puppet::Node.new("mynode"))
+
+      expect(catalog).to have_resource("Notify[nbr1]").with_parameter(:message, 'overridden')
+      expect(catalog).to have_resource("Notify[nbr2]").with_parameter(:message, 'overridden')
+    end
   end
 
   describe "when evaluating relationships" do
@@ -866,6 +892,25 @@ describe Puppet::Parser::Compiler do
           expect(catalog).to have_resource("Notify[expected]").with_parameter(:message, "8080")
         end
       end
+
+      it 'looks up default parameter values from inherited class (PUP-2532)' do
+        catalog = compile_to_catalog(<<-CODE)
+          class a {
+            Notify { message => "defaulted" }
+            include c
+            notify { bye: }
+          }
+          class b { Notify { message => "inherited" } }
+          class c inherits b { notify { hi: } }
+
+          include a
+          notify {hi_test: message => Notify[hi][message] }
+          notify {bye_test: message => Notify[bye][message] }
+        CODE
+
+        expect(catalog).to have_resource("Notify[hi_test]").with_parameter(:message, "inherited")
+        expect(catalog).to have_resource("Notify[bye_test]").with_parameter(:message, "defaulted")
+      end
     end
   end
 
@@ -924,4 +969,809 @@ describe Puppet::Parser::Compiler do
       Puppet::Parser::Compiler.compile(Puppet::Node.new("mynode"))
     end
   end
+
+  context 'when working with $server_facts' do
+    include PuppetSpec::Compiler
+    context 'and have opted in to trusted_server_facts' do
+      before :each do
+        Puppet[:trusted_server_facts] = true
+      end
+
+      it 'should make $trusted available' do
+        node = Puppet::Node.new("testing")
+        node.add_server_facts({ "server_fact" => "foo" })
+
+        catalog = compile_to_catalog(<<-MANIFEST, node)
+            notify { 'test': message => $server_facts[server_fact] }
+        MANIFEST
+
+        expect(catalog).to have_resource("Notify[test]").with_parameter(:message, "foo")
+      end
+
+      it 'should not allow assignment to $server_facts' do
+        node = Puppet::Node.new("testing")
+        node.add_server_facts({ "server_fact" => "foo" })
+
+        expect do
+          compile_to_catalog(<<-MANIFEST, node)
+              $server_facts = 'changed'
+              notify { 'test': message => $server_facts == 'changed' }
+          MANIFEST
+        end.to raise_error(Puppet::PreformattedError, /Attempt to assign to a reserved variable name: '\$server_facts'.*/)
+      end
+    end
+
+    context 'and have not opted in to hashed_node_data' do
+      before :each do
+        Puppet[:trusted_server_facts] = false
+      end
+
+      it 'should not make $server_facts available' do
+        node = Puppet::Node.new("testing")
+        node.add_server_facts({ "server_fact" => "foo" })
+
+        catalog = compile_to_catalog(<<-MANIFEST, node)
+            notify { 'test': message => ($server_facts == undef) }
+        MANIFEST
+
+        expect(catalog).to have_resource("Notify[test]").with_parameter(:message, true)
+      end
+
+      it 'should allow assignment to $server_facts' do
+        catalog = compile_to_catalog(<<-MANIFEST)
+            $server_facts = 'changed'
+            notify { 'test': message => $server_facts == 'changed' }
+        MANIFEST
+
+        expect(catalog).to have_resource("Notify[test]").with_parameter(:message, true)
+      end
+    end
+  end
+  describe "the compiler when using future parser and evaluator" do
+    include PuppetSpec::Compiler
+
+    if Puppet.features.microsoft_windows?
+      it "should be able to determine the configuration version from a local version control repository" do
+        pending("Bug #14071 about semantics of Puppet::Util::Execute on Windows")
+        # This should always work, because we should always be
+        # in the puppet repo when we run this.
+        version = %x{git rev-parse HEAD}.chomp
+
+        Puppet.settings[:config_version] = 'git rev-parse HEAD'
+
+        compiler = Puppet::Parser::Compiler.new(Puppet::Node.new("testnode"))
+        compiler.catalog.version.should == version
+      end
+    end
+
+    it "should not create duplicate resources when a class is referenced both directly and indirectly by the node classifier (4792)" do
+      node = Puppet::Node.new("testnodex")
+      node.classes = ['foo', 'bar']
+      catalog = compile_to_catalog(<<-PP, node)
+        class foo
+        {
+          notify { foo_notify: }
+          include bar
+        }
+        class bar
+        {
+          notify { bar_notify: }
+        }
+      PP
+
+      catalog = Puppet::Parser::Compiler.compile(node)
+
+      expect(catalog).to have_resource("Notify[foo_notify]")
+      expect(catalog).to have_resource("Notify[bar_notify]")
+    end
+
+    it 'applies defaults for defines with qualified names (PUP-2302)' do
+      catalog = compile_to_catalog(<<-CODE)
+        define my::thing($msg = 'foo') { notify {'check_me': message => $msg } }
+        My::Thing { msg => 'evoe' }
+        my::thing { 'name': }
+      CODE
+
+      expect(catalog).to have_resource("Notify[check_me]").with_parameter(:message, "evoe")
+    end
+
+    it 'Applies defaults from dynamic scopes (3x and future with reverted PUP-867)' do
+      catalog = compile_to_catalog(<<-CODE)
+      class a {
+        Notify { message => "defaulted" }
+        include b
+        notify { bye: }
+      }
+      class b { notify { hi: } }
+
+      include a
+      CODE
+      expect(catalog).to have_resource("Notify[hi]").with_parameter(:message, "defaulted")
+      expect(catalog).to have_resource("Notify[bye]").with_parameter(:message, "defaulted")
+    end
+
+    it 'gets default from inherited class (PUP-867)' do
+      catalog = compile_to_catalog(<<-CODE)
+      class a {
+        Notify { message => "defaulted" }
+        include c
+        notify { bye: }
+      }
+      class b { Notify { message => "inherited" } }
+      class c inherits b { notify { hi: } }
+
+      include a
+      CODE
+
+      expect(catalog).to have_resource("Notify[hi]").with_parameter(:message, "inherited")
+      expect(catalog).to have_resource("Notify[bye]").with_parameter(:message, "defaulted")
+    end
+
+    it 'looks up default parameter values from inherited class (PUP-2532)' do
+      catalog = compile_to_catalog(<<-CODE)
+      class a {
+        Notify { message => "defaulted" }
+        include c
+        notify { bye: }
+      }
+      class b { Notify { message => "inherited" } }
+      class c inherits b { notify { hi: } }
+
+      include a
+      notify {hi_test: message => Notify[hi][message] }
+      notify {bye_test: message => Notify[bye][message] }
+      CODE
+
+      expect(catalog).to have_resource("Notify[hi_test]").with_parameter(:message, "inherited")
+      expect(catalog).to have_resource("Notify[bye_test]").with_parameter(:message, "defaulted")
+    end
+
+    it 'does not allow override of class parameters using a resource override expression' do
+      expect do
+        compile_to_catalog(<<-CODE)
+          Class[a] { x => 2}
+        CODE
+      end.to raise_error(/Resource Override can only.*got: Class\[a\].*/)
+    end
+
+    describe "when resolving class references" do
+      include Matchers::Resource
+      it "should not favor local scope (with class included in topscope)" do
+        catalog = compile_to_catalog(<<-PP)
+          class experiment {
+            class baz {
+            }
+            notify {"x" : require => Class[Baz] }
+            notify {"y" : require => Class[Experiment::Baz] }
+          }
+          class baz {
+          }
+          include baz
+          include experiment
+          include experiment::baz
+        PP
+
+        expect(catalog).to have_resource("Notify[x]").with_parameter(:require, be_resource("Class[Baz]"))
+        expect(catalog).to have_resource("Notify[y]").with_parameter(:require, be_resource("Class[Experiment::Baz]"))
+      end
+
+      it "should not favor local scope, (with class not included in topscope)" do
+        catalog = compile_to_catalog(<<-PP)
+          class experiment {
+            class baz {
+            }
+            notify {"x" : require => Class[Baz] }
+            notify {"y" : require => Class[Experiment::Baz] }
+          }
+          class baz {
+          }
+          include experiment
+          include experiment::baz
+        PP
+
+        expect(catalog).to have_resource("Notify[x]").with_parameter(:require, be_resource("Class[Baz]"))
+        expect(catalog).to have_resource("Notify[y]").with_parameter(:require, be_resource("Class[Experiment::Baz]"))
+      end
+    end
+
+    describe "(ticket #13349) when explicitly specifying top scope" do
+      ["class {'::bar::baz':}", "include ::bar::baz"].each do |include|
+        describe "with #{include}" do
+          it "should find the top level class" do
+            catalog = compile_to_catalog(<<-MANIFEST)
+              class { 'foo::test': }
+              class foo::test {
+              	#{include}
+              }
+              class bar::baz {
+              	notify { 'good!': }
+              }
+              class foo::bar::baz {
+              	notify { 'bad!': }
+              }
+            MANIFEST
+
+            expect(catalog).to have_resource("Class[Bar::Baz]")
+            expect(catalog).to have_resource("Notify[good!]")
+            expect(catalog).not_to have_resource("Class[Foo::Bar::Baz]")
+            expect(catalog).not_to have_resource("Notify[bad!]")
+          end
+        end
+      end
+    end
+
+    it 'should recompute the version after input files are re-parsed' do
+      Puppet[:code] = 'class foo { }'
+      Time.stubs(:now).returns(1)
+      node = Puppet::Node.new('mynode')
+      expect(Puppet::Parser::Compiler.compile(node).version).to eq(1)
+      Time.stubs(:now).returns(2)
+      expect(Puppet::Parser::Compiler.compile(node).version).to eq(1) # no change because files didn't change
+      Puppet[:code] = nil
+      expect(Puppet::Parser::Compiler.compile(node).version).to eq(2)
+    end
+
+    ['define', 'class', 'node'].each do |thing|
+      it "'#{thing}' is not allowed inside evaluated conditional constructs" do
+        expect do
+          compile_to_catalog(<<-PP)
+            if true {
+              #{thing} foo {
+              }
+              notify { decoy: }
+            }
+          PP
+        end.to raise_error(Puppet::Error, /Classes, definitions, and nodes may only appear at toplevel/)
+      end
+
+      it "'#{thing}' is not allowed inside un-evaluated conditional constructs" do
+        expect do
+          compile_to_catalog(<<-PP)
+            if false {
+              #{thing} foo {
+              }
+              notify { decoy: }
+            }
+          PP
+        end.to raise_error(Puppet::Error, /Classes, definitions, and nodes may only appear at toplevel/)
+      end
+    end
+
+    describe "relationships can be formed" do
+      def extract_name(ref)
+        ref.sub(/File\[(\w+)\]/, '\1')
+      end
+
+      def assert_creates_relationships(relationship_code, expectations)
+        base_manifest = <<-MANIFEST
+          file { [a,b,c]:
+            mode => '0644',
+          }
+          file { [d,e]:
+            mode => '0755',
+          }
+        MANIFEST
+        catalog = compile_to_catalog(base_manifest + relationship_code)
+
+        resources = catalog.resources.select { |res| res.type == 'File' }
+
+        actual_relationships, actual_subscriptions = [:before, :notify].map do |relation|
+          resources.map do |res|
+            dependents = Array(res[relation])
+            dependents.map { |ref| [res.title, extract_name(ref)] }
+          end.inject(&:concat)
+        end
+
+        expect(actual_relationships).to match_array(expectations[:relationships] || [])
+        expect(actual_subscriptions).to match_array(expectations[:subscriptions] || [])
+      end
+
+      it "of regular type" do
+        assert_creates_relationships("File[a] -> File[b]",
+          :relationships => [['a','b']])
+      end
+
+      it "of subscription type" do
+        assert_creates_relationships("File[a] ~> File[b]",
+          :subscriptions => [['a', 'b']])
+      end
+
+      it "between multiple resources expressed as resource with multiple titles" do
+        assert_creates_relationships("File[a,b] -> File[c,d]",
+          :relationships => [['a', 'c'],
+            ['b', 'c'],
+            ['a', 'd'],
+            ['b', 'd']])
+      end
+
+      it "between collection expressions" do
+        assert_creates_relationships("File <| mode == '0644' |> -> File <| mode == '0755' |>",
+          :relationships => [['a', 'd'],
+            ['b', 'd'],
+            ['c', 'd'],
+            ['a', 'e'],
+            ['b', 'e'],
+            ['c', 'e']])
+      end
+
+      it "between resources expressed as Strings" do
+        assert_creates_relationships("'File[a]' -> 'File[b]'",
+          :relationships => [['a', 'b']])
+      end
+
+      it "between resources expressed as variables" do
+        assert_creates_relationships(<<-MANIFEST, :relationships => [['a', 'b']])
+          $var = File[a]
+          $var -> File[b]
+        MANIFEST
+
+      end
+
+      it "between resources expressed as case statements" do
+        assert_creates_relationships(<<-MANIFEST, :relationships => [['s1', 't2']])
+          $var = 10
+          case $var {
+            10: {
+              file { s1: }
+            }
+            12: {
+              file { s2: }
+            }
+          }
+          ->
+          case $var + 2 {
+            10: {
+              file { t1: }
+            }
+            12: {
+              file { t2: }
+            }
+          }
+        MANIFEST
+      end
+
+      it "using deep access in array" do
+        assert_creates_relationships(<<-MANIFEST, :relationships => [['a', 'b']])
+          $var = [ [ [ File[a], File[b] ] ] ]
+          $var[0][0][0] -> $var[0][0][1]
+        MANIFEST
+
+      end
+
+      it "using deep access in hash" do
+        assert_creates_relationships(<<-MANIFEST, :relationships => [['a', 'b']])
+          $var = {'foo' => {'bar' => {'source' => File[a], 'target' => File[b]}}}
+          $var[foo][bar][source] -> $var[foo][bar][target]
+        MANIFEST
+
+      end
+
+      it "using resource declarations" do
+        assert_creates_relationships("file { l: } -> file { r: }", :relationships => [['l', 'r']])
+      end
+
+      it "between entries in a chain of relationships" do
+        assert_creates_relationships("File[a] -> File[b] ~> File[c] <- File[d] <~ File[e]",
+          :relationships => [['a', 'b'], ['d', 'c']],
+          :subscriptions => [['b', 'c'], ['e', 'd']])
+      end
+    end
+
+    context "when dealing with variable references" do
+      it 'an initial underscore in a variable name is ok' do
+        catalog = compile_to_catalog(<<-MANIFEST)
+          class a { $_a = 10}
+          include a
+          notify { 'test': message => $a::_a }
+        MANIFEST
+
+        expect(catalog).to have_resource("Notify[test]").with_parameter(:message, 10)
+      end
+
+      it 'an initial underscore in not ok if elsewhere than last segment' do
+        expect do
+          catalog = compile_to_catalog(<<-MANIFEST)
+            class a { $_a = 10}
+            include a
+            notify { 'test': message => $_a::_a }
+          MANIFEST
+        end.to raise_error(/Illegal variable name/)
+      end
+
+      it 'a missing variable as default value becomes undef' do
+        # strict variables not on
+        catalog = compile_to_catalog(<<-MANIFEST)
+        class a ($b=$x) { notify {test: message=>"yes ${undef == $b}" } }
+          include a
+        MANIFEST
+
+        expect(catalog).to have_resource("Notify[test]").with_parameter(:message, "yes true")
+      end
+    end
+
+    context 'when working with the trusted data hash' do
+      context 'and have opted in to hashed_node_data' do
+        it 'should make $trusted available' do
+          node = Puppet::Node.new("testing")
+          node.trusted_data = { "data" => "value" }
+
+          catalog = compile_to_catalog(<<-MANIFEST, node)
+            notify { 'test': message => $trusted[data] }
+          MANIFEST
+
+          expect(catalog).to have_resource("Notify[test]").with_parameter(:message, "value")
+        end
+
+        it 'should not allow assignment to $trusted' do
+          node = Puppet::Node.new("testing")
+          node.trusted_data = { "data" => "value" }
+
+          expect do
+            compile_to_catalog(<<-MANIFEST, node)
+              $trusted = 'changed'
+              notify { 'test': message => $trusted == 'changed' }
+            MANIFEST
+          end.to raise_error(Puppet::PreformattedError, /Attempt to assign to a reserved variable name: '\$trusted'/)
+        end
+      end
+    end
+
+    context 'when using typed parameters in definition' do
+      it 'accepts type compliant arguments' do
+        catalog = compile_to_catalog(<<-MANIFEST)
+          define foo(String $x) { }
+          foo { 'test': x =>'say friend' }
+        MANIFEST
+        expect(catalog).to have_resource("Foo[test]").with_parameter(:x, 'say friend')
+      end
+
+      it 'accepts undef as the default for an Optional argument' do
+        catalog = compile_to_catalog(<<-MANIFEST)
+          define foo(Optional[String] $x = undef) {
+            notify { "expected": message => $x == undef }
+          }
+          foo { 'test': }
+        MANIFEST
+        expect(catalog).to have_resource("Notify[expected]").with_parameter(:message, true)
+      end
+
+      it 'accepts anything when parameters are untyped' do
+        expect do
+          catalog = compile_to_catalog(<<-MANIFEST)
+          define foo($a, $b, $c) { }
+          foo { 'test': a => String, b=>10, c=>undef }
+          MANIFEST
+        end.to_not raise_error()
+      end
+
+      it 'denies non type compliant arguments' do
+        expect do
+          catalog = compile_to_catalog(<<-MANIFEST)
+            define foo(Integer $x) { }
+            foo { 'test': x =>'say friend' }
+          MANIFEST
+        end.to raise_error(/type Integer, got String/)
+      end
+
+      it 'denies undef for a non-optional type' do
+        expect do
+          catalog = compile_to_catalog(<<-MANIFEST)
+            define foo(Integer $x) { }
+            foo { 'test': x => undef }
+          MANIFEST
+        end.to raise_error(/type Integer, got Undef/)
+      end
+
+      it 'denies non type compliant default argument' do
+        expect do
+          catalog = compile_to_catalog(<<-MANIFEST)
+            define foo(Integer $x = 'pow') { }
+            foo { 'test':  }
+          MANIFEST
+        end.to raise_error(/type Integer, got String/)
+      end
+
+      it 'denies undef as the default for a non-optional type' do
+        expect do
+          catalog = compile_to_catalog(<<-MANIFEST)
+            define foo(Integer $x = undef) { }
+            foo { 'test':  }
+          MANIFEST
+        end.to raise_error(/type Integer, got Undef/)
+      end
+
+      it 'accepts a Resource as a Type' do
+        catalog = compile_to_catalog(<<-MANIFEST)
+          define foo(Type[Bar] $x) {
+            notify { 'test': message => $x[text] }
+          }
+          define bar($text) { }
+          bar { 'joke': text => 'knock knock' }
+          foo { 'test': x => Bar[joke] }
+        MANIFEST
+        expect(catalog).to have_resource("Notify[test]").with_parameter(:message, 'knock knock')
+      end
+
+      it 'uses infer_set when reporting type mismatch' do
+        expect do
+          catalog = compile_to_catalog(<<-MANIFEST)
+            define foo(Struct[{b => Integer, d=>String}] $a) { }
+            foo{ bar: a => {b => 5, c => 'stuff'}}
+          MANIFEST
+        end.to raise_error(/got Struct\[\{'b'=>Integer, 'c'=>String\}\]/)
+      end
+    end
+
+    context 'when using typed parameters in class' do
+      it 'accepts type compliant arguments' do
+        catalog = compile_to_catalog(<<-MANIFEST)
+          class foo(String $x) { }
+          class { 'foo': x =>'say friend' }
+        MANIFEST
+        expect(catalog).to have_resource("Class[Foo]").with_parameter(:x, 'say friend')
+      end
+
+      it 'accepts undef as the default for an Optional argument' do
+        catalog = compile_to_catalog(<<-MANIFEST)
+          class foo(Optional[String] $x = undef) {
+            notify { "expected": message => $x == undef }
+          }
+          class { 'foo': }
+        MANIFEST
+        expect(catalog).to have_resource("Notify[expected]").with_parameter(:message, true)
+      end
+
+      it 'accepts anything when parameters are untyped' do
+        expect do
+          catalog = compile_to_catalog(<<-MANIFEST)
+            class foo($a, $b, $c) { }
+            class { 'foo': a => String, b=>10, c=>undef }
+          MANIFEST
+        end.to_not raise_error()
+      end
+
+      it 'denies non type compliant arguments' do
+        expect do
+          catalog = compile_to_catalog(<<-MANIFEST)
+            class foo(Integer $x) { }
+            class { 'foo': x =>'say friend' }
+          MANIFEST
+        end.to raise_error(/type Integer, got String/)
+      end
+
+      it 'denies undef for a non-optional type' do
+        expect do
+          catalog = compile_to_catalog(<<-MANIFEST)
+            class foo(Integer $x) { }
+            class { 'foo': x => undef }
+          MANIFEST
+        end.to raise_error(/type Integer, got Undef/)
+      end
+
+      it 'denies non type compliant default argument' do
+        expect do
+          catalog = compile_to_catalog(<<-MANIFEST)
+            class foo(Integer $x = 'pow') { }
+            class { 'foo':  }
+          MANIFEST
+        end.to raise_error(/type Integer, got String/)
+      end
+
+      it 'denies undef as the default for a non-optional type' do
+        expect do
+          catalog = compile_to_catalog(<<-MANIFEST)
+            class foo(Integer $x = undef) { }
+            class { 'foo':  }
+          MANIFEST
+        end.to raise_error(/type Integer, got Undef/)
+      end
+
+      it 'accepts a Resource as a Type' do
+        catalog = compile_to_catalog(<<-MANIFEST)
+          class foo(Type[Bar] $x) {
+            notify { 'test': message => $x[text] }
+          }
+          define bar($text) { }
+          bar { 'joke': text => 'knock knock' }
+          class { 'foo': x => Bar[joke] }
+        MANIFEST
+        expect(catalog).to have_resource("Notify[test]").with_parameter(:message, 'knock knock')
+      end
+    end
+
+    context 'when using typed parameters in lambdas' do
+      it 'accepts type compliant arguments' do
+        catalog = compile_to_catalog(<<-MANIFEST)
+          with('value') |String $x| { notify { "$x": } }
+        MANIFEST
+        expect(catalog).to have_resource("Notify[value]")
+      end
+
+      it 'handles an array as a single argument' do
+        catalog = compile_to_catalog(<<-MANIFEST)
+          with(['value', 'second']) |$x| { notify { "${x[0]} ${x[1]}": } }
+        MANIFEST
+        expect(catalog).to have_resource("Notify[value second]")
+      end
+
+      # Conditinoally left out for Ruby 1.8.x since the Proc created for the expected number of arguments will accept
+      # a call with fewer arguments and then pass all arguments to the closure. The closure then receives an argument
+      # array of correct size with nil values instead of an array with too few arguments
+      unless RUBY_VERSION[0,3] == '1.8'
+        it 'denies when missing required arguments' do
+          expect do
+            compile_to_catalog(<<-MANIFEST)
+              with(1) |$x, $y| { }
+            MANIFEST
+          end.to raise_error(/Parameter \$y is required but no value was given/m)
+        end
+      end
+
+      it 'accepts anything when parameters are untyped' do
+        catalog = compile_to_catalog(<<-MANIFEST)
+          ['value', 1, true, undef].each |$x| { notify { "value: $x": } }
+        MANIFEST
+
+        expect(catalog).to have_resource("Notify[value: value]")
+        expect(catalog).to have_resource("Notify[value: 1]")
+        expect(catalog).to have_resource("Notify[value: true]")
+        expect(catalog).to have_resource("Notify[value: ]")
+      end
+
+      it 'accepts type-compliant, slurped arguments' do
+        catalog = compile_to_catalog(<<-MANIFEST)
+          with(1, 2) |Integer *$x| { notify { "${$x[0] + $x[1]}": } }
+        MANIFEST
+        expect(catalog).to have_resource("Notify[3]")
+      end
+
+      it 'denies non-type-compliant arguments' do
+        expect do
+          compile_to_catalog(<<-MANIFEST)
+            with(1) |String $x| { }
+          MANIFEST
+        end.to raise_error(/expected.*String.*actual.*Integer/m)
+      end
+
+      it 'denies non-type-compliant, slurped arguments' do
+        expect do
+          compile_to_catalog(<<-MANIFEST)
+            with(1, "hello") |Integer *$x| { }
+          MANIFEST
+        end.to raise_error(/called with mis-matched arguments.*expected.*Integer.*actual.*Integer, String/m)
+      end
+
+      it 'denies non-type-compliant default argument' do
+        expect do
+          compile_to_catalog(<<-MANIFEST)
+            with(1) |$x, String $defaulted = 1| { notify { "${$x + $defaulted}": }}
+          MANIFEST
+        end.to raise_error(/expected.*Any.*String.*actual.*Integer.*Integer/m)
+      end
+
+      it 'raises an error when a default argument value is an incorrect type and there are no arguments passed' do
+        expect do
+          compile_to_catalog(<<-MANIFEST)
+            with() |String $defaulted = 1| {}
+          MANIFEST
+        end.to raise_error(/expected.*String.*actual.*Integer/m)
+      end
+
+      it 'raises an error when the default argument for a slurped parameter is an incorrect type' do
+        expect do
+          compile_to_catalog(<<-MANIFEST)
+            with() |String *$defaulted = 1| {}
+          MANIFEST
+        end.to raise_error(/expected.*String.*actual.*Integer/m)
+      end
+
+      it 'allows using an array as the default slurped value' do
+        catalog = compile_to_catalog(<<-MANIFEST)
+          with() |String *$defaulted = [hi]| { notify { $defaulted[0]: } }
+        MANIFEST
+
+        expect(catalog).to have_resource('Notify[hi]')
+      end
+
+      it 'allows using a value of the type as the default slurped value' do
+        catalog = compile_to_catalog(<<-MANIFEST)
+          with() |String *$defaulted = hi| { notify { $defaulted[0]: } }
+        MANIFEST
+
+        expect(catalog).to have_resource('Notify[hi]')
+      end
+
+      it 'allows specifying the type of a slurped parameter as an array' do
+        catalog = compile_to_catalog(<<-MANIFEST)
+          with() |Array[String] *$defaulted = hi| { notify { $defaulted[0]: } }
+        MANIFEST
+
+        expect(catalog).to have_resource('Notify[hi]')
+      end
+
+      it 'raises an error when the number of default values does not match the parameter\'s size specification' do
+        expect do
+          compile_to_catalog(<<-MANIFEST)
+            with() |Array[String, 2] *$defaulted = hi| { }
+          MANIFEST
+        end.to raise_error(/expected.*arg count \{2,\}.*actual.*arg count \{1\}/m)
+      end
+
+      it 'raises an error when the number of passed values does not match the parameter\'s size specification' do
+        expect do
+          compile_to_catalog(<<-MANIFEST)
+            with(hi) |Array[String, 2] *$passed| { }
+          MANIFEST
+        end.to raise_error(/expected.*arg count \{2,\}.*actual.*arg count \{1\}/m)
+      end
+
+      it 'matches when the number of arguments passed for a slurp parameter match the size specification' do
+        catalog = compile_to_catalog(<<-MANIFEST)
+          with(hi, bye) |Array[String, 2] *$passed| {
+            $passed.each |$n| { notify { $n: } }
+          }
+        MANIFEST
+
+        expect(catalog).to have_resource('Notify[hi]')
+        expect(catalog).to have_resource('Notify[bye]')
+      end
+
+      it 'raises an error when the number of allowed slurp parameters exceeds the size constraint' do
+        expect do
+          compile_to_catalog(<<-MANIFEST)
+            with(hi, bye) |Array[String, 1, 1] *$passed| { }
+          MANIFEST
+        end.to raise_error(/expected.*arg count \{1\}.*actual.*arg count \{2\}/m)
+      end
+
+      it 'allows passing slurped arrays by specifying an array of arrays' do
+        catalog = compile_to_catalog(<<-MANIFEST)
+          with([hi], [bye]) |Array[Array[String, 1, 1]] *$passed| {
+            notify { $passed[0][0]: }
+            notify { $passed[1][0]: }
+          }
+        MANIFEST
+
+        expect(catalog).to have_resource('Notify[hi]')
+        expect(catalog).to have_resource('Notify[bye]')
+      end
+
+      it 'raises an error when a required argument follows an optional one' do
+        expect do
+          compile_to_catalog(<<-MANIFEST)
+            with() |$y = first, $x, Array[String, 1] *$passed = bye| {}
+          MANIFEST
+        end.to raise_error(/Parameter \$x is required/)
+      end
+
+      it 'raises an error when the minimum size of a slurped argument makes it required and it follows an optional argument' do
+        expect do
+          compile_to_catalog(<<-MANIFEST)
+            with() |$x = first, Array[String, 1] *$passed| {}
+          MANIFEST
+        end.to raise_error(/Parameter \$passed is required/)
+      end
+
+      it 'allows slurped arguments with a minimum size of 0 after an optional argument' do
+        catalog = compile_to_catalog(<<-MANIFEST)
+          with() |$x = first, Array[String, 0] *$passed| {
+            notify { $x: }
+          }
+        MANIFEST
+
+        expect(catalog).to have_resource('Notify[first]')
+      end
+
+      it 'accepts a Resource as a Type' do
+        catalog = compile_to_catalog(<<-MANIFEST)
+          define bar($text) { }
+          bar { 'joke': text => 'knock knock' }
+
+          with(Bar[joke]) |Type[Bar] $joke| { notify { "${joke[text]}": } }
+        MANIFEST
+        expect(catalog).to have_resource("Notify[knock knock]")
+      end
+    end
+  end
+
 end