overcommit 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71918eba0365e808f93d99e998125bde65250068
-  data.tar.gz: 1f44c67193e451b99db6297ae759a7b1bc6fa871
+  metadata.gz: 7d64fbba103905649d8924761929dd8de6ed8dda
+  data.tar.gz: 7e60a0e86700b84e2c0e20f31d9725e3d20e17b5
 SHA512:
-  metadata.gz: 3ffd93a8720739d8acbb86f9e0df55c314fe706f0be649c3d66bac58cc3bcf45690db70a48862eb4297bafc99d8fd2c702be9991082107d446beb211ac3f95ae
-  data.tar.gz: cc535627eb8fec824ddc27358e33ff29b78e0ff3e3d53c2aa79b7a251b3272d41f6c0270404f8ccd0aff0916c22c8355fe955a02d6e7b30d2ebdcb79826e0c41
+  metadata.gz: 6287bda409ccdcb0b42760bae088929caec13d9a09ab9dd8355374e889cae1fb33ebc2450bc2a725ec8901f2d0df3185ec7f604694ca2631c43449f4ef371d82
+  data.tar.gz: 4c8de904dcf1b65ef3854e43e8a313baacef309e999d38448f106941284a246fe3cdcc933c7e9e96efe749627771cf9b4b3207a221b413c3006ea78b2ebdef7e

data/config/default.yml

@@ -134,6 +134,8 @@ CommitMsg:
 
   TextWidth:
     description: 'Checking text width'
+    max_subject_width: 60
+    max_body_width: 72
 
   TrailingPeriod:
     description: 'Checking for trailing periods in subject'

data/lib/overcommit/hook/commit_msg/text_width.rb

@@ -3,17 +3,28 @@ module Overcommit::Hook::CommitMsg
   # under the preferred limits.
   class TextWidth < Base
     def run
-      if commit_message_lines.first.size > 60
-        return :warn, 'Please keep the subject < ~60 characters'
+      errors = []
+
+      max_subject_width = @config['max_subject_width']
+      max_body_width = @config['max_body_width']
+
+      if commit_message_lines.first.size > max_subject_width
+        errors << "Please keep the subject <= #{max_subject_width} characters"
       end
 
-      commit_message_lines.each do |line|
-        chomped = line.chomp
-        if chomped.size > 72
-          return :warn, "> 72 characters, please hard wrap: '#{chomped}'"
+      if commit_message_lines.size > 2
+        commit_message_lines[2..-1].each_with_index do |line, index|
+          chomped = line.chomp
+          if chomped.size > max_body_width
+            error = "Line #{index + 3} of commit message has > " <<
+                    "#{max_body_width} characters"
+            errors << error
+          end
         end
       end
 
+      return :warn, errors.join("\n") if errors.any?
+
       :good
     end
   end

data/lib/overcommit/hook/post_checkout/bundle_check.rb

@@ -7,7 +7,7 @@ module Overcommit::Hook::PostCheckout
         return :warn, 'bundler not installed -- run `gem install bundler`'
       end
 
-      return :bad if dependencies_changed? && !dependencies_satisfied?
+      return :warn if dependencies_changed? && !dependencies_satisfied?
 
       :good
     end

data/lib/overcommit/hook_context/pre_commit.rb

@@ -11,7 +11,8 @@ module Overcommit::HookContext
     def setup_environment
       store_modified_times
 
-      if modified_files.any?
+      if any_changes?
+        @changes_stashed = true
         `git stash save --keep-index --quiet #{<<-MSG}`
           "Overcommit: Stash of repo state before hook run at #{Time.now}"
         MSG
@@ -24,8 +25,11 @@ module Overcommit::HookContext
     # Restore unstaged changes and reset file modification times so it appears
     # as if nothing ever changed.
     def cleanup_environment
-      `git reset --hard`
-      `git stash pop --index --quiet` if modified_files.any?
+      `git reset --hard` # Ensure working tree is clean before popping stash
+
+      if @changes_stashed
+        `git stash pop --index --quiet`
+      end
 
       restore_modified_times
     end
@@ -48,6 +52,12 @@ module Overcommit::HookContext
 
   private
 
+    # Returns whether there are any changes between the working tree or index
+    # and HEAD.
+    def any_changes?
+      !`git diff --name-only --ignore-submodules=all HEAD`.strip.empty?
+    end
+
     DIFF_HUNK_REGEX = /
       ^@@\s
       [^\s]+\s           # Ignore old file range

data/lib/overcommit/version.rb

@@ -1,4 +1,4 @@
 # Defines the gem version.
 module Overcommit
-  VERSION = '0.6.2'
+  VERSION = '0.6.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: overcommit
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Causes Engineering
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-21 00:00:00.000000000 Z
+date: 2014-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: wopen3
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.2
+        version: 0.11.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.2
+        version: 0.11.1
 description: Utility to install, configure, and extend Git hooks
 email:
 - eng@causes.com