overcommit 0.46.0 → 0.47.0

data/lib/overcommit/hook_runner.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit
   # Responsible for loading the hooks the repository has configured and running
   # them, collecting and displaying the results.

data/lib/overcommit/hook_signer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit
   # Calculates, stores, and retrieves stored signatures of hook plugins.
   class HookSigner

data/lib/overcommit/installer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fileutils'
 
 module Overcommit

data/lib/overcommit/interrupt_handler.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'singleton'
 
 # Provides a handler for interrupt signals (SIGINT), allowing the application to

data/lib/overcommit/logger.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit
   # Encapsulates all communication to an output source.
   class Logger
@@ -38,7 +40,7 @@ module Overcommit
 
     # Write a line of output if debug mode is enabled.
     def debug(*args)
-      color('35', *args) unless ENV.fetch('OVERCOMMIT_DEBUG', '').empty?
+      color('35', *args) unless ENV.fetch('OVERCOMMIT_DEBUG') { '' }.empty?
     end
 
     # Write a line of output that is intended to be emphasized.

data/lib/overcommit/os.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rbconfig'
 
 module Overcommit

data/lib/overcommit/printer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'monitor'
 
 module Overcommit

data/lib/overcommit/subprocess.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'childprocess'
 require 'tempfile'
 

data/lib/overcommit/utils.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pathname'
 require 'overcommit/os'
 require 'overcommit/subprocess'
@@ -172,7 +174,7 @@ module Overcommit
         end
 
         result =
-          if (splittable_args = options.fetch(:args, [])).any?
+          if (splittable_args = options.fetch(:args) { [] }).any?
             debug(initial_args.join(' ') + " ... (#{splittable_args.length} splittable args)")
             Overcommit::CommandSplitter.execute(initial_args, options)
           else

data/lib/overcommit/utils/file_utils.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'overcommit/os'
 require 'overcommit/subprocess'
 

data/lib/overcommit/utils/messages_utils.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Overcommit::Utils
   # Utility to process messages
   module MessagesUtils

data/lib/overcommit/version.rb

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

data/template-dir/hooks/commit-msg

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 # Entrypoint for Overcommit hook integration. Installing Overcommit will result
 # in all of your git hooks being copied from this file, allowing the framework

data/template-dir/hooks/overcommit-hook

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 # Entrypoint for Overcommit hook integration. Installing Overcommit will result
 # in all of your git hooks being copied from this file, allowing the framework

data/template-dir/hooks/post-checkout

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 # Entrypoint for Overcommit hook integration. Installing Overcommit will result
 # in all of your git hooks being copied from this file, allowing the framework

data/template-dir/hooks/post-commit

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 # Entrypoint for Overcommit hook integration. Installing Overcommit will result
 # in all of your git hooks being copied from this file, allowing the framework

data/template-dir/hooks/post-merge

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 # Entrypoint for Overcommit hook integration. Installing Overcommit will result
 # in all of your git hooks being copied from this file, allowing the framework

data/template-dir/hooks/post-rewrite

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 # Entrypoint for Overcommit hook integration. Installing Overcommit will result
 # in all of your git hooks being copied from this file, allowing the framework

data/template-dir/hooks/pre-commit

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 # Entrypoint for Overcommit hook integration. Installing Overcommit will result
 # in all of your git hooks being copied from this file, allowing the framework

data/template-dir/hooks/pre-push

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 # Entrypoint for Overcommit hook integration. Installing Overcommit will result
 # in all of your git hooks being copied from this file, allowing the framework

data/template-dir/hooks/pre-rebase

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 # Entrypoint for Overcommit hook integration. Installing Overcommit will result
 # in all of your git hooks being copied from this file, allowing the framework

data/template-dir/hooks/prepare-commit-msg

