puppet-check 1.5.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3cd7dc1dabc1251536858b7dbf35964aa48b3039
-  data.tar.gz: 024abf09283611e0738d06f1d1cecd92701d5048
+SHA256:
+  metadata.gz: aa44aac16d4ff64057807c913172a7a064352f4fcfee70868b0d0c06dc0dffd6
+  data.tar.gz: 4a1fbf02e9638af8605b26377ac335594ac8d640308f38fdbc9dbae1ada78a99
 SHA512:
-  metadata.gz: d6e5c7dbcb317f589a11a751c5a2d5267252a2d82e609da29fb16cff3f79372dcfe2b98d32cb6d20a49ab18631d0e6157755f9d42aa6cccfc66a899a55c7d87c
-  data.tar.gz: 86efe8bfbafdbd84f82c5bc50b42646aea30016a0700aa321f1eede6356a39038bb02e08dbd25994c3ea03d02440a23ad59dff8cc237e81042c0986246db709b
+  metadata.gz: 58186b18c0aa0fe1600c158be2d20be6ccaf75389e18baae51041a47b8c314dd550f0817a329aca29e2ed1a6c96249f3220815b8f26387a2795306ce41715d9e
+  data.tar.gz: 616cdc41630d9b06e93cbc27015980baa3777063837ce91e1a88955a0fdbfb41cbcc79473133d4bbe1439961345cb8f745acda8f40b15c1d0bfb58b863a80be0

data/CHANGELOG.md

@@ -1,12 +1,47 @@
+### 2.0.1
+- Check for existence of executables for dependency module retrieval.
+- Beta support for Puppet 7, Rubocop 1, and Reek 6.
+
+### 2.0.0
+- Bump minimum version of Puppet to 4.0.0 and remove < 4 support code.
+- Official support for Puppet 6.
+- Minimum Ruby version bumped to 2.2.0.
+- Bumped Rubocop and Reek minimum versions and fully migrated SPDX to Rubygems.
+- Add rubocop-performance extension to Rubocop.
+- Update manifest validation for breaking change in 6.5 API.
+- Fix check on specified dependencies in metadata.
+- Enable parallel module dependency retrieval.
+
+### 1.6.1
+- Removed check for hieradata nil/undef value for Hiera >= 5.
+- Add rudimentary checks for task metadata.
+- Preliminary support for Puppet 6.
+- RSpec Puppet fixed its default `spec_helper`. Revert to loading it instead of generating a working one.
+
+### 1.6.0
+- 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.
+- Fixed check for semantic versioning in `metadata.json` for numbering > 9.
+- Accounted for Puppet syntax validation output bugfix in 5.3.
+- Fix bad symlink for module fixture during RSpec Puppet.
+- Updating Beaker Rake task usage.
+
 ### 1.5.0
-- Maximum Puppet version increased from 5 to 6.
+- Maximum Puppet version increased from 4 to 5.
 - 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).
+- Suppress constant redefinition warnings from Octocatalog-Diff's Puppet code reuse.
+- Changed FileName cop to reflect change in RuboCop >= 0.50.
+- 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

