overcommit 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f50342c0638e20584a726340b172131a24085be4
-  data.tar.gz: 64cb433bf1f877cda8257ae840bed4588594ca2b
+  metadata.gz: fb17024356867bde9bd05acbeee3d3e21d1c2c4d
+  data.tar.gz: 6d0e29731c275e36832826d17b9261a256f75738
 SHA512:
-  metadata.gz: 8520683843161c250dba3e94fb15e4222cc6f0e2d3d8c8e63763e2a6837a50c30ce478f6d86699817950f120fdb472eef0cd9816f48cbfc23876d2355bacec84
-  data.tar.gz: c961cadf99ce02e0766f68ea53b6bd4f7b403ecfa0c048821c130d38b4778066a70ae7945b27e6a3342b0271ba7014a56a4920722c7b594809c4a7b8772c7ce1
+  metadata.gz: fc9754e4d5eeed0c7e0f53c3743fdf1d2ee76829c7e085053a795a3950b57c7cd7cd1aaa47a84a4c2943bb4a40377ef70900b0fffd4b226ad5ef6e85402600ca
+  data.tar.gz: fa43ebdc705f91361e7e6964ca0a1315d0d42cffff876e9389d573997f3835b321ba339e0f266bd9a646ded011db32d5feeed7e29aa1d48127ebe36dec17f583

data/config/default.yml

@@ -164,6 +164,8 @@ PreCommit:
 
   TrailingWhitespace:
     description: 'Checking for trailing whitespace'
+    exclude:
+      - '**/db/structure.sql'
 
   TravisLint:
     description: 'Checking Travis CI configuration'

data/lib/overcommit.rb

@@ -1,16 +1,19 @@
 require 'overcommit/constants'
 require 'overcommit/exceptions'
+require 'overcommit/configuration_validator'
 require 'overcommit/configuration'
 require 'overcommit/configuration_loader'
 require 'overcommit/hook/base'
 require 'overcommit/hook_context/base'
 require 'overcommit/hook_context'
 require 'overcommit/user_input'
+require 'overcommit/git_repo'
 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/printer'
 require 'overcommit/hook_runner'
 require 'overcommit/installer'
 require 'overcommit/logger'

data/lib/overcommit/cli.rb

@@ -26,33 +26,7 @@ module Overcommit
     attr_reader :log
 
     def parse_arguments
-      @parser = OptionParser.new do |opts|
-        opts.banner = "Usage: #{opts.program_name} [options] [target-repo]"
-
-        opts.on_tail('-h', '--help', 'Show this message') do
-          print_help opts.help
-        end
-
-        opts.on_tail('-v', '--version', 'Show version') do
-          print_version(opts.program_name)
-        end
-
-        opts.on('-u', '--uninstall', 'Remove Overcommit hooks from a repository') do
-          @options[:action] = :uninstall
-        end
-
-        opts.on('-i', '--install', 'Install Overcommit hooks in a repository') do
-          @options[:action] = :install
-        end
-
-        opts.on('-f', '--force', 'Overwrite any previously installed hooks') do
-          @options[:force] = true
-        end
-
-        opts.on('-t', '--template-dir', 'Print location of template directory') do
-          @options[:action] = :template_dir
-        end
-      end
+      @parser = create_option_parser
 
       begin
         @parser.parse!(@arguments)
@@ -67,6 +41,46 @@ module Overcommit
       end
     end
 
+    def create_option_parser
+      OptionParser.new do |opts|
+        opts.banner = "Usage: #{opts.program_name} [options] [target-repo]"
+
+        add_information_options(opts)
+        add_installation_options(opts)
+        add_other_options(opts)
+      end
+    end
+
+    def add_information_options(opts)
+      opts.on_tail('-h', '--help', 'Show this message') do
+        print_help opts.help
+      end
+
+      opts.on_tail('-v', '--version', 'Show version') do
+        print_version(opts.program_name)
+      end
+    end
+
+    def add_installation_options(opts)
+      opts.on('-u', '--uninstall', 'Remove Overcommit hooks from a repository') do
+        @options[:action] = :uninstall
+      end
+
+      opts.on('-i', '--install', 'Install Overcommit hooks in a repository') do
+        @options[:action] = :install
+      end
+
+      opts.on('-f', '--force', 'Overwrite any previously installed hooks') do
+        @options[:force] = true
+      end
+    end
+
+    def add_other_options(opts)
+      opts.on('-t', '--template-dir', 'Print location of template directory') do
+        @options[:action] = :template_dir
+      end
+    end
+
     def install_or_uninstall
       if Array(@options[:targets]).empty?
         @options[:targets] = [Overcommit::Utils.repo_root].compact

