overcommit 0.1.11 → 0.2.0

data/lib/overcommit/git_hook.rb

@@ -30,7 +30,7 @@ module Overcommit
           next if check_class.filetype && check.staged.empty?
 
           reporter.with_status(check) do
-            check.run_check
+            run_and_filter_check(check)
           end
         end
 
@@ -67,6 +67,20 @@ module Overcommit
       def requires_modified_files?
         false
       end
+
+      # Filters temporary staged file names from the output of the check and
+      # replaces them with their original filenames.
+      def run_and_filter_check(check)
+        status, output = check.run_check
+
+        if output && !output.empty?
+          check.staged.each do |staged_file|
+            output = staged_file.filter_string(output)
+          end
+        end
+
+        [status, output]
+      end
     end
   end
 end

data/lib/overcommit/hook_specific_check.rb

@@ -51,7 +51,7 @@ module Overcommit
       end
 
       def staged
-        @staged ||= Utils.modified_files.map do |filename|
+        @staged ||= modified_files.map do |filename|
           if self.class.filetype.nil? || filename.end_with?(".#{self.class.filetype}")
             StagedFile.new(filename)
           end

data/lib/overcommit/plugins/pre_commit/css_linter.rb

@@ -11,7 +11,6 @@ module Overcommit::GitHook
       paths = staged.map { |s| s.path }.join(' ')
 
       output = `rhino #{CSS_LINTER_PATH} --quiet --format=compact #{paths} | grep 'Error - '`
-      staged.each { |s| output = s.filter_string(output) }
       return (output !~ /Error - (?!Unknown @ rule)/ ? :good : :bad), output
     end
   end

data/lib/overcommit/plugins/pre_commit/erb_syntax.rb

@@ -15,7 +15,6 @@ module Overcommit::GitHook
 
     def run_check
       output = `bundle exec #{ERB_CHECKER} #{staged.map{ |file| file.path }.join(' ')}`
-      staged.each { |s| output = s.filter_string(output) }
       return (output !~ /: compile error$/ ? :good : :bad), output
     end
   end

data/lib/overcommit/plugins/pre_commit/js_console_log.rb

@@ -10,7 +10,6 @@ module Overcommit::GitHook
         /^\d+:\s*\/\// =~ line ||     # Skip comments
           /ALLOW_CONSOLE_LOG/ =~ line # and lines with ALLOW_CONSOLE_LOG
       end.join("\n")
-      staged.each { |s| output = s.filter_string(output) }
       return (output.empty? ? :good : :bad), output
     end
   end

data/lib/overcommit/plugins/pre_commit/js_syntax.rb

@@ -8,7 +8,6 @@ module Overcommit::GitHook
 
       paths = staged.map { |s| s.path }.join(' ')
       output = runner.call(paths)
-      staged.each { |s| output = s.filter_string(output) }
 
       return (output.empty? ? :good : :bad), output
     end

data/lib/overcommit/plugins/pre_commit/ruby_style.rb

@@ -8,13 +8,24 @@ module Overcommit::GitHook
         return :warn, 'rubocop not installed -- run `gem install rubocop`'
       end
 
-      paths = staged.map { |s| s.path }.join(' ')
+      paths_to_staged_files = Hash[staged.map { |s| [s.path, s] }]
+      staged_files = paths_to_staged_files.keys
 
-      output = `rubocop #{paths} 2>&1`
+      output = `rubocop --format=emacs --silent #{staged_files.join(' ')} 2>&1`
       return :good if $?.success?
 
-      staged.each { |s| output = s.filter_string(output) }
-      return :bad, output
+      # Keep lines from the output for files that we actually modified
+      error_lines, warning_lines = output.lines.partition do |output_line|
+        if match = output_line.match(/^([^:]+):(\d+)/)
+          file = match[1]
+          line = match[2]
+        end
+        paths_to_staged_files[file].modified_lines.include?(line.to_i)
+      end
+
+      return :bad, error_lines.join unless error_lines.empty?
+      return :warn, "Modified files have style lints (on lines you didn't modify)\n" <<
+                    warning_lines.join
     end
   end
 end

data/lib/overcommit/plugins/pre_commit/ruby_syntax.rb

@@ -9,7 +9,7 @@ module Overcommit::GitHook
       staged.each do |staged|
         syntax = `ruby -c #{staged.path} 2>&1`
         unless $?.success?
-          output += staged.filter_string(syntax).lines.to_a
+          output += syntax.lines.to_a
           clean = false
         end
       end

data/lib/overcommit/plugins/pre_commit/scss_lint.rb

@@ -14,7 +14,6 @@ module Overcommit::GitHook
 
       output = `scss-lint #{paths} 2>&1`
 
-      staged.each { |s| output = s.filter_string(output) }
       return (output.empty? ? :good : :bad), output
     end
   end

data/lib/overcommit/plugins/pre_commit/whitespace.rb

@@ -7,7 +7,6 @@ module Overcommit::GitHook
 
       # Catches hard tabs
       output = `grep -Inl "\t" #{paths}`
-      staged.each { |s| output = s.filter_string(output) }
       unless output.empty?
         return :stop, "Don't use hard tabs:\n#{output}"
       end

data/lib/overcommit/staged_file.rb

@@ -1,13 +1,14 @@
+require 'set'
 require 'tempfile'
+
 # We run syntax checks against the version of the file that is staged in
 # the index, not the one in the work tree. This class is a simple wrapper
 # to make working with staged files easier.
-
 module Overcommit
   class StagedFile
     attr_reader :contents
 
-    def initialize path
+    def initialize(path)
       @original_path  = path
       @tempfile       = Tempfile.new([path.gsub('/', '_'), File.extname(path)])
       self.contents   = `git show :#{@original_path}`
@@ -15,7 +16,7 @@ module Overcommit
 
     # Given error output from a syntax checker, replace references to the
     # temporary file path with the original path.
-    def filter_string string
+    def filter_string(string)
       string.gsub(path, @original_path)
     end
 
@@ -35,5 +36,38 @@ module Overcommit
       @tempfile.write @contents
       @tempfile.flush
     end
+
+    # Returns the set of line numbers corresponding to the lines that were
+    # changed in this file.
+    def modified_lines
+      @modified_lines ||= extract_modified_lines
+    end
+
+  private
+
+    DIFF_HUNK_REGEX = /
+      ^@@\s
+      [^\s]+\s           # Ignore old file range
+      \+(\d+)(?:,(\d+))? # Extract range of hunk containing start line and number of lines
+      \s@@.*$
+    /x
+
+    def extract_modified_lines
+      lines = Set.new
+
+      `git diff --cached -U0 -- #{@original_path}`.
+        scan(DIFF_HUNK_REGEX) do |start_line, lines_added|
+
+        lines_added = (lines_added || 1).to_i # When blank, one line was added
+        cur_line    = start_line.to_i
+
+        lines_added.times do
+          lines.add cur_line
+          cur_line += 1
+        end
+      end
+
+      lines
+    end
   end
 end

data/lib/overcommit/utils.rb

@@ -50,8 +50,7 @@ module Overcommit
       # Get a list of staged Added, Copied, or Modified files (ignore renames
       # and deletions, since there should be nothing to check).
       def modified_files
-        @modified_files ||=
-          `git diff --cached --name-only --diff-filter=ACM`.split "\n"
+        `git diff --cached --name-only --diff-filter=ACM`.split "\n"
       end
 
     private

data/lib/overcommit/version.rb

@@ -1,3 +1,3 @@
 module Overcommit
-  VERSION = '0.1.11'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: overcommit
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-10 00:00:00.000000000 Z
+date: 2013-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec