puppet 3.1.1 → 3.2.0.rc1

data/spec/unit/pops/parser/parse_containers_spec.rb

@@ -0,0 +1,175 @@
+#! /usr/bin/env ruby
+require 'spec_helper'
+require 'puppet/pops'
+
+# relative to this spec file (./) does not work as this file is loaded by rspec
+require File.join(File.dirname(__FILE__), '/parser_rspec_helper')
+
+describe "egrammar parsing containers" do
+  include ParserRspecHelper
+
+  context "When parsing file scope" do
+    it "$a = 10 $b = 20" do
+      dump(parse("$a = 10 $b = 20")).should == "(block (= $a 10) (= $b 20))"
+    end
+
+    it "$a = 10" do
+      dump(parse("$a = 10")).should == "(= $a 10)"
+    end
+  end
+
+  context "When parsing class" do
+    it "class foo {}" do
+      dump(parse("class foo {}")).should == "(class foo ())"
+    end
+
+    it "class foo::bar {}" do
+      dump(parse("class foo::bar {}")).should == "(class foo::bar ())"
+    end
+
+    it "class foo inherits bar {}" do
+      dump(parse("class foo inherits bar {}")).should == "(class foo (inherits bar) ())"
+    end
+
+    it "class foo($a) {}" do
+      dump(parse("class foo($a) {}")).should == "(class foo (parameters a) ())"
+    end
+
+    it "class foo($a, $b) {}" do
+      dump(parse("class foo($a, $b) {}")).should == "(class foo (parameters a b) ())"
+    end
+
+    it "class foo($a, $b=10) {}" do
+      dump(parse("class foo($a, $b=10) {}")).should == "(class foo (parameters a (= b 10)) ())"
+    end
+
+    it "class foo($a, $b) inherits belgo::bar {}" do
+      dump(parse("class foo($a, $b) inherits belgo::bar{}")).should == "(class foo (inherits belgo::bar) (parameters a b) ())"
+    end
+
+    it "class foo {$a = 10 $b = 20}" do
+      dump(parse("class foo {$a = 10 $b = 20}")).should == "(class foo (block (= $a 10) (= $b 20)))"
+    end
+
+    context "it should handle '3x weirdness'" do
+      it "class class {} # a class named 'class'" do
+        # Not as much weird as confusing that it is possible to name a class 'class'. Can have
+        # a very confusing effect when resolving relative names, getting the global hardwired "Class"
+        # instead of some foo::class etc.
+        # This is allowed in 3.x.
+        dump(parse("class class {}")).should == "(class class ())"
+      end
+
+      it "class default {} # a class named 'default'" do
+        # The weirdness here is that a class can inherit 'default' but not declare a class called default.
+        # (It will work with relative names i.e. foo::default though). The whole idea with keywords as
+        # names is flawed to begin with - it generally just a very bad idea.
+        expect { dump(parse("class default {}")).should == "(class default ())" }.to raise_error(Puppet::ParseError)
+      end
+
+      it "class foo::default {} # a nested name 'default'" do
+        dump(parse("class foo::default {}")).should == "(class foo::default ())"
+      end
+
+      it "class class inherits default {} # inherits default", :broken => true do
+        dump(parse("class class inherits default {}")).should == "(class class (inherits default) ())"
+      end
+
+      it "class class inherits default {} # inherits default" do
+        # TODO: See previous test marked as :broken=>true, it is actually this test (result) that is wacky,
+        # this because a class is named at parse time (since class evaluation is lazy, the model must have the
+        # full class name for nested classes - only, it gets this wrong when a class is named "class" - or at least
+        # I think it is wrong.)
+        #
+        dump(parse("class class inherits default {}")).should == "(class class::class (inherits default) ())"
+      end
+
+      it "class foo inherits class" do
+        dump(parse("class foo inherits class {}")).should == "(class foo (inherits class) ())"
+      end
+    end
+  end
+
+  context "When the parser parses define" do
+    it "define foo {}" do
+      dump(parse("define foo {}")).should == "(define foo ())"
+    end
+
+    it "define foo::bar {}" do
+      dump(parse("define foo::bar {}")).should == "(define foo::bar ())"
+    end
+
+    it "define foo($a) {}" do
+      dump(parse("define foo($a) {}")).should == "(define foo (parameters a) ())"
+    end
+
+    it "define foo($a, $b) {}" do
+      dump(parse("define foo($a, $b) {}")).should == "(define foo (parameters a b) ())"
+    end
+
+    it "define foo($a, $b=10) {}" do
+      dump(parse("define foo($a, $b=10) {}")).should == "(define foo (parameters a (= b 10)) ())"
+    end
+
+    it "define foo {$a = 10 $b = 20}" do
+      dump(parse("define foo {$a = 10 $b = 20}")).should == "(define foo (block (= $a 10) (= $b 20)))"
+    end
+
+    context "it should handle '3x weirdness'" do
+      it "define class {} # a define named 'class'" do
+        # This is weird because Class already exists, and instantiating this define will probably not
+        # work
+        dump(parse("define class {}")).should == "(define class ())"
+      end
+
+      it "define default {} # a define named 'default'" do
+        # Check unwanted ability to define 'default'.
+        # The expression below is not allowed (which is good).
+        #
+        expect { dump(parse("define default {}")).should == "(define default ())"}.to raise_error(Puppet::ParseError)
+      end
+    end
+  end
+
+  context "When parsing node" do
+    it "node foo {}" do
+      dump(parse("node foo {}")).should == "(node (matches foo) ())"
+    end
+
+    it "node foo, x::bar, default {}" do
+      dump(parse("node foo, x::bar, default {}")).should == "(node (matches foo x::bar :default) ())"
+    end
+
+    it "node 'foo' {}" do
+      dump(parse("node 'foo' {}")).should == "(node (matches 'foo') ())"
+    end
+
+    it "node foo inherits x::bar {}" do
+      dump(parse("node foo inherits x::bar {}")).should == "(node (matches foo) (parent x::bar) ())"
+    end
+
+    it "node foo inherits 'bar' {}" do
+      dump(parse("node foo inherits 'bar' {}")).should == "(node (matches foo) (parent 'bar') ())"
+    end
+
+    it "node foo inherits default {}" do
+      dump(parse("node foo inherits default {}")).should == "(node (matches foo) (parent :default) ())"
+    end
+
+    it "node /web.*/ {}" do
+      dump(parse("node /web.*/ {}")).should == "(node (matches /web.*/) ())"
+    end
+
+    it "node /web.*/, /do\.wop.*/, and.so.on {}" do
+      dump(parse("node /web.*/, /do\.wop.*/, 'and.so.on' {}")).should == "(node (matches /web.*/ /do\.wop.*/ 'and.so.on') ())"
+    end
+
+    it "node wat inherits /apache.*/ {}" do
+      expect { parse("node wat inherits /apache.*/ {}")}.to raise_error(Puppet::ParseError)
+    end
+
+    it "node foo inherits bar {$a = 10 $b = 20}" do
+      dump(parse("node foo inherits bar {$a = 10 $b = 20}")).should == "(node (matches foo) (parent bar) (block (= $a 10) (= $b 20)))"
+    end
+  end
+end

