overcommit 0.2.6 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffbc74c18b780690aa2bc17d03f761587e25af5f
-  data.tar.gz: 63e054091b6b4ce79382cc006ad6ced1a1854feb
+  metadata.gz: 4562478a934a5f5508a128e402c8c9f427b753ef
+  data.tar.gz: bc858f83d829676f7850cb6a5cc3b27f2abcecb4
 SHA512:
-  metadata.gz: 44b1113f451e96e94a147eaef737b0a42f728bb360a9e738da18d723ea6df2f86a435e163fee99989d27c94e3e11d9833c2bef53599ffc238499f8bd36744db9
-  data.tar.gz: 5048811fc9f795f457be2e98bc27465063beb295495954cc50038d196fce4e77f36b6529de78b83d4d2529349cb0164212282203f87ba4b7745d26a4c9badec9
+  metadata.gz: d8079c98abe3278a5442e875f409c42f88075413500576ce7b086c4b0e568557bd01b9f8aef2313773135d8402f0f31880edf44407ebfa650aacaf9398300a83
+  data.tar.gz: 3dea86ab44728d7708a7c93845c89911e102ae5da853253eee33ce886fc823ed784e996e256acf392983696c7ecff54fff885c32e637cae5ff161419290c0bc6

data/bin/hooks/post-checkout

@@ -2,6 +2,7 @@
 
 # Executed every time HEAD changes. The current working directory will be set to
 # the top-level directory of the git repository for which this hook was fired.
+.git/hooks/scripts/check-gemfile $1 $2
 
 # Run in the background since even though it takes just over a second for a
 # large repo, it's a noticeable delay.

data/bin/scripts/check-gemfile

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+if [ -e Gemfile.lock ] && which bundle &> /dev/null; then
+  if ! git diff --exit-code $1 $2 -- Gemfile.lock &> /dev/null; then
+    if ! bundle check &> /dev/null; then
+      echo 'NOTE: Gemfile dependencies unsatisfied. You might want to `bundle install`.'
+    fi
+  fi
+fi

data/lib/overcommit/staged_file.rb

@@ -6,7 +6,7 @@ require 'tempfile'
 # to make working with staged files easier.
 module Overcommit
   class StagedFile
-    attr_reader :contents
+    attr_reader :contents, :original_path
 
     def initialize(path)
       @original_path = path
@@ -52,7 +52,7 @@ module Overcommit
     def extract_modified_lines
       lines = Set.new
 
-      `git diff --cached -U0 -- #{@original_path}`.
+      `git diff --no-ext-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

data/lib/overcommit/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: overcommit
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.0
 platform: ruby
 authors:
 - Causes Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-15 00:00:00.000000000 Z
+date: 2013-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -31,55 +31,56 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/overcommit.rb
+- lib/overcommit/git_hook.rb
+- lib/overcommit/errors.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/change_id.rb
+- lib/overcommit/plugins/commit_msg/text_width.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/yaml_syntax.rb
-- lib/overcommit/plugins/pre_commit/haml_syntax.rb
+- lib/overcommit/plugins/pre_commit/python_flake8.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/python_flake8.rb
+- lib/overcommit/plugins/pre_commit/yaml_syntax.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/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/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/logger.rb
+- lib/overcommit/configuration.rb
 - lib/overcommit/cli.rb
+- lib/overcommit/reporter.rb
+- lib/overcommit/logger.rb
+- lib/overcommit/installer.rb
+- lib/overcommit.rb
 - bin/run-hook
-- bin/scripts/index-tags
-- 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/prepare-commit-msg
 - bin/hooks/post-checkout
+- bin/hooks/commit-msg
 - bin/hooks/post-merge
 - bin/hooks/pre-commit
-- bin/hooks/prepare-commit-msg
+- 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
 - config/templates.yml
 homepage: http://github.com/causes/overcommit
 licenses: