puppet-check 2.2.2 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8202ec2f014dfda495943251a944a05a2f02dd411d4432d4ae2fa670090147f
-  data.tar.gz: 79926aa5d6f7a5b4abdf5141a110d08f2dd2d678439b89a3a4193ba957b3eb36
+  metadata.gz: d04c10fa6bc7d10b70113b7d93ab7be0d0f5cc1e65e0976e2e40e3edcc561ff8
+  data.tar.gz: 5e0fc0e541f9aa21bc65015cc0bc5958a8d44b3aaf36b8d1ce5e69f3942b9221
 SHA512:
-  metadata.gz: 5881b391a02f1f7afd9d902e16c578fa02128511275e9c670767ec2c1ebcce263a1137f36244c1e8bb118da057719f955727df577a6df421d66966cb39d3d054
-  data.tar.gz: d74c947acf7b79cbc0f82ba7280617495eb2bfd7574e6e22791b59bffa8a9fa4228aec7194fd3c8c9b77e99993a10dc9886074e43c3166da69b2d0ccccd1a052
+  metadata.gz: d762b4386dc42703ffea264872629684f35a98ddbf69b2eb3fb82f9039a614e146a9a6d6961c51086c33dffd80e8d192a973f4025adc355d355d1d20e442d039
+  data.tar.gz: 90cea3c4ebc6a20d48793276f3563f7d82e8067b94ab3f3ff0c6e51bbbe8de00333c34b157baec92ed919d110eb9eb29065d90e04c01c1e7a287ae2ce3ed78fc

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+### 2.3.1
+- No input target paths now defaults to current working directory instead of error.
+- Additionally check `Vagrantfile` and `gemspec` files.
+- Fix and improve behavior for when optional dependency `octocatalog-diff` is absent.
+
+### 2.3.0
+- Minimum Ruby version increased to 2.7.
+- Support Puppet 8.
+- Upgrade EYAML validation functionality from experimental to beta.
+- Code execution optimization.
+
 ### 2.2.2
 - Workaround Ruby passbyref issue mutating an immutable.
 

data/README.md

@@ -1,7 +1,4 @@
 # Puppet Check