data/lib/overcommit/configuration.rb

@@ -3,8 +3,7 @@ module Overcommit
   class Configuration
     # Creates a configuration from the given hash.
     def initialize(hash)
-      @hash = hash
-      validate
+      @hash = ConfigurationValidator.new.validate(hash)
     end
 
     def ==(other)
@@ -104,13 +103,6 @@ module Overcommit
       true
     end
 
-    # Validates the configuration for any invalid options, normalizing it where
-    # possible.
-    def validate
-      @hash = convert_nils_to_empty_hashes(@hash)
-      ensure_hook_type_sections_exist(@hash)
-    end
-
     def smart_merge(parent, child)
       parent.merge(child) do |_key, old, new|
         case old
@@ -123,25 +115,5 @@ module Overcommit
         end
       end
     end
-
-    def ensure_hook_type_sections_exist(hash)
-      Overcommit::Utils.supported_hook_type_classes.each do |hook_type|
-        hash[hook_type] ||= {}
-        hash[hook_type]['ALL'] ||= {}
-      end
-    end
-
-    def convert_nils_to_empty_hashes(hash)
-      hash.inject({}) do |h, (key, value)|
-        h[key] =
-          case value
-          when nil  then {}
-          when Hash then convert_nils_to_empty_hashes(value)
-          else
-            value
-          end
-        h
-      end
-    end
   end
 end

data/lib/overcommit/configuration_validator.rb

@@ -0,0 +1,41 @@
+module Overcommit
+  # Validates and normalizes a configuration.
+  class ConfigurationValidator
+    # Validates hash for any invalid options, normalizing where possible.
+    def validate(hash)
+      hash = convert_nils_to_empty_hashes(hash)
+      ensure_hook_type_sections_exist(hash)
+
+      hash
+    end
+
+  private
+
+    # Ensures that keys for all supported hook types exist (PreCommit,
+    # CommitMsg, etc.)
+    def ensure_hook_type_sections_exist(hash)
+      Overcommit::Utils.supported_hook_type_classes.each do |hook_type|
+        hash[hook_type] ||= {}
+        hash[hook_type]['ALL'] ||= {}
+      end
+    end
+
+    # Normalizes `nil` values to empty hashes.
+    #
+    # This is useful for when we want to merge two configuration hashes
+    # together, since it's easier to merge two hashes than to have to check if
+    # one of the values is nil.
+    def convert_nils_to_empty_hashes(hash)
+      hash.inject({}) do |h, (key, value)|
+        h[key] =
+          case value
+          when nil  then {}
+          when Hash then convert_nils_to_empty_hashes(value)
+          else
+            value
+          end
+        h
+      end
+    end
+  end
+end

data/lib/overcommit/git_repo.rb