@@ -0,0 +1,116 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+# Entrypoint for Overcommit hook integration. Installing Overcommit will result
+# in all of your git hooks being copied from this file, allowing the framework
+# to manage your hooks for you.
+
+# Prevent a Ruby stack trace from appearing when we interrupt the hook.
+# Note that this will be overridden when Overcommit is loaded, since the
+# InterruptHandler will redefine the trap at that time.
+Signal.trap('INT') do
+  puts 'Hook run interrupted'
+  exit 130
+end
+
+# Allow hooks to be disabled via environment variable so git commands can be run
+# in scripts without Overcommit running hooks
+if ENV['OVERCOMMIT_DISABLE'].to_i != 0 || ENV['OVERCOMMIT_DISABLED'].to_i != 0
+  exit
+end
+
+hook_type = File.basename($0)
+if hook_type == 'overcommit-hook'
+  puts "Don't run `overcommit-hook` directly; it is intended to be symlinked " \
+       "by each hook in a repository's .git/hooks directory."
+  exit 64 # EX_USAGE
+end
+
+# 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
+    Bundler.setup
+  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'
+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
+    puts 'This repository contains hooks installed by Overcommit, but the ' \
+         "`overcommit` gem is not installed.\n" \
+         'Install it with `gem install overcommit`.'
+  end
+
+  exit 64 # EX_USAGE
+end
+
+begin
+  logger = Overcommit::Logger.new(STDOUT)
+  Overcommit::Utils.log = logger
+
+  # Ensure master hook is up-to-date
+  installer = Overcommit::Installer.new(logger)
+  if installer.run(Overcommit::Utils.repo_root, action: :update)
+    exec($0, *ARGV) # Execute the updated hook with all original arguments
+  end
+
+  config = Overcommit::ConfigurationLoader.new(logger).load_repo_config
+
+  context = Overcommit::HookContext.create(hook_type, config, ARGV, STDIN)
+  config.apply_environment!(context, ENV)
+
+  printer = Overcommit::Printer.new(config, logger, context)
+  runner = Overcommit::HookRunner.new(config, logger, context, printer)
+
+  status = runner.run
+
+  exit(status ? 0 : 65) # 65 = EX_DATAERR
+rescue Overcommit::Exceptions::ConfigurationError => error
+  puts error
+  exit 78 # EX_CONFIG
+rescue Overcommit::Exceptions::HookContextLoadError => error
+  puts error
+  puts 'Are you running an old version of Overcommit?'
+  exit 69 # EX_UNAVAILABLE
+rescue Overcommit::Exceptions::HookLoadError,
+       Overcommit::Exceptions::InvalidHookDefinition => error
+  puts error.message
+  puts error.backtrace
+  exit 78 # EX_CONFIG
+rescue Overcommit::Exceptions::HookSetupFailed,
+       Overcommit::Exceptions::HookCleanupFailed => error
+  puts error.message
+  exit 74 # EX_IOERR
+rescue Overcommit::Exceptions::HookCancelled
+  puts 'You cancelled the hook run'
+  exit 130 # Ctrl-C cancel
+rescue Overcommit::Exceptions::InvalidGitRepo => error
+  puts error
+  exit 64 # EX_USAGE
+rescue Overcommit::Exceptions::ConfigurationSignatureChanged => error
+  puts error
+  puts "For more information, see #{Overcommit::REPO_URL}#security"
+  exit 1
+rescue Overcommit::Exceptions::InvalidHookSignature
+  exit 1
+rescue StandardError => error
+  puts error.message
+  puts error.backtrace
+  puts "Report this bug at #{Overcommit::BUG_REPORT_URL}"
+  exit 70 # EX_SOFTWARE
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: overcommit
 version: !ruby/object:Gem::Version
-  version: 0.46.0
+  version: 0.47.0
 platform: ruby
 authors:
 - Brigade Engineering
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-02 00:00:00.000000000 Z
+date: 2019-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
@@ -127,6 +127,7 @@ files:
 - lib/overcommit/hook/pre_commit/chamber_security.rb
 - lib/overcommit/hook/pre_commit/chamber_verification.rb
 - lib/overcommit/hook/pre_commit/coffee_lint.rb
+- lib/overcommit/hook/pre_commit/cook_style.rb
 - lib/overcommit/hook/pre_commit/credo.rb
 - lib/overcommit/hook/pre_commit/css_lint.rb
 - lib/overcommit/hook/pre_commit/dogma.rb
@@ -152,6 +153,7 @@ files:
 - lib/overcommit/hook/pre_commit/jscs.rb
 - lib/overcommit/hook/pre_commit/jsl.rb
 - lib/overcommit/hook/pre_commit/json_syntax.rb
+- lib/overcommit/hook/pre_commit/kt_lint.rb
 - lib/overcommit/hook/pre_commit/license_finder.rb
 - lib/overcommit/hook/pre_commit/license_header.rb
 - lib/overcommit/hook/pre_commit/line_endings.rb
@@ -189,6 +191,8 @@ files:
 - lib/overcommit/hook/pre_commit/sqlint.rb
 - lib/overcommit/hook/pre_commit/standard.rb
 - lib/overcommit/hook/pre_commit/stylelint.rb
+- lib/overcommit/hook/pre_commit/swift_lint.rb
+- lib/overcommit/hook/pre_commit/terraform_format.rb
 - lib/overcommit/hook/pre_commit/trailing_whitespace.rb
 - lib/overcommit/hook/pre_commit/travis_lint.rb
 - lib/overcommit/hook/pre_commit/ts_lint.rb
@@ -214,6 +218,8 @@ files:
 - lib/overcommit/hook/pre_push/test_unit.rb
 - lib/overcommit/hook/pre_rebase/base.rb
 - lib/overcommit/hook/pre_rebase/merged_commits.rb
+- lib/overcommit/hook/prepare_commit_msg/base.rb
+- lib/overcommit/hook/prepare_commit_msg/replace_branch.rb
 - lib/overcommit/hook/shared/bower_install.rb
 - lib/overcommit/hook/shared/bundle_install.rb
 - lib/overcommit/hook/shared/composer_install.rb
@@ -232,6 +238,7 @@ files:
 - lib/overcommit/hook_context/pre_commit.rb
 - lib/overcommit/hook_context/pre_push.rb
 - lib/overcommit/hook_context/pre_rebase.rb
+- lib/overcommit/hook_context/prepare_commit_msg.rb
 - lib/overcommit/hook_context/run_all.rb
 - lib/overcommit/hook_loader/base.rb
 - lib/overcommit/hook_loader/built_in_hook_loader.rb
@@ -260,6 +267,7 @@ files:
 - template-dir/hooks/pre-commit
 - template-dir/hooks/pre-push
 - template-dir/hooks/pre-rebase
+- template-dir/hooks/prepare-commit-msg
 homepage: https://github.com/brigade/overcommit
 licenses:
 - MIT
@@ -280,8 +288,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Git hook manager