overcommit 0.19.0 → 0.20.0

data/template-dir/hooks/commit-msg

@@ -18,11 +18,6 @@ if ENV['OVERCOMMIT_DISABLE'].to_i != 0 || ENV['OVERCOMMIT_DISABLED'].to_i != 0
   exit
 end
 
-# Required for Ruby 1.8 compatibility (for older OSX versions)
-if RUBY_VERSION.split('.')[0..1] == %w[1 8]
-  require 'rubygems'
-end
-
 hook_type = File.basename($0)
 if hook_type == 'overcommit-hook'
   puts "Don't run `overcommit-hook` directly; it is intended to be symlinked " \
@@ -33,34 +28,10 @@ end
 begin
   require 'overcommit'
 rescue LoadError
-  puts 'Overcommit is not installed. Install it to manage git hooks for ' \
-       'this repository? (y/n)'
-
-  # If the hook isn't interactive, we need to map STDIN to keyboard manually
-  STDIN.reopen('/dev/tty') if STDIN.eof?
-
-  if (answer = gets) && answer.strip.downcase.start_with?('y')
-    puts 'Installing...'
-    if system('gem install overcommit')
-      Gem.clear_paths # Reset load paths so newly installed gem is found
-      require 'overcommit'
-    else
-      puts 'Unable to install Overcommit -- try running `gem install overcommit`'
-      exit 69 # EX_UNAVAILABLE
-    end
-  else
-    puts 'You chose not to install Overcommit'
-    puts "No hooks were run for '#{hook_type}'"
-    exit
-  end
-end
-
-if Gem::Version.new(Overcommit::VERSION) < Gem::Version.new('0.6.0')
-  puts "Installed version of Overcommit (#{Overcommit::VERSION}) is " \
-       "incompatible with the installed hooks.\n" \
-       'Run `gem install overcommit && overcommit --install` to ensure ' \
-       "you're up-to-date."
-  exit 64 # EX_USAGE
+  puts 'This repository contains hooks installed by Overcommit, but the ' \
+       "overcommit gem is not installed.\n" \
+       'Install it with `gem install overcommit`.'
+  exit
 end
 
 begin
@@ -68,19 +39,17 @@ begin
 
   # Ensure master hook is up-to-date
   installer = Overcommit::Installer.new(logger)
-  if installer.run(Overcommit::Utils.repo_root, :action => :update)
+  if installer.run(Overcommit::Utils.repo_root, action: :update)
     exec($0, *ARGV) # Execute the updated hook with all original arguments
   end
 
   config = Overcommit::ConfigurationLoader.load_repo_config
 
-  context = Overcommit::HookContext.create(hook_type, config, ARGV, STDIN)
+  context = Overcommit::HookContext.create(hook_type, config, ARGV)
   config.apply_environment!(context, ENV)
 
-  input = Overcommit::UserInput.new(STDIN)
-
   printer = Overcommit::Printer.new(logger, context)
-  runner = Overcommit::HookRunner.new(config, logger, context, input, printer)
+  runner = Overcommit::HookRunner.new(config, logger, context, printer)
 
   status = runner.run
 
@@ -102,6 +71,8 @@ rescue Overcommit::Exceptions::HookCancelled
 rescue Overcommit::Exceptions::InvalidGitRepo => error
   puts error
   exit 64 # EX_USAGE
+rescue Overcommit::Exceptions::InvalidHookSignature
+  exit 1
 rescue => error
   puts error.message
   puts error.backtrace

data/template-dir/hooks/overcommit-hook

@@ -18,11 +18,6 @@ if ENV['OVERCOMMIT_DISABLE'].to_i != 0 || ENV['OVERCOMMIT_DISABLED'].to_i != 0
   exit
 end
 
-# Required for Ruby 1.8 compatibility (for older OSX versions)
-if RUBY_VERSION.split('.')[0..1] == %w[1 8]
-  require 'rubygems'
-end
-
 hook_type = File.basename($0)
 if hook_type == 'overcommit-hook'
   puts "Don't run `overcommit-hook` directly; it is intended to be symlinked " \
@@ -33,34 +28,10 @@ end
 begin
   require 'overcommit'
 rescue LoadError
