1 files changed, 48 insertions, 14 deletions
diff --git a/Rakefile b/Rakefile
index adcac180..0d1b18ad 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,23 +1,57 @@
 require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-lint/tasks/puppet-lint'
+require 'puppet-syntax/tasks/puppet-syntax'
 
+# return list of modules, either
+# submodules, custom or all modules
+# so we can check each array seperately
+def modules_pattern (type)
+  submodules = Array.new
+  custom_modules = Array.new
+  all_modules = Array.new
+
+  Dir['puppet/modules/*'].sort.each do |m|
+    system("grep -q #{m} .gitmodules")
+    if $?.exitstatus == 0
+      submodules << m + '/**/*.pp'
+    else
+      custom_modules << m + '/**/*.pp'
+    end
+    all_modules << m + '/**/*.pp'
+  end
+
+  case type
+    when 'submodule'
+      submodules
+    when 'custom'
+      custom_modules
+    when 'all'
+      all_modules
+  end
+end
+
+exclude_paths = ["**/vendor/**/*", "spec/fixtures/**/*", "pkg/**/*" ]
+
+# redefine lint task so we don't lint submoudules for now
 Rake::Task[:lint].clear
 PuppetLint::RakeTask.new :lint do |config|
-  config.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp", "vendor/**/*.pp"]
-  config.disable_checks = ['80chars']
-  config.fail_on_warnings = true
+  # only check for custom manifests, not submodules for now
+  config.pattern          = modules_pattern('custom')
+  config.ignore_paths     = exclude_paths
+  config.disable_checks   = ['documentation', '80chars']
+  config.fail_on_warnings = false
 end
 
-PuppetSyntax.exclude_paths = ["spec/fixtures/**/*.pp", "vendor/**/*"]
-
-# Publishing tasks
-unless RUBY_VERSION =~ /^1\.8/
-  require 'puppet_blacksmith'
-  require 'puppet_blacksmith/rake_tasks'
-  require 'github_changelog_generator/task'
-  GitHubChangelogGenerator::RakeTask.new :changelog do |config|
-    m = Blacksmith::Modulefile.new
-    config.future_release = m.version
-    config.release_url = "https://forge.puppetlabs.com/#{m.author}/#{m.name}/%s"
+# rake syntax::* tasks
+PuppetSyntax.exclude_paths = exclude_paths
+PuppetSyntax.future_parser = true
+
+desc "Validate erb templates"
+task :templates do
+  Dir['**/templates/**/*.erb'].each do |template|
+    sh "erb -P -x -T '-' #{template} | ruby -c" unless template =~ /.*vendor.*/
   end
 end
+
+desc "Run all puppet checks required for CI (syntax , validate, spec, lint)"
+task :test => [:syntax , :validate, :templates, :spec, :lint]