overcommit 0.1.7 → 0.1.8

data/bin/scripts/gerrit-change-id

@@ -18,7 +18,7 @@
 # limitations under the License.
 #
 
-CHANGE_ID_AFTER="Bug|Issue"
+CHANGE_ID_AFTER="Bug|Issue|Story"
 MSG="$1"
 
 # Check for, and add if missing, a unique Change-Id

data/lib/overcommit.rb

@@ -5,5 +5,6 @@ require 'overcommit/hook_specific_check'
 require 'overcommit/installer'
 require 'overcommit/logger'
 require 'overcommit/reporter'
+require 'overcommit/staged_file'
 require 'overcommit/utils'
 require 'overcommit/version'

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

@@ -8,9 +8,10 @@ module Overcommit::GitHook
     def run_check
       return :warn, "Rhino is not installed" unless in_path? 'rhino'
 
-      paths = staged.join(' ')
-      output = `rhino #{CSS_LINTER_PATH} --quiet --format=compact #{paths} | grep 'Error - '`
+      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

@@ -14,7 +14,8 @@ module Overcommit::GitHook
     end
 
     def run_check
-      output = `bundle exec #{ERB_CHECKER} #{staged.join(' ')}`
+      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/haml_syntax.rb

@@ -10,14 +10,15 @@ module Overcommit::GitHook
         return :warn, "'haml' gem not installed -- run `gem install haml`"
       end
 
-      staged.each do |path|
+      staged.map { |s| s.path }.each do |path|
         begin
           Haml::Engine.new(File.read(path), :check_syntax => true)
         rescue Haml::Error => e
           return :bad, e.message
         end
       end
-      return :good, nil
+
+      :good
     end
   end
 end

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

@@ -5,11 +5,12 @@ module Overcommit::GitHook
 
     # https://www.pivotaltracker.com/story/show/18119495
     def run_check
-      paths = staged.join(' ')
+      paths = staged.map { |s| s.path }.join(' ')
       output = `grep -n -e 'console\\.log' #{paths}`.split("\n").reject do |line|
         /^\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

@@ -6,7 +6,10 @@ module Overcommit::GitHook
     def run_check
       return :warn, 'Need either `jshint` or `rhino` in path' unless runner
 
-      output = runner.call(staged.join(' ')).split("\n")
+      paths = staged.map { |s| s.path }.join(' ')
+      output = runner.call(paths).split("\n")
+      staged.each { |s| output = s.filter_string(output) }
+
       return (output.none? ? :good : :bad), output
     end
 

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

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

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

@@ -10,10 +10,11 @@ module Overcommit::GitHook
         return :warn, 'scss-lint not installed -- run `gem install scss-lint`'
       end
 
-      paths = staged.join(' ')
+      paths = staged.map { |s| s.path }.join(' ')
 
       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

@@ -3,8 +3,11 @@ module Overcommit::GitHook
     include HookRegistry
 
     def run_check
+      paths = staged.map { |s| s.path }.join(' ')
+
       # Catches hard tabs
-      output = `grep -Inl "\t" #{staged.join(' ')}`
+      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/plugins/pre_commit/yaml_syntax.rb

@@ -8,11 +8,11 @@ module Overcommit::GitHook
     def run_check
       clean = true
       output = []
-      staged.each do |path|
+      staged.each do |staged_file|
         begin
-          YAML.load_file(path)
+          YAML.load_file(staged_file.path)
         rescue ArgumentError => e
-          output << "#{e.message} parsing #{path}"
+          output << "#{e.message} parsing #{staged_file.path}"
           clean = false
         end
       end

data/lib/overcommit/staged_file.rb

@@ -0,0 +1,39 @@
+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
+      @original_path  = path
+      @tempfile       = Tempfile.new([path.gsub('/', '_'), File.extname(path)])
+      self.contents   = `git show :#{@original_path}`
+    end
+
+    # Given error output from a syntax checker, replace references to the
+    # temporary file path with the original path.
+    def filter_string string
+      string.gsub(path, @original_path)
+    end
+
+    # The path of the temporary file on disk, suitable for feeding in to a
+    # syntax checker.
+    def path
+      @tempfile.path
+    end
+
+    # Set or overwrite the temporary file's contents.
+    #
+    # This is used by the ERB syntax checker, for example, to compile
+    # the template before checking.
+    def contents=(contents)
+      @contents = contents
+      @tempfile.seek 0
+      @tempfile.write @contents
+      @tempfile.flush
+    end
+  end
+end

data/lib/overcommit/version.rb

@@ -1,3 +1,3 @@
 module Overcommit
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: overcommit
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-10 00:00:00.000000000 Z
+date: 2013-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -38,6 +38,7 @@ files:
 - lib/overcommit/installer.rb
 - lib/overcommit/hook_specific_check.rb
 - lib/overcommit/reporter.rb
+- lib/overcommit/staged_file.rb
 - lib/overcommit/plugins/commit_msg/hard_tabs.rb
 - lib/overcommit/plugins/commit_msg/russian_novel.rb
 - lib/overcommit/plugins/commit_msg/release_note.rb