-  puts 'Overcommit is not installed. Install it to manage git hooks for ' \
-       'this repository? (y/n)'
-
-  # If the hook isn't interactive, we need to map STDIN to keyboard manually
-  STDIN.reopen('/dev/tty') if STDIN.eof?
-
-  if (answer = gets) && answer.strip.downcase.start_with?('y')
-    puts 'Installing...'
-    if system('gem install overcommit')
-      Gem.clear_paths # Reset load paths so newly installed gem is found
-      require 'overcommit'
-    else
-      puts 'Unable to install Overcommit -- try running `gem install overcommit`'
-      exit 69 # EX_UNAVAILABLE
-    end
-  else
-    puts 'You chose not to install Overcommit'
-    puts "No hooks were run for '#{hook_type}'"
-    exit
-  end
-end
-
-if Gem::Version.new(Overcommit::VERSION) < Gem::Version.new('0.6.0')
-  puts "Installed version of Overcommit (#{Overcommit::VERSION}) is " \
-       "incompatible with the installed hooks.\n" \
-       'Run `gem install overcommit && overcommit --install` to ensure ' \
-       "you're up-to-date."
-  exit 64 # EX_USAGE
+  puts 'This repository contains hooks installed by Overcommit, but the ' \
+       "overcommit gem is not installed.\n" \
+       'Install it with `gem install overcommit`.'
+  exit
 end
 
 begin
@@ -68,19 +39,17 @@ begin
 
   # Ensure master hook is up-to-date
   installer = Overcommit::Installer.new(logger)
-  if installer.run(Overcommit::Utils.repo_root, :action => :update)
+  if installer.run(Overcommit::Utils.repo_root, action: :update)
     exec($0, *ARGV) # Execute the updated hook with all original arguments
   end
 
   config = Overcommit::ConfigurationLoader.load_repo_config
 
-  context = Overcommit::HookContext.create(hook_type, config, ARGV, STDIN)
+  context = Overcommit::HookContext.create(hook_type, config, ARGV)
   config.apply_environment!(context, ENV)
 
-  input = Overcommit::UserInput.new(STDIN)
-
   printer = Overcommit::Printer.new(logger, context)
-  runner = Overcommit::HookRunner.new(config, logger, context, input, printer)
+  runner = Overcommit::HookRunner.new(config, logger, context, printer)
 
   status = runner.run
 
@@ -102,6 +71,8 @@ rescue Overcommit::Exceptions::HookCancelled
 rescue Overcommit::Exceptions::InvalidGitRepo => error
   puts error
   exit 64 # EX_USAGE
+rescue Overcommit::Exceptions::InvalidHookSignature
+  exit 1
 rescue => error
   puts error.message
   puts error.backtrace

data/template-dir/hooks/post-checkout

@@ -18,11 +18,6 @@ if ENV['OVERCOMMIT_DISABLE'].to_i != 0 || ENV['OVERCOMMIT_DISABLED'].to_i != 0
   exit
 end
 
-# Required for Ruby 1.8 compatibility (for older OSX versions)
-if RUBY_VERSION.split('.')[0..1] == %w[1 8]
-  require 'rubygems'
-end
-
 hook_type = File.basename($0)
 if hook_type == 'overcommit-hook'
   puts "Don't run `overcommit-hook` directly; it is intended to be symlinked " \
@@ -33,34 +28,10 @@ end
 begin
   require 'overcommit'
 rescue LoadError
-  puts 'Overcommit is not installed. Install it to manage git hooks for ' \
-       'this repository? (y/n)'
-
-  # If the hook isn't interactive, we need to map STDIN to keyboard manually
-  STDIN.reopen('/dev/tty') if STDIN.eof?
-
-  if (answer = gets) && answer.strip.downcase.start_with?('y')
-    puts 'Installing...'
-    if system('gem install overcommit')
-      Gem.clear_paths # Reset load paths so newly installed gem is found
-      require 'overcommit'
-    else
-      puts 'Unable to install Overcommit -- try running `gem install overcommit`'
-      exit 69 # EX_UNAVAILABLE
-    end
-  else
-    puts 'You chose not to install Overcommit'
-    puts "No hooks were run for '#{hook_type}'"
-    exit
-  end
-end
-
-if Gem::Version.new(Overcommit::VERSION) < Gem::Version.new('0.6.0')
-  puts "Installed version of Overcommit (#{Overcommit::VERSION}) is " \
-       "incompatible with the installed hooks.\n" \
-       'Run `gem install overcommit && overcommit --install` to ensure ' \
-       "you're up-to-date."
-  exit 64 # EX_USAGE
+  puts 'This repository contains hooks installed by Overcommit, but the ' \
+       "overcommit gem is not installed.\n" \
+       'Install it with `gem install overcommit`.'
+  exit
 end
 
 begin
