overcommit 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24385419d31ec2658a5088bbc7805f993e78f55d
-  data.tar.gz: 9532a577df43ec23f97c045f8539dd9d44a555f6
+  metadata.gz: f50342c0638e20584a726340b172131a24085be4
+  data.tar.gz: 64cb433bf1f877cda8257ae840bed4588594ca2b
 SHA512:
-  metadata.gz: 6573a5e8d63690e215e693d6a0d1a920632a1687bb008c689b0aae0e4ab563cc7668214cbdfc2002eb55efb9f304334a7b82dd053d7f90829d33cdf915626276
-  data.tar.gz: 0e32d2d386baf428288518982dbc52c1751d1d8a90e7e806f634f7e368aa0a698892b43f86ec684aa96168218ba66e8dff37455dbe475fe3e9bd25a069ff27b0
+  metadata.gz: 8520683843161c250dba3e94fb15e4222cc6f0e2d3d8c8e63763e2a6837a50c30ce478f6d86699817950f120fdb472eef0cd9816f48cbfc23876d2355bacec84
+  data.tar.gz: c961cadf99ce02e0766f68ea53b6bd4f7b403ecfa0c048821c130d38b4778066a70ae7945b27e6a3342b0271ba7014a56a4920722c7b594809c4a7b8772c7ce1

data/config/default.yml

@@ -54,6 +54,12 @@ PreCommit:
     required: true
     quiet: true
 
+  BerksfileCheck:
+    description: 'Checking Berksfile lock'
+    include:
+      - 'Berksfile'
+      - 'Berksfile.lock'
+
   Brakeman:
     enabled: false
     description: 'Checking for security vulnerabilities'
@@ -92,6 +98,8 @@ PreCommit:
     description: 'Checking for hard tabs'
     exclude:
       - '**/*.go'
+      - '**/Makefile'
+      - '.gitmodules'
 
   ImageOptim:
     description: 'Checking for optimizable images'

data/lib/overcommit.rb

@@ -10,6 +10,7 @@ require 'overcommit/hook_signer'
 require 'overcommit/hook_loader/base'
 require 'overcommit/hook_loader/built_in_hook_loader'
 require 'overcommit/hook_loader/plugin_hook_loader'
+require 'overcommit/interrupt_handler'
 require 'overcommit/hook_runner'
 require 'overcommit/installer'
 require 'overcommit/logger'

data/lib/overcommit/hook/pre_commit/json_syntax.rb

@@ -8,7 +8,7 @@ module Overcommit::Hook::PreCommit
 
       applicable_files.each do |file|
         begin
-          File.open(file) { |io| JSON.load(io) }
+          JSON.parse(IO.read(file))
         rescue JSON::ParserError => e
           output << "#{e.message} parsing #{file}"
         end

data/lib/overcommit/hook_context/pre_commit.rb

@@ -14,7 +14,7 @@ module Overcommit::HookContext
       store_merge_state
       store_cherry_pick_state
 
-      if any_changes?
+      if !initial_commit? && any_changes?
         @changes_stashed = true
         `git stash save --keep-index --quiet #{<<-MSG}`
           "Overcommit: Stash of repo state before hook run at #{Time.now}"
