[#213] Run puppet-lint as part of CI

Will prevent lint from being violated again in the future.

diff --git a/.travis.yml b/.travis.yml
index 8f713e06b8fb28bbc476f0ccbc3db93b5dd04e26..0f05b192072958b10db67bf326f83e373ccdbdaf 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: ruby
 bundler_args: --without development
-script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
+script: "bundle exec rake ci SPEC_OPTS='--format documentation'"
 rvm:
   - 1.8.7
   - 1.9.3

diff --git a/Gemfile b/Gemfile
index 130bd14755ce7149ab34d4a82d5c26312a8bbbdd..4ed08e85ac5bf9666a5e8828e996e1063b15ebf9 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -3,6 +3,7 @@ source 'https://rubygems.org'
 group :development, :test do
   gem 'puppetlabs_spec_helper', :require => false
   gem 'rspec-system-puppet', '~>2.0'
+  gem 'puppet-lint'
 end
 
 if puppetversion = ENV['PUPPET_GEM_VERSION']

diff --git a/Rakefile b/Rakefile
index 4847ddd2044f49a5c4d0c69edea83efe427d8c96..261e9d06fb15eb4fbc4bb300dd2e0e51372b3043 100644 (file)
--- a/Rakefile
+++ b/Rakefile
@@ -7,6 +7,15 @@ require 'rspec/core/rake_task'
 require 'puppetlabs_spec_helper/rake_tasks'
 require 'rspec-system/rake_task'
 
+require 'puppet-lint/tasks/puppet-lint'
+PuppetLint.configuration.ignore_paths = ['vendor/**/*.pp']
+
 task :default do
   sh %{rake -T}
 end
+
+desc 'Run reasonably quick tests for CI'
+task :ci => [
+  :lint,
+  :spec,
+]