overcommit 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4562478a934a5f5508a128e402c8c9f427b753ef
-  data.tar.gz: bc858f83d829676f7850cb6a5cc3b27f2abcecb4
+  metadata.gz: 58ead1f5474b347ce42bdbc99e97631448bf2015
+  data.tar.gz: e8b9c8a05a8dfc527a03bea6e73aa065d336ff2f
 SHA512:
-  metadata.gz: d8079c98abe3278a5442e875f409c42f88075413500576ce7b086c4b0e568557bd01b9f8aef2313773135d8402f0f31880edf44407ebfa650aacaf9398300a83
-  data.tar.gz: 3dea86ab44728d7708a7c93845c89911e102ae5da853253eee33ce886fc823ed784e996e256acf392983696c7ecff54fff885c32e637cae5ff161419290c0bc6
+  metadata.gz: bd933d5284859f892b55f5d7e266a56ab9f7c47f9a257fa8adb2439ebb558cc722eb367b544846dee46728829984573c768660980624f1ab53f5f0bda3092da3
+  data.tar.gz: 0b8ce5598eb55c8112b5af8afaa64316886c9d3c3ec853a58f23d84048388d52f0c8e1765ce1c339bce8235e4993047f174e16eaf3299e3601a6396576e379d0

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

@@ -1,3 +1,5 @@
+require 'pathname'
+
 module Overcommit::GitHook
   class RubyStyle < HookSpecificCheck
     include HookRegistry
@@ -9,10 +11,9 @@ module Overcommit::GitHook
       end
 
       paths_to_staged_files = Hash[staged.map { |s| [s.path, s] }]
-      staged_files = paths_to_staged_files.keys
 
-      output = `rubocop --format=emacs #{staged_files.join(' ')} 2>&1`
-      return :good if $?.success?
+      success, output = run_rubocop
+      return :good if success
 
       # Keep lines from the output for files that we actually modified
       error_lines, warning_lines = output.lines.partition do |output_line|
@@ -30,5 +31,38 @@ module Overcommit::GitHook
       return :warn, "Modified files have style lints (on lines you didn't modify)\n" <<
                     warning_lines.join
     end
+
+  private
+
+    def run_rubocop
+      success, output = true, ''
+      rubocop_config_mapping.each do |config, files|
+        config = config ? "-c #{config}" : ''
+        output += `rubocop #{config} --format=emacs #{files.join(' ')} 2>&1`
+        success = success && $?.success?
+      end
+      [success, output]
+    end
+
+    def rubocop_config_mapping
+      staged.inject({}) do |mapping, file|
+        config = rubocop_yml_for(file)
+        mapping[config] ||= []
+        mapping[config] << file.path
+        mapping
+      end
+    end
+
+    def rubocop_yml_for(staged_file)
+      config_file = nil
+      Pathname.new(staged_file.original_path).ascend do |path|
+        rubo_file = path + '.rubocop.yml'
+        if rubo_file.file?
+          config_file = rubo_file
+          break
+        end
+      end
+      config_file
+    end
   end
 end

data/lib/overcommit/version.rb

@@ -1,3 +1,3 @@
 module Overcommit
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: overcommit
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Causes Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-10 00:00:00.000000000 Z
+date: 2013-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.13.0
 description: Overcommit is a utility to install and extend Git hooks
 email: eng@causes.com
 executables:
@@ -31,56 +31,56 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/overcommit/git_hook.rb
-- lib/overcommit/errors.rb
+- lib/overcommit.rb
 - lib/overcommit/version.rb
-- lib/overcommit/hook_specific_check.rb
-- lib/overcommit/staged_file.rb
 - lib/overcommit/utils.rb
-- lib/overcommit/plugins/commit_msg/hard_tabs.rb
 - lib/overcommit/plugins/commit_msg/trailing_period.rb
-- lib/overcommit/plugins/commit_msg/text_width.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/pre_commit/js_console_log.rb
+- lib/overcommit/plugins/pre_commit/haml_style.rb
 - lib/overcommit/plugins/pre_commit/ruby_syntax.rb
-- lib/overcommit/plugins/pre_commit/restricted_paths.rb
-- lib/overcommit/plugins/pre_commit/scss_lint.rb
-- lib/overcommit/plugins/pre_commit/css_linter.rb
 - lib/overcommit/plugins/pre_commit/js_syntax.rb
-- lib/overcommit/plugins/pre_commit/python_flake8.rb
+- lib/overcommit/plugins/pre_commit/yaml_syntax.rb
+- lib/overcommit/plugins/pre_commit/haml_syntax.rb
 - lib/overcommit/plugins/pre_commit/causes_email.rb
+- lib/overcommit/plugins/pre_commit/author_name.rb
 - lib/overcommit/plugins/pre_commit/whitespace.rb
-- lib/overcommit/plugins/pre_commit/yaml_syntax.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/author_name.rb
-- lib/overcommit/plugins/pre_commit/haml_style.rb
-- lib/overcommit/plugins/pre_commit/js_console_log.rb
-- lib/overcommit/plugins/pre_commit/haml_syntax.rb
+- lib/overcommit/plugins/pre_commit/restricted_paths.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/staged_file.rb
+- lib/overcommit/reporter.rb
+- lib/overcommit/hook_specific_check.rb
+- lib/overcommit/installer.rb
+- lib/overcommit/errors.rb
+- lib/overcommit/git_hook.rb
+- lib/overcommit/configuration.rb
 - lib/overcommit/hooks/pre_commit.rb
 - lib/overcommit/hooks/commit_msg.rb
-- lib/overcommit/configuration.rb
-- lib/overcommit/cli.rb
-- lib/overcommit/reporter.rb
 - lib/overcommit/logger.rb
-- lib/overcommit/installer.rb
-- lib/overcommit.rb
+- lib/overcommit/cli.rb
 - bin/run-hook
+- bin/scripts/index-tags
+- bin/scripts/gerrit-change-id
+- bin/scripts/jshint.js
+- bin/scripts/csslint-rhino.js
+- bin/scripts/check-gemfile
+- bin/scripts/jshint_runner.js
 - bin/overcommit
-- bin/hooks/prepare-commit-msg
-- bin/hooks/post-checkout
 - bin/hooks/commit-msg
+- bin/hooks/post-checkout
 - bin/hooks/post-merge
 - bin/hooks/pre-commit
-- bin/scripts/jshint.js
-- bin/scripts/jshint_runner.js
-- bin/scripts/check-gemfile
-- bin/scripts/index-tags
-- bin/scripts/csslint-rhino.js
-- bin/scripts/gerrit-change-id
+- bin/hooks/prepare-commit-msg
 - config/templates.yml
 homepage: http://github.com/causes/overcommit
 licenses:
@@ -107,3 +107,4 @@ signing_key:
 specification_version: 4
 summary: Opinionated Git hook manager
 test_files: []
+has_rdoc: