overcommit 0.2.3 → 0.2.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6cd8b8340af3898a298d1815312a9a626b1a8527
+  data.tar.gz: 785733cce0fe10a619d20ad2a761ac141a5a9130
+SHA512:
+  metadata.gz: c5fd460690ff210f14f1940b08798d7d49c2d0c0e74ba5fcbc8391b2f46600484e058f8ea5af917ee3b34a3e6ba2a62511aed8d21fc942828c92eaf4c863ce24
+  data.tar.gz: 9a40e46f3cd1ddeb9a25aece89572d3000ddf41ff462599cb32c718ed3eccf740aacb0047e0fadc2f8ca54f9cbf2094224fa89bcb1f78f9a5a409af870b9d1e8

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

@@ -8,7 +8,7 @@ module Overcommit::GitHook
     def run_check
       return :warn, "Rhino is not installed" unless in_path? 'rhino'
 
-      paths = staged.map { |s| s.path }.join(' ')
+      paths = staged.collect(&:path).join(' ')
 
       output = `rhino #{CSS_LINTER_PATH} --quiet --format=compact #{paths} | grep 'Error - '`
       return (output !~ /Error - (?!Unknown @ rule)/ ? :good : :bad), output

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

@@ -5,7 +5,7 @@ module Overcommit::GitHook
 
     # https://www.pivotaltracker.com/story/show/18119495
     def run_check