@@ -68,19 +39,17 @@ begin
 
   # Ensure master hook is up-to-date
   installer = Overcommit::Installer.new(logger)
-  if installer.run(Overcommit::Utils.repo_root, :action => :update)
+  if installer.run(Overcommit::Utils.repo_root, action: :update)
     exec($0, *ARGV) # Execute the updated hook with all original arguments
   end
 
   config = Overcommit::ConfigurationLoader.load_repo_config
 
-  context = Overcommit::HookContext.create(hook_type, config, ARGV, STDIN)
+  context = Overcommit::HookContext.create(hook_type, config, ARGV)
   config.apply_environment!(context, ENV)
 
-  input = Overcommit::UserInput.new(STDIN)
-
   printer = Overcommit::Printer.new(logger, context)
-  runner = Overcommit::HookRunner.new(config, logger, context, input, printer)
+  runner = Overcommit::HookRunner.new(config, logger, context, printer)
 
   status = runner.run
 
@@ -102,6 +71,8 @@ rescue Overcommit::Exceptions::HookCancelled
 rescue Overcommit::Exceptions::InvalidGitRepo => error
   puts error
   exit 64 # EX_USAGE
+rescue Overcommit::Exceptions::InvalidHookSignature
+  exit 1
 rescue => error
   puts error.message
   puts error.backtrace

data/template-dir/hooks/pre-commit

@@ -18,11 +18,6 @@ if ENV['OVERCOMMIT_DISABLE'].to_i != 0 || ENV['OVERCOMMIT_DISABLED'].to_i != 0
   exit
 end
 
-# Required for Ruby 1.8 compatibility (for older OSX versions)
-if RUBY_VERSION.split('.')[0..1] == %w[1 8]
-  require 'rubygems'
-end
-
 hook_type = File.basename($0)
 if hook_type == 'overcommit-hook'
   puts "Don't run `overcommit-hook` directly; it is intended to be symlinked " \
@@ -33,34 +28,10 @@ end
 begin
   require 'overcommit'
 rescue LoadError
-  puts 'Overcommit is not installed. Install it to manage git hooks for ' \
-       'this repository? (y/n)'
-
-  # If the hook isn't interactive, we need to map STDIN to keyboard manually
-  STDIN.reopen('/dev/tty') if STDIN.eof?
-
-  if (answer = gets) && answer.strip.downcase.start_with?('y')
-    puts 'Installing...'
-    if system('gem install overcommit')
-      Gem.clear_paths # Reset load paths so newly installed gem is found
-      require 'overcommit'
-    else
-      puts 'Unable to install Overcommit -- try running `gem install overcommit`'
-      exit 69 # EX_UNAVAILABLE
-    end
-  else
-    puts 'You chose not to install Overcommit'
-    puts "No hooks were run for '#{hook_type}'"
-    exit
-  end
-end
-
-if Gem::Version.new(Overcommit::VERSION) < Gem::Version.new('0.6.0')
-  puts "Installed version of Overcommit (#{Overcommit::VERSION}) is " \
-       "incompatible with the installed hooks.\n" \
-       'Run `gem install overcommit && overcommit --install` to ensure ' \
-       "you're up-to-date."
-  exit 64 # EX_USAGE
+  puts 'This repository contains hooks installed by Overcommit, but the ' \
+       "overcommit gem is not installed.\n" \
+       'Install it with `gem install overcommit`.'
+  exit
 end
 
 begin
@@ -68,19 +39,17 @@ begin
 
   # Ensure master hook is up-to-date
   installer = Overcommit::Installer.new(logger)
-  if installer.run(Overcommit::Utils.repo_root, :action => :update)
+  if installer.run(Overcommit::Utils.repo_root, action: :update)
     exec($0, *ARGV) # Execute the updated hook with all original arguments
   end
 
   config = Overcommit::ConfigurationLoader.load_repo_config
 
-  context = Overcommit::HookContext.create(hook_type, config, ARGV, STDIN)
+  context = Overcommit::HookContext.create(hook_type, config, ARGV)
   config.apply_environment!(context, ENV)
 
-  input = Overcommit::UserInput.new(STDIN)
-
   printer = Overcommit::Printer.new(logger, context)