@@ -0,0 +1,121 @@
+module Overcommit
+  # Provide a set of utilities for certain interactions with `git`.
+  module GitRepo
+    module_function
+
+    # Regular expression used to extract diff ranges from hunks of diff output.
+    DIFF_HUNK_REGEX = /
+      ^@@\s
+      [^\s]+\s           # Ignore old file range
+      \+(\d+)(?:,(\d+))? # Extract range of hunk containing start line and number of lines
+      \s@@.*$
+    /x
+
+    # Extract the set of modified lines from a given file.
+    #
+    # @param file_path [String]
+    # @param options [Hash]
+    # @return [Set] line numbers that have been modified in file
+    def extract_modified_lines(file_path, options)
+      lines = Set.new
+
+      flags = '--cached' if options[:staged]
+
+      `git diff --no-ext-diff -U0 #{flags} -- #{file_path}`.
+        scan(DIFF_HUNK_REGEX) do |start_line, lines_added|
+
+        lines_added = (lines_added || 1).to_i # When blank, one line was added
+        cur_line = start_line.to_i
+
+        lines_added.times do
+          lines.add cur_line
+          cur_line += 1
+        end
+      end
+
+      lines
+    end
+
+    # Returns the names of all files that have been modified from compared to
+    # HEAD.
+    #
+    # @param options [Hash]
+    # @return [Array<String>] list of absolute file paths
+    def modified_files(options)
+      flags = '--cached' if options[:staged]
+
+      `git diff --name-only -z --diff-filter=ACM --ignore-submodules=all #{flags}`.
+        split("\0").
+        map { |relative_file| File.expand_path(relative_file) }
+    end
+
+    # Returns whether the current git branch is empty (has no commits).
+    # @return [true,false]
+    def initial_commit?
+      !Overcommit::Utils.execute(%w[git rev-parse HEAD]).success?
+    end
+
+    # Store any relevant files that are present when repo is in the middle of a
+    # merge.
+    #
+    # Restored via [#restore_merge_state].
+    def store_merge_state
+      merge_head = `git rev-parse MERGE_HEAD 2> /dev/null`.chomp
+
+      # Store the merge state if we're in the middle of resolving a merge
+      # conflict. This is necessary since stashing removes the merge state.
+      if merge_head != 'MERGE_HEAD'
+        @merge_head = merge_head
+
+        merge_msg_file = File.expand_path('.git/MERGE_MSG', Overcommit::Utils.repo_root)
+        @merge_msg = File.open(merge_msg_file).read if File.exist?(merge_msg_file)
+      end
+    end
+
+    # Store any relevant files that are present when repo is in the middle of a
+    # cherry-pick.
+    #
+    # Restored via [#restore_cherry_pick_state].
+    def store_cherry_pick_state
+      cherry_head = `git rev-parse CHERRY_PICK_HEAD 2> /dev/null`.chomp
+
+      # Store the merge state if we're in the middle of resolving a merge
+      # conflict. This is necessary since stashing removes the merge state.
+      if cherry_head != 'CHERRY_PICK_HEAD'
+        @cherry_head = cherry_head
+      end
+    end
+
+    # Restore any relevant files that were present when repo was in the middle
+    # of a merge.
+    def restore_merge_state
+      if @merge_head
+        FileUtils.touch(File.expand_path('.git/MERGE_MODE', Overcommit::Utils.repo_root))
+
+        File.open(File.expand_path('.git/MERGE_HEAD', Overcommit::Utils.repo_root), 'w') do |f|
+          f.write("#{@merge_head}\n")
+        end
+        @merge_head = nil
+      end
+
+      if @merge_msg
+        File.open(File.expand_path('.git/MERGE_MSG', Overcommit::Utils.repo_root), 'w') do |f|
+          f.write("#{@merge_msg}\n")
+        end
+        @merge_msg = nil
+      end
+    end
+
+    # Restore any relevant files that were present when repo was in the middle
+    # of a cherry-pick.
+    def restore_cherry_pick_state
+      if @cherry_head
+        File.open(File.expand_path('.git/CHERRY_PICK_HEAD',
+                                   Overcommit::Utils.repo_root), 'w') do |f|
+          f.write("#{@cherry_head}\n")
+        end
+        @cherry_head = nil
+      end
+    end
+  end
+end

data/lib/overcommit/hook/base.rb

@@ -70,10 +70,10 @@ module Overcommit::Hook
     def applicable_file?(file)
       includes = Array(@config['include']).map { |glob| convert_glob_to_absolute(glob) }
       included = includes.empty? ||
-                 includes.any? { |glob| Dir[glob].include?(file) }
+                 includes.any? { |glob| matches_path?(glob, file) }
 
       excludes = Array(@config['exclude']).map { |glob| convert_glob_to_absolute(glob) }
-      excluded = excludes.any? { |glob| Dir[glob].include?(file) }
+      excluded = excludes.any? { |glob| matches_path?(glob, file) }
 
       included && !excluded
     end
