puppet-check 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f163a7745155d25678269090a38458154b83f78
-  data.tar.gz: 916d7c176c97f75f138e9fe5dc3506c51ecdf197
+  metadata.gz: 3cd7dc1dabc1251536858b7dbf35964aa48b3039
+  data.tar.gz: 024abf09283611e0738d06f1d1cecd92701d5048
 SHA512:
-  metadata.gz: 30666a5147dbfc9e369c969ed774a7dc056c69ee0489573009fa0c32ef96ac0b6afbb37a40926f7d7471a69f09c6a0e2c663de4418fb896466862c698117c0e8
-  data.tar.gz: 9dc6066fe7e26bdb43c89602de6fc4f4d2644696856d57ab7f37322b6280e4539cd1397a431770e27cb2992e7131e8172d18dd31bedc127e85dcbadee1579042
+  metadata.gz: d6e5c7dbcb317f589a11a751c5a2d5267252a2d82e609da29fb16cff3f79372dcfe2b98d32cb6d20a49ab18631d0e6157755f9d42aa6cccfc66a899a55c7d87c
+  data.tar.gz: 86efe8bfbafdbd84f82c5bc50b42646aea30016a0700aa321f1eede6356a39038bb02e08dbd25994c3ea03d02440a23ad59dff8cc237e81042c0986246db709b

data/CHANGELOG.md

@@ -1,17 +1,12 @@
-### 1.5.0 (Roadmap)
-- optional octocatalog-diff regression testing (minor)
-- optional octocatalog-diff regression testing options (patch)
-- test-kitchen interface (minor)
-- improved json and yaml output formats support (file arrays become file hashes and output results further handles formatting) (minor; this would be a big refactoring effort)
-- https://blog.fluentz.io/learn-how-to-achieve-parallelism-with-ruby-i-o-bound-threads-a29c92aff58c#.zcqpibirn (parallelism/minor)
-- resolve deps in module fixtures? (minor)
-- rspec puppet stubbing (minor)
-- parallel spec option (minor)
-- multiple node testing with octocatalog-diff (minor)
-- split syntax and style checks to separate methods for style (patch)
-- missing puppet binary error changed
-- puppet 5
-- try closing the template to deal with the erb binding issue
+### 1.5.0
+- Maximum Puppet version increased from 5 to 6.
+- Added capability to check EYAML (experimental).
+- Test Kitchen frontend interface.
+- Updated Puppet error output for Puppet 5 differences.
+- Slight optimization for smaller test sets.
+- Suppress constant redefinition warnings from Octocatalog-diff's Puppet code reuse.
+- Changed FileName cop to reflect change in RuboCop >= 0.5.
+- Entire module is now symlinked into `spec/fixtures/modules` during rspec-puppet testing (formerly specific components).
 
 ### 1.4.1
 - Support for using SVN to download external module dependencies for RSpec Puppet.

data/README.md

@@ -15,6 +15,10 @@
 ## Description
 Puppet Check is a gem that provides a comprehensive, streamlined, and efficient analysis of the syntax, style, and validity of your entire Puppet code and data.
 
