puppet-check 1.6.1 → 2.1.0

data/spec/puppet-check/ruby_parser_spec.rb

@@ -10,25 +10,25 @@ describe RubyParser do
 
   context '.ruby' do
     it 'puts a bad syntax ruby file in the error files array' do
-      RubyParser.ruby([fixtures_dir + 'lib/syntax.rb'], false, [])
+      RubyParser.ruby(["#{fixtures_dir}lib/syntax.rb"], false, [])
       expect(PuppetCheck.settings[:error_files][0]).to match(%r{^#{fixtures_dir}lib/syntax.rb:\n.*syntax error})
       expect(PuppetCheck.settings[:warning_files]).to eql([])
       expect(PuppetCheck.settings[:clean_files]).to eql([])
     end
     it 'puts a bad style ruby file in the warning files array' do
-      RubyParser.ruby([fixtures_dir + 'lib/style.rb'], true, [])
+      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.*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
-      RubyParser.ruby([fixtures_dir + 'lib/rubocop_style.rb'], true, ['--except', 'Lint/UselessAssignment,Style/HashSyntax,Style/GlobalVars,Style/StringLiterals'])
+      RubyParser.ruby(["#{fixtures_dir}lib/rubocop_style.rb"], true, ['--except', 'Lint/UselessAssignment,Style/HashSyntax,Style/GlobalVars,Style/StringLiterals'])
       expect(PuppetCheck.settings[:error_files]).to eql([])
       expect(PuppetCheck.settings[:warning_files]).to eql([])
       expect(PuppetCheck.settings[:clean_files]).to eql(["#{fixtures_dir}lib/rubocop_style.rb"])
     end
     it 'puts a good ruby file in the clean files array' do
-      RubyParser.ruby([fixtures_dir + 'lib/good.rb'], true, [])
+      RubyParser.ruby(["#{fixtures_dir}lib/good.rb"], true, [])
       expect(PuppetCheck.settings[:error_files]).to eql([])
       expect(PuppetCheck.settings[:warning_files]).to eql([])
       expect(PuppetCheck.settings[:clean_files]).to eql(["#{fixtures_dir}lib/good.rb"])
@@ -37,25 +37,29 @@ describe RubyParser do
 
   context '.template' do
     it 'puts a bad syntax ruby template file in the error files array' do
-      RubyParser.template([fixtures_dir + 'templates/syntax.erb'])
-      expect(PuppetCheck.settings[:error_files][0]).to match(%r{^#{fixtures_dir}templates/syntax.erb:\n.*syntax error, unexpected tIDENTIFIER})
+      RubyParser.template(["#{fixtures_dir}templates/syntax.erb"])
+      if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.7')
+        expect(PuppetCheck.settings[:error_files][0]).to match(%r{^#{fixtures_dir}templates/syntax.erb:\n.*1: syntax error, unexpected.*\n.*ruby})
+      else
+        expect(PuppetCheck.settings[:error_files][0]).to match(%r{^#{fixtures_dir}templates/syntax.erb:\n.*syntax error, unexpected tIDENTIFIER})
+      end
       expect(PuppetCheck.settings[:warning_files]).to eql([])
       expect(PuppetCheck.settings[:clean_files]).to eql([])
     end
     it 'puts a bad style ruby template file in the warning files array' do
-      RubyParser.template([fixtures_dir + 'templates/style.erb'])
+      RubyParser.template(["#{fixtures_dir}templates/style.erb"])
       expect(PuppetCheck.settings[:error_files]).to eql([])
       expect(PuppetCheck.settings[:warning_files][0]).to match(%r{^#{fixtures_dir}templates/style.erb:\n.*already initialized constant.*\n.*previous definition of})
       expect(PuppetCheck.settings[:clean_files]).to eql([])
     end
     it 'puts a ruby template file with ignored errors in the clean files array' do
-      RubyParser.template([fixtures_dir + 'templates/no_method_error.erb'])
+      RubyParser.template(["#{fixtures_dir}templates/no_method_error.erb"])
       expect(PuppetCheck.settings[:error_files]).to eql([])
       expect(PuppetCheck.settings[:warning_files]).to eql([])
       expect(PuppetCheck.settings[:clean_files]).to eql(["#{fixtures_dir}templates/no_method_error.erb"])
     end
     it 'puts a good ruby template file in the clean files array' do
-      RubyParser.template([fixtures_dir + 'templates/good.erb'])
+      RubyParser.template(["#{fixtures_dir}templates/good.erb"])
       expect(PuppetCheck.settings[:error_files]).to eql([])
       expect(PuppetCheck.settings[:warning_files]).to eql([])
       expect(PuppetCheck.settings[:clean_files]).to eql(["#{fixtures_dir}templates/good.erb"])
@@ -64,25 +68,25 @@ describe RubyParser do
 
   context '.librarian' do
     it 'puts a bad syntax librarian Puppet file in the error files array' do
-      RubyParser.librarian([fixtures_dir + 'librarian_syntax/Puppetfile'], false, [])
+      RubyParser.librarian(["#{fixtures_dir}librarian_syntax/Puppetfile"], false, [])
       expect(PuppetCheck.settings[:error_files][0]).to match(%r{^#{fixtures_dir}librarian_syntax/Puppetfile:\n.*syntax error})
       expect(PuppetCheck.settings[:warning_files]).to eql([])
       expect(PuppetCheck.settings[:clean_files]).to eql([])
     end
     it 'puts a bad style librarian Puppet file in the warning files array' do
-      RubyParser.librarian([fixtures_dir + 'librarian_style/Puppetfile'], true, [])
+      RubyParser.librarian(["#{fixtures_dir}librarian_style/Puppetfile"], true, [])
       expect(PuppetCheck.settings[:error_files]).to eql([])
-      expect(PuppetCheck.settings[:warning_files][0]).to match(%r{^#{fixtures_dir}librarian_style/Puppetfile:\n.*Align the parameters.*\n.*Use the new})
+      expect(PuppetCheck.settings[:warning_files][0]).to match(%r{^#{fixtures_dir}librarian_style/Puppetfile:\n.*Align the arguments.*\n.*Use the new})
       expect(PuppetCheck.settings[:clean_files]).to eql([])
     end
     it 'puts a bad style librarian Puppet file in the clean files array when rubocop_args ignores its warnings' do
-      RubyParser.librarian([fixtures_dir + 'librarian_style/Puppetfile'], true, ['--except', 'Layout/AlignParameters,Style/HashSyntax'])
+      RubyParser.librarian(["#{fixtures_dir}librarian_style/Puppetfile"], true, ['--except', 'Layout/AlignArguments,Style/HashSyntax'])
       expect(PuppetCheck.settings[:error_files]).to eql([])
       expect(PuppetCheck.settings[:warning_files]).to eql([])
       expect(PuppetCheck.settings[:clean_files]).to eql(["#{fixtures_dir}librarian_style/Puppetfile"])
     end
     it 'puts a good librarian Puppet file in the clean files array' do
-      RubyParser.librarian([fixtures_dir + 'librarian_good/Puppetfile'], true, [])
+      RubyParser.librarian(["#{fixtures_dir}librarian_good/Puppetfile"], true, [])
       expect(PuppetCheck.settings[:error_files]).to eql([])
       expect(PuppetCheck.settings[:warning_files]).to eql([])
       expect(PuppetCheck.settings[:clean_files]).to eql(["#{fixtures_dir}librarian_good/Puppetfile"])

data/spec/puppet-check/tasks_spec.rb

@@ -1,12 +1,12 @@
 require 'rake/task'
-require_relative '../spec_helper.rb'
+require_relative '../spec_helper'
 require_relative '../../lib/puppet-check/tasks'
 
 describe PuppetCheck::Tasks do
   after(:all) do
     # cleanup rspec_puppet_setup
-    %w[spec/spec_helper.rb].each { |file| File.delete(file) }
-    %w[manifests modules].each { |dir| FileUtils.rm_r('spec/fixtures/' + dir) }
+    File.delete("#{fixtures_dir}/spec/spec_helper.rb")
+    %w[manifests modules].each { |dir| FileUtils.rm_r("#{fixtures_dir}/spec/fixtures/#{dir}") }
   end
 
   context 'puppetcheck:spec' do

data/spec/{puppet-check_spec.rb → puppet_check_spec.rb}

@@ -1,19 +1,18 @@
 require_relative 'spec_helper'
-require_relative '../lib/puppet-check'
+require_relative '../lib/puppet_check'
 
 describe PuppetCheck do
   context 'self' do
     it 'settings can be altered' do
-      PuppetCheck.settings[:future_parser] = true
-      expect(PuppetCheck.settings[:future_parser]).to eql(true)
+      expect(PuppetCheck.settings[:future_parser]).to eql(nil)
       PuppetCheck.settings[:fail_on_warnings] = true
       expect(PuppetCheck.settings[:fail_on_warnings]).to eql(true)
-      PuppetCheck.settings[:style_check] = true
-      expect(PuppetCheck.settings[:style_check]).to eql(true)
-      PuppetCheck.settings[:smoke_check] = true
-      expect(PuppetCheck.settings[:smoke_check]).to eql(true)
-      PuppetCheck.settings[:regression_check] = true
-      expect(PuppetCheck.settings[:regression_check]).to eql(true)
+      PuppetCheck.settings[:style] = true
+      expect(PuppetCheck.settings[:style]).to eql(true)
+      PuppetCheck.settings[:smoke] = true
+      expect(PuppetCheck.settings[:smoke]).to eql(true)
+      PuppetCheck.settings[:regression] = true
+      expect(PuppetCheck.settings[:regression]).to eql(true)
       PuppetCheck.settings[:public] = 'public.pem'
       expect(PuppetCheck.settings[:public]).to eql('public.pem')
       PuppetCheck.settings[:private] = 'private.pem'
@@ -66,7 +65,7 @@ describe PuppetCheck do
 
   context '.execute_parsers' do
     it 'correctly organizes a set of files and invokes the correct parsers' do
-      # parser_output = instance_double('execute_parsers', files: %w[puppet.pp puppet_template.epp ruby.rb ruby_template.erb yaml.yaml yaml.yml json.json Puppetfile Modulefile foobarbaz], future: false, style: false, pl_args: [], rc_args: [])
+      # parser_output = instance_double('execute_parsers', files: %w[puppet.pp puppet_template.epp ruby.rb ruby_template.erb yaml.yaml yaml.yml json.json Puppetfile Modulefile foobarbaz], style: false, pl_args: [], rc_args: [])
       # expect(parser_output).to receive(:manifest).with(%w[puppet.pp])
       # expect(parser_output).to receive(:template).with(%w[puppet_template.epp])
       # expect(parser_output).to receive(:ruby).with(%w[ruby.rb])

data/spec/spec_helper.rb

@@ -4,8 +4,13 @@ require 'rspec'
 module Variables
   extend RSpec::SharedContext
 
-  let(:fixtures_dir) { File.dirname(__FILE__) + '/fixtures/' }
-  let(:octocatalog_diff_dir) { File.dirname(__FILE__) + '/octocatalog-diff/' }
+  def fixtures_dir
+    @fixtures_dir = "#{File.dirname(__FILE__)}/fixtures/"
+  end
+
+  def octocatalog_diff_dir
+    @octocatalog_diff_dir = "#{File.dirname(__FILE__)}/octocatalog-diff/"
+  end
 end
 
 RSpec.configure do |config|

data/spec/system/system_spec.rb

@@ -1,12 +1,12 @@
 require 'rake/task'
-require_relative '../spec_helper.rb'
+require_relative '../spec_helper'
 require_relative '../../lib/puppet-check/cli'
 require_relative '../../lib/puppet-check/tasks'
 
 describe PuppetCheck do
   context 'executed as a system from the CLI with arguments and various files to be processed' do
     # see regression_check_spec
-    if File.directory?('/home/travis')
+    if ENV['TRAVIS'] == 'true' || ENV['CIRCLECI'] == 'true'
       let(:cli) { PuppetCheck::CLI.run(%w[-s --puppet-lint no-hard_tabs-check,no-140chars-check --rubocop Metrics/LineLength,Style/Encoding .]) }
     else
       let(:cli) { PuppetCheck::CLI.run(%w[-s --puppet-lint no-hard_tabs-check,no-140chars-check --rubocop Metrics/LineLength,Style/Encoding --smoke -n good.example.com --octoconfig spec/octocatalog-diff/octocatalog-diff.cfg.rb .]) }
@@ -38,10 +38,10 @@ describe PuppetCheck do
       PuppetCheck.settings[:warning_files] = []
       PuppetCheck.settings[:clean_files] = []
       PuppetCheck.settings[:ignored_files] = []
-      PuppetCheck.settings[:style_check] = true
+      PuppetCheck.settings[:style] = true
       # see regression_check_spec
       unless File.directory?('/home/travis')
-        PuppetCheck.settings[:smoke_check] = true
+        PuppetCheck.settings[:smoke] = true
         PuppetCheck.settings[:octonodes] = %w[good.example.com]
         PuppetCheck.settings[:octoconfig] = 'spec/octocatalog-diff/octocatalog-diff.cfg.rb'
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-check
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Matt Schuchard
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-12-30 00:00:00.000000000 Z
+date: 2022-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: puppet-lint
   requirement: !ruby/object:Gem::Requirement
@@ -48,38 +48,44 @@ dependencies:
   name: reek
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.51'
+        version: '0.58'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.58'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.51'
+        version: '2'
 - !ruby/object:Gem::Dependency
-  name: spdx-licenses
+  name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -110,22 +116,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '9'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '13'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '9'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '13'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -143,7 +143,7 @@ dependencies:
 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.
-email: 
+email:
 executables:
 - puppet-check
 extensions: []
@@ -153,7 +153,6 @@ files:
 - LICENSE.md
 - README.md
 - bin/puppet-check
-- lib/puppet-check.rb
 - lib/puppet-check/cli.rb
 - lib/puppet-check/data_parser.rb
 - lib/puppet-check/output_results.rb
@@ -163,6 +162,7 @@ files:
 - lib/puppet-check/ruby_parser.rb
 - lib/puppet-check/tasks.rb
 - lib/puppet-check/utils.rb
+- lib/puppet_check.rb
 - spec/fixtures/foobarbaz
 - spec/fixtures/hieradata/good.eyaml
 - spec/fixtures/hieradata/good.json
@@ -204,7 +204,7 @@ files:
 - spec/octocatalog-diff/facts.yaml
 - spec/octocatalog-diff/hiera.yaml
 - spec/octocatalog-diff/manifests/site.pp
-- spec/octocatalog-diff/octocatalog-diff.cfg.rb
+- spec/octocatalog-diff/octocatalog_diff.cfg.rb
 - spec/puppet-check/cli_spec.rb
 - spec/puppet-check/data_parser_spec.rb
 - spec/puppet-check/output_results_spec.rb
@@ -214,14 +214,14 @@ files:
 - spec/puppet-check/ruby_parser_spec.rb
 - spec/puppet-check/tasks_spec.rb
 - spec/puppet-check/utils_spec.rb
-- spec/puppet-check_spec.rb
+- spec/puppet_check_spec.rb
 - spec/spec_helper.rb
 - spec/system/system_spec.rb
 homepage: https://www.github.com/mschuchard/puppet-check
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -229,16 +229,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: A streamlined comprehensive set of checks for your entire Puppet code and
   data
@@ -284,7 +283,7 @@ test_files:
 - spec/octocatalog-diff/facts.yaml
 - spec/octocatalog-diff/hiera.yaml
 - spec/octocatalog-diff/manifests/site.pp
-- spec/octocatalog-diff/octocatalog-diff.cfg.rb
+- spec/octocatalog-diff/octocatalog_diff.cfg.rb
 - spec/puppet-check/cli_spec.rb
 - spec/puppet-check/data_parser_spec.rb
 - spec/puppet-check/output_results_spec.rb
@@ -294,6 +293,6 @@ test_files:
 - spec/puppet-check/ruby_parser_spec.rb
 - spec/puppet-check/tasks_spec.rb
 - spec/puppet-check/utils_spec.rb
-- spec/puppet-check_spec.rb
+- spec/puppet_check_spec.rb
 - spec/spec_helper.rb
 - spec/system/system_spec.rb