From 40546a44524a494142628010c6cab7dc9f24b991 Mon Sep 17 00:00:00 2001
From: Felix Bechstein <f@ub0r.de>
Date: Wed, 20 Jan 2016 08:53:03 +0100
Subject: [PATCH] Allow injecting options for metadata-json-lint

This allows running `metadata-json-lint` with `--no-strict-license` or `--no-fail-on-warnings`.
---
 lib/puppetlabs_spec_helper/rake_tasks.rb | 25 +++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/lib/puppetlabs_spec_helper/rake_tasks.rb b/lib/puppetlabs_spec_helper/rake_tasks.rb
index 77efec5c..a7b1ddff 100644
--- a/lib/puppetlabs_spec_helper/rake_tasks.rb
+++ b/lib/puppetlabs_spec_helper/rake_tasks.rb
@@ -2,6 +2,13 @@
 require 'rspec/core/rake_task'
 require 'yaml'
 
+# optional gems
+begin
+  require 'metadata-json-lint/rake_task'
+rescue LoadError
+  # ignore
+end
+
 task :default => [:help]
 
 desc "Run spec tests on an existing fixtures directory"
@@ -248,23 +255,19 @@ def revision(scm, target, ref)
 PuppetSyntax.exclude_paths << "vendor/**/*"
 PuppetSyntax.future_parser = true if ENV['FUTURE_PARSER'] == 'yes'
 
-desc "Check syntax of Ruby files and call :syntax and :metadata"
+desc "Check syntax of Ruby files and call :syntax and :metadata_lint"
 task :validate do
   Dir['lib/**/*.rb'].each do |lib_file|
     sh "ruby -c #{lib_file}"
   end
 
   Rake::Task[:syntax].invoke
-  Rake::Task[:metadata].invoke if File.exist?('metadata.json')
-end
-
-desc "Validate metadata.json file"
-task :metadata do
-  begin
-    require 'metadata_json_lint'
-    sh "metadata-json-lint metadata.json"
-  rescue LoadError => e
-    warn "Skipping metadata validation; the metadata-json-lint gem was not found"
+  if File.exist?('metadata.json')
+    if Rake::Task.task_defined?(:metadata_lint)
+      Rake::Task[:metadata_lint].invoke
+    else
+      warn "Skipping metadata validation; the metadata-json-lint gem was not found"
+    end
   end
 end