diff --git a/lib/puppet/module_tool/skeleton/templates/generator/Gemfile b/lib/puppet/module_tool/skeleton/templates/generator/Gemfile index 7bd34cda7..3b888ac99 100644 --- a/lib/puppet/module_tool/skeleton/templates/generator/Gemfile +++ b/lib/puppet/module_tool/skeleton/templates/generator/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' puppetversion = ENV.key?('PUPPET_VERSION') ? "= #{ENV['PUPPET_VERSION']}" : ['>= 3.3'] gem 'puppet', puppetversion gem 'puppetlabs_spec_helper', '>= 0.1.0' -gem 'puppet-lint', '>= 0.3.2' +gem 'puppet-lint', '>= 1.0.0' gem 'facter', '>= 1.7.0' diff --git a/lib/puppet/module_tool/skeleton/templates/generator/Rakefile b/lib/puppet/module_tool/skeleton/templates/generator/Rakefile index d1e11f798..5377fd31a 100644 --- a/lib/puppet/module_tool/skeleton/templates/generator/Rakefile +++ b/lib/puppet/module_tool/skeleton/templates/generator/Rakefile @@ -1,18 +1,19 @@ require 'rubygems' require 'puppetlabs_spec_helper/rake_tasks' require 'puppet-lint/tasks/puppet-lint' PuppetLint.configuration.send('disable_80chars') +PuppetLint.configuration.relative = true PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"] desc "Validate manifests, templates, and ruby files" task :validate do Dir['manifests/**/*.pp'].each do |manifest| sh "puppet parser validate --noop #{manifest}" end Dir['spec/**/*.rb','lib/**/*.rb'].each do |ruby_file| sh "ruby -c #{ruby_file}" unless ruby_file =~ /spec\/fixtures/ end Dir['templates/**/*.erb'].each do |template| sh "erb -P -x -T '-' #{template} | ruby -c" end end