overcommit 0.32.0 → 0.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0c2c570d206163b748a1aefa226cacfbe1987a6
-  data.tar.gz: fd391b54a75ca207031562fc896d2dfa57494088
+  metadata.gz: 82d13816e551875c9d755901cb847f586459cefd
+  data.tar.gz: 582491d7682c80f69a4b931a9fb03bc3e0a63ce9
 SHA512:
-  metadata.gz: df5aecb87481a132a0fc6b0d5ee0ac651a9ca74ba962a0563fc66b5a5583d19aad33293e25bd71626aecbdfe186d7af0e2be1bbda440c8ec2ffc5b5c4507dc8e
-  data.tar.gz: d2eb883b0d1bb0bfd0a4b970150e466eb5a5fe5631d49d876b8c9b751463120efb99a9c788c2079b6907679dbc778b6ab780fed382c14d510df702ee406988da
+  metadata.gz: 2affc1f9a55e9db9fd9d5f260ffa347715f4bf9694f244707a3503f0d5eefe1ab8036f27053873ef523a1190e49566bf5bb0b3a7bfef710274501ffe06b7e52a
+  data.tar.gz: c11fc79fcc65a689c852f7fb2428131cb51b6dcef877dbf0ea8e4314bd603a89ab22b10d08dab35223e0c525fe630bf0c88fefef7d4d143e846c47d4a38ba531

data/bin/overcommit

@@ -1,6 +1,44 @@
 #!/usr/bin/env ruby
 
-require 'overcommit/cli'
+# Check if Overcommit should invoke a Bundler context for loading gems
+require 'yaml'
+# rubocop:disable Style/RescueModifier
+if gemfile = YAML.load_file('.overcommit.yml')['gemfile'] rescue nil
+  ENV['BUNDLE_GEMFILE'] = gemfile
+  require 'bundler'
+
+  begin
+    # We need to temporarily silence STDERR to remove annoying Gem specification
+    # warnings that ultimately don't matter, e.g.
+    # https://github.com/rubygems/rubygems/issues/1070
+    old_stderr = $stderr
+    begin
+      $stderr = File.new(File::NULL, 'w')
+      Bundler.setup
+    ensure
+      $stderr = old_stderr
+    end
+  rescue Bundler::BundlerError => ex
+    puts "Problem loading '#{gemfile}': #{ex.message}"
+    puts "Try running:\nbundle install --gemfile=#{gemfile}" if ex.is_a?(Bundler::GemNotFound)
+    exit 78 # EX_CONFIG
+  end
+end
+# rubocop:enable Style/RescueModifier
+
+begin
+  require 'overcommit/cli'
+rescue LoadError
+  if gemfile
+    puts 'You have specified the `gemfile` option in your Overcommit ' \
+         'configuration but have not added the `overcommit` gem to ' \
+         "#{gemfile}."
+  else
+    raise
+  end
+
+  exit 64 # EX_USAGE
+end
 
 logger = Overcommit::Logger.new(STDOUT)
 

data/config/default.yml

@@ -39,6 +39,10 @@ gemfile: false
 # to the root of the repository.
 plugin_directory: '.git-hooks'
 
+# Whether to hide hook output by default. This results in completely silent hook
+# runs except in the case of warning or failure.
+quiet: false
+
 # Number of hooks that can be run concurrently. Typically this won't need to be
 # adjusted, but if you know that some of your hooks themselves use multiple
 # processors you can lower this value accordingly. You can define

data/lib/overcommit/cli.rb

@@ -197,7 +197,7 @@ module Overcommit
       context = Overcommit::HookContext.create('run-all', config, @arguments, empty_stdin)
       config.apply_environment!(context, ENV)
 
-      printer = Overcommit::Printer.new(log, context)
+      printer = Overcommit::Printer.new(config, log, context)
       runner  = Overcommit::HookRunner.new(config, log, context, printer)
 
       status = runner.run

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

@@ -2,14 +2,20 @@ module Overcommit::Hook::PreCommit
   # Checks the format of an author's email address.
   class AuthorEmail < Base
     def run
-      result = execute(%w[git config --get user.email])
-      email = result.stdout.chomp
+      email =
+        if ENV.key?('GIT_AUTHOR_EMAIL')
+          ENV['GIT_AUTHOR_EMAIL']
+        else
+          result = execute(%w[git config --get user.email])
+          result.stdout.chomp
+        end
 
       unless email =~ /#{config['pattern']}/
         return :fail,
                "Author has an invalid email address: '#{email}'\n" \
                'Set your email with ' \
-               '`git config --global user.email your_email@example.com`'
+               '`git config --global user.email your_email@example.com` ' \
+               'or via the GIT_AUTHOR_EMAIL environment variable'
       end
 
       :pass

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

@@ -2,13 +2,19 @@ module Overcommit::Hook::PreCommit
   # Ensures that a commit author has a name with at least first and last names.
   class AuthorName < Base
     def run
-      result = execute(%w[git config --get user.name])
-      name = result.stdout.chomp
+      name =
+        if ENV.key?('GIT_AUTHOR_NAME')
+          ENV['GIT_AUTHOR_NAME']
+        else
+          result = execute(%w[git config --get user.name])
+          result.stdout.chomp
+        end
 
       unless name.split(' ').count >= 2
         return :fail,
                "Author must have at least first and last name, but was: #{name}.\n" \
-               'Set your name with `git config --global user.name "Your Name"`'
+               'Set your name with `git config --global user.name "Your Name"` ' \
+               'or via the GIT_AUTHOR_NAME environment variable'
       end
 
       :pass

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

@@ -3,7 +3,7 @@ module Overcommit::Hook::PreCommit
   #
   # @see http://checkstyle.sourceforge.net/
   class JavaCheckstyle < Base
-    MESSAGE_REGEX = /^(?<file>(?:\w:)?[^:]+):(?<line>\d+)/
+    MESSAGE_REGEX = /^(\[[^\]]+\]\s+)?(?<file>(?:\w:)?[^:]+):(?<line>\d+)/
 
     def run
       result = execute(command, args: applicable_files)

data/lib/overcommit/hook_loader/plugin_hook_loader.rb

@@ -79,7 +79,7 @@ module Overcommit::HookLoader
       # Implement a simple class that executes the command and returns pass/fail
       # based on the exit status
       hook_class = Class.new(hook_base) do
-        def run # rubocop:disable Lint/NestedMethodDefinition
+        def run
           result = @context.execute_hook(command)
 
           if result.success?

data/lib/overcommit/printer.rb

@@ -8,7 +8,8 @@ module Overcommit
   class Printer
     attr_reader :log
 
-    def initialize(logger, context)
+    def initialize(config, logger, context)
+      @config = config
       @log = logger
       @context = context
       @lock = Monitor.new # Need to use monitor so we can have re-entrant locks
@@ -17,7 +18,7 @@ module Overcommit
 
     # Executed at the very beginning of running the collection of hooks.
     def start_run
-      log.bold "Running #{hook_script_name} hooks"
+      log.bold "Running #{hook_script_name} hooks" unless @config['quiet']
     end
 
     def nothing_to_run
@@ -36,7 +37,7 @@ module Overcommit
     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 != :pass
+      print_header(hook) if (!hook.quiet? && !@config['quiet']) || status != :pass
 
       print_result(hook, status, output)
     end
@@ -69,9 +70,11 @@ module Overcommit
 
     # Executed when no hooks failed by the end of the run.
     def run_succeeded
-      log.newline
-      log.success "✓ All #{hook_script_name} hooks passed"
-      log.newline
+      unless @config['quiet']
+        log.newline
+        log.success "✓ All #{hook_script_name} hooks passed"
+        log.newline
+      end
     end
 
     private
@@ -83,10 +86,10 @@ module Overcommit
       log.partial hook_name
     end
 
-    def print_result(hook, status, output)
+    def print_result(hook, status, output) # rubocop:disable Metrics/CyclomaticComplexity
       case status
       when :pass
-        log.success 'OK' unless hook.quiet?
+        log.success 'OK' unless @config['quiet'] || hook.quiet?
       when :warn
         log.warning 'WARNING'
         print_report(output, :bold_warning)

data/lib/overcommit/version.rb

@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module Overcommit
-  VERSION = '0.32.0'.freeze
+  VERSION = '0.33.0'.freeze
 end

data/template-dir/hooks/commit-msg

@@ -73,7 +73,7 @@ begin
   context = Overcommit::HookContext.create(hook_type, config, ARGV, STDIN)
   config.apply_environment!(context, ENV)
 
-  printer = Overcommit::Printer.new(logger, context)
+  printer = Overcommit::Printer.new(config, logger, context)
   runner = Overcommit::HookRunner.new(config, logger, context, printer)
 
   status = runner.run

data/template-dir/hooks/overcommit-hook

@@ -73,7 +73,7 @@ begin
   context = Overcommit::HookContext.create(hook_type, config, ARGV, STDIN)
   config.apply_environment!(context, ENV)
 
-  printer = Overcommit::Printer.new(logger, context)
+  printer = Overcommit::Printer.new(config, logger, context)
   runner = Overcommit::HookRunner.new(config, logger, context, printer)
 
   status = runner.run

data/template-dir/hooks/post-checkout

@@ -73,7 +73,7 @@ begin
   context = Overcommit::HookContext.create(hook_type, config, ARGV, STDIN)
   config.apply_environment!(context, ENV)
 
-  printer = Overcommit::Printer.new(logger, context)
+  printer = Overcommit::Printer.new(config, logger, context)
   runner = Overcommit::HookRunner.new(config, logger, context, printer)
 
   status = runner.run

data/template-dir/hooks/post-commit

@@ -73,7 +73,7 @@ begin
   context = Overcommit::HookContext.create(hook_type, config, ARGV, STDIN)
   config.apply_environment!(context, ENV)
 
-  printer = Overcommit::Printer.new(logger, context)
+  printer = Overcommit::Printer.new(config, logger, context)
   runner = Overcommit::HookRunner.new(config, logger, context, printer)
 
   status = runner.run

data/template-dir/hooks/post-merge

@@ -73,7 +73,7 @@ begin
   context = Overcommit::HookContext.create(hook_type, config, ARGV, STDIN)
   config.apply_environment!(context, ENV)
 
-  printer = Overcommit::Printer.new(logger, context)
+  printer = Overcommit::Printer.new(config, logger, context)
   runner = Overcommit::HookRunner.new(config, logger, context, printer)
 
   status = runner.run

data/template-dir/hooks/post-rewrite

@@ -73,7 +73,7 @@ begin
   context = Overcommit::HookContext.create(hook_type, config, ARGV, STDIN)
   config.apply_environment!(context, ENV)
 
-  printer = Overcommit::Printer.new(logger, context)
+  printer = Overcommit::Printer.new(config, logger, context)
   runner = Overcommit::HookRunner.new(config, logger, context, printer)
 
   status = runner.run

data/template-dir/hooks/pre-commit

@@ -73,7 +73,7 @@ begin
   context = Overcommit::HookContext.create(hook_type, config, ARGV, STDIN)
   config.apply_environment!(context, ENV)
 
-  printer = Overcommit::Printer.new(logger, context)
+  printer = Overcommit::Printer.new(config, logger, context)
   runner = Overcommit::HookRunner.new(config, logger, context, printer)
 
   status = runner.run

data/template-dir/hooks/pre-push

@@ -73,7 +73,7 @@ begin
   context = Overcommit::HookContext.create(hook_type, config, ARGV, STDIN)
   config.apply_environment!(context, ENV)
 
-  printer = Overcommit::Printer.new(logger, context)
+  printer = Overcommit::Printer.new(config, logger, context)
   runner = Overcommit::HookRunner.new(config, logger, context, printer)
 
   status = runner.run

data/template-dir/hooks/pre-rebase

@@ -73,7 +73,7 @@ begin
   context = Overcommit::HookContext.create(hook_type, config, ARGV, STDIN)
   config.apply_environment!(context, ENV)
 
-  printer = Overcommit::Printer.new(logger, context)
+  printer = Overcommit::Printer.new(config, logger, context)
   runner = Overcommit::HookRunner.new(config, logger, context, printer)
 
   status = runner.run

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: overcommit
 version: !ruby/object:Gem::Version
-  version: 0.32.0
+  version: 0.33.0
 platform: ruby
 authors:
 - Brigade Engineering
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-21 00:00:00.000000000 Z
+date: 2016-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
@@ -39,48 +39,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.4'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: travis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
 description: Utility to install, configure, and extend Git hooks
 email:
 - eng@brigade.com