-      paths = staged.map { |s| s.path }.join(' ')
+      paths = staged.collect(&: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

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

@@ -6,7 +6,7 @@ module Overcommit::GitHook
     def run_check
       return :warn, 'Need either `jshint` or `rhino` in path' unless runner
 
-      paths = staged.map { |s| s.path }.join(' ')
+      paths = staged.collect(&:path).join(' ')
       output = runner.call(paths)
 
       return (output.empty? ? :good : :bad), output

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

@@ -8,7 +8,7 @@ module Overcommit::GitHook
         return :warn, 'Run `pip install flake8`'
       end
 
-      output = `flake8 #{(staged.join(' '))}`.split("\n")
+      output = `flake8 #{(staged.collect(&:path).join(' '))}`.split("\n")
       return ($?.success? ? :good : :bad), output
     end
   end

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

@@ -20,6 +20,9 @@ module Overcommit::GitHook
           file = match[1]
           line = match[2]
         end
+        unless paths_to_staged_files[file]
+          return :warn, "Unexpected output from rubocop:\n#{output}"
+        end
         paths_to_staged_files[file].modified_lines.include?(line.to_i)
       end
 

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

@@ -10,11 +10,27 @@ module Overcommit::GitHook
         return :warn, 'scss-lint not installed -- run `gem install scss-lint`'
       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 = `scss-lint #{paths} 2>&1`
+      output = `scss-lint #{staged_files.join(' ')} 2>&1`
+      return :good if $?.success?
 
-      return (output.empty? ? :good : :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
+        unless paths_to_staged_files[file]
+          return :warn, "Unexpected output from scss-lint:\n#{output}"
+        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 lints (on lines you didn't modify)\n" <<
+                    warning_lines.join
     end
   end
 end

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

@@ -3,7 +3,7 @@ module Overcommit::GitHook
     include HookRegistry
 
     def run_check
-      paths = staged.map { |s| s.path }.join(' ')
+      paths = staged.collect(&:path).join(' ')
 
       # Catches hard tabs
       output = `grep -Inl "\t" #{paths}`

data/lib/overcommit/version.rb

@@ -1,3 +1,3 @@
 module Overcommit
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

metadata

@@ -1,129 +1,107 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: overcommit
-version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 3
-  version: 0.2.3
+version: !ruby/object:Gem::Version
+  version: 0.2.4
 platform: ruby
-authors: 
+authors:
 - Causes Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-08-21 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-08-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Overcommit is a utility to install and extend Git hooks
 email: eng@causes.com
-executables: 
+executables:
 - overcommit
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- lib/overcommit/logger.rb
-- 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
+files:
+- lib/overcommit.rb
+- lib/overcommit/version.rb
+- lib/overcommit/utils.rb
+- lib/overcommit/plugins/commit_msg/trailing_period.rb
+- lib/overcommit/plugins/commit_msg/change_id.rb
 - lib/overcommit/plugins/commit_msg/release_note.rb
 - lib/overcommit/plugins/commit_msg/single_line_subject.rb
-- lib/overcommit/plugins/commit_msg/change_id.rb
+- lib/overcommit/plugins/commit_msg/russian_novel.rb
+- lib/overcommit/plugins/commit_msg/hard_tabs.rb
 - lib/overcommit/plugins/commit_msg/text_width.rb
-- lib/overcommit/plugins/commit_msg/trailing_period.rb
-- lib/overcommit/plugins/pre_commit/ruby_style.rb
+- lib/overcommit/plugins/pre_commit/js_console_log.rb
+- lib/overcommit/plugins/pre_commit/ruby_syntax.rb
 - lib/overcommit/plugins/pre_commit/js_syntax.rb
-- lib/overcommit/plugins/pre_commit/test_history.rb
 - lib/overcommit/plugins/pre_commit/yaml_syntax.rb
-- lib/overcommit/plugins/pre_commit/python_flake8.rb
+- lib/overcommit/plugins/pre_commit/haml_syntax.rb
 - lib/overcommit/plugins/pre_commit/causes_email.rb
-- lib/overcommit/plugins/pre_commit/js_console_log.rb
 - lib/overcommit/plugins/pre_commit/author_name.rb
-- lib/overcommit/plugins/pre_commit/erb_syntax.rb
-- lib/overcommit/plugins/pre_commit/scss_lint.rb
-- lib/overcommit/plugins/pre_commit/coffee_lint.rb
-- lib/overcommit/plugins/pre_commit/haml_syntax.rb
 - lib/overcommit/plugins/pre_commit/whitespace.rb
+- lib/overcommit/plugins/pre_commit/python_flake8.rb
+- lib/overcommit/plugins/pre_commit/coffee_lint.rb
+- lib/overcommit/plugins/pre_commit/test_history.rb
 - lib/overcommit/plugins/pre_commit/restricted_paths.rb
-- lib/overcommit/plugins/pre_commit/ruby_syntax.rb
+- lib/overcommit/plugins/pre_commit/ruby_style.rb
+- lib/overcommit/plugins/pre_commit/scss_lint.rb
 - lib/overcommit/plugins/pre_commit/css_linter.rb
-- lib/overcommit/git_hook.rb
+- lib/overcommit/staged_file.rb
+- lib/overcommit/reporter.rb
+- lib/overcommit/hook_specific_check.rb
+- lib/overcommit/installer.rb
 - lib/overcommit/errors.rb
-- lib/overcommit/cli.rb
+- lib/overcommit/git_hook.rb
 - lib/overcommit/configuration.rb
-- lib/overcommit/version.rb
 - lib/overcommit/hooks/pre_commit.rb
 - lib/overcommit/hooks/commit_msg.rb
-- lib/overcommit/utils.rb
-- lib/overcommit.rb
-- bin/overcommit
+- lib/overcommit/logger.rb
+- lib/overcommit/cli.rb
 - bin/run-hook
-- bin/scripts/jshint.js
 - bin/scripts/index-tags
-- bin/scripts/csslint-rhino.js
 - bin/scripts/gerrit-change-id
+- bin/scripts/jshint.js
+- bin/scripts/csslint-rhino.js
 - bin/scripts/jshint_runner.js
+- bin/overcommit
 - bin/hooks/commit-msg
-- bin/hooks/pre-commit
-- bin/hooks/post-merge
 - bin/hooks/post-checkout
+- bin/hooks/post-merge
+- bin/hooks/pre-commit
 - bin/hooks/prepare-commit-msg
 - config/templates.yml
-has_rdoc: true
 homepage: http://github.com/causes/overcommit
-licenses: 
+licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Opinionated Git hook manager
 test_files: []
-

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

@@ -1,21 +0,0 @@
-require 'erb'
-
-module Overcommit::GitHook
-  class ErbSyntax < HookSpecificCheck
-    include HookRegistry
-    file_type :erb
-    ERB_CHECKER = 'bin/check-rails-erb'
-
-    def skip?
-      return 'Bundler is not installed' unless in_path? 'bundle'
-      unless File.executable? ERB_CHECKER
-        return "Can't find/execute #{ERB_CHECKER}"
-      end
-    end
-
-    def run_check
-      output = `bundle exec #{ERB_CHECKER} #{staged.map{ |file| file.path }.join(' ')}`
-      return (output !~ /: compile error$/ ? :good : :bad), output
-    end
-  end
-end