+**IMPORTANT**: The current support for encrypted yaml validation is experimental. The code is blocked in the current release (the files will continue to be treated as unrecognized) and will be unblocked when the feature is finished in a future version.
+
+Also, when most Ruby gems (both third party and standard) dropped support for 1.9.3, it became difficult for users to use Puppet Check with 1.9.3, and support for it was eventually dropped. This is now occurring again for 2.0.0 as few gems are supporting it anymore, and support for 2.0.0 will be discontinued in Puppet Check 1.6.0.
+
 ### Former Method for Code and Data Checks
 ![Old](https://raw.githubusercontent.com/mschuchard/puppet-check/master/images/puppetcheck_old.png)
 
@@ -129,16 +133,18 @@ The following files have unrecognized formats and therefore were not processed:
 - Puppetlabs Spec Helper requires an additional config file for RSpec Puppet support.
 - Puppetlabs Spec Helper does not update external module dependencies in a stateful/persistent workspace and fails gracefully instead.
 - Puppetlabs Spec Helper requires extra configuration items to setup self-module RSpec testing.
-- Puppetlabs Spec Helper does not frontend to Octocatalog Diff.
+- Puppetlabs Spec Helper does not frontend to Octocatalog Diff or Test-Kitchen.
 
 It is worth nothing that there is no current development objective for Puppet Check to achieve the same advanced level of robustness for spec testing that Puppetlabs Spec Helper enables. If you are performing standard spec testing on your Puppet code and data, then Puppet Check's spec testing is a fantastic lighter and faster alternative to Puppetlabs Spec Helper. If you require advanced and intricate capabilities in your spec testing (e.g. direct interfacing to the `Puppet::Parser::Scope` API), then you will likely prefer Puppetlabs Spec Helper's spec testing in conjunction with Puppet Check's file validation.
 
 ## Usage
 Puppet Check requires `ruby >= 2.0.0`, `puppet >= 3.4`, and `puppet-lint >= 1.1.0`. `Octocatalog-diff >= 1.0.0` if you are performing smoke/regression checks. All other dependencies should be fine with various versions. Puppet Check can be used with a CLI, Rake tasks, or API, from your system, rbenv, rvm, Docker, or Vagrant. Please note all interfaces (API by default, but can be modified) will ignore any directories named `fixtures` or specified paths with that directory during file checks and spec tests.
 
-#### Ruby 2.0 and Reek
+#### Ruby 2.0 and Reek/Rubocop
 Reek dropped support for Ruby 2.0 when it went to 4.0. Since dependencies by Ruby version are allowed in Gemfiles but not gemspecs, this means that PuppetCheck installed with `bundler` will automatically pick up the correct version of Reek for your Ruby version and install it. If you are installing PuppetCheck via `gem`, then you can install reek normally with `gem` with Ruby >= 2.1, but you will need to specify `gem install reek -v 3.11` if you are using Ruby 2.0.
 
+Similarly, RuboCop has dropped support for Ruby 2.0 at 0.51.0. Since this is a recent change, the expectation will be to automatically manage this dependency outside of Puppet Check. Only new installations on 2.0 will be affected by this.
+
 ### CLI
 ```
 usage: puppet-check [options] paths
@@ -148,13 +154,15 @@ usage: puppet-check [options] paths
     -s, --style                      Enable style checks
         --smoke                      Enable smoke testing
     -r, --regression                 Enable regression testing (in progress, do not use)
+        --public cert.pem            Public key for EYAML checks
+        --private cert.pem           Private key for EYAML checks
     -o, --output format              Format for results output (default is text): text, json, or yaml
-        --octoconfig config_file     Octocatalog-diff configuration file to use.
+        --octoconfig config_file     Octocatalog-diff configuration file to use
     -n node1.example.com,node2.example.com,
-        --octonodes                  Octocatalog-diff nodes to test catalog on.
+        --octonodes                  Octocatalog-diff nodes to test catalog on
         --puppet-lint arg_one,arg_two
                                      Arguments for PuppetLint ignored checks
-    -c, --config file                Load PuppetLint options from file.
+    -c, --config file                Load PuppetLint options from file
         --rubocop arg_one,arg_two    Arguments for Rubocop disabled cops
 ```
 
@@ -173,17 +181,21 @@ rake puppetcheck           # Execute all Puppet-Check checks
 rake puppetcheck:file      # Execute Puppet-Check file checks
 rake puppetcheck:spec      # Execute RSpec and RSpec-Puppet tests
 rake puppetcheck:beaker    # Execute Beaker acceptance tests
+rake puppetcheck:kitchen:* # Execute Test Kitchen acceptance tests
 ```
 
 #### puppetcheck:file
 You can add style, smoke, and regression checks to and select the future parser for the `rake puppetcheck:file`, or change the output format, by adding the following after the require:
 
 ```ruby
+# example of modifying Puppet Check behavior
 PuppetCheck.settings[:style_check] = true
 PuppetCheck.settings[:fail_on_warnings] = true
 PuppetCheck.settings[:future_parser] = true
 PuppetCheck.settings[:smoke_check] = true
 PuppetCheck.settings[:regression_check] = true # in progress, do not use
+PuppetCheck.settings[:public] = 'public.pem'
+PuppetCheck.settings[:private] = 'private.pem'
 PuppetCheck.settings[:output_format] = 'yaml'
 PuppetCheck.settings[:octoconfig] = '.octocatalog-diff.cfg.rb'
 PuppetCheck.settings[:octonodes] = %w(localhost.localdomain)
@@ -193,7 +205,7 @@ PuppetCheck.settings[:rubocop_args] = ['--except', 'rubocop-arg-one,rubocop-arg-
 
 Please note that `rspec` does not support yaml output and therefore would still use the default 'progress' formatter even if `yaml` is specified as the format option to Puppet Check.
 
-The style checks from within `rake puppetcheck:file` are directly interfaced to `puppet-lint`, `rubocop`, and `reek`. This means that all arguments and options should be specified from within your `.puppet-lint.rc`, `.rubocop.yml`, and `*.reek`. The capability to pass style arguments and options from within the `Rakefile` task block will be considered for future versions.
+The style checks from within `rake puppetcheck:file` are directly interfaced to `puppet-lint`, `rubocop`, and `reek`. This means that all arguments and options should be specified from within your `.puppet-lint.rc`, `.rubocop.yml`, and `*.reek`. However, you can alternatively utilize the hashes listed above.
 
 #### puppetcheck:spec
 The spec tests will be executed against everything that matches the pattern `**/{classes, defines, facter, functions, hosts, puppet, unit, types}/**/*_spec.rb`. Any of these directories inside of a `fixtures` directory will be ignored. This means everything in the current path that appears to be a Puppet module spec test for your module (not dependencies) will be regarded as such and executed during this rake task.
@@ -245,7 +257,7 @@ Example:
 ]
 ```
 
-Note that `args` will be ignored during `git pull`, 'svn update', and `hg pull/hg update` when the modules are updated instead of freshly cloned.
+Note that `args` will be ignored during `git pull`, `svn update`, and `hg pull/hg update` when the modules are updated instead of freshly cloned.
 
 #### puppetcheck:beaker
 The spec tests will be executed against everything that matches the pattern `**/acceptance`. Any of these directories inside of a `fixtures` directory will be ignored. This means everything in the current path that appears to be a Puppet module acceptance test for your module (not dependencies) will be regarded as such and executed during this rake task.
@@ -265,6 +277,8 @@ PuppetCheck.settings[:fail_on_warnings] = true # default false
 PuppetCheck.settings[:style_check] = true # default false
 PuppetCheck.settings[:smoke_check] = true # default false
 PuppetCheck.settings[:regression_check] = true # in progress, do not use; default false
+PuppetCheck.settings[:public] = 'public.pem' # default nil
+PuppetCheck.settings[:private] = 'private.pem' # default nil
 PuppetCheck.settings[:output_format] = 'yaml' # also 'json'; default 'text'
 PuppetCheck.settings[:octoconfig] = '$HOME/octocatalog-diff.cfg.rb' # default '.octocatalog-diff.cfg.rb'
 PuppetCheck.settings[:octonodes] = %w(server.example.com) # default: %w(localhost.localdomain)
@@ -295,7 +309,7 @@ RUN gem install --no-document puppet-check reek rspec-puppet rake
 ENV LANG en_US.UTF-8
 # create the directory for your module, directory environment, etc. and change directory into it
 WORKDIR /module_name_or_directory_environment_name
-# copy the module, directory environment, etc. contents into the module directory inside the container
+# copy the module, directory environment, etc. contents into the corresponding directory inside the container
 COPY / .
 # execute your tests; in this example we are executing the full suite of tests
 ENTRYPOINT ["rake", "puppetcheck"]
@@ -335,13 +349,14 @@ To overcome the lack of convenient portability, you could try spinning up the Va
 - 2: PuppetCheck exited with one or more errors in your code and data. Alternatively, PuppetCheck exited with one or more warnings in your code and data and you specified to fail on warnings.
 
 ### Optional dependencies
-- **rake**: install this if you want to use Puppet Check with `rake` tasks in addition to the CLI.
-- **rspec**: install this if you want to use Puppet Check to execute the spec tests for your Ruby files during `rake`.
-- **rspec-puppet**: install this if you want to use Puppet Check to execute the spec tests for your Puppet files during `rake`.
-- **octocatalog-diff**: install this if you want to use Puppet Check to execute smoke or regression tests for your Puppet catalog.
-- **beaker**: install this if you want to use Puppet Check to execute the acceptance tests during `rake`.
-- **git**: install this if you want to use Puppet Check to download external module dependencies with `git` commands during RSpec Puppet testing.
-- **mercurial**: install this if you want to use Puppet Check to download external module dependencies with `hg` commands during RSpec Puppet testing.
+- **rake** (gem): install this if you want to use Puppet Check with `rake` tasks in addition to the CLI.
+- **rspec** (gem): install this if you want to use Puppet Check to execute the spec tests for your Ruby files during `rake`.
+- **rspec-puppet** (gem): install this if you want to use Puppet Check to execute the spec tests for your Puppet files during `rake`.
+- **octocatalog-diff** (gem): install this if you want to use Puppet Check to execute smoke or regression tests for your Puppet catalog.
+- **beaker** (gem): install this if you want to use Puppet Check to execute the Beaker acceptance tests during `rake`.
+- **test-kitchen** (gem): install this if you want to use Puppet Check to execute the Test Kitchen acceptance tests during `rake`.
+- **git** (pkg): install this if you want to use Puppet Check to download external module dependencies with `git` commands during RSpec Puppet testing.
+- **mercurial** (pkg): install this if you want to use Puppet Check to download external module dependencies with `hg` commands during RSpec Puppet testing.
 
 ## Contributing
 Code should pass all spec tests. New features should involve new spec tests. Adherence to Rubocop and Reek is expected where not overly onerous or where the check is of dubious cost/benefit.

data/bin/puppet-check

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-
 require_relative '../lib/puppet-check/cli'
 
 exit PuppetCheck::CLI.run(ARGV)

data/lib/puppet-check.rb

@@ -15,6 +15,10 @@ class PuppetCheck
   @settings[:smoke_check] = false
   @settings[:regression_check] = false
 
+  # initialize ssl keys for eyaml checks
+  @settings[:public] = nil
+  @settings[:private] = nil
+
   # initialize output format option
   @settings[:output_format] = 'text'
 
@@ -43,15 +47,18 @@ class PuppetCheck
     files = self.class.parse_paths(paths)
 
     # parse the files
-    execute_parsers(files, self.class.settings[:future_parser], self.class.settings[:style_check], self.class.settings[:puppetlint_args], self.class.settings[:rubocop_args])
+    execute_parsers(files, self.class.settings[:future_parser], self.class.settings[:style_check], self.class.settings[:public], self.class.settings[:private], self.class.settings[:puppetlint_args], self.class.settings[:rubocop_args])
 
     # output the diagnostic results
     PuppetCheck.settings[:output_format] == 'text' ? OutputResults.text : OutputResults.markup
 
+    # progress to regression checks if no errors in file checks
     if self.class.settings[:error_files].empty? && (!self.class.settings[:fail_on_warning] || self.class.settings[:warning_files].empty?)
       begin
         require_relative 'puppet-check/regression_check'
+      # if octocatalog-diff is not installed then return immediately
       rescue LoadError
+        return 0
       end
 
       # perform smoke checks if there were no errors and the user desires
@@ -104,7 +111,7 @@ class PuppetCheck
   end
 
   # categorize and pass the files out to the parsers to determine their status
-  def execute_parsers(files, future, style, pl_args, rc_args)
+  def execute_parsers(files, future, style, public, private, pl_args, rc_args)
     manifests, files = files.partition { |file| File.extname(file) == '.pp' }
     PuppetParser.manifest(manifests, future, style, pl_args)
     templates, files = files.partition { |file| File.extname(file) == '.epp' }
@@ -117,6 +124,9 @@ class PuppetCheck
     DataParser.yaml(yamls)
     jsons, files = files.partition { |file| File.extname(file) == '.json' }
     DataParser.json(jsons)
+    # block this for now
+    # eyamls, files = files.partition { |file| File.extname(file) =~ /\.eya?ml$/ }
+    # DataParser.eyaml(eyamls, public, private)
     librarians, files = files.partition { |file| File.basename(file) =~ /(?:Puppet|Module|Rake|Gem)file$/ }
     RubyParser.librarian(librarians, style, rc_args)
     files.each { |file| self.class.settings[:ignored_files].push(file.to_s) }

data/lib/puppet-check/cli.rb

@@ -15,13 +15,16 @@ class PuppetCheck::CLI
 
   # parse the user arguments
   def self.parse(args)
+    # show help message if no args specified
+    args = %w[-h] if args.empty?
+
     opt_parser = OptionParser.new do |opts|
       # usage
       opts.banner = 'usage: puppet-check [options] paths'
 
       # base options
       opts.on('--version', 'Display the current version.') do
-        puts 'puppet-check 1.4.1'
+        puts 'puppet-check 1.5.0'
         exit 0
       end
 
@@ -32,19 +35,23 @@ class PuppetCheck::CLI
       opts.on('--smoke', 'Enable smoke testing') { PuppetCheck.settings[:smoke_check] = true }
       opts.on('-r', '--regression', 'Enable regression testing (in progress, do not use)') { PuppetCheck.settings[:regression_check] = true }
 
+      # ssl key options for eyaml checks
+      opts.on('--public cert.pem', String, 'Public key for EYAML checks') { |arg| PuppetCheck.settings[:public] = arg }
+      opts.on('--private cert.pem', String, 'Private key for EYAML checks') { |arg| PuppetCheck.settings[:private] = arg }
+
       # formatting options
       opts.on('-o', '--output format', String, 'Format for results output (default is text): text, json, or yaml') { |arg| PuppetCheck.settings[:output_format] = arg }
 
       # octocatalog-diff options
-      opts.on('--octoconfig config_file', String, 'Octocatalog-diff configuration file to use.') { |arg| PuppetCheck.settings[:octoconfig] = arg }
-      opts.on('-n', '--octonodes node1.example.com,node2.example.com', Array, 'Octocatalog-diff nodes to test catalog on.') { |arg| PuppetCheck.settings[:octonodes] = arg }
+      opts.on('--octoconfig config_file', String, 'Octocatalog-diff configuration file to use') { |arg| PuppetCheck.settings[:octoconfig] = arg }
+      opts.on('-n', '--octonodes node1.example.com,node2.example.com', Array, 'Octocatalog-diff nodes to test catalog on') { |arg| PuppetCheck.settings[:octonodes] = arg }
 
       # arguments to style checkers
       opts.on('--puppet-lint arg_one,arg_two', Array, 'Arguments for PuppetLint ignored checks') do |puppetlint_args|
-        PuppetCheck.settings[:puppetlint_args] += puppetlint_args.map { |arg| "--#{arg}" }
+        PuppetCheck.settings[:puppetlint_args].concat(puppetlint_args.map { |arg| "--#{arg}" })
       end
-      opts.on('-c', '--config file', String, 'Load PuppetLint options from file.') do |file|
-        PuppetCheck.settings[:puppetlint_args] += File.read(file).split("\n")
+      opts.on('-c', '--config file', String, 'Load PuppetLint options from file') do |file|
+        PuppetCheck.settings[:puppetlint_args].concat(File.read(file).split("\n"))
       end
       opts.on('--rubocop arg_one,arg_two', String, 'Arguments for Rubocop disabled cops') { |arg| PuppetCheck.settings[:rubocop_args] = ['--except', arg] }
     end

data/lib/puppet-check/data_parser.rb

@@ -4,6 +4,8 @@ require_relative '../puppet-check'
 class DataParser
   # checks yaml (.yaml/.yml)
   def self.yaml(files)
+    return if files.empty?
+
     require 'yaml'
 
     files.each do |file|
@@ -16,10 +18,48 @@ class DataParser
         warnings = []
 
         # perform some rudimentary hiera checks if data exists and is hieradata
-        warnings = hiera(parsed) unless (parsed.class.to_s == 'NilClass') || (File.basename(file) == 'hiera.yaml')
+        warnings = hiera(parsed, file) unless (parsed.class.to_s == 'NilClass') || (File.basename(file) == 'hiera.yaml')
+
+        next PuppetCheck.settings[:warning_files].push("#{file}:\n#{warnings.join("\n")}") unless warnings.empty?
+        PuppetCheck.settings[:clean_files].push(file.to_s)
+      end
+    end
+  end
+
+  # checks eyaml (.eyaml/.eyml)
+  def self.eyaml(files, public, private)
+    return if files.empty?
+
+    require 'openssl'
+
+    # keys specified?
+    return warn 'Public X509 and/or Private RSA PKCS7 certs were not specified. EYAML checks will not be executed.' if public.nil? || private.nil?
+
+    # keys exist?
+    return warn 'Specified Public X509 and/or Private RSA PKCS7 certs do not exist. EYAML checks will not be executed.' unless File.file?(public) && File.file?(private)
+
+    # setup decryption
+    rsa = OpenSSL::PKey::RSA.new(File.read(private))
+    x509 = OpenSSL::X509::Certificate.new(File.read(public))
+
+    files.each do |file|
+      # grab all encoded portions of the eyaml
+
+      # decrypt the encoded portions
+      decrypted = OpenSSL::PKCS7.new(File.read(file)).decrypt(rsa, x509)
 
-        # check that '---' does not show up more than once in the hieradata
-        warnings.push('The string --- appears more than once in this data and Hiera will fail to parse it correctly.') if File.read(file).scan(/---/).count >= 2
+      # insert decrypted portions back into eyaml (pass into loader below)
+
+      # check yaml syntax
+      begin
+        parsed = YAML.safe_load(decrypted)
+      rescue StandardError => err
+        PuppetCheck.settings[:error_files].push("#{file}:\n#{err.to_s.gsub("(#{file}): ", '')}")
+      else
+        warnings = []
+
+        # perform some rudimentary hiera checks if data exists and is hieradata
+        warnings = hiera(parsed, file) unless (parsed.class.to_s == 'NilClass') || (File.basename(file) == 'hiera.yaml')
 
         next PuppetCheck.settings[:warning_files].push("#{file}:\n#{warnings.join("\n")}") unless warnings.empty?
         PuppetCheck.settings[:clean_files].push(file.to_s)
@@ -29,6 +69,8 @@ class DataParser
 
   # checks json (.json)
   def self.json(files)
+    return if files.empty?
+
     require 'json'
 
     files.each do |file|
@@ -126,7 +168,7 @@ class DataParser
         # assume this is hieradata
         else
           # perform some rudimentary hiera checks if data exists
-          warnings = hiera(parsed) unless parsed.class.to_s == 'NilClass'
+          warnings = hiera(parsed, file) unless parsed.class.to_s == 'NilClass'
         end
         next PuppetCheck.settings[:warning_files].push("#{file}:\n#{warnings.join("\n")}") unless warnings.empty?
         PuppetCheck.settings[:clean_files].push(file.to_s)
@@ -135,7 +177,8 @@ class DataParser
   end
 
   # checks hieradata
-  def self.hiera(data)
+  def self.hiera(data, file)
+    private_class_method :method
     warnings = []
 
     data.each do |key, value|
@@ -145,6 +188,9 @@ class DataParser
       end
     end
 
+    # check that '---' does not show up more than once in the hieradata
+    warnings.push('The string --- appears more than once in this data and Hiera will fail to parse it correctly.') if File.read(file).scan(/---/).count >= 2
+
     warnings
   end
 end

data/lib/puppet-check/puppet_parser.rb

@@ -5,6 +5,8 @@ require_relative '../puppet-check'
 class PuppetParser
   # checks puppet (.pp)
   def self.manifest(files, future, style, pl_args)
+    return if files.empty?
+
     require 'puppet/face'
 
     # prepare the Puppet settings for the error checking
@@ -21,6 +23,9 @@ class PuppetParser
         Puppet::Face[:parser, :current].validate(file)
       # this is the actual error that we need to rescue Puppet::Face from
       rescue SystemExit
+        # puppet 5 can only do one error per line and outputs fake dir env info
+        next PuppetCheck.settings[:error_files].push("#{file}:\n#{errors.map(&:to_s).join("\n").gsub("#{File.absolute_path(file)}:", '').gsub(/Could not parse.*: /, '')}") if Puppet::PUPPETVERSION.to_i == 5
+        # puppet < 5 parser output style
         next PuppetCheck.settings[:error_files].push("#{file}:\n#{errors.map(&:to_s).join("\n").gsub("#{File.absolute_path(file)}:", '')}")
       end
 
@@ -47,7 +52,7 @@ class PuppetParser
 
         # collect the warnings
         if puppet_lint.warnings?
-          puppet_lint.problems.each { |values| warnings += "\n#{values[:line]}:#{values[:column]}: #{values[:message]}" }
+          puppet_lint.problems.each { |values| warnings << "\n#{values[:line]}:#{values[:column]}: #{values[:message]}" }
         end
       end
       next PuppetCheck.settings[:warning_files].push(warnings) unless warnings == "#{file}:"
@@ -57,6 +62,8 @@ class PuppetParser
 
   # checks puppet template (.epp)
   def self.template(files)
+    return if files.empty?
+
     require 'puppet/pops'
 
     files.each do |file|

data/lib/puppet-check/regression_check.rb

@@ -1,10 +1,13 @@
+# temporarily supress warning messages for octocatalog-diff redefining puppet constants and then reactivate
+$VERBOSE = nil
 require 'octocatalog-diff'
+$VERBOSE = false
 
 # executes smoke and regression tests on catalogs
 class RegressionCheck
   # smoke testing
   def self.smoke(interface_nodes, octoconfig)
-    options = RegressionCheck.config(octoconfig)
+    options = config(octoconfig)
     nodes = options.key?(:node) ? [options[:node]] : interface_nodes
     nodes.each do |node|
       options[:node] = node
@@ -20,6 +23,7 @@ class RegressionCheck
 
   # config file loading
   def self.config(octoconfig)
+    private_class_method :method
     OctocatalogDiff::API::V1.config(filename: octoconfig)
   end
 end

data/lib/puppet-check/rspec_puppet_support.rb

@@ -30,18 +30,17 @@ class RSpecPuppetSupport
 
   # setup the files, directories, and symlinks for rspec-puppet testing
   def self.file_setup(module_name)
+    private_class_method :method
     # create all the necessary fixture dirs that are missing
-    ['spec/fixtures', 'spec/fixtures/manifests', 'spec/fixtures/modules', "spec/fixtures/modules/#{module_name}"].each do |dir|
+    ['spec/fixtures', 'spec/fixtures/manifests', 'spec/fixtures/modules'].each do |dir|
       Dir.mkdir(dir) unless File.directory?(dir)
     end
 
     # create empty site.pp if missing
     File.write('spec/fixtures/manifests/site.pp', '') unless File.file?('spec/fixtures/manifests/site.pp')
 
-    # symlink over everything the module needs for compilation
-    %w[hiera.yaml data hieradata functions manifests lib files templates].each do |file|
-      File.symlink("../../../../#{file}", "spec/fixtures/modules/#{module_name}/#{file}") if File.exist?(file) && !File.exist?("spec/fixtures/modules/#{module_name}/#{file}")
-    end
+    # symlink the module into spec/fixtures/modules
+    File.symlink("../../../#{module_name}", "spec/fixtures/modules/#{module_name}") unless File.exist?("spec/fixtures/modules/#{module_name}")
 
     # create spec_helper if missing
     return if File.file?('spec/spec_helper.rb')
@@ -50,6 +49,7 @@ class RSpecPuppetSupport
 
   # setup the module dependencies for rspec-puppet testing
   def self.dependency_setup
+    private_class_method :method
     require 'json'
 
     # parse the metadata.json (assumes DataParser.json has already given it a pass)
@@ -75,6 +75,7 @@ class RSpecPuppetSupport
 
   # download external module dependency with git
   def self.git(git_url, args = '')
+    private_class_method :method
     # establish path to clone module to
     path = "spec/fixtures/modules/#{File.basename(git_url, '.git')}"
     # is the module present and already cloned with git? do a pull; otherwise, do a clone
@@ -83,6 +84,7 @@ class RSpecPuppetSupport
 
   # download external module dependency with forge
   def self.forge(forge_name, args = '')
+    private_class_method :method
     # is the module present? do an upgrade; otherwise, do an install
     subcommand = File.directory?("spec/fixtures/modules/#{forge_name}") ? 'upgrade' : 'install'
     system("puppet module #{subcommand} --modulepath spec/fixtures/modules/ #{args} #{forge_name}")
@@ -90,6 +92,7 @@ class RSpecPuppetSupport
 
   # download external module dependency with svn
   def self.svn(svn_url, args = '')
+    private_class_method :method
     # establish path to checkout module to
     path = "spec/fixtures/modules/#{File.basename(svn_url)}"
     # is the module present and already checked out with svn? do an update; otherwise, do a checkout
@@ -98,6 +101,7 @@ class RSpecPuppetSupport
 
   # download external module dependency with hg
   def self.hg(hg_url, args = '')
+    private_class_method :method
     # establish path to clone module to
     path = "spec/fixtures/modules/#{File.basename(hg_url)}"
     # is the module present and already cloned with hg? do a pull and update; otherwise do a clone

data/lib/puppet-check/ruby_parser.rb

@@ -25,7 +25,7 @@ class RubyParser
           require 'reek'
           require 'reek/cli/application'
           reek_warnings = Utils.capture_stdout { Reek::CLI::Application.new([file]).execute }
-          warnings += reek_warnings.split("\n")[1..-1].map(&:strip).join("\n") unless reek_warnings == ''
+          warnings << reek_warnings.split("\n")[1..-1].map(&:strip).join("\n") unless reek_warnings == ''
 
           # return warnings
           next PuppetCheck.settings[:warning_files].push("#{file}:\n#{warnings.strip}") unless warnings == ''
@@ -37,6 +37,8 @@ class RubyParser
 
   # checks ruby template (.erb)
   def self.template(files)
+    return if files.empty?
+
     require 'erb'
 
     files.each do |file|
@@ -59,6 +61,13 @@ class RubyParser
 
   # checks librarian puppet (Puppetfile/Modulefile) and misc ruby (Rakefile/Gemfile)
   def self.librarian(files, style, rc_args)
+    # efficient var assignment prior to iterator
+    if style
+      require 'rubocop'
+      # cop named differently depending upon version
+      filename_cop = RuboCop::Version::STRING.to_f >= 0.5 ? 'Naming/FileName' : 'Style/FileName'
+    end
+
     files.each do |file|
       # check librarian puppet syntax
       begin
@@ -69,11 +78,9 @@ class RubyParser
       # check librarian puppet style
       else
         if style
-          require 'rubocop'
-
           # check Rubocop
-          # RuboCop is grumpy about non-snake_case filenames so disable the Style/FileName check
-          rc_args.include?('--except') ? rc_args[rc_args.index('--except') + 1] = "#{rc_args[rc_args.index('--except') + 1]},Style/FileName" : rc_args.concat(['--except', 'Style/FileName'])
+          # RuboCop is grumpy about non-snake_case filenames so disable the FileName check
+          rc_args.include?('--except') ? rc_args[rc_args.index('--except') + 1] = "#{rc_args[rc_args.index('--except') + 1]},#{filename_cop}" : rc_args.concat(['--except', filename_cop])
           warnings = Utils.capture_stdout { RuboCop::CLI.new.run(rc_args + ['--format', 'emacs', file]) }
 
           # collect style warnings

data/lib/puppet-check/tasks.rb

@@ -9,7 +9,7 @@ require_relative '../puppet-check'
 class PuppetCheck::Tasks < ::Rake::TaskLib
   def initialize
     desc 'Execute all Puppet-Check checks'
-    task puppetcheck: %w[puppetcheck:file puppetcheck:spec puppetcheck:beaker]
+    task puppetcheck: %w[puppetcheck:file puppetcheck:spec puppetcheck:beaker puppetcheck:kitchen]
 
     namespace :puppetcheck do
       desc 'Execute Puppet-Check file checks'
@@ -17,6 +17,7 @@ class PuppetCheck::Tasks < ::Rake::TaskLib
         PuppetCheck.new.run(Dir.glob('*'))
       end
 
+      # rspec, rspec-puppet, and beaker tasks
       begin
         require 'rspec/core/rake_task'
         require_relative 'rspec_puppet_support'
@@ -38,7 +39,29 @@ class PuppetCheck::Tasks < ::Rake::TaskLib
           task.rspec_opts = '-f json' if PuppetCheck.settings[:output_format] == 'json'
         end
       rescue LoadError
-        puts 'RSpec is not installed. The RSpec/RSpecPuppet and Beaker tasks will not be available.'
+        desc 'RSpec is not installed.'
+        task :spec do
+          puts 'RSpec is not installed. The RSpec/RSpecPuppet tasks will not be available.'
+        end
+        desc 'RSpec is not installed.'
+        task :beaker do
+          puts 'RSpec is not installed. The Beaker tasks will not be available.'
+        end
+      end
+
+      # test kitchen tasks
+      begin
+        require 'kitchen/rake_tasks'
+
+        desc 'Execute Test Kitchen acceptance tests'
+        task :kitchen do
+          Rake::Task['kitchen:all'].invoke
+        end
+      rescue LoadError
+        desc 'Test Kitchen is not installed.'
+        task :kitchen do
+          puts 'Test Kitchen is not installed. The Kitchen tasks will not be available.'
+        end
       end
     end
   end

data/spec/fixtures/hieradata/good.eyaml

@@ -0,0 +1,7 @@
+---
+i:
+  - am
+  - a
+
+good:
+  eyaml: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAE55MeA/kW1uoyJV8WJPU+2q3DklRBKcRBhJtofuDwkKO7SQ+T30A/vDAP+A2IRFXDC0xOCM1iwQvbVIUht9Godb6qeT+8wLHmMuekN7jZpjYnAZHECy8QcWxlLaGP6LSJrvq5VN//4djiwdne5064tmTpXxwVffL+z7QyKI24t7YO3zjR40L2tm4mduyRnK2KuLpfI9hGAWwKWFAQ8GywEtZaFmN+7M7BYvCnR6WclZSkokVraAJk1v31blTCs/2E2NrTFbjDvAlJIYLdU8Q1rcifW06r8Rx5I0Ufzbd+vcCGyKjCWJ1Rzjgs29UaF2hogJbEsFS/BUx8AEbffL4DjA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBuhvUa47kIQ2/nHGwfju9ogBAusaL97ZJBWahoLgSEY+gT]

data/spec/fixtures/hieradata/style.eyaml

@@ -0,0 +1,16 @@
+---
+i: 'am'
+
+:a:
+  good:
+    - eyaml
+    - ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAE55MeA/kW1uoyJV8WJPU+2q3DklRBKcRBhJtofuDwkKO7SQ+T30A/vDAP+A2IRFXDC0xOCM1iwQvbVIUht9Godb6qeT+8wLHmMuekN7jZpjYnAZHECy8QcWxlLaGP6LSJrvq5VN//4djiwdne5064tmTpXxwVffL+z7QyKI24t7YO3zjR40L2tm4mduyRnK2KuLpfI9hGAWwKWFAQ8GywEtZaFmN+7M7BYvCnR6WclZSkokVraAJk1v31blTCs/2E2NrTFbjDvAlJIYLdU8Q1rcifW06r8Rx5I0Ufzbd+vcCGyKjCWJ1Rzjgs29UaF2hogJbEsFS/BUx8AEbffL4DjA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBuhvUa47kIQ2/nHGwfju9ogBAusaL97ZJBWahoLgSEY+gT]
+
+but: 'i am missing a'
+
+value:
+
+and:
+  also: 'a'
+  subvalue:
+---

data/spec/fixtures/hieradata/syntax.eyaml

@@ -0,0 +1,8 @@
+---
+i: - am :an:
+  - :eyaml:
+  - file:
+
+with:
+  : ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAPW3B3OFO48lQZcrcFPj1oGl1Qx9It8JN6neAfxPIV5lWx5o//gBVpy0tcc0rq83A1UxYJ9wdamgqUoSCd9oYBXMjjbkd4OCe6z3XCDBGnAkYy0jvwg6/1SUgmMgo5MC1GEg/ADe9LfxxbRosV8MUAozoevvWoWQyZ6Sr4s0PDjhvIf8F4P2uUmIw0lsUyfgl8H1qTWy+RQFkjZ9ArURMuzNs0ru5HvzHtQt8o/PzW31RqEGm4k/4B0DNhWmd5jvjr+VCuCn8gn7ypj6HbfTRA/mMenm/p2dU9yJA7oROsV55kMTHD7Uav4CMTMLXmfF5oiO9mRw91KkmNjB7FGlxJDA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBzcD656/BIbPWtkc1i0t2KgBAD+oVqa/H8lMynix7pN4eL]
+  :syntax: -

data/spec/fixtures/keys/private_key.pkcs7.pem

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEogIBAAKCAQEArcVImrrizOvxggoj9pQsJ78zweoxp0EbTSQXJVLQ+fBWxNDm
+LYGeRpxeBu2laHG/rVtuokiVdVjRfGIxhMW5n+WE0+tg7xQD8M9gtoIzZcCfPO68
+TLb/SF7pSL7kZJqlV62VsdyzAYSmQTYeAqIVg/1y9AH4Bm8UPOpHOpCX2BODa18S
+cBKTkCdXbRPIdsvJ1xNAag0yD4erEtz1/In9AKzL1urxFILoSU4w3IBQigMLT6r9
+eo5xd91PIXZwSMO3ypN9ZQCVkDBoyO6g5HaqPHeSP6ZMWzKBCGdi2T613mZgK3u8
+AaHtHcTdryDFLsYpgwcBFFsiwf2b2GT2TNPrrQIDAQABAoIBAC5xiBIy2ONEPGwx
+IaOJvrNw2vh9C4BUWmOnvbfwBoKGxeocmyiWeCMPL+JSKd9cZ4qB4XPmSmvurS69
+X9bIsfAWfAXX5zR++P6nroWZDvunG+hBNnqafmhtVZRn0MtCueZRMq0y+3Tway8K
+s8KoZ2+7kbm9vPibP6F4TElO1Aaf303gmnXFENzZasaHP6qxdFCqAdFw4/AXpXE4
+wSWprUPwJRqF0MlWK4IuANblIQ3q1SL6rq4TSylp/OvdYP0Ps85sVyNGIjVwXA5u
+SRdVyhog3kbzpHj7hpv7Kl2gHKV50pbp90aOpRNqiGqP9WzSIOTjb5G855QqYNk/
+uPL6tlECgYEA5wZWeeB0aIichWCzNrKO0SEJMY7JtPnjtwWL/GYGHUiTDijNR3j5
+njS+58DwVW0adZKpkNvqZ9QJQnw4Fg0iwb16o2FfiZ3whV9XBJbgYyglue/U3WWq
+E20/sPZdkFBGKkhmgCcuGvVRGyzKZCQ3xFU8O51Ha3qK6NYr2jsYlQcCgYEAwI5s
+2fGp4Vc/4RLWOA8rJ8ywKt4HuLNBxnCb8hHTg2LJG7RjEM2nCJlcUnLB2UctaDqy
+8hMf1vGubMlWt9n9MxyWSSdjdzppQbo75HqAVXZBtC+FCJXGKzOnR9OkuTQ8RU9Y
+I7OMQ07d3mECXvvUo9z+j5sGBFCZCOSiMKqcoKsCgYAqIOa+HOc9dMQOMn8b113h
+1wNlLSOtQ/B5nKJVaYlt56EhcOFWSkJCzl2Nx4pMGbQ8gn03dFL/khQKMrrLkqOm
+7tWhW41ffBSzTZqBtL3Adz7B9HE92l80YbS+oX6YZXsWFNPURNDMi7W5neZecphU
+zjJIsLqoZ9VS9lNS3XnzGwKBgHnutoccPNLxCQZhgz1kfZNqTnQWvRT8jj42uMmE
++EdOmsLsa38MeyU61/dtq8sHA33pDb+01Iir6iQBKuSpKWjgRVp1ksrBNj3kzGBW
+IkX76IdNQBS7ow1gXCFjp/+PUEsjf1C8Nam5m01iaLn1BiXtn1UYearpzr6O6RWg
+NCaZAoGAIPGk+dcgKFf5lVWj0XkZfzVbj/OgwVBsUxP/jQ/monB7iHjwoYPK4A4y
+sBy4FHFBfQKKMrn52uQFcrXq6/EK+pASswkrxsIUrASsPaTNOq+SngT+NWqHC5Fj
+7vaA1e59QlSQWSAf6IZbsr2qu/NKPN6JkA1SLbtF8gF3T7QphKo=
+-----END RSA PRIVATE KEY-----

data/spec/fixtures/keys/public_key.pkcs7.pem

@@ -0,0 +1,18 @@
+-----BEGIN CERTIFICATE-----
+MIIC2TCCAcGgAwIBAgIBATANBgkqhkiG9w0BAQUFADAAMCAXDTE3MDgyOTIzMzYz
+OFoYDzIwNjcwODE3MjMzNjM4WjAAMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEArcVImrrizOvxggoj9pQsJ78zweoxp0EbTSQXJVLQ+fBWxNDmLYGeRpxe
+Bu2laHG/rVtuokiVdVjRfGIxhMW5n+WE0+tg7xQD8M9gtoIzZcCfPO68TLb/SF7p
+SL7kZJqlV62VsdyzAYSmQTYeAqIVg/1y9AH4Bm8UPOpHOpCX2BODa18ScBKTkCdX
+bRPIdsvJ1xNAag0yD4erEtz1/In9AKzL1urxFILoSU4w3IBQigMLT6r9eo5xd91P
+IXZwSMO3ypN9ZQCVkDBoyO6g5HaqPHeSP6ZMWzKBCGdi2T613mZgK3u8AaHtHcTd
+ryDFLsYpgwcBFFsiwf2b2GT2TNPrrQIDAQABo1wwWjAPBgNVHRMBAf8EBTADAQH/
+MB0GA1UdDgQWBBSNRJcp7zds5OoHwILPQ54USW6UdjAoBgNVHSMEITAfgBSNRJcp
+7zds5OoHwILPQ54USW6UdqEEpAIwAIIBATANBgkqhkiG9w0BAQUFAAOCAQEAK0Hu
+Q9oB1+w4OnilleLyARiCz64RDdbAPCmQtg18L7LG4Y19qmlThF7o+3sPzy4XHsGN
+R96II4LWwzvYnoWbb9YDspdoR3S9NeR5nEQ0cHhCvCjJabciJb0Ua5s7B6n/OZI2
+yLiksSDVjqLz3MxRSDGm4BU/6THJtktmxHqFkZpIyi+Ph/zlifB3tkB+EUqZ4x3T
+zzKi+zVDI2fZHZbpwrXbCShagvTc466hEji3JZAXjr3G2KJBsCvbMVuYtAWX4XQE
++/F8BoNpZkIOd1xgRcDR07bLjM7AfTjxec88fUebd2FYYX498AqC6VuzCeFk56nS
+7p9qXtWyXoV/G9Xdeg==
+-----END CERTIFICATE-----

data/spec/puppet-check/cli_spec.rb

@@ -27,6 +27,14 @@ describe PuppetCheck::CLI do
       expect(PuppetCheck.settings[:regression_check]).to eql(true)
     end
 
+    it 'correctly parser EYAML options' do
+      PuppetCheck.settings[:public] = nil
+      PuppetCheck.settings[:private] = nil
+      PuppetCheck::CLI.parse(%w[--public pub.pem --private priv.pem])
+      expect(PuppetCheck.settings[:public]).to eql('pub.pem')
+      expect(PuppetCheck.settings[:private]).to eql('priv.pem')
+    end
+
     it 'correctly parses a formatting option' do
       PuppetCheck.settings[:output_format] = ''
       PuppetCheck::CLI.parse(%w[-o text])

data/spec/puppet-check/data_parser_spec.rb

@@ -29,6 +29,38 @@ describe DataParser do
     end
   end
 
+  if RUBY_VERSION.to_f >= 2.3
+    context '.eyaml' do
+      it 'returns a warning if a public key was not specified' do
+        expect { DataParser.eyaml('foo.eyaml', nil, 'private.pem') }.to output("Public X509 and/or Private RSA PKCS7 certs were not specified. EYAML checks will not be executed.\n").to_stderr
+      end
+      it 'returns a warning if a private key was not specified' do
+        expect { DataParser.eyaml('foo.eyaml', 'public.pem', nil) }.to output("Public X509 and/or Private RSA PKCS7 certs were not specified. EYAML checks will not be executed.\n").to_stderr
+      end
+      it 'returns a warning if the public key or private key are not existing files' do
+        expect { DataParser.eyaml('foo.eyaml', 'public.pem', 'private.pem') }.to output("Specified Public X509 and/or Private RSA PKCS7 certs do not exist. EYAML checks will not be executed.\n").to_stderr
+      end
+      it 'puts a bad syntax eyaml file in the error files array' do
+        DataParser.eyaml([fixtures_dir + 'hieradata/syntax.eyaml'], fixtures_dir + 'keys/public_key.pkcs7.pem', fixtures_dir + 'keys/private_key.pkcs7.pem')
+        expect(PuppetCheck.settings[:error_files][0]).to match(%r{^#{fixtures_dir}hieradata/syntax.eyaml:\nblock sequence entries are not allowed})
+        expect(PuppetCheck.settings[:warning_files]).to eql([])
+        expect(PuppetCheck.settings[:clean_files]).to eql([])
+      end
+      it 'puts a good eyaml file with potential hiera issues in the warning files array' do
+        DataParser.eyaml([fixtures_dir + 'hieradata/style.eyaml'], fixtures_dir + 'keys/public_key.pkcs7.pem', fixtures_dir + 'keys/private_key.pkcs7.pem')
+        expect(PuppetCheck.settings[:error_files]).to eql([])
+        expect(PuppetCheck.settings[:warning_files][0]).to match(%r{^#{fixtures_dir}hieradata/style.eyaml:\nValue\(s\) missing in key.*\nValue\(s\) missing in key.*\nThe string --- appears more than once in this data and Hiera will fail to parse it correctly})
+        expect(PuppetCheck.settings[:clean_files]).to eql([])
+      end
+      it 'puts a good eyaml file in the clean files array' do
+        DataParser.eyaml([fixtures_dir + 'hieradata/good.eyaml'], fixtures_dir + 'keys/public_key.pkcs7.pem', fixtures_dir + 'keys/private_key.pkcs7.pem')
+        expect(PuppetCheck.settings[:error_files]).to eql([])
+        expect(PuppetCheck.settings[:warning_files]).to eql([])
+        expect(PuppetCheck.settings[:clean_files]).to eql(["#{fixtures_dir}hieradata/good.eyaml"])
+      end
+    end
+  end
+
   context '.json' do
     it 'puts a bad syntax json file in the error files array' do
       DataParser.json([fixtures_dir + 'hieradata/syntax.json'])

data/spec/puppet-check/puppet_parser_spec.rb

@@ -12,10 +12,17 @@ describe PuppetParser do
     it 'puts a bad syntax Puppet manifest in the error files array' do
       PuppetParser.manifest([fixtures_dir + 'manifests/syntax.pp'], false, false, [])
       # stupid Puppet deprecation warning
-      if RUBY_VERSION.to_f < 2.1
+      if RUBY_VERSION.to_f < 2.1 && Puppet::PUPPETVERSION.to_i < 5
         expect(PuppetCheck.settings[:error_files][0]).to match(%r{^#{fixtures_dir}manifests/syntax.pp:\nSupport for ruby version.*\n.*\nThis Variable has no effect.*\nIllegal variable name})
-      else
-        expect(PuppetCheck.settings[:error_files][0]).to match(%r{^#{fixtures_dir}manifests/syntax.pp:\nThis Variable has no effect.*\nIllegal variable name})
+      # stupid Puppet deprecation warning and Puppet 5 is no longer able to do multiple errors per line
+      elsif RUBY_VERSION.to_f < 2.1 && Puppet::PUPPETVERSION.to_i == 5
+        expect(PuppetCheck.settings[:error_files][0]).to match(%r{^#{fixtures_dir}manifests/syntax.pp:\nSupport for ruby version.*\n.*\nThis Variable has no effect.*})
+      # ideal error-checking situation
+      elsif RUBY_VERSION.to_f >= 2.1 && Puppet::PUPPETVERSION.to_i < 5
+        expect(PuppetCheck.settings[:error_files][0]).to match(%r{^#{fixtures_dir}manifests/syntax.pp:\nSupport for ruby version.*\n.*\nThis Variable has no effect.*\nIllegal variable name})
+      # Puppet 5 is no longer able to do multiple errors per line
+      else # ruby >= 2.1 and puppet == 5
+        expect(PuppetCheck.settings[:error_files][0]).to match(%r{^#{fixtures_dir}manifests/syntax.pp:\nThis Variable has no effect})
       end
       expect(PuppetCheck.settings[:warning_files]).to eql([])
       expect(PuppetCheck.settings[:clean_files]).to eql([])

data/spec/puppet-check/rspec_puppet_support_spec.rb

@@ -3,6 +3,12 @@ require_relative '../../lib/puppet-check/rspec_puppet_support'
 require 'fileutils'
 
 describe RSpecPuppetSupport do
+  after(:all) do
+    # cleanup rspec_puppet_setup
+    File.delete('spec/spec_helper.rb')
+    %w[manifests modules].each { |dir| FileUtils.rm_r('spec/fixtures/' + dir) }
+  end
+
   context '.run' do
     let(:rspec_puppet_setup) { RSpecPuppetSupport.run }
     before(:each) { Dir.chdir(fixtures_dir) }
@@ -12,21 +18,14 @@ describe RSpecPuppetSupport do
 
       # .file_setup
       expect(File.directory?('spec/fixtures/manifests')).to be true
-      expect(File.directory?('spec/fixtures/modules/fixtures')).to be true
+      expect(File.directory?('spec/fixtures/modules')).to be true
       expect(File.file?('spec/fixtures/manifests/site.pp')).to be true
-      expect(File.symlink?('spec/fixtures/modules/fixtures/hieradata')).to be true
-      expect(File.symlink?('spec/fixtures/modules/fixtures/manifests')).to be true
-      expect(File.symlink?('spec/fixtures/modules/fixtures/lib')).to be true
-      expect(File.symlink?('spec/fixtures/modules/fixtures/templates')).to be true
+      expect(File.symlink?('spec/fixtures/modules/fixtures')).to be true
       expect(File.file?('spec/spec_helper.rb')).to be true
 
       # .dependency_setup
       expect(File.directory?('spec/fixtures/modules/puppetlabs-lvm')).to be true
       expect(File.directory?('spec/fixtures/modules/stdlib')).to be true
-
-      # cleanup rspec_puppet_setup
-      %w[spec/spec_helper.rb].each { |file| File.delete(file) }
-      %w[manifests modules].each { |dir| FileUtils.rm_r('spec/fixtures/' + dir) }
     end
   end
 end

data/spec/puppet-check/ruby_parser_spec.rb

@@ -76,7 +76,7 @@ describe RubyParser do
       expect(PuppetCheck.settings[:clean_files]).to eql([])
     end
     it 'puts a bad style librarian Puppet file in the clean files array when rubocop_args ignores its warnings' do
-      RubyParser.librarian([fixtures_dir + 'librarian_style/Puppetfile'], true, ['--except', 'Style/AlignParameters,Style/HashSyntax'])
+      RubyParser.librarian([fixtures_dir + 'librarian_style/Puppetfile'], true, ['--except', 'Layout/AlignParameters,Style/HashSyntax'])
       expect(PuppetCheck.settings[:error_files]).to eql([])
       expect(PuppetCheck.settings[:warning_files]).to eql([])
       expect(PuppetCheck.settings[:clean_files]).to eql(["#{fixtures_dir}librarian_style/Puppetfile"])

data/spec/puppet-check/tasks_spec.rb

@@ -3,6 +3,12 @@ require_relative '../spec_helper.rb'
 require_relative '../../lib/puppet-check/tasks'
 
 describe PuppetCheck::Tasks do
+  after(:all) do
+    # cleanup rspec_puppet_setup
+    %w[spec/spec_helper.rb].each { |file| File.delete(file) }
+    %w[manifests modules].each { |dir| FileUtils.rm_r('spec/fixtures/' + dir) }
+  end
+
   context 'puppetcheck:spec' do
     let(:spec_tasks) { Rake::Task['puppetcheck:spec'.to_sym].invoke }
 
@@ -13,10 +19,6 @@ describe PuppetCheck::Tasks do
       expect { spec_tasks }.to output(%r{spec/facter/facter_spec.rb}).to_stdout
       # if this is first then the stdout is not captured for testing
       expect { spec_tasks }.not_to raise_exception
-
-      # cleanup rspec_puppet_setup
-      %w[spec/spec_helper.rb].each { |file| File.delete(file) }
-      %w[manifests modules].each { |dir| FileUtils.rm_r('spec/fixtures/' + dir) }
     end
   end
 

data/spec/puppet-check_spec.rb

@@ -14,6 +14,10 @@ describe PuppetCheck do
       expect(PuppetCheck.settings[:smoke_check]).to eql(true)
       PuppetCheck.settings[:regression_check] = true
       expect(PuppetCheck.settings[:regression_check]).to eql(true)
+      PuppetCheck.settings[:public] = 'public.pem'
+      expect(PuppetCheck.settings[:public]).to eql('public.pem')
+      PuppetCheck.settings[:private] = 'private.pem'
+      expect(PuppetCheck.settings[:private]).to eql('private.pem')
       PuppetCheck.settings[:output_format] = 'text'
       expect(PuppetCheck.settings[:output_format]).to eql('text')
       PuppetCheck.settings[:octoconfig] = '.octocatalog-diff.cfg.rb'
@@ -46,17 +50,17 @@ describe PuppetCheck do
 
     it 'correctly parses one directory and returns all of its files' do
       dir.each { |file| expect(File.file?(file)).to be true }
-      expect(dir.length).to eql(29)
+      expect(dir.length).to eql(34)
     end
 
     it 'correctly parses multiple directories and returns all of their files' do
       multi_dir.each { |file| expect(File.file?(file)).to be true }
-      expect(multi_dir.length).to eql(13)
+      expect(multi_dir.length).to eql(16)
     end
 
     it 'correctly parses three directories (one repeated) and three files (one repeated from directories and another repeated from files) and returns the unique files' do
       repeats.each { |file| expect(File.file?(file)).to be true }
-      expect(repeats.length).to eql(10)
+      expect(repeats.length).to eql(13)
     end
   end
 

data/spec/system/system_spec.rb

@@ -26,7 +26,7 @@ describe PuppetCheck do
         expect(PuppetCheck.settings[:warning_files].length).to eql(9)
         expect(PuppetCheck.settings[:clean_files].length).to eql(11)
       end
-      expect(PuppetCheck.settings[:ignored_files].length).to eql(1)
+      expect(PuppetCheck.settings[:ignored_files].length).to eql(6)
 
       expect(cli).to eql(2)
     end
@@ -57,7 +57,7 @@ describe PuppetCheck do
       expect(PuppetCheck.settings[:error_files].length).to eql(8)
       expect(PuppetCheck.settings[:warning_files].length).to eql(9)
       expect(PuppetCheck.settings[:clean_files].length).to eql(11)
-      expect(PuppetCheck.settings[:ignored_files].length).to eql(1)
+      expect(PuppetCheck.settings[:ignored_files].length).to eql(6)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-check
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Matt Schuchard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-30 00:00:00.000000000 Z
+date: 2017-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet
@@ -19,7 +19,7 @@ dependencies:
         version: '3.4'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '3.4'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -79,19 +79,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: octocatalog-diff
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -113,19 +113,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '13'
 - !ruby/object:Gem::Dependency
-  name: octocatalog-diff
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.0'
 description: Puppet Check is a gem that provides a comprehensive, streamlined, and
   efficient analysis of the syntax, style, and validity of your entire Puppet code
   and data.
@@ -150,11 +150,16 @@ files:
 - lib/puppet-check/tasks.rb
 - lib/puppet-check/utils.rb
 - spec/fixtures/foobarbaz
+- spec/fixtures/hieradata/good.eyaml
 - spec/fixtures/hieradata/good.json
 - spec/fixtures/hieradata/good.yaml
+- spec/fixtures/hieradata/style.eyaml
 - spec/fixtures/hieradata/style.yaml
+- spec/fixtures/hieradata/syntax.eyaml
 - spec/fixtures/hieradata/syntax.json
 - spec/fixtures/hieradata/syntax.yaml
+- spec/fixtures/keys/private_key.pkcs7.pem
+- spec/fixtures/keys/public_key.pkcs7.pem
 - spec/fixtures/lib/good.rb
 - spec/fixtures/lib/rubocop_style.rb
 - spec/fixtures/lib/style.rb
@@ -215,18 +220,23 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: A streamlined comprehensive set of checks for your entire Puppet code and
   data
 test_files:
 - spec/fixtures/foobarbaz
+- spec/fixtures/hieradata/good.eyaml
 - spec/fixtures/hieradata/good.json
 - spec/fixtures/hieradata/good.yaml
+- spec/fixtures/hieradata/style.eyaml
 - spec/fixtures/hieradata/style.yaml
+- spec/fixtures/hieradata/syntax.eyaml
 - spec/fixtures/hieradata/syntax.json
 - spec/fixtures/hieradata/syntax.yaml
+- spec/fixtures/keys/private_key.pkcs7.pem
+- spec/fixtures/keys/public_key.pkcs7.pem
 - spec/fixtures/lib/good.rb
 - spec/fixtures/lib/rubocop_style.rb
 - spec/fixtures/lib/style.rb