-  runner = Overcommit::HookRunner.new(config, logger, context, input, printer)
+  runner = Overcommit::HookRunner.new(config, logger, context, printer)
 
   status = runner.run
 
@@ -102,6 +71,8 @@ rescue Overcommit::Exceptions::HookCancelled
 rescue Overcommit::Exceptions::InvalidGitRepo => error
   puts error
   exit 64 # EX_USAGE
+rescue Overcommit::Exceptions::InvalidHookSignature
+  exit 1
 rescue => error
   puts error.message
   puts error.backtrace

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: overcommit
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.20.0
 platform: ruby
 authors:
 - Causes Engineering
@@ -9,64 +9,50 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-07 00:00:00.000000000 Z
+date: 2014-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: image_optim
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.18.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.18.0
 - !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: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.26.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.26.0
 description: Utility to install, configure, and extend Git hooks
 email:
 - eng@causes.com
@@ -80,76 +66,77 @@ files:
 - config/default.yml
 - config/starter.yml
 - lib/overcommit.rb
-- lib/overcommit/version.rb
-- lib/overcommit/hook_context.rb
+- lib/overcommit/cli.rb
+- lib/overcommit/configuration.rb
+- lib/overcommit/configuration_loader.rb
+- lib/overcommit/configuration_validator.rb
 - lib/overcommit/constants.rb
-- lib/overcommit/utils.rb
-- lib/overcommit/hook_runner.rb
-- lib/overcommit/user_input.rb
-- lib/overcommit/subprocess.rb
-- lib/overcommit/hook/commit_msg/trailing_period.rb
+- lib/overcommit/exceptions.rb
+- lib/overcommit/git_repo.rb
+- lib/overcommit/hook/base.rb
+- lib/overcommit/hook/commit_msg/base.rb
 - lib/overcommit/hook/commit_msg/gerrit_change_id.rb
-- lib/overcommit/hook/commit_msg/single_line_subject.rb
-- lib/overcommit/hook/commit_msg/russian_novel.rb
 - lib/overcommit/hook/commit_msg/hard_tabs.rb
+- lib/overcommit/hook/commit_msg/russian_novel.rb
+- lib/overcommit/hook/commit_msg/single_line_subject.rb
 - lib/overcommit/hook/commit_msg/text_width.rb
-- lib/overcommit/hook/commit_msg/base.rb
-- lib/overcommit/hook/post_checkout/index_tags.rb
+- lib/overcommit/hook/commit_msg/trailing_period.rb
 - lib/overcommit/hook/post_checkout/base.rb
-- lib/overcommit/hook/base.rb
+- lib/overcommit/hook/post_checkout/index_tags.rb
 - lib/overcommit/hook/pre_commit/author_email.rb
-- lib/overcommit/hook/pre_commit/pry_binding.rb
-- lib/overcommit/hook/pre_commit/jsxcs.rb
-- lib/overcommit/hook/pre_commit/image_optim.rb
+- lib/overcommit/hook/pre_commit/author_name.rb
+- lib/overcommit/hook/pre_commit/base.rb
+- lib/overcommit/hook/pre_commit/berksfile_check.rb
+- lib/overcommit/hook/pre_commit/brakeman.rb
+- lib/overcommit/hook/pre_commit/broken_symlinks.rb
+- lib/overcommit/hook/pre_commit/bundle_check.rb
+- lib/overcommit/hook/pre_commit/chamber_security.rb
+- lib/overcommit/hook/pre_commit/coffee_lint.rb
 - lib/overcommit/hook/pre_commit/css_lint.rb
+- lib/overcommit/hook/pre_commit/go_lint.rb
+- lib/overcommit/hook/pre_commit/haml_lint.rb
+- lib/overcommit/hook/pre_commit/hard_tabs.rb
+- lib/overcommit/hook/pre_commit/image_optim.rb
+- lib/overcommit/hook/pre_commit/js_hint.rb
+- lib/overcommit/hook/pre_commit/jscs.rb
+- lib/overcommit/hook/pre_commit/json_syntax.rb
 - lib/overcommit/hook/pre_commit/jsx_hint.rb
+- lib/overcommit/hook/pre_commit/jsxcs.rb
 - lib/overcommit/hook/pre_commit/local_paths_in_gemfile.rb