@@ -82,5 +82,16 @@ module Overcommit::Hook
       repo_root = Overcommit::Utils.repo_root
       File.join(repo_root, glob)
     end
+
+    # Return whether a pattern matches the given path.
+    #
+    # @param pattern [String]
+    # @param path [String]
+    def matches_path?(pattern, path)
+      File.fnmatch?(pattern, path,
+                    File::FNM_PATHNAME | # Wildcard doesn't match separator
+                    File::FNM_DOTMATCH   # Wildcards match dotfiles
+      )
+    end
   end
 end

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

@@ -17,9 +17,9 @@ module Overcommit::Hook::PreCommit
 
       if optimized_images.any?
         return :bad,
-          "The following images were optimized:\n" <<
-          optimized_images.join("\n") <<
-          "\nPlease add them to your commit."
+          "The following images are optimizable:\n#{optimized_images.join("\n")}" \
+          "\n\nOptimize them by running:\n" \
+          "  image_optim #{optimized_images.join(' ')}"
       end
 
       :good

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

@@ -10,7 +10,7 @@ module Overcommit::Hook::PreCommit
       result = execute(%w[jscs --reporter=inline] + applicable_files)
       return :good if result.success?
 
-      if /Config.*not found/i =~ result.stderr
+      if result.status == 1
         return :warn, result.stderr.chomp
       end
 

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

@@ -1,7 +1,7 @@
 module Overcommit::Hook::PreCommit
   # Check to see whether the schema file is in line with the migrations
   class RailsSchemaUpToDate < Base
-    def run
+    def run # rubocop:disable CyclomaticComplexity
       if migration_files.any? && schema_files.none?
         return :bad, "It looks like you're adding a migration, but did not update the schema file"
       elsif migration_files.none? && schema_files.any?

data/lib/overcommit/hook_context/pre_commit.rb

@@ -5,14 +5,15 @@ module Overcommit::HookContext
   # Contains helpers related to contextual information used by pre-commit hooks.
   #
   # This includes staged files, which lines of those files have been modified,
-  # etc.
+  # etc. It is also responsible for saving/restoring the state of the repo so
+  # hooks only inspect staged changes.
   class PreCommit < Base
     # Stash unstaged contents of files so hooks don't see changes that aren't
     # about to be committed.
     def setup_environment
       store_modified_times
-      store_merge_state
-      store_cherry_pick_state
+      Overcommit::GitRepo.store_merge_state
+      Overcommit::GitRepo.store_cherry_pick_state
 
       if !initial_commit? && any_changes?
         @changes_stashed = true
@@ -33,28 +34,25 @@ module Overcommit::HookContext
       end
 
       if @changes_stashed
-        `git stash apply --index --quiet`
+        `git stash pop --index --quiet`
       end
 
-      restore_merge_state
-      restore_cherry_pick_state
+      Overcommit::GitRepo.restore_merge_state
+      Overcommit::GitRepo.restore_cherry_pick_state
       restore_modified_times
     end
 
     # Get a list of added, copied, or modified files that have been staged.
     # Renames and deletions are ignored, since there should be nothing to check.
     def modified_files
-      @modified_files ||=
-        `git diff --cached --name-only -z --diff-filter=ACM --ignore-submodules=all`.
-          split("\0").
-          map { |relative_file| File.expand_path(relative_file) }
+      @modified_files ||= Overcommit::GitRepo.modified_files(:staged => true)
     end
 
     # Returns the set of line numbers corresponding to the lines that were
     # changed in a specified file.
     def modified_lines(file)
       @modified_lines ||= {}
-      @modified_lines[file] ||= extract_modified_lines(file)
+      @modified_lines[file] ||= Overcommit::GitRepo.extract_modified_lines(file, :staged => true)
     end
 
   private
@@ -72,85 +70,14 @@ module Overcommit::HookContext
     # 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 = /
