summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Lewis <nick@puppetlabs.com>2011-04-13 15:35:47 -0700
committerNick Lewis <nick@puppetlabs.com>2011-04-13 15:40:18 -0700
commita688461100150d3f4e102e669ece839f8571e14c (patch)
tree5401af36d7e6b0c64e1b057528a0e650bf40da5b
parentaa41b27b8687d15c468a343a6e513de8c524139a (diff)
downloadpuppet-a688461100150d3f4e102e669ece839f8571e14c.tar.gz
puppet-a688461100150d3f4e102e669ece839f8571e14c.tar.xz
puppet-a688461100150d3f4e102e669ece839f8571e14c.zip
(#6928) Add a Parser face with Validate action
This will accept a number of manifests as arguments and check their syntax. If no filenames are specified, it will check the default 'manifest' setting. Paired-With: Jesse Wolfe
-rw-r--r--lib/puppet/application/parser.rb5
-rw-r--r--lib/puppet/face/parser.rb17
-rw-r--r--lib/puppet/resource/type_collection.rb1
-rwxr-xr-xspec/unit/resource/type_collection_spec.rb5
4 files changed, 28 insertions, 0 deletions
diff --git a/lib/puppet/application/parser.rb b/lib/puppet/application/parser.rb
new file mode 100644
index 000000000..b6ec3c185
--- /dev/null
+++ b/lib/puppet/application/parser.rb
@@ -0,0 +1,5 @@
+require 'puppet/application/face_base'
+require 'puppet/face'
+
+class Puppet::Application::Parser < Puppet::Application::FaceBase
+end
diff --git a/lib/puppet/face/parser.rb b/lib/puppet/face/parser.rb
new file mode 100644
index 000000000..c44810b99
--- /dev/null
+++ b/lib/puppet/face/parser.rb
@@ -0,0 +1,17 @@
+require 'puppet/face'
+require 'puppet/parser'
+
+Puppet::Face.define(:parser, '0.0.1') do
+ action :validate do
+ when_invoked do |*args|
+ args.pop
+ files = args
+ files << Puppet[:manifest] if files.empty?
+ files.each do |file|
+ Puppet[:manifest] = file
+ Puppet::Node::Environment.new(Puppet[:environment]).known_resource_types.clear
+ end
+ nil
+ end
+ end
+end
diff --git a/lib/puppet/resource/type_collection.rb b/lib/puppet/resource/type_collection.rb
index 9fe7cdd06..89b0a16ed 100644
--- a/lib/puppet/resource/type_collection.rb
+++ b/lib/puppet/resource/type_collection.rb
@@ -6,6 +6,7 @@ class Puppet::Resource::TypeCollection
@hostclasses.clear
@definitions.clear
@nodes.clear
+ @watched_files.clear
end
def initialize(env)
diff --git a/spec/unit/resource/type_collection_spec.rb b/spec/unit/resource/type_collection_spec.rb
index b5f0a0ec7..0c997c2ad 100755
--- a/spec/unit/resource/type_collection_spec.rb
+++ b/spec/unit/resource/type_collection_spec.rb
@@ -5,6 +5,8 @@ require 'puppet/resource/type_collection'
require 'puppet/resource/type'
describe Puppet::Resource::TypeCollection do
+ include PuppetSpec::Files
+
before do
@instance = Puppet::Resource::Type.new(:hostclass, "foo")
@code = Puppet::Resource::TypeCollection.new("env")
@@ -81,11 +83,14 @@ describe Puppet::Resource::TypeCollection do
loader.add Puppet::Resource::Type.new(:hostclass, "class")
loader.add Puppet::Resource::Type.new(:definition, "define")
loader.add Puppet::Resource::Type.new(:node, "node")
+ watched_file = tmpfile('watched_file')
+ loader.watch_file(watched_file)
loader.clear
loader.hostclass("class").should be_nil
loader.definition("define").should be_nil
loader.node("node").should be_nil
+ loader.should_not be_watching_file(watched_file)
end
describe "when resolving namespaces" do