@@ -1,5 +1,6 @@
 # Puppet Check
 [![Build Status](https://travis-ci.org/mschuchard/puppet-check.svg?branch=master)](https://travis-ci.org/mschuchard/puppet-check)
+[![CircleCI](https://circleci.com/gh/mschuchard/puppet-check.svg?style=svg)](https://circleci.com/gh/mschuchard/puppet-check)
 
 - [Description](#description)
 - [Usage](#usage)
@@ -17,8 +18,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)
 
@@ -123,33 +122,16 @@ The following files have unrecognized formats and therefore were not processed:
 -- foobarbaz
 ```
 
-### Why not Puppetlabs Spec Helper?
-- Puppetlabs Spec Helper is focused more on advanced and robust spec testing.  Puppet Check is focused more on efficient and comprehensive Puppet code and data validation.
-- Puppetlabs Spec Helper performs fewer types of checks.
-- Puppetlabs Spec Helper has extra layers of gems in between it and the gems executing the checks.
-- Puppetlabs Spec Helper does not allow interfacing through it to the gems executing the checks.
-- Puppetlabs Spec Helper has no CLI.
-- Puppetlabs Spec Helper intrinsically only executes spec tests against one module at a time.
-- 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 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.
+### What About Puppet Development Kit?
+The fairly recent release of the Puppet Development Kit (PDK) will hopefully eventually bring about the capability to test and validate your Puppet code and data in a streamlined, efficient, comprehensive, and accurate fashion comparable to Puppet Check. Unfortunately, the PDK has not yet achieved feature or efficiency parity with Puppet Check. The goal is for the PDK to one day replace Puppet Check and for Puppet Check to enter maintenance mode, but for now Puppet Check is still needed to lead Puppet testing.
 
 ## 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
 ```
 usage: puppet-check [options] paths
         --version                    Display the current version.
-    -f, --future                     Enable future parser
         --fail-on-warnings           Fail on warnings
     -s, --style                      Enable style checks
         --smoke                      Enable smoke testing
@@ -166,7 +148,7 @@ usage: puppet-check [options] paths
         --rubocop arg_one,arg_two    Arguments for Rubocop disabled cops
 ```
 
-The command line interface enables the ability to select the Puppet future parser, additional style checks besides the syntax checks, and to specify PuppetLint and Rubocop checks to ignore. If you require a more robust interface to PuppetLint, Rubocop, and Reek, then please use `.puppet-lint.rc`, `.rubocop.yml` and `*.reek` config files. The `.puppet-lint.rc` can be specified with the `-c` argument. If it is not specified, then PuppetLint will automatically load one from `.puppet-lint.rc`, `~/.puppet-lint.rc`, or `/etc/puppet-lint.rc`, in that order of preference. The nearest `.rubocop.yml` and `*.reek` will be automatically respected.
+The command line interface enables the ability to select additional style checks besides the syntax checks, and to specify PuppetLint and Rubocop checks to ignore. If you require a more robust interface to PuppetLint, Rubocop, and Reek, then please use `.puppet-lint.rc`, `.rubocop.yml` and `*.reek` config files. The `.puppet-lint.rc` can be specified with the `-c` argument. If it is not specified, then PuppetLint will automatically load one from `.puppet-lint.rc`, `~/.puppet-lint.rc`, or `/etc/puppet-lint.rc`, in that order of preference. The nearest `.rubocop.yml` and `*.reek` will be automatically respected.
 
 Example:
 ```
@@ -185,15 +167,14 @@ 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:
+You can add style, smoke, and regression checks to 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[:style] = 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[:smoke] = true
+PuppetCheck.settings[:regression] = true # in progress, do not use
 PuppetCheck.settings[:public] = 'public.pem'
 PuppetCheck.settings[:private] = 'private.pem'
 PuppetCheck.settings[:output_format] = 'yaml'
@@ -260,9 +241,10 @@ 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.
 
 #### 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.
+This task serves as a frontend to the `beaker_quickstart:run_test[hypervisor]` rake task that Beaker provides. It merely provides a convenient unified frontend for the task and automated as part of the `puppetcheck` tasks. Note that you should still provide a hypervisor argument to the rake task when executed individually (e.g. `rake puppetcheck:beaker[vagrant]`). The Vagrant hypervisor will be selected by default when executed as part of the `puppetcheck` task. Vagrant will also be selected by default if no hypervisor argument is provided to the individual task.
 
-Please note this is merely a frontend to Beaker and that Beaker itself has a self-contained scope compared to all the other tools Puppet Check interfaces with and utilizes. This means if you want to add Beaker-RSpec, Serverspec, etc., or perform advanced configurations, those would be all be performed within Beaker itself. This task merely provides an interface to integrate Beaker in with your other testing infrastructure.
+#### puppetcheck:kitchen
+This task serves as a frontend to the `kitchen:all` rake task that Test Kitchen provides. It merely provides a convenient unified frontend for the task and automated as part of the `puppetcheck` tasks.
 
 ### API
 
@@ -272,20 +254,20 @@ 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[:fail_on_warnings] = true # default false
+settings[:style] = true # default false
+settings[:smoke] = true # default false
+settings[:regression] = 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'
@@ -300,7 +282,7 @@ You can also use Puppet Check inside of Docker for quick, portable, and disposab
 
 ```dockerfile
 # a reliable and small container at the moment
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 # you need ruby and any other extra dependencies that come from packages; in this example we install git to use it for downloading external module dependencies
 RUN apt-get update && apt-get install ruby git -y
 # you need puppet-check and any other extra dependencies that come from gems; in this example we install reek because the ruby ABI is 2.3 and then rspec-puppet and rake for extra testing
@@ -309,7 +291,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 corresponding directory inside the container
+# copy the module, directory environment, etc. contents into the corresponding directory inside the container; alternative, bind a volume mount for your module(s) into the container at runtime
 COPY / .
 # execute your tests; in this example we are executing the full suite of tests
 ENTRYPOINT ["rake", "puppetcheck"]
@@ -317,6 +299,8 @@ ENTRYPOINT ["rake", "puppetcheck"]
 
 You can also build your own general container for testing various Puppet situations by removing the last three lines. You can then test each module, directory environment, etc. on top of that container by merely adding and modifying the final three lines to a Dockerfile that uses the container you built from the first four lines. This is recommended usage due to being very efficient and stable.
 
+As an alternative to copying Puppet code and data into the image for testing, it is also recommended to bind volume mount the container to the directory with your Puppet code and data.
+
 ### Vagrant
 
 As an alternative to Docker, you can also use Vagrant for quick and disposable testing, but it is not as portable as Docker for these testing purposes. Below is an example Vagrantfile for this purpose.
@@ -324,7 +308,7 @@ As an alternative to Docker, you can also use Vagrant for quick and disposable t
 ```ruby
 Vagrant.configure(2) do |config|
   # a reliable and small box at the moment
-  config.vm.box = 'fedora/24-cloud-base'
+  config.vm.box = 'fedora/26-cloud-base'
 
   config.vm.provision 'shell', inline: <<-SHELL
     # cd to '/vagrant'
@@ -348,19 +332,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,52 +8,30 @@ 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(settings)
+
     # 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)
 
     # output the diagnostic results
-    PuppetCheck.settings[:output_format] == 'text' ? OutputResults.text : OutputResults.markup
+    settings[:output_format] == 'text' ? OutputResults.text : OutputResults.markup(settings)
 
     # 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?)
+    if self.class.settings[:error_files].empty? && (!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
@@ -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]
       # 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]
       # rescue OctocatalogDiff::Errors::CatalogError => err
       #   puts 'There was a catalog compilation error during the regression check:'
       #   puts err
@@ -89,6 +67,36 @@ class PuppetCheck
     end
   end
 
+  # establish default settings
+  def self.defaults(settings)
+    # initialize fail on warning,  style check, and regression check bools
+    settings[:fail_on_warning] ||= false
+    settings[:style] ||= false
+    settings[:smoke] ||= false
+    settings[:regression] ||= 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 = []
@@ -96,7 +104,7 @@ class PuppetCheck
     # traverse the unique paths and return all files
     paths.uniq.each do |path|
       if File.directory?(path)
-        files.concat(Dir.glob("#{path}/**/*").select { |subpath| File.file? subpath })
+        files.concat(Dir.glob("#{path}/**/*").select { |subpath| File.file?(subpath) })
       elsif File.file?(path)
         files.push(path)
       end
@@ -104,31 +112,39 @@ class PuppetCheck
 
     # do not process fixtures, check that at least one file was found, and remove double slashes
     files.reject! { |file| file =~ /fixtures/ }
-    raise "puppet-check: no files found in supplied paths #{paths.join(', ')}." if files.empty?
+    raise "puppet-check: no files found in supplied paths '#{paths.join(', ')}'." if files.empty?
     files.map! { |file| file.gsub('//', '/') }
 
     files.uniq
   end
 
   # categorize and pass the files out to the parsers to determine their status
-  def execute_parsers(files, future, style, public, private, pl_args, rc_args)
+  def execute_parsers(files, settings)
+    # check manifests
     manifests, files = files.partition { |file| File.extname(file) == '.pp' }
-    PuppetParser.manifest(manifests, future, style, pl_args)
+    PuppetParser.manifest(manifests, settings[:style], settings[:puppetlint_args]) unless manifests.empty?
+    # check puppet templates
     templates, files = files.partition { |file| File.extname(file) == '.epp' }
-    PuppetParser.template(templates)
+    PuppetParser.template(templates) unless templates.empty?
+    # check ruby files
     rubies, files = files.partition { |file| File.extname(file) == '.rb' }
-    RubyParser.ruby(rubies, style, rc_args)
+    RubyParser.ruby(rubies, settings[:style], settings[:rubocop_args]) unless rubies.empty?
+    # check ruby templates
     templates, files = files.partition { |file| File.extname(file) == '.erb' }
-    RubyParser.template(templates)
+    RubyParser.template(templates) unless templates.empty?
+    # check yaml data
     yamls, files = files.partition { |file| File.extname(file) =~ /\.ya?ml$/ }
-    DataParser.yaml(yamls)
+    DataParser.yaml(yamls) unless yamls.empty?
+    # check json data
     jsons, files = files.partition { |file| File.extname(file) == '.json' }
-    DataParser.json(jsons)
-    # block this for now
+    DataParser.json(jsons) unless jsons.empty?
+    # check eyaml data; block this for now
     # eyamls, files = files.partition { |file| File.extname(file) =~ /\.eya?ml$/ }
-    # DataParser.eyaml(eyamls, public, private)
+    # DataParser.eyaml(eyamls, public, private) unless eyamls.empty?
+    # check misc ruby
     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) }
+    RubyParser.librarian(librarians, settings[:style], settings[:rubocop_args]) unless librarians.empty?
+    # ignore everything else
+    self.class.settings[:ignored_files].concat(files)
   end
 end

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
-    PuppetCheck.new.run(args)
+    # run PuppetCheck with specified paths
+    PuppetCheck.new.run(settings, args)
   end
 
   # parse the user arguments
@@ -18,44 +18,48 @@ 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.0'
+        puts 'puppet-check 2.0.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('--fail-on-warnings', 'Fail on warnings') { settings[:fail_on_warnings] = true }
+      opts.on('-s', '--style', 'Enable style checks') { settings[:style] = true }
+      opts.on('--smoke', 'Enable smoke testing') { settings[:smoke] = true }
+      opts.on('-r', '--regression', 'Enable regression testing (in progress, do not use)') { settings[:regression] = 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