-- lib/overcommit/hook/pre_commit/travis_lint.rb
-- lib/overcommit/hook/pre_commit/bundle_check.rb
-- lib/overcommit/hook/pre_commit/yaml_syntax.rb
-- lib/overcommit/hook/pre_commit/rails_schema_up_to_date.rb
-- lib/overcommit/hook/pre_commit/berksfile_check.rb
 - lib/overcommit/hook/pre_commit/merge_conflicts.rb
-- lib/overcommit/hook/pre_commit/trailing_whitespace.rb
-- lib/overcommit/hook/pre_commit/go_lint.rb
-- lib/overcommit/hook/pre_commit/author_name.rb
-- lib/overcommit/hook/pre_commit/rubocop.rb
+- lib/overcommit/hook/pre_commit/pry_binding.rb
 - lib/overcommit/hook/pre_commit/python_flake8.rb
-- lib/overcommit/hook/pre_commit/js_hint.rb
-- lib/overcommit/hook/pre_commit/chamber_security.rb
-- lib/overcommit/hook/pre_commit/hard_tabs.rb
-- lib/overcommit/hook/pre_commit/haml_lint.rb
-- lib/overcommit/hook/pre_commit/coffee_lint.rb
-- lib/overcommit/hook/pre_commit/brakeman.rb
+- lib/overcommit/hook/pre_commit/rails_schema_up_to_date.rb
 - lib/overcommit/hook/pre_commit/reek.rb
-- lib/overcommit/hook/pre_commit/jscs.rb
+- lib/overcommit/hook/pre_commit/rubocop.rb
 - lib/overcommit/hook/pre_commit/scss_lint.rb
-- lib/overcommit/hook/pre_commit/base.rb
-- lib/overcommit/hook/pre_commit/broken_symlinks.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/pre_commit/trailing_whitespace.rb
+- lib/overcommit/hook/pre_commit/travis_lint.rb
+- lib/overcommit/hook/pre_commit/yaml_syntax.rb
+- lib/overcommit/hook_context.rb
 - lib/overcommit/hook_context/base.rb
+- lib/overcommit/hook_context/commit_msg.rb
 - lib/overcommit/hook_context/post_checkout.rb
-- lib/overcommit/installer.rb
-- lib/overcommit/configuration_loader.rb
-- lib/overcommit/interrupt_handler.rb
+- lib/overcommit/hook_context/pre_commit.rb
+- lib/overcommit/hook_context/run_all.rb
+- lib/overcommit/hook_loader/base.rb
 - lib/overcommit/hook_loader/built_in_hook_loader.rb
 - lib/overcommit/hook_loader/plugin_hook_loader.rb
-- lib/overcommit/hook_loader/base.rb
-- lib/overcommit/exceptions.rb
-- lib/overcommit/configuration.rb
-- lib/overcommit/printer.rb
+- lib/overcommit/hook_runner.rb
+- lib/overcommit/hook_signer.rb
+- lib/overcommit/installer.rb
+- lib/overcommit/interrupt_handler.rb
 - lib/overcommit/logger.rb
-- lib/overcommit/cli.rb
-- libexec/index-tags
+- lib/overcommit/message_processor.rb
+- lib/overcommit/printer.rb
+- lib/overcommit/subprocess.rb
+- lib/overcommit/utils.rb
+- lib/overcommit/version.rb
 - libexec/gerrit-change-id
+- libexec/index-tags
 - template-dir/hooks/commit-msg
-- template-dir/hooks/post-checkout
 - template-dir/hooks/overcommit-hook
+- template-dir/hooks/post-checkout
 - template-dir/hooks/pre-commit
 homepage: https://github.com/causes/overcommit
 licenses:
@@ -162,17 +149,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Git hook manager

data/lib/overcommit/user_input.rb

@@ -1,26 +0,0 @@
-module Overcommit
-  # Encapsulates prompting for and fetching input from a user.
-  class UserInput
-    # @param io [IO] device to fetch input from
-    def initialize(io)
-      @io = io
-
-      reopen_tty
-    end
-
-    # Get a string of input from the user (up to the next newline character).
-    def get
-      @io.gets
-    end
-
-    private
-
-    # Git hooks are not interactive and will close STDIN by default.
-    def reopen_tty
-      # If the hook isn't interactive, we need to map STDIN to keyboard manually
-      STDIN.reopen('/dev/tty') if STDIN.eof?
-    rescue # rubocop:disable HandleExceptions
-      # Happens in tests run with no console available
-    end
-  end
-end