Bring in strip_log_message for better log analysis

Author: Kevin Paulisse

spec/octocatalog-diff/tests/spec_helper.rb

@@ -217,6 +217,11 @@ def self.setup_logger
     # remove the file and line locations. This takes the JSON result from catalog-diff and returns
     # a cleaned-up array of diffs.
     def self.remove_file_and_line(diff)
+      if diff.is_a?(OctocatalogDiff::API::V1::Diff)
+        result = diff.to_h.dup
+        %w(new_location old_location new_line old_line new_file old_file).each { |x| result.delete(x.to_sym) }
+        return result
+      end
       if diff.is_a?(Hash)
         result = diff.dup
         %w(new_location old_location new_line old_line new_file old_file).each { |x| result.delete(x) }
@@ -228,6 +233,13 @@ def self.remove_file_and_line(diff)
       obj.map { |x| x[0] =~ /^[\-\+]$/ ? x[0..2] : x[0..3] }
     end
 
+    # Strip off timestamps and other extraneous content from log messages so that matching
+    # of individual elements can be done via string and not regexp.
+    def self.strip_log_message(message)
+      return message unless message.strip =~ /\A\w,\s*\[[^\]]+\]\s+(\w+)\s*--\s*:(.+)/
+      "#{Regexp.last_match(1)} - #{Regexp.last_match(2).strip}"
+    end
+
     # Get the Puppet version from the Puppet binary
     def self.puppet_version
       require require_path('util/puppetversion')