Switch HamlLint hook to use extract_messages

Simplify hook by using helper provided by Hook::PreCommit::Base.

Change-Id: Icbf45532487a02502cd0395ded5798545436ffd5
Reviewed-on: http://gerrit.causes.com/44902
Tested-by: jenkins <jenkins@brigade.com>
Reviewed-by: Shane da Silva <shane.dasilva@brigade.com>

Author: sds

lib/overcommit/hook/pre_commit/haml_lint.rb

@@ -1,23 +1,19 @@
 module Overcommit::Hook::PreCommit
   # Runs `haml-lint` against any modified HAML files.
   class HamlLint < Base
+    MESSAGE_TYPE_CATEGORIZER = lambda do |type|
+      type.include?('W') ? :warning : :error
+    end
+
     def run
       result = execute([executable] + applicable_files)
       return :pass if result.success?
 
-      # Keep lines from the output for files that we actually modified
-      error_lines, warning_lines = result.stdout.split("\n").partition do |output_line|
-        if match = output_line.match(/^([^:]+):(\d+)/)
-          file = match[1]
-          line = match[2]
-        end
-        modified_lines(file).include?(line.to_i)
-      end
-
-      return :fail, error_lines.join("\n") unless error_lines.empty?
-
-      [:warn, "Modified files have lints (on lines you didn't modify)\n" <<
-              warning_lines.join("\n")]
+      extract_messages(
+        result.stdout.split("\n"),
+        /^(?<file>[^:]+):(?<line>\d+)[^ ]* (?<type>[^ ]+)/,
+        MESSAGE_TYPE_CATEGORIZER,
+      )
     end
   end
 end

spec/overcommit/hook/pre_commit/haml_lint_spec.rb

@@ -27,25 +27,25 @@
       subject.stub(:execute).and_return(result)
     end
 
-    context 'and it reports lines that were not modified by the commit' do
+    context 'and it reports a warning' do
       before do
         result.stub(:stdout).and_return([
           'file1.haml:1 [W] Prefer single quoted strings',
         ].join("\n"))
 
-        subject.stub(:modified_lines).and_return([2, 3])
+        subject.stub(:modified_lines_in_file).and_return([2, 3])
       end
 
       it { should warn }
     end
 
-    context 'and it reports lines that were modified by the commit' do
+    context 'and it reports an error' do
       before do
         result.stub(:stdout).and_return([
-          'file1.haml:1 [W] Prefer single quoted strings',
+          'file1.haml:1 [E] Unbalanced brackets.',
         ].join("\n"))
 
-        subject.stub(:modified_lines).and_return([1, 2])
+        subject.stub(:modified_lines_in_file).and_return([1, 2])
       end
 
       it { should fail_hook }