Testing update

This commit is contained in:
Gene Liverman 2017-05-07 14:35:31 -07:00
parent db43cfea54
commit 2cdee4c475
2 changed files with 10 additions and 17 deletions

View file

@ -143,8 +143,5 @@ DEPENDENCIES
rugged (~> 0.24) rugged (~> 0.24)
yamllint (~> 0.0.9) yamllint (~> 0.0.9)
RUBY VERSION
ruby 2.3.1p112
BUNDLED WITH BUNDLED WITH
1.14.6 1.14.6

View file

@ -1,33 +1,29 @@
require 'rubygems' require 'rubygems'
require 'puppetlabs_spec_helper/rake_tasks' require 'puppetlabs_spec_helper/rake_tasks'
require 'puppet-lint/tasks/puppet-lint' require 'puppet-lint/tasks/puppet-lint'
require 'yamllint/rake_task'
begin
require 'puppet_blacksmith/rake_tasks'
rescue LoadError
end
exclude_paths = [ exclude_paths = [
"pkg/**/*", 'pkg/**/*',
"vendor/**/*", 'vendor/**/*',
"spec/**/*", 'spec/**/*'
] ]
PuppetLint.configuration.fail_on_warnings = true PuppetLint.configuration.fail_on_warnings = true
PuppetLint.configuration.ignore_paths = exclude_paths PuppetLint.configuration.ignore_paths = exclude_paths
PuppetLint.configuration.log_format = "%{path}:%{linenumber}:%{check}:%{KIND}:%{message}" PuppetLint.configuration.log_format = '%{path}:%{linenumber}:%{check}:%{KIND}:%{message}'
PuppetSyntax.exclude_paths = exclude_paths PuppetSyntax.exclude_paths = exclude_paths
desc "Validate manifests, templates, and ruby files" desc 'Validate manifests, templates, and ruby files'
task :validate do task :validate do
Dir['manifests/**/*.pp'].each do |manifest| Dir['puppet/manifests/**/*.pp', 'puppet/site/*/manifests/**/*.pp'].each do |manifest|
sh "puppet parser validate --noop #{manifest}" sh "puppet parser validate --noop #{manifest}"
end end
Dir['spec/**/*.rb','lib/**/*.rb'].each do |ruby_file| Dir['bin/**/*.rb', 'spec/**/*.rb'].each do |ruby_file|
sh "ruby -c #{ruby_file}" unless ruby_file =~ /spec\/fixtures/ sh "ruby -c #{ruby_file}" unless ruby_file.match? %r{spec\/fixtures}
end end
Dir['templates/**/*.erb'].each do |template| Dir['puppet/site/*/templates/**/*.erb'].each do |template|
sh "erb -P -x -T '-' #{template} | ruby -c" sh "erb -P -x -T '-' #{template} | ruby -c"
end end
end end