-      ^@@\s
-      [^\s]+\s           # Ignore old file range
-      \+(\d+)(?:,(\d+))? # Extract range of hunk containing start line and number of lines
-      \s@@.*$
-    /x
-
-    def extract_modified_lines(staged_file)
-      lines = Set.new
-
-      `git diff --no-ext-diff --cached -U0 -- #{staged_file}`.
-        scan(DIFF_HUNK_REGEX) do |start_line, lines_added|
-
-        lines_added = (lines_added || 1).to_i # When blank, one line was added
-        cur_line = start_line.to_i
-
-        lines_added.times do
-          lines.add cur_line
-          cur_line += 1
-        end
-      end
-
-      lines
-    end
-
-    def store_merge_state
-      merge_head = `git rev-parse MERGE_HEAD 2> /dev/null`.chomp
-
-      # Store the merge state if we're in the middle of resolving a merge
-      # conflict. This is necessary since stashing removes the merge state.
-      if merge_head != 'MERGE_HEAD'
-        @merge_head = merge_head
-
-        merge_msg_file = File.expand_path('.git/MERGE_MSG', Overcommit::Utils.repo_root)
-        @merge_msg = File.open(merge_msg_file).read if File.exist?(merge_msg_file)
-      end
-    end
-
-    def store_cherry_pick_state
-      cherry_head = `git rev-parse CHERRY_PICK_HEAD 2> /dev/null`.chomp
-
-      # Store the merge state if we're in the middle of resolving a merge
-      # conflict. This is necessary since stashing removes the merge state.
-      if cherry_head != 'CHERRY_PICK_HEAD'
-        @cherry_head = cherry_head
-      end
-    end
-
-    def restore_merge_state
-      if @merge_head
-        FileUtils.touch(File.expand_path('.git/MERGE_MODE', Overcommit::Utils.repo_root))
-
-        File.open(File.expand_path('.git/MERGE_HEAD', Overcommit::Utils.repo_root), 'w') do |f|
-          f.write("#{@merge_head}\n")
-        end
-        @merge_head = nil
-      end
-
-      if @merge_msg
-        File.open(File.expand_path('.git/MERGE_MSG', Overcommit::Utils.repo_root), 'w') do |f|
-          f.write("#{@merge_msg}\n")
-        end
-        @merge_msg = nil
-      end
-    end
-
-    def restore_cherry_pick_state
-      if @cherry_head
-        File.open(File.expand_path('.git/CHERRY_PICK_HEAD',
-                                   Overcommit::Utils.repo_root), 'w') do |f|
-          f.write("#{@cherry_head}\n")
-        end
-        @cherry_head = nil
-      end
+      @initial_commit = Overcommit::GitRepo.initial_commit?
     end
 
+    # Stores the modification times for all modified files to make it appear like
+    # they never changed.
+    #
+    # This prevents (some) editors from complaining about files changing when we
+    # stash changes before running the hooks.
     def store_modified_times
       @modified_times = {}
 
@@ -159,11 +86,8 @@ module Overcommit::HookContext
       end
     end
 
-    # Stores the modification times for all modified files to make it appear like
-    # they never changed.
-    #
-    # This prevents editors from complaining about files changing when we stash
-    # changes before running the hooks.
+    # Restores the file modification times for all modified files to make it
+    # appear like they never changed.
     def restore_modified_times
       modified_files.each do |file|
         time = @modified_times[file]

data/lib/overcommit/hook_runner.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Overcommit
   # Responsible for loading the hooks the repository has configured and running
   # them, collecting and displaying the results.
@@ -8,11 +6,12 @@ module Overcommit
     # @param logger [Overcommit::Logger]
     # @param context [Overcommit::HookContext]
     # @param input [Overcommit::UserInput]
-    def initialize(config, logger, context, input)
+    def initialize(config, logger, context, input, printer)
       @config = config
       @log = logger
       @context = context
       @input = input
+      @printer = printer
       @hooks = []
     end
 
@@ -33,39 +32,28 @@ module Overcommit
 
     def run_hooks
       if @hooks.any? { |hook| hook.run? || hook.skip? }
-        log.bold "Running #{hook_script_name} hooks"
+        @printer.start_run
 
         interrupted = false
+        run_failed = false
 
-        statuses = @hooks.map do |hook|
+        @hooks.each do |hook|
           hook_status = run_hook(hook)
 
