Merge remote-tracking branch 'skel/master'

samuraiii · Aug 24, 2013 · 4c6b9bc · 4c6b9bc
2 parents dddb48a + ed6a68b
commit 4c6b9bc
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,6 @@
 pkg/
 spec/fixtures/
 Gemfile.lock
+*.orig
+*.rej
+*.patch
diff --git a/Gemfile b/Gemfile
@@ -9,5 +9,6 @@ end
 gem 'rake'
 gem 'puppetlabs_spec_helper'
 gem 'puppet-lint'
+gem 'puppet-syntax'
 
 # vim:ft=ruby
diff --git a/Rakefile b/Rakefile
@@ -1,7 +1,12 @@
 require 'puppetlabs_spec_helper/rake_tasks'
+require 'puppet-syntax/tasks/puppet-syntax'
 require 'puppet-lint/tasks/puppet-lint'
 
 PuppetLint.configuration.send("disable_class_inherits_from_params_class")
 PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", 'tests/**/*.pp']
 
-task :default => [:spec, :lint]
+task :default => [
+  :syntax,
+  :lint,
+  :spec,
+]