-[![Build Status](https://travis-ci.com/mschuchard/puppet-check.svg?branch=master)](https://travis-ci.com/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)
   - [CLI](#cli)
@@ -16,7 +13,7 @@
 ## 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.
+**IMPORTANT**: The current support for encrypted yaml validation is experimental and should be considered a beta feature as of 2.3.0.
 
 ### Former Method for Code and Data Checks
 ![Old](https://raw.githubusercontent.com/mschuchard/puppet-check/master/images/puppetcheck_old.png)

data/lib/puppet-check/cli.rb

@@ -6,7 +6,9 @@ class PuppetCheck::CLI
   def self.run(args)
     # gather the user arguments
     settings = parse(args)
-    raise 'puppet-check: no file paths specified; try using --help' if args.empty?
+
+    # target cwd if no paths input as variadic
+    args = [Dir.pwd] if args.empty?
 
     # run PuppetCheck with specified paths
     PuppetCheck.new.run(settings, args)
@@ -29,7 +31,9 @@ class PuppetCheck::CLI
 
       # base options
       opts.on('--version', 'Display the current version.') do
-        puts 'puppet-check 2.2.2'
+        require 'rubygems'
+
+        puts Gem::Specification.load("#{File.dirname(__FILE__)}/../../puppet-check.gemspec").version
         exit 0
       end
 

data/lib/puppet-check/data_parser.rb

@@ -43,27 +43,30 @@ class DataParser
     x509 = OpenSSL::X509::Certificate.new(File.read(public))
 
     files.each do |file|
-      # grab all encoded portions of the eyaml
+      # check encoded yaml syntax
+      parsed = YAML.load_file(file)
 
-      # decrypt the encoded portions
-      decrypted = OpenSSL::PKCS7.new(File.read(file)).decrypt(rsa, x509)
+      # extract encoded values
+      # ENC[PKCS7]
 
-      # insert decrypted portions back into eyaml (pass into loader below)
+      # decrypt the encoded yaml
+      # decrypted = OpenSSL::PKCS7.new(File.read(file)).decrypt(rsa, x509)
 
-      # check yaml syntax
-      begin
-        parsed = YAML.load_file(decrypted)
-      rescue StandardError => err
-        PuppetCheck.files[:errors][file] = err.to_s.gsub("(#{file}): ", '').split("\n")
-      else
-        warnings = []
-
-        # perform some rudimentary hiera checks if data exists and is hieradata
-        warnings = hiera(parsed, file) if parsed
-
-        next PuppetCheck.files[:warnings][file] = warnings unless warnings.empty?
-        PuppetCheck.files[:clean].push(file.to_s)
-      end
+      # check decoded eyaml syntax
+      # decoded = YAML.safe_load(decrypted)
+
+      # merge data hashes
+      # parsed = merge(parsed, decoded)
+    rescue StandardError => err
+      PuppetCheck.files[:errors][file] = err.to_s.gsub("(#{file}): ", '').split("\n")
+    else
+      warnings = []
+
+      # perform some rudimentary hiera checks if data exists and is hieradata
+      warnings = hiera(parsed, file) if parsed
+
+      next PuppetCheck.files[:warnings][file] = warnings unless warnings.empty?
+      PuppetCheck.files[:clean].push(file.to_s)
     end
   end
 
@@ -79,127 +82,125 @@ class DataParser
 
     files.each do |file|
       # check json syntax
-      begin
-        parsed = JSON.parse(File.read(file))
-      rescue JSON::ParserError => err
-        PuppetCheck.files[:errors][file] = err.to_s.lines.first.strip.split("\n")
-      else
-        warnings = []
-
-        # check metadata.json
-        if File.basename(file) == 'metadata.json'
-          # metadata-json-lint has issues and is essentially no longer maintained, so here is an improved and leaner version of it
-          require 'rubygems/util/licenses'
-
-          # check for errors
-          errors = []
-
-          # check for required keys
-          REQUIRED_KEYS.each do |key|
-            errors.push("Required field '#{key}' not found.") unless parsed.key?(key)
-          end
+      parsed = JSON.parse(File.read(file))
+    rescue JSON::ParserError => err
+      PuppetCheck.files[:errors][file] = err.to_s.lines.first.strip.split("\n")
+    else
+      warnings = []
 
-          # check requirements and dependencies keys
-          REQ_DEP_KEYS.each do |key|
-            # skip if key is missing or value is an empty string, array, or hash
-            next if !parsed.key?(key) || parsed[key].empty?
+      # check metadata.json
+      if File.basename(file) == 'metadata.json'
+        # metadata-json-lint has issues and is essentially no longer maintained, so here is an improved and leaner version of it
+        require 'rubygems/util/licenses'
 
-            # check that dependencies and requirements are an array of hashes
-            next errors.push("Field '#{key}' is not an array of hashes.") unless (parsed[key].is_a? Array) && (parsed[key][0].is_a? Hash)
+        # check for errors
+        errors = []
 
-            # check dependencies and requirements values
-            names = []
-            parsed[key].each do |req_dep|
-              # check for duplicate dependencies and requirements
-              name = req_dep['name']
-              next errors.push("Duplicate #{key} on #{name}.") if names.include?(name)
-              names << name
+        # check for required keys
+        REQUIRED_KEYS.each do |key|
+          errors.push("Required field '#{key}' not found.") unless parsed.key?(key)
+        end
+
+        # check requirements and dependencies keys
+        REQ_DEP_KEYS.each do |key|
+          # skip if key is missing or value is an empty string, array, or hash
+          next if !parsed.key?(key) || parsed[key].empty?
+
+          # check that dependencies and requirements are an array of hashes
+          next errors.push("Field '#{key}' is not an array of hashes.") unless (parsed[key].is_a? Array) && (parsed[key][0].is_a? Hash)
 
-              # warn and skip if key is missing
-              next warnings.push("'#{req_dep['name']}' is missing a 'version_requirement' key.") if req_dep['version_requirement'].nil?
+          # check dependencies and requirements values
+          names = []
+          parsed[key].each do |req_dep|
+            # check for duplicate dependencies and requirements
+            name = req_dep['name']
+            next errors.push("Duplicate #{key} on #{name}.") if names.include?(name)
+            names << name
 
-              # warn and skip if no upper bound
-              next warnings.push("'#{req_dep['name']}' is missing an upper bound.") unless req_dep['version_requirement'].include?('<')
+            # warn and skip if key is missing
+            next warnings.push("'#{req_dep['name']}' is missing a 'version_requirement' key.") if req_dep['version_requirement'].nil?
 
-              # check for semantic versioning
-              if key == 'dependencies' && req_dep['version_requirement'] !~ /\d+\.\d+\.\d+.*\d+\.\d+\.\d+/
-                warnings.push("'#{req_dep['name']}' has non-semantic versioning in its 'version_requirement' key.")
-              end
+            # warn and skip if no upper bound
+            next warnings.push("'#{req_dep['name']}' is missing an upper bound.") unless req_dep['version_requirement'].include?('<')
+
+            # check for semantic versioning
+            if key == 'dependencies' && req_dep['version_requirement'] !~ /\d+\.\d+\.\d+.*\d+\.\d+\.\d+/
+              warnings.push("'#{req_dep['name']}' has non-semantic versioning in its 'version_requirement' key.")
             end
           end
+        end
 
-          # check for deprecated fields
-          DEPRECATED_KEYS.each do |key|
-            errors.push("Deprecated field '#{key}' found.") if parsed.key?(key)
-          end
+        # check for deprecated fields
+        DEPRECATED_KEYS.each do |key|
+          errors.push("Deprecated field '#{key}' found.") if parsed.key?(key)
+        end
 
-          # check for summary under 144 character
-          errors.push('Summary exceeds 144 characters.') if parsed.key?('summary') && parsed['summary'].size > 144
+        # check for summary under 144 character
+        errors.push('Summary exceeds 144 characters.') if parsed.key?('summary') && parsed['summary'].size > 144
 
-          next PuppetCheck.files[:errors][file] = errors unless errors.empty?
+        next PuppetCheck.files[:errors][file] = errors unless errors.empty?
 
-          # check for warnings
-          # check for operatingsystem_support hash array
-          if parsed.key?('operatingsystem_support')
-            # check if operatingsystem_support array is actually empty
-            if !(parsed['operatingsystem_support'].is_a? Array) || parsed['operatingsystem_support'].empty? || (!parsed['operatingsystem_support'].empty? && !(parsed['operatingsystem_support'][0].is_a? Hash))
-              warnings.push('Recommended field \'operatingsystem\' not found.')
-              warnings.push('Recommended field \'operatingsystemrelease\' not found.')
+        # check for warnings
+        # check for operatingsystem_support hash array
+        if parsed.key?('operatingsystem_support')
+          # check if operatingsystem_support array is actually empty
+          if !(parsed['operatingsystem_support'].is_a? Array) || parsed['operatingsystem_support'].empty? || (!parsed['operatingsystem_support'].empty? && !(parsed['operatingsystem_support'][0].is_a? Hash))
+            warnings.push('Recommended field \'operatingsystem\' not found.')
+            warnings.push('Recommended field \'operatingsystemrelease\' not found.')
+          else
+            # check for operatingsystem string
+            if parsed['operatingsystem_support'][0].key?('operatingsystem')
+              warnings.push('Field \'operatingsystem\' is not a string.') unless parsed['operatingsystem_support'][0]['operatingsystem'].is_a? String
             else
-              # check for operatingsystem string
-              if parsed['operatingsystem_support'][0].key?('operatingsystem')
-                warnings.push('Field \'operatingsystem\' is not a string.') unless parsed['operatingsystem_support'][0]['operatingsystem'].is_a? String
-              else
-                warnings.push('Recommended field \'operatingsystem\' not found.')
-              end
-
-              # check for operatingsystemrelease string array
-              if parsed['operatingsystem_support'][0].key?('operatingsystemrelease')
-                warnings.push('Field \'operatingsystemrelease\' is not a string array.') unless parsed['operatingsystem_support'][0]['operatingsystemrelease'][0].is_a? String
-              else
-                warnings.push('Recommended field \'operatingsystemrelease\' not found.')
-              end
+              warnings.push('Recommended field \'operatingsystem\' not found.')
             end
-          else
-            warnings.push('Recommended field \'operatingsystem_support\' not found.')
-          end
 
-          # check for spdx license
-          if parsed.key?('license') && !Gem::Licenses.match?(parsed['license']) && parsed['license'] !~ /[pP]roprietary/
-            warnings.push("License identifier '#{parsed['license']}' is not in the SPDX list: http://spdx.org/licenses/")
-          end
-        # assume this is task metadata if it has this key
-        elsif parsed.key?('description')
-          # check that description is a string
-          warnings.push('description value is not a String') unless parsed['description'].is_a?(String)
-          # check that input_method is one of three possible values
-          if parsed.key?('input_method')
-            if parsed['input_method'].is_a?(String)
-              warnings.push('input_method value is not one of environment, stdin, or powershell') unless TASK_INPUTS.include?(parsed['input_method'])
+            # check for operatingsystemrelease string array
+            if parsed['operatingsystem_support'][0].key?('operatingsystemrelease')
+              warnings.push('Field \'operatingsystemrelease\' is not a string array.') unless parsed['operatingsystem_support'][0]['operatingsystemrelease'][0].is_a? String
             else
-              warnings.push('input_method value is not a String')
+              warnings.push('Recommended field \'operatingsystemrelease\' not found.')
             end
           end
-          # check that parameters is a hash
-          if parsed.key?('parameters') && !parsed['parameters'].is_a?(Hash)
-            warnings.push('parameters value is not a Hash')
-          end
-          # check that puppet_task_version is an integer
-          if parsed.key?('puppet_task_version') && !parsed['puppet_task_version'].is_a?(Integer)
-            warnings.push('puppet_task_version value is not an Integer')
-          end
-          # check that supports_noop is a boolean
-          if parsed.key?('supports_noop') && !(parsed['supports_noop'].is_a?(TrueClass) || parsed['supports_noop'].is_a?(FalseClass))
-            warnings.push('supports_noop value is not a Boolean')
+        else
+          warnings.push('Recommended field \'operatingsystem_support\' not found.')
+        end
+
+        # check for spdx license
+        if parsed.key?('license') && !Gem::Licenses.match?(parsed['license']) && parsed['license'] !~ /[pP]roprietary/
+          warnings.push("License identifier '#{parsed['license']}' is not in the SPDX list: http://spdx.org/licenses/")
+        end
+      # assume this is task metadata if it has this key
+      elsif parsed.key?('description')
+        # check that description is a string
+        warnings.push('description value is not a String') unless parsed['description'].is_a?(String)
+        # check that input_method is one of three possible values
+        if parsed.key?('input_method')
+          if parsed['input_method'].is_a?(String)
+            warnings.push('input_method value is not one of environment, stdin, or powershell') unless TASK_INPUTS.include?(parsed['input_method'])
+          else
+            warnings.push('input_method value is not a String')
           end
-        # assume this is hieradata and ensure it is non-empty
-        elsif parsed
-          # perform some rudimentary hiera checks if data exists
-          warnings = hiera(parsed, file)
         end
-        next PuppetCheck.files[:warnings][file] = warnings unless warnings.empty?
-        PuppetCheck.files[:clean].push(file.to_s)
+        # check that parameters is a hash
+        if parsed.key?('parameters') && !parsed['parameters'].is_a?(Hash)
+          warnings.push('parameters value is not a Hash')
+        end
+        # check that puppet_task_version is an integer
+        if parsed.key?('puppet_task_version') && !parsed['puppet_task_version'].is_a?(Integer)
+          warnings.push('puppet_task_version value is not an Integer')
+        end
+        # check that supports_noop is a boolean
+        if parsed.key?('supports_noop') && !(parsed['supports_noop'].is_a?(TrueClass) || parsed['supports_noop'].is_a?(FalseClass))
+          warnings.push('supports_noop value is not a Boolean')
+        end
+      # assume this is hieradata and ensure it is non-empty
+      elsif parsed
+        # perform some rudimentary hiera checks if data exists
+        warnings = hiera(parsed, file)
       end
+      next PuppetCheck.files[:warnings][file] = warnings unless warnings.empty?
+      PuppetCheck.files[:clean].push(file.to_s)
     end
   end
 
@@ -219,7 +220,7 @@ class DataParser
     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 may fail to parse it correctly.') if File.read(file).scan(/---/).count >= 2
+    warnings.push('The string --- appears more than once in this data and Hiera may fail to parse it correctly.') if File.read(file).scan('---').count >= 2
 
     warnings
   end

data/lib/puppet-check/output_results.rb

@@ -2,6 +2,13 @@ require_relative '../puppet_check'
 
 # class to handle outputting diagnostic results in desired format
 class OutputResults
+  HEADER = {
+    errors: "\033[31mThe following files have errors:\033[0m\n",
+    warnings: "\033[33mThe following files have warnings:\033[0m\n",
+    clean: "\033[32mThe following files have no errors or warnings:\033[0m\n-- ",
+    ignored: "\033[36mThe following files have unrecognized formats and therefore were not processed:\033[0m\n-- "
+  }.freeze
+
   # output the results in various formats
   def self.run(files, format)
     # remove empty entries
@@ -28,24 +35,26 @@ class OutputResults
   def self.text(files)
     private_class_method :method
 
-    # errors
-    if files.key?(:errors)
-      puts "\033[31mThe following files have errors:\033[0m"
-      files[:errors].each { |file, errors| puts "-- #{file}:\n#{errors.join("\n")}" }
-    end
-    # warnings
-    if files.key?(:warnings)
-      puts "\n\033[33mThe following files have warnings:\033[0m"
-      files[:warnings].each { |file, warnings| puts "-- #{file}:\n#{warnings.join("\n")}" }
-    end
-    # cleans
-    if files.key?(:clean)
-      print "\n\033[32mThe following files have no errors or warnings:\033[0m\n-- "
-      puts files[:clean].join("\n-- ")
+    # output text for each of four file categories
+    %i[errors warnings clean ignored].each do |category|
+      # immediately return if category is empty
+      next unless files.key?(category)
+
+      # display heading, files, and file messages per category for text formatting
+      category_files = files[category]
+
+      # display category heading
+      print HEADER[category]
+
+      # display files and optionally messages
+      case category_files
+      when Hash then category_files.each { |file, messages| puts "-- #{file}:\n#{messages.join("\n")}" }
+      when Array then puts category_files.join("\n-- ")
+      else raise "puppet-check: The files category was of unexpected type #{category_files.class}. Please file an issue with this log message, category heading, and information about the parsed files."
+      end
+
+      # newline between categories for easier visual parsing
+      puts ''
     end
-    # ignores
-    return unless files.key?(:ignored)
-    print "\n\033[36mThe following files have unrecognized formats and therefore were not processed:\033[0m\n-- "
-    puts files[:ignored].join("\n-- ")
   end
 end

data/lib/puppet-check/puppet_parser.rb

@@ -10,6 +10,13 @@ class PuppetParser
     # prepare the Puppet settings for the error checking
     Puppet.initialize_settings unless Puppet.settings.app_defaults_initialized?
 
+    # prepare the PuppetLint object for style checks
+    if style
+      require 'puppet-lint'
+      require 'puppet-lint/optparser'
+      puppet_lint = PuppetLint.new
+    end
+
     files.each do |file|
       # setup error logging and collection; warnings logged for all versions, but errors for only puppet < 6.5
       errors = []
@@ -48,9 +55,6 @@ class PuppetParser
 
       # check puppet style
       if style
-        require 'puppet-lint'
-        require 'puppet-lint/optparser'
-
         # check for invalid arguments to PuppetLint
         begin
           PuppetLint::OptParser.build.parse!(pl_args.clone)
@@ -58,8 +62,7 @@ class PuppetParser
           raise "puppet-lint: invalid option supplied among #{pl_args.join(' ')}"
         end
 
-        # prepare the PuppetLint object for style checks
-        puppet_lint = PuppetLint.new
+        # execute puppet-lint style checks
         puppet_lint.file = file
         puppet_lint.run
 

data/lib/puppet-check/regression_check.rb

@@ -1,29 +1,34 @@
-# temporarily supress warning messages for octocatalog-diff redefining puppet constants and then reactivate
-$VERBOSE = nil
-require 'octocatalog-diff'
-$VERBOSE = false
+begin
+  # 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 = config(octoconfig)
-    nodes = options.key?(:node) ? [options[:node]] : interface_nodes
-    nodes.each do |node|
-      options[:node] = node
-      OctocatalogDiff::API::V1.catalog(options)
+  # executes smoke and regression tests on catalogs
+  class RegressionCheck
+    # smoke testing
+    def self.smoke(interface_nodes, octoconfig)
+      options = config(octoconfig)
+      nodes = options.key?(:node) ? [options[:node]] : interface_nodes
+      nodes.each do |node|
+        options[:node] = node
+        OctocatalogDiff::API::V1.catalog(options)
+      end
     end
-  end
 
-  # regression testing
-  # def self.regression(nodes, octoconfig)
-  #   options = RegressionCheck.config(octoconfig)
-  #   nodes.each { |node| stuff }
-  # end
+    # regression testing
+    # def self.regression(nodes, octoconfig)
+    #   options = RegressionCheck.config(octoconfig)
+    #   nodes.each { |node| stuff }
+    # end
 
-  # config file loading
-  def self.config(octoconfig)
-    private_class_method :method
-    OctocatalogDiff::API::V1.config(filename: octoconfig)
+    # config file loading
+    def self.config(octoconfig)
+      private_class_method :method
+      OctocatalogDiff::API::V1.config(filename: octoconfig)
+    end
   end
+rescue LoadError
+  warn 'puppet-check: octocatalog-diff is not installed, and therefore the regression checks will be skipped'
+  $VERBOSE = false
 end

data/lib/puppet-check/ruby_parser.rb

@@ -5,26 +5,30 @@ require_relative 'utils'
 class RubyParser
   # checks ruby (.rb)
   def self.ruby(files, style, rc_args)
+    # prepare rubocop object for style checks
+    if style
+      require 'json'
+      require 'rubocop'
+      require 'reek'
+      require 'reek/cli/application'
+
+      rubocop_cli = RuboCop::CLI.new
+    end
+
     files.each do |file|
       # check ruby syntax
-      # prevents ruby code from actually executing
-      catch(:good) { instance_eval("BEGIN {throw :good}; #{File.read(file)}", file) }
+      # prevents ruby code from actually executing the input ruby file
+      catch(:good) { instance_eval("BEGIN {throw :good}; #{File.read(file)} # BEGIN {throw :good}; ruby_file_content", file) }
     rescue ScriptError, StandardError => err
       PuppetCheck.files[:errors][file] = err.to_s.gsub("#{file}:", '').split("\n")
     else
       # check ruby style
       if style
         # check RuboCop and parse warnings' JSON output
-        require 'json'
-        require 'rubocop'
-
-        rubocop_warnings = Utils.capture_stdout { RuboCop::CLI.new.run(rc_args + ['--enable-pending-cops', '--require', 'rubocop-performance', '--format', 'json', file]) }
+        rubocop_warnings = Utils.capture_stdout { rubocop_cli.run(rc_args + ['--enable-pending-cops', '--require', 'rubocop-performance', '--format', 'json', file]) }
         rubocop_offenses = JSON.parse(rubocop_warnings)['files'][0]['offenses'].map { |warning| "#{warning['location']['line']}:#{warning['location']['column']} #{warning['message']}" }
 
         # check Reek and parse warnings' JSON output
-        require 'reek'
-        require 'reek/cli/application'
-
         reek_warnings = Utils.capture_stdout { Reek::CLI::Application.new(['-f', 'json', file]).execute }
         reek_offenses = JSON.parse(reek_warnings).map { |warning| "#{warning['lines'].join(',')}: #{warning['context']} #{warning['message']}" }
 
@@ -65,24 +69,25 @@ class RubyParser
   def self.librarian(files, style, rc_args)
     # efficient var assignment prior to iterator
     if style
+      require 'json'
+      require 'rubocop'
+
+      rubocop_cli = RuboCop::CLI.new
+
       # 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]},Naming/FileName" : rc_args.push('--except', 'Naming/FileName')
     end
 
     files.each do |file|
       # check librarian puppet syntax
-      # prevents ruby code from actually executing
-      catch(:good) { instance_eval("BEGIN {throw :good}; #{File.read(file)}", file) }
+      # prevents ruby code from actually executing the input ruby file
+      catch(:good) { instance_eval("BEGIN {throw :good}; #{File.read(file)} # BEGIN {throw :good}; ruby_file_content", file) }
     rescue SyntaxError, LoadError, ArgumentError => err
       PuppetCheck.files[:errors][file] = err.to_s.gsub("#{file}:", '').split("\n")
     # check librarian puppet style
     else
       if style
-        # check Rubocop
-        require 'json'
-        require 'rubocop'
-
-        warnings = Utils.capture_stdout { RuboCop::CLI.new.run(rc_args + ['--enable-pending-cops', '--require', 'rubocop-performance', '--format', 'json', file]) }
+        warnings = Utils.capture_stdout { rubocop_cli.run(rc_args + ['--enable-pending-cops', '--require', 'rubocop-performance', '--format', 'json', file]) }
         offenses = JSON.parse(warnings)['files'][0]['offenses'].map { |warning| "#{warning['location']['line']}:#{warning['location']['column']} #{warning['message']}" }
 
         # collect style warnings