Add integration spec for committing

Change-Id: I78e35d2c9c6dd178d4f4d3773cae03499ae342ab
Reviewed-on: http://gerrit.causes.com/35584
Reviewed-by: Shane da Silva <shane@causes.com>
Tested-by: Shane da Silva <shane@causes.com>

Author: sds

config/default.yml

@@ -34,6 +34,7 @@ pre_commit:
     quiet: false
 
   AuthorName:
+    description: 'Checking for author name'
     requires_files: false
     required: true
     quiet: true

lib/overcommit/configuration.rb

@@ -15,14 +15,14 @@ def ==(other)
     # Returns absolute path to the directory that external hook plugins should
     # be loaded from.
     def plugin_directory
-      File.join(Overcommit::Utils.repo_root, @hash['plugin_directory'])
+      File.join(Overcommit::Utils.repo_root, @hash['plugin_directory'] || '.githooks')
     end
 
     # Returns the built-in hooks that have been enabled for a hook type.
     def enabled_builtin_hooks(hook_type)
       @hash[hook_type].keys.
         select { |hook_name| hook_name != 'ALL' }.
-        select { |hook_name| @hash[hook_type][hook_name]['enabled'] != false }
+        select { |hook_name| hook_enabled?(hook_type, hook_name) }
     end
 
     # Returns a non-modifiable configuration for a hook.
@@ -76,6 +76,16 @@ def hook_exists?(hook_type, hook_name)
                             hook_type, "#{hook_name}.rb"))
     end
 
+    def hook_enabled?(hook_type, hook_name)
+      individual_enabled = @hash[hook_type][hook_name]['enabled']
+      return individual_enabled unless individual_enabled.nil?
+
+      all_enabled = @hash[hook_type]['ALL']['enabled']
+      return all_enabled unless all_enabled.nil?
+
+      true
+    end
+
     # Validates the configuration for any invalid options, normalizing it where
     # possible.
     def validate

lib/overcommit/hook/pre_commit/author_name.rb

@@ -6,8 +6,8 @@ def run
       name = result.stdout.chomp
 
       unless name.split(' ').count >= 2
-        return :bad, 'Author must have at least first and last name; ' <<
-                     "was: '#{name}'.\n Set your name with " <<
+        return :bad, 'Author must have at least first and last name, but ' <<
+                     "was: '#{name}'.\nSet your name with " <<
                      "`git config --global user.name 'Your Name'`"
       end
 

lib/overcommit/reporter.rb

@@ -8,7 +8,7 @@ def initialize(context, hooks, config, log)
       @config  = config
       @name    = Overcommit::Utils.underscorize(context.hook_class_name).gsub('_', '-')
       @hooks   = hooks
-      @width   = [@hooks.map { |s| s.description.length }.max + 3, 60].max
+      @width   = [(@hooks.map { |s| s.description.length }.max || 57) + 3, 60].max
       @results = []
     end
 
@@ -20,7 +20,7 @@ def with_status(hook, &block)
       title = "  #{hook.description}"
       unless hook.quiet?
         log.partial title
-        print '.' * (@width - title.length)
+        log.partial '.' * (@width - title.length)
       end
 
       status, output = yield
@@ -51,6 +51,7 @@ def print_hook_result(hook, title, status, output)
       if hook.quiet?
         return if status == :good
         log.partial title
+        log.partial '.' * (@width - title.length)
       end
 
       case status

spec/integration/committing_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+describe 'commiting' do
+  subject { shell('git commit --allow-empty -m "Test"') }
+
+  let(:config) { <<-YML }
+    commit_msg:
+      ALL:
+        enabled: false
+    pre_commit:
+      ALL:
+        enabled: false
+      AuthorName:
+        enabled: true
+  YML
+
+  around do |example|
+    repo do
+      File.open('.overcommit.yml', 'w') { |f| f.write(config) }
+      Overcommit::Installer.new(Overcommit::Logger.silent).
+                            run('.', :action => :install)
+      example.run
+    end
+  end
+
+  context 'when a hook fails' do
+    before do
+      `git config --local user.name ''`
+    end
+
+    its(:status) { should_not be_zero }
+  end
+
+  context 'when no hooks fail' do
+    before do
+      `git config --local user.name 'John Doe'`
+    end
+
+    its(:status) { should be_zero }
+  end
+end

spec/spec_helper.rb

@@ -18,4 +18,5 @@
 RSpec.configure do |config|
   config.include GitSpecHelpers
   config.include OutputHelpers
+  config.include ShellHelpers
 end

spec/support/shell_helpers.rb

@@ -0,0 +1,8 @@
+require 'wopen3'
+
+# Helpers for executing shell commands in tests.
+module ShellHelpers
+  def shell(command)
+    Wopen3.system(command)
+  end
+end