data/spec/unit/pops/parser/parse_resource_spec.rb

@@ -0,0 +1,228 @@
+#! /usr/bin/env ruby
+require 'spec_helper'
+require 'puppet/pops'
+
+# relative to this spec file (./) does not work as this file is loaded by rspec
+require File.join(File.dirname(__FILE__), '/parser_rspec_helper')
+
+describe "egrammar parsing resource declarations" do
+  include ParserRspecHelper
+
+  context "When parsing regular resource" do
+    it "file { 'title': }" do
+      dump(parse("file { 'title': }")).should == [
+        "(resource file",
+        "  ('title'))"
+      ].join("\n")
+    end
+
+    it "file { 'title': path => '/somewhere', mode => 0777}" do
+      dump(parse("file { 'title': path => '/somewhere', mode => 0777}")).should == [
+        "(resource file",
+        "  ('title'",
+        "    (path => '/somewhere')",
+        "    (mode => 0777)))"
+      ].join("\n")
+    end
+
+    it "file { 'title': path => '/somewhere', }" do
+      dump(parse("file { 'title': path => '/somewhere', }")).should == [
+        "(resource file",
+        "  ('title'",
+        "    (path => '/somewhere')))"
+      ].join("\n")
+    end
+
+    it "file { 'title': , }" do
+      dump(parse("file { 'title': , }")).should == [
+        "(resource file",
+        "  ('title'))"
+      ].join("\n")
+    end
+
+    it "file { 'title': ; }" do
+      dump(parse("file { 'title': ; }")).should == [
+        "(resource file",
+        "  ('title'))"
+      ].join("\n")
+    end
+
+    it "file { 'title': ; 'other_title': }" do
+      dump(parse("file { 'title': ; 'other_title': }")).should == [
+        "(resource file",
+        "  ('title')",
+        "  ('other_title'))"
+      ].join("\n")
+    end
+
+    it "file { 'title1': path => 'x'; 'title2': path => 'y'}" do
+      dump(parse("file { 'title1': path => 'x'; 'title2': path => 'y'}")).should == [
+        "(resource file",
+        "  ('title1'",
+        "    (path => 'x'))",
+        "  ('title2'",
+        "    (path => 'y')))",
+      ].join("\n")
+    end
+  end
+
+  context "When parsing resource defaults" do
+    it "File {  }" do
+      dump(parse("File { }")).should == "(resource-defaults file)"
+    end
+
+    it "File { mode => 0777 }" do
+      dump(parse("File { mode => 0777}")).should == [
+        "(resource-defaults file",
+        "  (mode => 0777))"
+      ].join("\n")
+    end
+  end
+
+  context "When parsing resource override" do
+    it "File['x'] {  }" do
+      dump(parse("File['x'] { }")).should == "(override (slice file 'x'))"
+    end
+
+    it "File['x'] { x => 1 }" do
+      dump(parse("File['x'] { x => 1}")).should == "(override (slice file 'x')\n  (x => 1))"
+    end
+
+    it "File['x', 'y'] { x => 1 }" do
+      dump(parse("File['x', 'y'] { x => 1}")).should == "(override (slice file ('x' 'y'))\n  (x => 1))"
+    end
+
+    it "File['x'] { x => 1, y => 2 }" do
+      dump(parse("File['x'] { x => 1, y=> 2}")).should == "(override (slice file 'x')\n  (x => 1)\n  (y => 2))"
+    end
+
+    it "File['x'] { x +> 1 }" do
+      dump(parse("File['x'] { x +> 1}")).should == "(override (slice file 'x')\n  (x +> 1))"
+    end
+  end
+
+  context "When parsing virtual and exported resources" do
+    it "@@file { 'title': }" do
+      dump(parse("@@file { 'title': }")).should ==  "(exported-resource file\n  ('title'))"
+    end
+
+    it "@file { 'title': }" do
+      dump(parse("@file { 'title': }")).should ==  "(virtual-resource file\n  ('title'))"
+    end
+
+    it "@file { mode => 0777 }" do
+      # Defaults are not virtualizeable
+      expect {
+        dump(parse("@file { mode => 0777 }")).should ==  ""
+      }.to raise_error(Puppet::ParseError, /Defaults are not virtualizable/)
+    end
+  end
+
+  context "When parsing class resource" do
+    it "class { 'cname': }" do
+      dump(parse("class { 'cname': }")).should == [
+        "(resource class",
+        "  ('cname'))"
+      ].join("\n")
+    end
+
+    it "class { 'cname': x => 1, y => 2}" do
+      dump(parse("class { 'cname': x => 1, y => 2}")).should == [
+        "(resource class",
+        "  ('cname'",
+        "    (x => 1)",
+        "    (y => 2)))"
+      ].join("\n")
+    end
+
+    it "class { 'cname1': x => 1; 'cname2': y => 2}" do
+      dump(parse("class { 'cname1': x => 1; 'cname2': y => 2}")).should == [
+        "(resource class",
+        "  ('cname1'",
+        "    (x => 1))",
+        "  ('cname2'",
+        "    (y => 2)))",
+      ].join("\n")
+    end
+  end
+
+  context "reported issues in 3.x" do
+    it "should not screw up on brackets in title of resource #19632" do
+      dump(parse('notify { "thisisa[bug]": }')).should == [
+        "(resource notify",
+        "  ('thisisa[bug]'))",
+      ].join("\n")
+    end
+  end
+
+  context "When parsing Relationships" do
+    it "File[a] -> File[b]" do
+      dump(parse("File[a] -> File[b]")).should == "(-> (slice file a) (slice file b))"
+    end
+
+    it "File[a] <- File[b]" do
+      dump(parse("File[a] <- File[b]")).should == "(<- (slice file a) (slice file b))"
+    end
+
+    it "File[a] ~> File[b]" do
+      dump(parse("File[a] ~> File[b]")).should == "(~> (slice file a) (slice file b))"
+    end
+
+    it "File[a] <~ File[b]" do
+      dump(parse("File[a] <~ File[b]")).should == "(<~ (slice file a) (slice file b))"
+    end
+
+    it "Should chain relationships" do
+      dump(parse("a -> b -> c")).should ==
+      "(-> (-> a b) c)"
+    end
+
+    it "Should chain relationships" do
+      dump(parse("File[a] -> File[b] ~> File[c] <- File[d] <~ File[e]")).should ==
+      "(<~ (<- (~> (-> (slice file a) (slice file b)) (slice file c)) (slice file d)) (slice file e))"
+    end
+
+    it "should create relationships between collects" do
+      dump(parse("File <| mode == 0644 |> -> File <| mode == 0755 |>")).should ==
+      "(-> (collect file\n  (<| |> (== mode 0644))) (collect file\n  (<| |> (== mode 0755))))"
+    end
+  end
+
+  context "When parsing collection" do
+    context "of virtual resources" do
+      it "File <| |>" do
+        dump(parse("File <| |>")).should == "(collect file\n  (<| |>))"
+      end
+    end
+
+    context "of exported resources" do
+      it "File <<| |>>" do
+        dump(parse("File <<| |>>")).should == "(collect file\n  (<<| |>>))"
+      end
+    end
+
+    context "queries are parsed with correct precedence" do
+      it "File <| tag == 'foo' |>" do
+        dump(parse("File <| tag == 'foo' |>")).should == "(collect file\n  (<| |> (== tag 'foo')))"
+      end
+
+      it "File <| tag == 'foo' and mode != 0777 |>" do
+        dump(parse("File <| tag == 'foo' and mode != 0777 |>")).should == "(collect file\n  (<| |> (&& (== tag 'foo') (!= mode 0777))))"
+      end
+
+      it "File <| tag == 'foo' or mode != 0777 |>" do
+        dump(parse("File <| tag == 'foo' or mode != 0777 |>")).should == "(collect file\n  (<| |> (|| (== tag 'foo') (!= mode 0777))))"
+      end
+
+      it "File <| tag == 'foo' or tag == 'bar' and mode != 0777 |>" do
+        dump(parse("File <| tag == 'foo' or tag == 'bar' and mode != 0777 |>")).should ==
+        "(collect file\n  (<| |> (|| (== tag 'foo') (&& (== tag 'bar') (!= mode 0777)))))"
+      end
+
+      it "File <| (tag == 'foo' or tag == 'bar') and mode != 0777 |>" do
+        dump(parse("File <| (tag == 'foo' or tag == 'bar') and mode != 0777 |>")).should ==
+        "(collect file\n  (<| |> (&& (|| (== tag 'foo') (== tag 'bar')) (!= mode 0777))))"
+      end
+    end
+  end
+end

