From 13e543e0f050e73ed24094c95e74eb04eb11940d Mon Sep 17 00:00:00 2001
From: Gael Chamoulaud <gchamoul@redhat.com>
Date: Mon, 17 Nov 2014 16:26:20 +0100
Subject: [PATCH] Add workaround for PuppetLint.configuration.ignore_paths

- https://github.com/rodjek/puppet-lint/issues/331

Change-Id: Ic6578b2ffa84f6f3955e49e4279be972ea4a5a96
Signed-off-by: Gael Chamoulaud <gchamoul@redhat.com>
---
 Gemfile  |  2 +-
 Rakefile | 31 ++++++++++++++++++++-----------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/Gemfile b/Gemfile
index 9e6d4a367..a7479cf28 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source ENV["GEM_SOURCE"] || "https://rubygems.org"
 
 group :development, :test do
   gem 'puppetlabs_spec_helper', :require => false
diff --git a/Rakefile b/Rakefile
index dc9efc974..6ff42650e 100644
--- a/Rakefile
+++ b/Rakefile
@@ -2,19 +2,28 @@ require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-lint/tasks/puppet-lint'
 require 'puppet-syntax/tasks/puppet-syntax'
 
+PuppetLint.configuration.relative = true
+PuppetLint.configuration.log_format = "%{path}:%{linenumber}:%{check}:%{KIND}:%{message}"
 PuppetLint.configuration.fail_on_warnings = true
-PuppetLint.configuration.with_filename = false
-PuppetLint.configuration.send('disable_names_containing_dash')
-PuppetLint.configuration.send('disable_80chars')
 PuppetLint.configuration.send('disable_class_parameter_defaults')
-exclude_paths = ['spec/**/*','pkg/**/*','vendor/**/*']
-exclude_lint_paths = exclude_paths
+PuppetLint.configuration.send('disable_class_inherits_from_params_class')
+PuppetLint.configuration.send('disable_80chars')
+PuppetLint.configuration.send('disable_containing_dash')
+PuppetLint.configuration.send('disable_quoted_booleans')
+PuppetLint.configuration.send('disable_documentation')
 
-PuppetLint.configuration.ignore_paths = exclude_lint_paths
+exclude_paths = [
+"pkg/**/*",
+"vendor/**/*",
+"spec/**/*",
+]
+
+Rake::Task[:lint].clear
+PuppetLint.configuration.ignore_paths = exclude_paths
 PuppetSyntax.exclude_paths = exclude_paths
 
-task(:default).clear
-task :default => :lint
-
-desc 'Run syntax, lint'
-task :test => [:syntax,:lint]
+desc "Run syntax, lint"
+task :test => [
+  :syntax,
+  :lint,
+]