puppet-check 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 75505f645bd001e57219d134a49f1d577154bef7
-  data.tar.gz: 33c2a820796a29b069e563b584583499cb826af5
+SHA256:
+  metadata.gz: 5e965d79b58fb8bb6f0b3a3d01d94a451e628239abd3aeefc472dc6a8965cb59
+  data.tar.gz: 25554b24ad51443eb8b6eabee9aaed19003c20b833a4dc5b74f59db236a607aa
 SHA512:
-  metadata.gz: a9be87827795fa8f90e546077b37ff50834a3cd75339e757760d4261506dc36b30be6435b718e2e7c3b87ebed1917632945049c15b1b5aa189b9e1bd18d9117a
-  data.tar.gz: 02d65c5713c1f9737859a92315c879e8c391dd68579c548a8450c31a4267fe469d3a9b58997348bb6040ca89fd1af55542c6b48a4ed8e085b5771477c6ef20d8
+  metadata.gz: 70176578f2be7977ac92d902dd790647962b43fafd32f3a2c1f65af121d84633b8701e759d536f063dd4c692513a35d2e6ca536812626215f571bb587986e19b
+  data.tar.gz: d15e1217350f3c8ee6215d23b2a5806f451564e6b371ffd994004f53dcd49631ebd469782c4e5a025bde864949eddd73007ce053424b77435d571192a0a6b8f0

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+### 1.6.0 (Next)
+- Minimum Ruby version increased to 2.1.
+- Minimum Puppet version increased to 3.7.
+- Minimum Puppet-Lint and Rubocop increased to 2.0 and 0.51.0.
+- Correctly capturing new Puppet >= 5.4 parser validator output format.
+- Refixing style checker error for empty hieradata.
+
 ### 1.5.1
 - Slight cleanup and optimization.
 - Fixed check for no spec directories during RSpec Puppet helper.

data/README.md

@@ -17,8 +17,6 @@ Puppet Check is a gem that provides a comprehensive, streamlined, and efficient
 
 **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)
 
@@ -138,12 +136,7 @@ The following files have unrecognized formats and therefore were not processed:
 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/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.
