overcommit 0.5.0 → 0.6.0

data/lib/overcommit/version.rb

@@ -1,3 +1,3 @@
 module Overcommit
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end

data/{bin/scripts → libexec}/index-tags

@@ -6,13 +6,11 @@
 
 set -e
 
-ctags --version &> /dev/null || exit 0
-
 trap "rm -f .git/tags.$$" EXIT
 err_file=.git/ctags.err
 if ctags --tag-relative -Rf.git/tags.$$ --exclude=.git "$@" 2>${err_file}; then
   mv .git/tags.$$ .git/tags
-  [ -e ${err_file} ] && rm ${err_file}
+  [ -e ${err_file} ] && rm -f ${err_file}
 else
   # Ignore STDERR unless `ctags` returned a non-zero exit code
   cat ${err_file}

data/template-dir/hooks/commit-msg

@@ -0,0 +1,83 @@
+#!/usr/bin/env ruby
+
+# Entrypoint for Overcommit hook integration. Installing Overcommit will result
+# in all of your git hooks being symlinked to this file, allowing the framework
+# to manage your hooks for you.
+
+# Required for Ruby 1.8 compatibility (for older OSX versions)
+if RUBY_VERSION.split('.')[0..1] == ['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 " <<
+       "by each hook in a repository's .git/hooks directory."
+  exit 64 # EX_USAGE
+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')
+    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
+end
+
+begin
+  hook_type_class = Overcommit::Utils.camel_case(hook_type)
+
+  config = Overcommit::ConfigurationLoader.load_repo_config
+  config.apply_environment!(hook_type_class, ENV)
+
+  # Ensure this script and all symlinks are always up-to-date (it's cheap to do)
+  Overcommit::Installer.new(Overcommit::Logger.silent).
+                        run(Overcommit::Utils.repo_root, :action => :install)
+
+  context = Overcommit::HookContext.create(hook_type_class, config, ARGV, STDIN)
+  logger = Overcommit::Logger.new(STDOUT)
+  runner = Overcommit::HookRunner.new(config, logger, context)
+
+  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::InvalidGitRepo => error
+  puts error
+  exit 64 # EX_USAGE
+rescue => error
+  puts error.message
+  puts error.backtrace
+  puts "Report this bug at #{Overcommit::BUG_REPORT_URL}"
+  exit 70 # EX_SOFTWARE
+end

data/template-dir/hooks/overcommit-hook

@@ -0,0 +1,83 @@
+#!/usr/bin/env ruby
+
+# Entrypoint for Overcommit hook integration. Installing Overcommit will result
+# in all of your git hooks being symlinked to this file, allowing the framework
+# to manage your hooks for you.
+
+# Required for Ruby 1.8 compatibility (for older OSX versions)
+if RUBY_VERSION.split('.')[0..1] == ['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 " <<
+       "by each hook in a repository's .git/hooks directory."
+  exit 64 # EX_USAGE
+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')
+    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
+end
+
+begin
+  hook_type_class = Overcommit::Utils.camel_case(hook_type)
+
+  config = Overcommit::ConfigurationLoader.load_repo_config
+  config.apply_environment!(hook_type_class, ENV)
+
+  # Ensure this script and all symlinks are always up-to-date (it's cheap to do)
+  Overcommit::Installer.new(Overcommit::Logger.silent).
+                        run(Overcommit::Utils.repo_root, :action => :install)
+
+  context = Overcommit::HookContext.create(hook_type_class, config, ARGV, STDIN)
+  logger = Overcommit::Logger.new(STDOUT)
+  runner = Overcommit::HookRunner.new(config, logger, context)
+
+  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::InvalidGitRepo => error
+  puts error
+  exit 64 # EX_USAGE
+rescue => error
+  puts error.message
+  puts error.backtrace
+  puts "Report this bug at #{Overcommit::BUG_REPORT_URL}"
+  exit 70 # EX_SOFTWARE
+end

data/template-dir/hooks/post-checkout

@@ -0,0 +1,83 @@
+#!/usr/bin/env ruby
+
+# Entrypoint for Overcommit hook integration. Installing Overcommit will result
+# in all of your git hooks being symlinked to this file, allowing the framework
+# to manage your hooks for you.
+
+# Required for Ruby 1.8 compatibility (for older OSX versions)
+if RUBY_VERSION.split('.')[0..1] == ['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 " <<
+       "by each hook in a repository's .git/hooks directory."
+  exit 64 # EX_USAGE
+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')
+    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
+end
+
+begin
+  hook_type_class = Overcommit::Utils.camel_case(hook_type)
+
+  config = Overcommit::ConfigurationLoader.load_repo_config
+  config.apply_environment!(hook_type_class, ENV)
+
+  # Ensure this script and all symlinks are always up-to-date (it's cheap to do)
+  Overcommit::Installer.new(Overcommit::Logger.silent).
+                        run(Overcommit::Utils.repo_root, :action => :install)
+
+  context = Overcommit::HookContext.create(hook_type_class, config, ARGV, STDIN)
+  logger = Overcommit::Logger.new(STDOUT)
+  runner = Overcommit::HookRunner.new(config, logger, context)
+
+  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::InvalidGitRepo => error
+  puts error
+  exit 64 # EX_USAGE
+rescue => error
+  puts error.message
+  puts error.backtrace
+  puts "Report this bug at #{Overcommit::BUG_REPORT_URL}"
+  exit 70 # EX_SOFTWARE
+end

data/template-dir/hooks/pre-commit

@@ -0,0 +1,83 @@
+#!/usr/bin/env ruby
+
+# Entrypoint for Overcommit hook integration. Installing Overcommit will result
+# in all of your git hooks being symlinked to this file, allowing the framework
+# to manage your hooks for you.
+
+# Required for Ruby 1.8 compatibility (for older OSX versions)
+if RUBY_VERSION.split('.')[0..1] == ['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 " <<
+       "by each hook in a repository's .git/hooks directory."
+  exit 64 # EX_USAGE
+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')
+    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
+end
+
+begin
+  hook_type_class = Overcommit::Utils.camel_case(hook_type)
+
+  config = Overcommit::ConfigurationLoader.load_repo_config
+  config.apply_environment!(hook_type_class, ENV)
+
+  # Ensure this script and all symlinks are always up-to-date (it's cheap to do)
+  Overcommit::Installer.new(Overcommit::Logger.silent).
+                        run(Overcommit::Utils.repo_root, :action => :install)
+
+  context = Overcommit::HookContext.create(hook_type_class, config, ARGV, STDIN)
+  logger = Overcommit::Logger.new(STDOUT)
+  runner = Overcommit::HookRunner.new(config, logger, context)
+
+  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::InvalidGitRepo => error
+  puts error
+  exit 64 # EX_USAGE
+rescue => error
+  puts error.message
+  puts error.backtrace
+  puts "Report this bug at #{Overcommit::BUG_REPORT_URL}"
+  exit 70 # EX_SOFTWARE
+end

metadata

@@ -1,106 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: overcommit
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Causes Engineering
+- Shane da Silva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-04 00:00:00.000000000 Z
+date: 2014-02-20 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: wopen3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: image_optim
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.10.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.1
-description: Overcommit is a utility to install and extend Git hooks
-email: eng@causes.com
+        version: 0.10.2
+description: Utility to install, configure, and extend Git hooks
+email:
+- eng@causes.com
+- shane@causes.com
 executables:
 - overcommit
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/overcommit
+- config/default.yml
+- config/templates.yml
 - lib/overcommit.rb
 - lib/overcommit/version.rb
+- lib/overcommit/hook_context.rb
+- lib/overcommit/constants.rb
 - lib/overcommit/utils.rb
-- lib/overcommit/plugins/commit_msg/trailing_period.rb
-- lib/overcommit/plugins/commit_msg/change_id.rb
-- lib/overcommit/plugins/commit_msg/release_note.rb
-- lib/overcommit/plugins/commit_msg/single_line_subject.rb
-- lib/overcommit/plugins/commit_msg/russian_novel.rb
-- lib/overcommit/plugins/commit_msg/hard_tabs.rb
-- lib/overcommit/plugins/commit_msg/text_width.rb
-- lib/overcommit/plugins/pre_commit/js_console_log.rb
-- lib/overcommit/plugins/pre_commit/haml_style.rb
-- lib/overcommit/plugins/pre_commit/ruby_syntax.rb
-- lib/overcommit/plugins/pre_commit/js_syntax.rb
-- lib/overcommit/plugins/pre_commit/yaml_syntax.rb
-- lib/overcommit/plugins/pre_commit/haml_syntax.rb
-- lib/overcommit/plugins/pre_commit/causes_email.rb
-- lib/overcommit/plugins/pre_commit/author_name.rb
-- lib/overcommit/plugins/pre_commit/whitespace.rb
-- lib/overcommit/plugins/pre_commit/image_optimization.rb
-- lib/overcommit/plugins/pre_commit/python_flake8.rb
-- lib/overcommit/plugins/pre_commit/coffee_lint.rb
-- lib/overcommit/plugins/pre_commit/test_history.rb
-- lib/overcommit/plugins/pre_commit/ruby_style.rb
-- lib/overcommit/plugins/pre_commit/scss_lint.rb
-- lib/overcommit/plugins/pre_commit/css_linter.rb
-- lib/overcommit/staged_file.rb
-- lib/overcommit/reporter.rb
-- lib/overcommit/hook_specific_check.rb
+- lib/overcommit/hook_runner.rb
+- lib/overcommit/hook/commit_msg/trailing_period.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/text_width.rb
+- lib/overcommit/hook/commit_msg/base.rb
+- lib/overcommit/hook/post_checkout/bundle_check.rb
+- lib/overcommit/hook/post_checkout/index_tags.rb
+- lib/overcommit/hook/post_checkout/base.rb
+- lib/overcommit/hook/base.rb
+- lib/overcommit/hook/pre_commit/author_email.rb
+- lib/overcommit/hook/pre_commit/image_optim.rb
+- lib/overcommit/hook/pre_commit/css_lint.rb
+- lib/overcommit/hook/pre_commit/bundle_check.rb
+- lib/overcommit/hook/pre_commit/yaml_syntax.rb
+- lib/overcommit/hook/pre_commit/trailing_whitespace.rb
+- lib/overcommit/hook/pre_commit/author_name.rb
+- lib/overcommit/hook/pre_commit/rubocop.rb
+- lib/overcommit/hook/pre_commit/python_flake8.rb
+- lib/overcommit/hook/pre_commit/js_hint.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/jscs.rb
+- lib/overcommit/hook/pre_commit/scss_lint.rb
+- lib/overcommit/hook/pre_commit/base.rb
+- lib/overcommit/hook_context/pre_commit.rb
+- lib/overcommit/hook_context/commit_msg.rb
+- lib/overcommit/hook_context/base.rb
+- lib/overcommit/hook_context/post_checkout.rb
 - lib/overcommit/installer.rb
-- lib/overcommit/errors.rb
-- lib/overcommit/git_hook.rb
+- lib/overcommit/configuration_loader.rb
+- lib/overcommit/exceptions.rb
 - lib/overcommit/configuration.rb
-- lib/overcommit/hooks/pre_commit.rb
-- lib/overcommit/hooks/commit_msg.rb
 - lib/overcommit/logger.rb
 - lib/overcommit/cli.rb
-- bin/run-hook
-- bin/scripts/index-tags
-- bin/scripts/gerrit-change-id
-- bin/scripts/jshint.js
-- bin/scripts/csslint-rhino.js
-- bin/scripts/check-gemfile
-- bin/scripts/jshint_runner.js
-- bin/overcommit
-- bin/hooks/commit-msg
-- bin/hooks/post-checkout
-- bin/hooks/post-merge
-- bin/hooks/pre-commit
-- bin/hooks/prepare-commit-msg
-- config/templates.yml
-homepage: http://github.com/causes/overcommit
+- libexec/index-tags
+- libexec/gerrit-change-id
+- template-dir/hooks/commit-msg
+- template-dir/hooks/post-checkout
+- template-dir/hooks/overcommit-hook
+- template-dir/hooks/pre-commit
+homepage: https://github.com/causes/overcommit
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message: Install hooks by running `overcommit --install` in your Git
+  repository
 rdoc_options: []
 require_paths:
 - lib
@@ -108,7 +127,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
@@ -116,9 +135,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
-summary: Opinionated Git hook manager
+summary: Git hook manager
 test_files: []
 has_rdoc: