From 2cdee4c4755c8965103d1147b71a52e1e33f143a Mon Sep 17 00:00:00 2001
From: Gene Liverman <me@technicalissues.us>
Date: Sun, 7 May 2017 14:35:31 -0700
Subject: [PATCH] Testing update

---
 Gemfile.lock |  3 ---
 Rakefile     | 24 ++++++++++--------------
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 7879ac3..e331bab 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -143,8 +143,5 @@ DEPENDENCIES
   rugged (~> 0.24)
   yamllint (~> 0.0.9)
 
-RUBY VERSION
-   ruby 2.3.1p112
-
 BUNDLED WITH
    1.14.6
diff --git a/Rakefile b/Rakefile
index 28ff8b3..9e40216 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,33 +1,29 @@
 require 'rubygems'
 require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-lint/tasks/puppet-lint'
-
-begin
-  require 'puppet_blacksmith/rake_tasks'
-rescue LoadError
-end
+require 'yamllint/rake_task'
 
 exclude_paths = [
-  "pkg/**/*",
-  "vendor/**/*",
-  "spec/**/*",
+  'pkg/**/*',
+  'vendor/**/*',
+  'spec/**/*'
 ]
 
 PuppetLint.configuration.fail_on_warnings = true
 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
 
-desc "Validate manifests, templates, and ruby files"
+desc 'Validate manifests, templates, and ruby files'
 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}"
   end
-  Dir['spec/**/*.rb','lib/**/*.rb'].each do |ruby_file|
-    sh "ruby -c #{ruby_file}" unless ruby_file =~ /spec\/fixtures/
+  Dir['bin/**/*.rb', 'spec/**/*.rb'].each do |ruby_file|
+    sh "ruby -c #{ruby_file}" unless ruby_file.match? %r{spec\/fixtures}
   end
-  Dir['templates/**/*.erb'].each do |template|
+  Dir['puppet/site/*/templates/**/*.erb'].each do |template|
     sh "erb -P -x -T '-' #{template} | ruby -c"
   end
 end