finish fixes and improvements to octo-diff absent

Author: mschuchard

CHANGELOG.md

@@ -1,6 +1,7 @@
 ### 2.3.1 (Next)
 - No input target paths now defaults to current working directory instead of error.
 - Additionally check `Vagrantfile` and `gemspec` files.
+- Fix behavior for when optional dependency `octocatalog-diff` is absent.
 
 ### 2.3.0
 - Minimum Ruby version increased to 2.7.

lib/puppet-check/regression_check.rb

@@ -29,5 +29,5 @@ def self.config(octoconfig)
     end
   end
 rescue LoadError
-  # octocatalog-diff not installed
+  warn 'puppet-check: octocatalog-diff is not installed, and therefore the regression checks will be skipped'
 end

lib/puppet_check.rb

@@ -36,15 +36,12 @@ def run(settings = {}, paths = [])
     if parsed_files[:errors].empty? && (!settings[:fail_on_warning] || parsed_files[:warnings].empty?)
       begin
         require_relative 'puppet-check/regression_check'
-      # if octocatalog-diff is not installed then return immediately
-      rescue LoadError
-        warn 'octocatalog-diff is not installed, and therefore the regressions check will be skipped'
-        return 0
-      end
 
-      # perform smoke checks if there were no errors and the user desires
-      begin
+        # perform smoke checks if there were no errors and the user desires
         catalog = RegressionCheck.smoke(settings[:octonodes], settings[:octoconfig]) if settings[:smoke]
+      # if octocatalog-diff is not installed then continue immediately
+      rescue NameError
+        puts 'puppet-check: immediately continuing to results'
       # smoke check failure? output message and return 2
       rescue OctocatalogDiff::Errors::CatalogError => err
         puts 'There was a smoke check error:'
@@ -61,6 +58,7 @@ def run(settings = {}, paths = [])
       #   puts catalog.error_message unless catalog.valid?
       #   2
       # end
+
       # code to output differences in catalog?
       # everything passed? return 0
       0

spec/puppet-check/regression_check_spec.rb

@@ -37,5 +37,5 @@
     end
   end
 rescue NameError
-  puts 'octocatalog-diff is not installed, and its unit tests will be skipped'
+  puts 'puppet-check+rspec: octocatalog-diff is not installed, and its unit tests will be skipped'
 end