data/spec/unit/pops/parser/parser_rspec_helper.rb

@@ -0,0 +1,11 @@
+require 'puppet/pops'
+
+require File.join(File.dirname(__FILE__), '/../factory_rspec_helper')
+
+module ParserRspecHelper
+  include FactoryRspecHelper
+  def parse(code)
+    parser = Puppet::Pops::Parser::Parser.new()
+    parser.parse_string(code)
+  end
+end

data/spec/unit/pops/parser/parser_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+require 'puppet/pops'
+
+describe Puppet::Pops::Parser::Parser do
+  it "should instantiate a parser" do
+    parser = Puppet::Pops::Parser::Parser.new()
+    parser.class.should == Puppet::Pops::Parser::Parser
+  end
+
+  it "should parse a code string and return a model" do
+    parser = Puppet::Pops::Parser::Parser.new()
+    model = parser.parse_string("$a = 10").current
+    model.class.should == Model::AssignmentExpression
+  end
+end

data/spec/unit/pops/parser/rgen_sanitycheck_spec.rb

@@ -0,0 +1,16 @@
+#! /usr/bin/env ruby
+require 'spec_helper'
+require 'puppet/pops'
+
+# relative to this spec file (./) does not work as this file is loaded by rspec
+require File.join(File.dirname(__FILE__), '/parser_rspec_helper')
+
+describe "RGen working with hashes" do
+  it "should be possible to create an empty hash after having required the files above" do
+    # If this fails, it means the rgen addition to Array is not monkey patched as it
+    # should (it will return an array instead of fail in a method_missing), and thus
+    # screw up Hash's check if it can do "to_hash' or not.
+    #
+    Hash[[]]
+  end
+end