Separate method for checking compare-file-text from doing it

Author: kpaulisse

lib/octocatalog-diff/catalog.rb

@@ -202,6 +202,12 @@ def retries
       nil
     end
 
+    # By default, catalogs do not support converting and comparing file resources. This can be overridden
+    # by backends that do support it.
+    def supports_compare_file_text?
+      false
+    end
+
     # Determine if the catalog build was successful.
     # @return [Boolean] Whether the catalog is valid
     def valid?

lib/octocatalog-diff/catalog/computed.rb

@@ -71,6 +71,10 @@ def convert_file_resources(logger = Logger.new(StringIO.new))
         convert_file_resources_real(logger)
       end
 
+      def supports_compare_file_text?
+        true
+      end
+
       private
 
       # Private method: Clean up a checkout directory, if it exists
@@ -124,7 +128,7 @@ def bootstrap(logger)
 
       # Private method: Build catalog by running Puppet
       # @param logger [Logger] Logger object
-      def build_catalog(logger = nil)
+      def build_catalog(logger)
         if @facts_terminus != 'facter'
           facts_obj = OctocatalogDiff::CatalogUtil::Facts.new(@opts, logger)
           logger.debug "Start retrieving facts for #{@node} from #{self.class}"

lib/octocatalog-diff/catalog/json.rb

@@ -33,6 +33,10 @@ def initialize(options)
       def convert_file_resources(logger = Logger.new(StringIO.new))
         convert_file_resources_real(logger)
       end
+
+      def supports_compare_file_text?
+        true
+      end
     end
   end
 end

lib/octocatalog-diff/util/catalogs.rb

@@ -70,7 +70,7 @@ def build_catalog_parallelizer
         # Disable --compare-file-text if either (or both) of the chosen backends do not support it
         if @options.fetch(:compare_file_text, false)
           result.each do |_key, val|
-            next unless val.convert_file_resources == false
+            next if val.supports_compare_file_text?
             @logger.debug "Disabling --compare-file-text; not supported by #{val.builder}"
             @options[:compare_file_text] = false
             catalog_tasks.map! do |x|