+          run_failed = true if hook_status == :bad
+
           if hook_status == :interrupted
             # Stop running any more hooks and assume a bad result
             interrupted = true
-            break [:bad]
+            break
           end
-
-          hook_status
-        end.compact
-
-        log.log # Newline
-
-        run_failed = statuses.include?(:bad)
-
-        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"
         end
 
-        log.log # Newline
+        @printer.end_run(interrupted, run_failed)
 
-        !run_failed
+        !(run_failed || interrupted)
       else
-        log.success "✓ No applicable #{hook_script_name} hooks to run"
+        @printer.nothing_to_run
         true # Run was successful
       end
     end
@@ -73,9 +61,7 @@ module Overcommit
     def run_hook(hook)
       return if should_skip?(hook)
 
-      unless hook.quiet?
-        print_header(hook)
-      end
+      @printer.start_hook(hook)
 
       begin
         # Disable the interrupt handler during individual hook run so that
@@ -93,30 +79,19 @@ module Overcommit
         InterruptHandler.enable!
       end
 
-      # Want to print the header in the event the result wasn't good so that the
-      # user knows what failed
-      if hook.quiet? && status != :good
-        print_header(hook)
-      end
-
-      print_result(hook, status, output)
+      @printer.end_hook(hook, status, output)
 
       status
     end
 
-    def print_header(hook)
-      log.partial hook.description
-      log.partial '.' * (70 - hook.description.length)
-    end
-
     def should_skip?(hook)
       return true unless hook.enabled?
 
       if hook.skip?
         if hook.required?
-          log.warning "Cannot skip #{hook.name} since it is required"
+          @printer.required_hook_not_skipped
         else
-          log.warning "Skipping #{hook.name}"
+          @printer.hook_skipped
           return true
         end
       end
@@ -124,26 +99,6 @@ module Overcommit
       !hook.run?
     end
 
-    def print_result(hook, status, output)
-      case status
-      when :good
-        log.success 'OK' unless hook.quiet?
-      when :warn
-        log.warning 'WARNING'
-        print_report(output, :bold_warning)
-      when :bad
-        log.error 'FAILED'
-        print_report(output, :bold_error)
-      when :interrupted
-        log.error 'INTERRUPTED'
-        print_report(output, :bold_error)
-      end
-    end
-
-    def print_report(output, format = :log)
-      log.send(format, output) unless output.nil? || output.empty?
-    end
-
     def load_hooks
       require "overcommit/hook/#{@context.hook_type_name}/base"
 
@@ -152,9 +107,5 @@ module Overcommit
       # Load plugin hooks after so they can subclass existing hooks
       @hooks += HookLoader::PluginHookLoader.new(@config, @context, @log, @input).load_hooks
     end
-
-    def hook_script_name
-      @context.hook_script_name
-    end
   end
 end

data/lib/overcommit/printer.rb

@@ -0,0 +1,105 @@
+# encoding: utf-8
+
+module Overcommit
+  # Provide a set of callbacks which can be executed as events occur during the
+  # course of {HookRunner#run}.
+  class Printer
+    attr_reader :log
+
+    def initialize(logger, context)
+      @log = logger
+      @context = context
+    end
+
+    # Executed at the very beginning of running the collection of hooks.
+    def start_run
+      log.bold "Running #{hook_script_name} hooks"
+    end
+
+    def nothing_to_run
+      log.success "✓ No applicable #{hook_script_name} hooks to run"
+    end
+
+    # Executed at the very end of running the collection of hooks.
+    def end_run(run_failed, interrupted)
+      log.log # Newline
+
+      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"
+      end
+
+      log.log # Newline
+    end
+
+    # Executed at the start of an individual hook run.
+    def start_hook(hook)
+      unless hook.quiet?
+        print_header(hook)
+      end
+    end
+
+    def hook_skipped(hook)
+      log.warning "Skipping #{hook.name}"
+    end
+
+    def required_hook_not_skipped(hook)
+      log.warning "Cannot skip #{hook.name} since it is required"
+    end
+
+    # Executed at the end of an individual hook run.
+    def end_hook(hook, status, output)
+      # Want to print the header for quiet hooks only if the result wasn't good
+      # so that the user knows what failed
+      print_header(hook) if hook.quiet? && status != :good
+
+      print_result(hook, status, output)
+    end
+
+  private
+
+    def print_header(hook)
+      log.partial hook.description
+      log.partial '.' * (70 - hook.description.length)
+    end
+
+    def print_result(hook, status, output)
+      case status
+      when :good
+        log.success 'OK' unless hook.quiet?
+      when :warn
+        log.warning 'WARNING'
+        print_report(output, :bold_warning)
+      when :bad
+        log.error 'FAILED'
+        print_report(output, :bold_error)
+      when :interrupted
+        log.error 'INTERRUPTED'
+        print_report(output, :bold_error)
+      end
+    end
+
+    def print_report(output, format = :log)
+      log.send(format, output) unless output.nil? || output.empty?
+    end
+
+    def run_interrupted
+      log.warning '⚠  Hook run interrupted by user'
+    end
+
+    def run_failed
+      log.error "✗ One or more #{hook_script_name} hooks failed"
+    end
+
+    def run_succeeded
+      log.success "✓ All #{hook_script_name} hooks passed"
+    end
+
+    def hook_script_name
+      @context.hook_script_name
+    end
+  end
+end