+Please see the [Gemspec](puppet-check.gemspec) for dependency information.  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.
 
 ### CLI
 ```
@@ -273,20 +266,21 @@ If you are performing your Puppet testing from within a Ruby script or your own
 # file checks
 require 'puppet-check'
 
-PuppetCheck.settings[:future_parser] = true # default false
-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)
-PuppetCheck.settings[:puppetlint_args] = ['--puppetlint-arg-one', '--puppetlint-arg-two'] # default []
-PuppetCheck.settings[:rubocop_args] = ['--except', 'rubocop-arg-one,rubocop-arg-two'] # default []
-
-PuppetCheck.new.run([dirs, files])
+settings = {}
+settings[:future_parser] = true # default false
+settings[:fail_on_warnings] = true # default false
+settings[:style_check] = true # default false
+settings[:smoke_check] = true # default false
+settings[:regression_check] = true # in progress, do not use; default false
+settings[:public] = 'public.pem' # default nil
+settings[:private] = 'private.pem' # default nil
+settings[:output_format] = 'yaml' # also 'json'; default 'text'
+settings[:octoconfig] = '$HOME/octocatalog-diff.cfg.rb' # default '.octocatalog-diff.cfg.rb'
+settings[:octonodes] = %w(server.example.com) # default: %w(localhost.localdomain)
+settings[:puppetlint_args] = ['--puppetlint-arg-one', '--puppetlint-arg-two'] # default []
+settings[:rubocop_args] = ['--except', 'rubocop-arg-one,rubocop-arg-two'] # default []
+
+PuppetCheck.new.run(settings, [dirs, files])
 
 # rspec checks (as part of a RSpec::Core::RakeTask.new block with |task|)
 require 'puppet-check/rspec_puppet_support'
@@ -349,19 +343,20 @@ To overcome the lack of convenient portability, you could try spinning up the Va
 - 1: PuppetCheck exited with an internal exception (takes preference over other non-zero exit codes) or failed spec test(s).
 - 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
+### Optional Dependencies
 - **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.
+- **octocatalog-diff** (gem): install a version `>= 1.0` of 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.
+- **subversion** (pkg): install this if you want to use Puppet Check to download external module dependencies with `svn` 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.
 
 A [Dockerfile](Dockerfile) is provided for easy rake testing. A [Vagrantfile](Vagrantfile) is provided for easy gem building, installation, and post-installation testing.
 
-Please consult the [CHANGELOG](CHANGELOG.md) for the current development roadmap.
+Please consult the GitHub Project for the current development roadmap.

data/lib/puppet-check.rb

@@ -8,49 +8,27 @@ class PuppetCheck
   # initialize settings hash
   @settings = {}
 
-  # initialize future parser, fail on warning,  style check, and regression check bools
-  @settings[:future_parser] = false
-  @settings[:fail_on_warning] = false
-  @settings[:style_check] = false
-  @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'
-
-  # initialize octocatalog-diff options
-  @settings[:octoconfig] = '.octocatalog-diff.cfg.rb'
-  @settings[:octonodes] = %w[localhost.localdomain]
-
-  # initialize diagnostic output arrays
-  @settings[:error_files] = []
-  @settings[:warning_files] = []
-  @settings[:clean_files] = []
-  @settings[:ignored_files] = []
-
-  # initialize style arg arrays
-  @settings[:puppetlint_args] = []
-  @settings[:rubocop_args] = []
-
   # allow the parser methods read user options and append to the file arrays; allow CLI and tasks write to user options
   class << self
     attr_accessor :settings
   end
 
   # main runner for PuppetCheck
-  def run(paths)
+  def run(settings, paths)
+    # establish settings
+    self.class.settings = settings
+
+    # settings defaults
+    self.class.defaults
+
     # grab all of the files to be processed
     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[:public], self.class.settings[:private], self.class.settings[:puppetlint_args], self.class.settings[:rubocop_args])
+    execute_parsers(files, settings[:future_parser], settings[:style_check], settings[:public], settings[:private], settings[:puppetlint_args], settings[:rubocop_args])
 
     # output the diagnostic results
-    PuppetCheck.settings[:output_format] == 'text' ? OutputResults.text : OutputResults.markup
+    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?)
@@ -63,7 +41,7 @@ class PuppetCheck
 
       # perform smoke checks if there were no errors and the user desires
       begin
-        catalog = RegressionCheck.smoke(self.class.octonodes, self.class.octoconfig) if PuppetCheck.settings[:smoke_check]
+        catalog = RegressionCheck.smoke(settings[:octonodes], settings[:octoconfig]) if settings[:smoke_check]
       # smoke check failure? output message and return 2
       rescue OctocatalogDiff::Errors::CatalogError => err
         puts 'There was a smoke check error:'
@@ -73,7 +51,7 @@ class PuppetCheck
       end
       # perform regression checks if there were no errors and the user desires
       # begin
-      #   catalog = RegressionCheck.regression(self.class.octonodes, self.class.octoconfig) if PuppetCheck.settings[:regression_check]
+      #   catalog = RegressionCheck.regression(settings[:octonodes], settings[:octoconfig]) if settings[:regression_check]
       # rescue OctocatalogDiff::Errors::CatalogError => err
       #   puts 'There was a catalog compilation error during the regression check:'
       #   puts err
@@ -89,6 +67,37 @@ class PuppetCheck
     end
   end
 
+  # establish default settings
+  def self.defaults
+    # initialize future parser, fail on warning,  style check, and regression check bools
+    @settings[:future_parser] ||= false
+    @settings[:fail_on_warning] ||= false
+    @settings[:style_check] ||= false
+    @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'
+
+    # initialize diagnostic output arrays
+    @settings[:error_files] = []
+    @settings[:warning_files] = []
+    @settings[:clean_files] = []
+    @settings[:ignored_files] = []
+
+    # initialize octocatalog-diff options
+    @settings[:octoconfig] ||= '.octocatalog-diff.cfg.rb'
+    @settings[:octonodes] ||= %w[localhost.localdomain]
+
+    # initialize style arg arrays
+    @settings[:puppetlint_args] ||= []
+    @settings[:rubocop_args] ||= []
+  end
+
   # parse the paths and return the array of files
   def self.parse_paths(paths)
     files = []

data/lib/puppet-check/cli.rb

@@ -6,11 +6,11 @@ class PuppetCheck::CLI
   # run method for the cli
   def self.run(args)
     # gather the user arguments
-    parse(args)
+    settings = parse(args)
     raise 'puppet-check: no paths specified; try using --help' if args.empty?
 
     # run PuppetCheck with specified paths
-    PuppetCheck.new.run(args)
+    PuppetCheck.new.run(settings, args)
   end
 
   # parse the user arguments
@@ -18,44 +18,49 @@ class PuppetCheck::CLI
     # show help message if no args specified
     args = %w[-h] if args.empty?
 
+    # initialize settings hash
+    settings = {}
+
     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.5.1'
+        puts 'puppet-check 1.6.0'
         exit 0
       end
 
       # bool options
-      opts.on('-f', '--future', 'Enable future parser') { PuppetCheck.settings[:future_parser] = true }
-      opts.on('--fail-on-warnings', 'Fail on warnings') { PuppetCheck.settings[:fail_on_warnings] = true }
-      opts.on('-s', '--style', 'Enable style checks') { PuppetCheck.settings[:style_check] = true }
-      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 }
+      opts.on('-f', '--future', 'Enable future parser') { settings[:future_parser] = true }
+      opts.on('--fail-on-warnings', 'Fail on warnings') { settings[:fail_on_warnings] = true }
+      opts.on('-s', '--style', 'Enable style checks') { settings[:style_check] = true }
+      opts.on('--smoke', 'Enable smoke testing') { settings[:smoke_check] = true }
+      opts.on('-r', '--regression', 'Enable regression testing (in progress, do not use)') { 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 }
+      opts.on('--public cert.pem', String, 'Public key for EYAML checks') { |arg| settings[:public] = arg }
+      opts.on('--private cert.pem', String, 'Private key for EYAML checks') { |arg| 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 }
+      opts.on('-o', '--output format', String, 'Format for results output (default is text): text, json, or yaml') { |arg| 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| settings[:octoconfig] = arg }
+      opts.on('-n', '--octonodes node1.example.com,node2.example.com', Array, 'Octocatalog-diff nodes to test catalog on') { |arg| 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].concat(puppetlint_args.map { |arg| "--#{arg}" })
+        settings[:puppetlint_args] = puppetlint_args.map { |arg| "--#{arg}" }
       end
       opts.on('-c', '--config file', String, 'Load PuppetLint options from file') do |file|
-        PuppetCheck.settings[:puppetlint_args].concat(File.read(file).split("\n"))
+        settings[:puppetlint_args] = 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] }
+      opts.on('--rubocop arg_one,arg_two', String, 'Arguments for Rubocop disabled cops') { |arg| settings[:rubocop_args] = ['--except', arg] }
     end
 
+    # remove atched args and return settings
     opt_parser.parse!(args)
+    settings
   end
 end

data/lib/puppet-check/data_parser.rb

@@ -16,7 +16,7 @@ class DataParser
         warnings = []
 
         # perform some rudimentary hiera checks if data exists and is hieradata
-        warnings = hiera(parsed, file) unless parsed.nil? || (File.basename(file) == 'hiera.yaml')
+        warnings = hiera(parsed, file) if parsed && (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)
@@ -54,14 +54,14 @@ class DataParser
 
       # check yaml syntax
       begin
-        parsed = YAML.safe_load(decrypted)
+        parsed = YAML.load_file(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.nil? || (File.basename(file) == 'hiera.yaml')
+        warnings = hiera(parsed, file) if parsed
 
         next PuppetCheck.settings[:warning_files].push("#{file}:\n#{warnings.join("\n")}") unless warnings.empty?
         PuppetCheck.settings[:clean_files].push(file.to_s)
@@ -165,9 +165,9 @@ class DataParser
             warnings.push("License identifier '#{parsed['license']}' is not in the SPDX list: http://spdx.org/licenses/")
           end
         # assume this is hieradata
-        else
+        elsif parsed
           # perform some rudimentary hiera checks if data exists
-          warnings = hiera(parsed, file) unless parsed.nil?
+          warnings = hiera(parsed, file)
         end
         next PuppetCheck.settings[:warning_files].push("#{file}:\n#{warnings.join("\n")}") unless warnings.empty?
         PuppetCheck.settings[:clean_files].push(file.to_s)

data/lib/puppet-check/puppet_parser.rb

@@ -21,14 +21,28 @@ 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.4-5.x has a new validator output format and eof errors have fake dir env info
+        if Puppet::PUPPETVERSION.to_f >= 5.4
+          next PuppetCheck.settings[:error_files].push("#{file}:\n#{errors.map(&:to_s).join("\n").gsub(/file: #{File.absolute_path(file)}(, |\))/, '').gsub(/Could not parse.*: /, '')}")
         # puppet 5.0-5.2 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_f >= 5.0 && Puppet::PUPPETVERSION.to_f < 5.3
-        # puppet < 5 parser output style
+        elsif Puppet::PUPPETVERSION.to_f >= 5.0 && Puppet::PUPPETVERSION.to_f < 5.3
+          next PuppetCheck.settings[:error_files].push("#{file}:\n#{errors.map(&:to_s).join("\n").gsub("#{File.absolute_path(file)}:", '').gsub(/Could not parse.*: /, '')}")
+        end
+        # puppet < 5 and 5.3 parser output style
         next PuppetCheck.settings[:error_files].push("#{file}:\n#{errors.map(&:to_s).join("\n").gsub("#{File.absolute_path(file)}:", '')}")
       end
 
       # initialize warnings with output from the parser if it exists, since the output is warnings if Puppet::Face did not trigger a SystemExit
-      warnings = errors.empty? ? "#{file}:" : "#{file}:\n#{errors.map(&:to_s).join("\n").gsub("#{File.absolute_path(file)}:", '')}"
+      warnings = "#{file}:"
+      unless errors.empty?
+        # puppet 5.4-5.x has a new validator output format
+        if Puppet::PUPPETVERSION.to_f >= 5.4
+          warnings << "\n#{errors.map(&:to_s).join("\n").gsub("file: #{File.absolute_path(file)}, ", '')}"
+        # puppet <= 5.3 validator output format
+        else
+          warnings << "\n#{errors.map(&:to_s).join("\n").gsub("#{File.absolute_path(file)}:", '')}"
+        end
+      end
       Puppet::Util::Log.close_all
 
       # check puppet style

data/lib/puppet-check/tasks.rb

@@ -14,7 +14,7 @@ class PuppetCheck::Tasks < ::Rake::TaskLib
     namespace :puppetcheck do
       desc 'Execute Puppet-Check file checks'
       task :file do
-        PuppetCheck.new.run(Dir.glob('*'))
+        PuppetCheck.new.run(PuppetCheck.settings, Dir.glob('*'))
       end
 
       # rspec and rspec-puppet tasks

data/spec/fixtures/manifests/eof_syntax.pp

@@ -0,0 +1,4 @@
+# syntax error at 'end of file' instead of line or line and col
+class foo {
+  file { 'bar': ensure => file
+}

data/spec/puppet-check/cli_spec.rb

@@ -14,69 +14,35 @@ describe PuppetCheck::CLI do
     end
 
     it 'allows future parser, fail on warnings, style, smoke, and regression checks to be enabled' do
-      PuppetCheck.settings[:future_parser] = false
-      PuppetCheck.settings[:fail_on_warnings] = false
-      PuppetCheck.settings[:style_check] = false
-      PuppetCheck.settings[:smoke_check] = false
-      PuppetCheck.settings[:regression_check] = false
-      PuppetCheck::CLI.parse(%w[-f --fail-on-warnings -s -r --smoke foo])
-      expect(PuppetCheck.settings[:future_parser]).to eql(true)
-      expect(PuppetCheck.settings[:fail_on_warnings]).to eql(true)
-      expect(PuppetCheck.settings[:style_check]).to eql(true)
-      expect(PuppetCheck.settings[:smoke_check]).to eql(true)
-      expect(PuppetCheck.settings[:regression_check]).to eql(true)
+      expect(PuppetCheck::CLI.parse(%w[-f --fail-on-warnings -s -r --smoke foo])).to include(future_parser: true, fail_on_warnings: true, style_check: true, smoke_check: true, regression_check: 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')
+      expect(PuppetCheck::CLI.parse(%w[--public pub.pem --private priv.pem])).to include(public: 'pub.pem', private: 'priv.pem')
     end
 
     it 'correctly parses a formatting option' do
-      PuppetCheck.settings[:output_format] = ''
-      PuppetCheck::CLI.parse(%w[-o text])
-      expect(PuppetCheck.settings[:output_format]).to eql('text')
+      expect(PuppetCheck::CLI.parse(%w[-o text])).to include(output_format: 'text')
     end
 
     it 'correctly parses octocatalog-diff options' do
-      PuppetCheck.settings[:octoconfig] = ''
-      PuppetCheck.settings[:octonodes] = []
-      PuppetCheck::CLI.parse(%w[--octoconfig config.cfg.rb --octonodes server1,server2])
-      expect(PuppetCheck.settings[:octoconfig]).to eql('config.cfg.rb')
-      expect(PuppetCheck.settings[:octonodes]).to eql(%w[server1 server2])
+      expect(PuppetCheck::CLI.parse(%w[--octoconfig config.cfg.rb --octonodes server1,server2])).to include(octoconfig: 'config.cfg.rb', octonodes: %w[server1 server2])
     end
 
     it 'correctly parses PuppetLint arguments' do
-      PuppetCheck.settings[:puppetlint_args] = []
-      PuppetCheck::CLI.parse(%w[--puppet-lint puppetlint-arg-one,puppetlint-arg-two foo])
-      expect(PuppetCheck.settings[:puppetlint_args]).to eql(['--puppetlint-arg-one', '--puppetlint-arg-two'])
+      expect(PuppetCheck::CLI.parse(%w[--puppet-lint puppetlint-arg-one,puppetlint-arg-two foo])).to include(puppetlint_args: ['--puppetlint-arg-one', '--puppetlint-arg-two'])
     end
 
     it 'correctly loads a .puppet-lint.rc' do
-      PuppetCheck.settings[:puppetlint_args] = []
-      PuppetCheck::CLI.parse(%W[-c #{fixtures_dir}/manifests/.puppet-lint.rc])
-      expect(PuppetCheck.settings[:puppetlint_args]).to eql(['--puppetlint-arg-one', '--puppetlint-arg-two'])
+      expect(PuppetCheck::CLI.parse(%W[-c #{fixtures_dir}/manifests/.puppet-lint.rc])).to include(puppetlint_args: ['--puppetlint-arg-one', '--puppetlint-arg-two'])
     end
 
     it 'correctly parses Rubocop arguments' do
-      PuppetCheck.settings[:rubocop_args] = []
-      PuppetCheck::CLI.parse(%w[--rubocop rubocop-arg-one,rubocop-arg-two foo])
-      expect(PuppetCheck.settings[:rubocop_args]).to eql(['--except', 'rubocop-arg-one,rubocop-arg-two'])
+      expect(PuppetCheck::CLI.parse(%w[--rubocop rubocop-arg-one,rubocop-arg-two foo])).to include(rubocop_args: ['--except', 'rubocop-arg-one,rubocop-arg-two'])
     end
 
     it 'correctly parses multiple sets of arguments' do
-      PuppetCheck.settings[:future_parser] = false
-      PuppetCheck.settings[:style_check] = false
-      PuppetCheck.settings[:puppetlint_args] = []
-      PuppetCheck.settings[:rubocop_args] = []
-      PuppetCheck::CLI.parse(%w[-s -f --puppet-lint puppetlint-arg-one,puppetlint-arg-two --rubocop rubocop-arg-one,rubocop-arg-two foo])
-      expect(PuppetCheck.settings[:future_parser]).to eql(true)
-      expect(PuppetCheck.settings[:style_check]).to eql(true)
-      expect(PuppetCheck.settings[:puppetlint_args]).to eql(['--puppetlint-arg-one', '--puppetlint-arg-two'])
-      expect(PuppetCheck.settings[:rubocop_args]).to eql(['--except', 'rubocop-arg-one,rubocop-arg-two'])
+      expect(PuppetCheck::CLI.parse(%w[-s -f --puppet-lint puppetlint-arg-one,puppetlint-arg-two --rubocop rubocop-arg-one,rubocop-arg-two foo])).to include(future_parser: true, style_check: true, puppetlint_args: ['--puppetlint-arg-one', '--puppetlint-arg-two'], rubocop_args: ['--except', 'rubocop-arg-one,rubocop-arg-two'])
     end
   end
 end

data/spec/puppet-check/data_parser_spec.rb

@@ -31,6 +31,10 @@ describe DataParser do
 
   if RUBY_VERSION.to_f >= 2.3
     context '.eyaml' do
+      before(:each) do
+        PuppetCheck.settings[:ignored_files] = []
+      end
+
       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

data/spec/puppet-check/puppet_parser_spec.rb

@@ -11,25 +11,21 @@ describe PuppetParser do
   context '.manifest' 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 in ruby < 2.1
-      if RUBY_VERSION.to_f < 2.1
-        # Puppet 5.0-5.2 cannot do multiple errors per line
-        if Puppet::PUPPETVERSION.to_f >= 5.0 && Puppet::PUPPETVERSION.to_f < 5.3
-          expect(PuppetCheck.settings[:error_files][0]).to match(%r{^#{fixtures_dir}manifests/syntax.pp:\nSupport for ruby version.*\n.*\nThis Variable has no effect.*})
-        # puppet < 5 or >= 5.3 can do multiple errors per line
-        else
-          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})
-        end
-      # no puppet deprecation warning in ruby >= 2.1 and Puppet 5.0-5.2 cannot do multiple errors per line
-      elsif Puppet::PUPPETVERSION.to_f >= 5.0 && Puppet::PUPPETVERSION.to_f < 5.3
-        expect(PuppetCheck.settings[:error_files][0]).to match(%r{^#{fixtures_dir}manifests/syntax.pp:\nThis Variable has no effect})
-      # no puppet deprecation warning in ruby >= 2.1 and puppet < 5 or >= 5.3 can do multiple errors per line
+      # dealing with annoying warning in puppet 5
+      if RUBY_VERSION.to_f < 2.3
+        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})
       end
       expect(PuppetCheck.settings[:warning_files]).to eql([])
       expect(PuppetCheck.settings[:clean_files]).to eql([])
     end
+    it 'puts a bad syntax at eof Puppet manifest in the error files array' do
+      PuppetParser.manifest([fixtures_dir + 'manifests/eof_syntax.pp'], false, false, [])
+      expect(PuppetCheck.settings[:error_files][0]).to match(%r{^#{fixtures_dir}manifests/eof_syntax.pp:\nSyntax error at end of input})
+      expect(PuppetCheck.settings[:warning_files]).to eql([])
+      expect(PuppetCheck.settings[:clean_files]).to eql([])
+    end
     it 'puts a bad parser and lint style Puppet manifest in the warning files array' do
       PuppetParser.manifest([fixtures_dir + 'manifests/style_parser.pp'], false, true, [])
       expect(PuppetCheck.settings[:error_files]).to eql([])

data/spec/puppet-check/ruby_parser_spec.rb

@@ -18,7 +18,7 @@ describe RubyParser do
     it 'puts a bad style ruby file in the warning files array' do
       RubyParser.ruby([fixtures_dir + 'lib/style.rb'], true, [])
       expect(PuppetCheck.settings[:error_files]).to eql([])
-      expect(PuppetCheck.settings[:warning_files][0]).to match(%r{^#{fixtures_dir}lib/style.rb:\n.*Useless assignment.*\n.*Use the new.*\n.*Do not introduce.*\n.*Prefer single.*\n.*is a writable attribute.*\n.*Issue has no descriptive comment})
+      expect(PuppetCheck.settings[:warning_files][0]).to match(%r{^#{fixtures_dir}lib/style.rb:\n.*Useless assignment.*\n.*Use the new.*\n.*Do not introduce.*\n.*Prefer single.*\n.*Source code comment is empty.*\n.*is a writable attribute.*\n.*Issue has no descriptive comment})
       expect(PuppetCheck.settings[:clean_files]).to eql([])
     end
     it 'puts a bad style ruby file in the clean files array when rubocop_args ignores its warnings' do

data/spec/puppet-check_spec.rb

@@ -50,12 +50,12 @@ 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(34)
+      expect(dir.length).to eql(35)
     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(16)
+      expect(multi_dir.length).to eql(17)
     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

data/spec/system/system_spec.rb

@@ -17,15 +17,9 @@ describe PuppetCheck do
 
       expect { cli }.not_to raise_exception
 
-      expect(PuppetCheck.settings[:error_files].length).to eql(8)
-      # stupid Puppet deprecation warning
-      if RUBY_VERSION.to_f < 2.1
-        expect(PuppetCheck.settings[:warning_files].length).to eql(10)
-        expect(PuppetCheck.settings[:clean_files].length).to eql(10)
-      else
-        expect(PuppetCheck.settings[:warning_files].length).to eql(9)
-        expect(PuppetCheck.settings[:clean_files].length).to eql(11)
-      end
+      expect(PuppetCheck.settings[:error_files].length).to eql(9)
+      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(6)
 
       expect(cli).to eql(2)
@@ -54,7 +48,7 @@ describe PuppetCheck do
 
       expect { tasks }.not_to raise_exception
 
-      expect(PuppetCheck.settings[:error_files].length).to eql(8)
+      expect(PuppetCheck.settings[:error_files].length).to eql(9)
       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(6)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-check
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - Matt Schuchard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-08 00:00:00.000000000 Z
+date: 2018-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.7'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.7'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6'
@@ -34,36 +34,44 @@ dependencies:
   name: puppet-lint
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
-    - - "<"
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: reek
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.51'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.51'
 - !ruby/object:Gem::Dependency
   name: spdx-licenses
   requirement: !ruby/object:Gem::Requirement
@@ -167,6 +175,7 @@ files:
 - spec/fixtures/librarian_good/Puppetfile
 - spec/fixtures/librarian_style/Puppetfile
 - spec/fixtures/librarian_syntax/Puppetfile
+- spec/fixtures/manifests/eof_syntax.pp
 - spec/fixtures/manifests/good.pp
 - spec/fixtures/manifests/style_lint.pp
 - spec/fixtures/manifests/style_parser.pp
@@ -212,7 +221,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -220,7 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A streamlined comprehensive set of checks for your entire Puppet code and
@@ -244,6 +253,7 @@ test_files:
 - spec/fixtures/librarian_good/Puppetfile
 - spec/fixtures/librarian_style/Puppetfile
 - spec/fixtures/librarian_syntax/Puppetfile
+- spec/fixtures/manifests/eof_syntax.pp
 - spec/fixtures/manifests/good.pp
 - spec/fixtures/manifests/style_lint.pp
 - spec/fixtures/manifests/style_parser.pp