@@ -28,7 +28,9 @@ 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` # Ensure working tree is clean before popping stash
+      unless initial_commit?
+        `git reset --hard &> /dev/null` # Ensure working tree is clean before popping stash
+      end
 
       if @changes_stashed
         `git stash apply --index --quiet`
@@ -43,8 +45,8 @@ module Overcommit::HookContext
     # Renames and deletions are ignored, since there should be nothing to check.
     def modified_files
       @modified_files ||=
-        `git diff --cached --name-only --diff-filter=ACM --ignore-submodules=all`.
-          split("\n").
+        `git diff --cached --name-only -z --diff-filter=ACM --ignore-submodules=all`.
+          split("\0").
           map { |relative_file| File.expand_path(relative_file) }
     end
 
@@ -57,10 +59,20 @@ module Overcommit::HookContext
 
   private
 
-    # Returns whether there are any changes between the working tree or index
-    # and HEAD.
+    # Returns whether there are any changes to the working tree, staged or
+    # otherwise.
     def any_changes?
-      !`git diff --name-only --ignore-submodules=all HEAD`.strip.empty?
+      modified_files = `git status -z --untracked-files=no`.
+        split("\0").
+        map { |line| line.gsub(/[^\s]+\s+(.+)/, '\\1') }
+
+      modified_files.any?
+    end
+
+    # Returns whether the current git branch is empty (has no commits).
+    def initial_commit?
+      return @initial_commit unless @initial_commit.nil?
+      @initial_commit = !Overcommit::Utils.execute(%w[git rev-parse HEAD]).success?
     end
 
     DIFF_HUNK_REGEX = /

data/lib/overcommit/hook_runner.rb

@@ -18,9 +18,11 @@ module Overcommit
 
     # Loads and runs the hooks registered for this {HookRunner}.
     def run
-      @context.setup_environment
-      load_hooks
-      run_hooks
+      InterruptHandler.isolate_from_interrupts do
+        @context.setup_environment
+        load_hooks
+        run_hooks
+      end
     ensure
       @context.cleanup_environment
     end
@@ -33,13 +35,27 @@ module Overcommit
       if @hooks.any? { |hook| hook.run? || hook.skip? }
         log.bold "Running #{hook_script_name} hooks"
 
-        statuses = @hooks.map { |hook| run_hook(hook) }.compact
+        interrupted = false
+
+        statuses = @hooks.map do |hook|
+          hook_status = run_hook(hook)
+
+          if hook_status == :interrupted
+            # Stop running any more hooks and assume a bad result
+            interrupted = true
+            break [:bad]
+          end
+
+          hook_status
+        end.compact
 
         log.log # Newline
 
         run_failed = statuses.include?(:bad)
 
-        if run_failed
+        if interrupted
+          log.warning '⚠  Hook run interrupted by user'
+        elsif run_failed
           log.error "✗ One or more #{hook_script_name} hooks failed"
         else
           log.success "✓ All #{hook_script_name} hooks passed"
@@ -62,10 +78,19 @@ module Overcommit
       end
 
       begin
+        # Disable the interrupt handler during individual hook run so that
+        # Ctrl-C actually stops the current hook from being run, but doesn't
+        # halt the entire process.
+        InterruptHandler.disable!
         status, output = hook.run
       rescue => ex
         status = :bad
         output = "Hook raised unexpected error\n#{ex.message}"
+      rescue Interrupt
+        status = :interrupted
+        output = 'Hook was interrupted by Ctrl-C; restoring repo state...'
+      ensure
+        InterruptHandler.enable!
       end
 
       # Want to print the header in the event the result wasn't good so that the
@@ -109,6 +134,9 @@ module Overcommit
       when :bad
         log.error 'FAILED'
         print_report(output, :bold_error)
+      when :interrupted
+        log.error 'INTERRUPTED'
+        print_report(output, :bold_error)
       end
     end
 

data/lib/overcommit/interrupt_handler.rb

@@ -0,0 +1,44 @@
+require 'singleton'
+
+# Provides a handler for interrupt signals (SIGINT), allowing the application to
+# finish what it's currently working on.
+class InterruptHandler
+  include Singleton
+
+  attr_accessor :isolate_signals, :signal_received
+
+  def initialize
+    self.isolate_signals = false
+    self.signal_received = false
+
+    Signal.trap('INT') do
+      if isolate_signals
+        self.signal_received = true
+      else
+        raise Interrupt
+      end
+    end
+  end
+
+  class << self
+    def disable!
+      instance.isolate_signals = false
+    end
+
+    def enable!
+      instance.isolate_signals = true
+    end
+
+    def isolate_from_interrupts
+      instance.signal_received = false
+      instance.isolate_signals = true
+      result = yield
+      instance.isolate_signals = false
+      result
+    end
+
+    def signal_received?
+      instance.signal_received
+    end
+  end
+end

data/lib/overcommit/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: overcommit
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Causes Engineering
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-23 00:00:00.000000000 Z
+date: 2014-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
@@ -132,6 +132,7 @@ files:
 - lib/overcommit/hook_context/post_checkout.rb
 - lib/overcommit/installer.rb
 - lib/overcommit/configuration_loader.rb
+- lib/overcommit/interrupt_handler.rb
 - lib/overcommit/hook_loader/built_in_hook_loader.rb
 - lib/overcommit/hook_loader/plugin_hook_loader.rb
 - lib/overcommit/hook_loader/base.rb