data/lib/overcommit/version.rb

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

data/template-dir/hooks/commit-msg

@@ -65,7 +65,8 @@ begin
 
   input = Overcommit::UserInput.new(STDIN)
 
-  runner = Overcommit::HookRunner.new(config, logger, context, input)
+  printer = Overcommit::Printer.new(logger, context)
+  runner = Overcommit::HookRunner.new(config, logger, context, input, printer)
 
   status = runner.run
 

data/template-dir/hooks/overcommit-hook

@@ -65,7 +65,8 @@ begin
 
   input = Overcommit::UserInput.new(STDIN)
 
-  runner = Overcommit::HookRunner.new(config, logger, context, input)
+  printer = Overcommit::Printer.new(logger, context)
+  runner = Overcommit::HookRunner.new(config, logger, context, input, printer)
 
   status = runner.run
 

data/template-dir/hooks/post-checkout

@@ -65,7 +65,8 @@ begin
 
   input = Overcommit::UserInput.new(STDIN)
 
-  runner = Overcommit::HookRunner.new(config, logger, context, input)
+  printer = Overcommit::Printer.new(logger, context)
+  runner = Overcommit::HookRunner.new(config, logger, context, input, printer)
 
   status = runner.run
 

data/template-dir/hooks/pre-commit

@@ -65,7 +65,8 @@ begin
 
   input = Overcommit::UserInput.new(STDIN)
 
-  runner = Overcommit::HookRunner.new(config, logger, context, input)
+  printer = Overcommit::Printer.new(logger, context)
+  runner = Overcommit::HookRunner.new(config, logger, context, input, printer)
 
   status = runner.run
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: overcommit
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Causes Engineering
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-09 00:00:00.000000000 Z
+date: 2014-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
@@ -26,19 +26,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.5.1
 - !ruby/object:Gem::Dependency
-  name: json
+  name: image_optim
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.8'
-  type: :runtime
+        version: 0.13.0
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -54,19 +54,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: image_optim
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.24.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.24.1
 description: Utility to install, configure, and extend Git hooks
 email:
 - eng@causes.com
@@ -126,6 +126,8 @@ files:
 - lib/overcommit/hook/pre_commit/base.rb
 - lib/overcommit/hook/pre_commit/json_syntax.rb
 - lib/overcommit/hook_signer.rb
+- lib/overcommit/git_repo.rb
+- lib/overcommit/configuration_validator.rb
 - lib/overcommit/hook_context/pre_commit.rb
 - lib/overcommit/hook_context/commit_msg.rb
 - lib/overcommit/hook_context/base.rb
@@ -138,6 +140,7 @@ files:
 - lib/overcommit/hook_loader/base.rb
 - lib/overcommit/exceptions.rb
 - lib/overcommit/configuration.rb
+- lib/overcommit/printer.rb
 - lib/overcommit/logger.rb
 - lib/overcommit/cli.rb
 - libexec/index-tags
@@ -159,7 +162,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='