From 92f01d04745a85cd68648e81cee85d5a2bd617d6 Mon Sep 17 00:00:00 2001 From: Colleen Murphy Date: Fri, 14 Aug 2015 11:45:54 -0700 Subject: [PATCH] Add Gemfile and puppet 4 checks In anticipation of puppet 4, start trying to deal with puppet 4 things that can be helpfully predicted by puppet lint plugins. Also update the Rakefile to match the other modules, which have puppetlabs_spec_helper and puppet-lint rake tasks included in them. Change-Id: I715328da58e27014b2de9edd53cb3f70fd2420e3 --- .gitignore | 2 ++ Gemfile | 30 ++++++++++++++++++++++++++++++ Rakefile | 21 ++++++++------------- 3 files changed, 40 insertions(+), 13 deletions(-) create mode 100644 Gemfile diff --git a/.gitignore b/.gitignore index ddd2d45..adf43d0 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ coverage .DS_Store .#* \#* +Gemfile.lock +.bundled_gems diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000..96912da --- /dev/null +++ b/Gemfile @@ -0,0 +1,30 @@ +source 'https://rubygems.org' + +group :development, :test do + gem 'puppetlabs_spec_helper', :require => false + + gem 'metadata-json-lint' + # This is nice and all, but let's not worry about it until we've actually + # got puppet 4.x sorted + # gem 'puppet-lint-param-docs' + gem 'puppet-lint-absolute_classname-check' + gem 'puppet-lint-absolute_template_path' + gem 'puppet-lint-trailing_newline-check' + + # Puppet 4.x related lint checks + gem 'puppet-lint-unquoted_string-check' + gem 'puppet-lint-empty_string-check' + gem 'puppet-lint-leading_zero-check' + gem 'puppet-lint-variable_contains_upcase' + gem 'puppet-lint-spaceship_operator_without_tag-check' + gem 'puppet-lint-undef_in_function-check' + + if puppetversion = ENV['PUPPET_GEM_VERSION'] + gem 'puppet', puppetversion, :require => false + else + gem 'puppet', '~> 3.0', :require => false + end + +end + +# vim:ft=ruby diff --git a/Rakefile b/Rakefile index 3e005ff..ff1f0d7 100644 --- a/Rakefile +++ b/Rakefile @@ -1,13 +1,8 @@ -require 'spec/rake/spectask' -Spec::Rake::SpecTask.new(:spec) do |spec| - spec.libs << 'lib' << 'spec' - spec.spec_files = FileList['spec/**/*_spec.rb'] -end - -Spec::Rake::SpecTask.new(:rcov) do |spec| - spec.libs << 'lib' << 'spec' - spec.pattern = 'spec/**/*_spec.rb' - spec.rcov = true -end - -task :default => :spec +require 'rubygems' +require 'puppetlabs_spec_helper/rake_tasks' +require 'puppet-lint/tasks/puppet-lint' +PuppetLint.configuration.fail_on_warnings = true +PuppetLint.configuration.send('disable_80chars') +PuppetLint.configuration.send('disable_autoloader_layout') +PuppetLint.configuration.send('disable_class_inherits_from_params_class') +PuppetLint.configuration.send('disable_class_parameter_defaults')