overcommit 0.22.0 → 0.23.0

data/template-dir/hooks/post-merge

@@ -0,0 +1,81 @@
+#!/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.
+
+# 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
+
+begin
+  require 'overcommit'
+rescue LoadError
+  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
+  logger = Overcommit::Logger.new(STDOUT)
+
+  # 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.load_repo_config
+
+  context = Overcommit::HookContext.create(hook_type, config, ARGV)
+  config.apply_environment!(context, ENV)
+
+  printer = Overcommit::Printer.new(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::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::InvalidHookSignature
+  exit 1
+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-rewrite

@@ -0,0 +1,81 @@
+#!/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.
+
+# 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
+
+begin
+  require 'overcommit'
+rescue LoadError
+  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
+  logger = Overcommit::Logger.new(STDOUT)
+
+  # 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.load_repo_config
+
+  context = Overcommit::HookContext.create(hook_type, config, ARGV)
+  config.apply_environment!(context, ENV)
+
+  printer = Overcommit::Printer.new(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::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::InvalidHookSignature
+  exit 1
+rescue => 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.22.0
+  version: 0.23.0
 platform: ruby
 authors:
 - Causes Engineering
@@ -9,36 +9,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-09 00:00:00.000000000 Z
+date: 2015-02-27 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
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: image_optim
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: 0.20.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: 0.20.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -67,6 +67,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: w3c_validators
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 description: Utility to install, configure, and extend Git hooks
 email:
 - eng@causes.com
@@ -97,6 +111,13 @@ files:
 - lib/overcommit/hook/commit_msg/trailing_period.rb
 - lib/overcommit/hook/post_checkout/base.rb
 - lib/overcommit/hook/post_checkout/index_tags.rb
+- lib/overcommit/hook/post_commit/base.rb
+- lib/overcommit/hook/post_commit/git_guilt.rb
+- lib/overcommit/hook/post_commit/index_tags.rb
+- lib/overcommit/hook/post_merge/base.rb
+- lib/overcommit/hook/post_merge/index_tags.rb
+- lib/overcommit/hook/post_rewrite/base.rb
+- lib/overcommit/hook/post_rewrite/index_tags.rb
 - lib/overcommit/hook/pre_commit/author_email.rb
 - lib/overcommit/hook/pre_commit/author_name.rb
 - lib/overcommit/hook/pre_commit/base.rb
@@ -107,31 +128,45 @@ files:
 - 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/es_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/html_tidy.rb
 - lib/overcommit/hook/pre_commit/image_optim.rb
+- lib/overcommit/hook/pre_commit/java_checkstyle.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/merge_conflicts.rb
+- lib/overcommit/hook/pre_commit/pep257.rb
+- lib/overcommit/hook/pre_commit/pep8.rb
 - lib/overcommit/hook/pre_commit/pry_binding.rb
+- lib/overcommit/hook/pre_commit/pyflakes.rb
+- lib/overcommit/hook/pre_commit/pylint.rb
 - lib/overcommit/hook/pre_commit/python_flake8.rb
 - lib/overcommit/hook/pre_commit/rails_schema_up_to_date.rb
 - lib/overcommit/hook/pre_commit/reek.rb
 - lib/overcommit/hook/pre_commit/rubocop.rb
+- lib/overcommit/hook/pre_commit/scalastyle.rb
 - lib/overcommit/hook/pre_commit/scss_lint.rb
+- lib/overcommit/hook/pre_commit/semi_standard.rb
 - lib/overcommit/hook/pre_commit/shell_check.rb
+- lib/overcommit/hook/pre_commit/standard.rb
 - lib/overcommit/hook/pre_commit/trailing_whitespace.rb
 - lib/overcommit/hook/pre_commit/travis_lint.rb
+- lib/overcommit/hook/pre_commit/w3c_css.rb
+- lib/overcommit/hook/pre_commit/w3c_html.rb
+- lib/overcommit/hook/pre_commit/xml_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/hook_context/post_commit.rb
+- lib/overcommit/hook_context/post_merge.rb
+- lib/overcommit/hook_context/post_rewrite.rb
 - lib/overcommit/hook_context/pre_commit.rb
 - lib/overcommit/hook_context/run_all.rb
 - lib/overcommit/hook_loader/base.rb
@@ -152,6 +187,9 @@ files:
 - template-dir/hooks/commit-msg
 - template-dir/hooks/overcommit-hook
 - template-dir/hooks/post-checkout
+- template-dir/hooks/post-commit
+- template-dir/hooks/post-merge
+- template-dir/hooks/post-rewrite
 - template-dir/hooks/pre-commit
 homepage: https://github.com/causes/overcommit
 licenses:

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

@@ -1,13 +0,0 @@
-module Overcommit::Hook::PreCommit
-  # Runs `jsxhint` against any modified JSX files.
-  class JsxHint < Base
-    def run
-      result = execute(command + applicable_files)
-      output = result.stdout
-
-      return :pass if output.empty?
-
-      [:fail, output]
-    end
-  end
-end

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

@@ -1,20 +0,0 @@
-module Overcommit::Hook::PreCommit
-  # Runs `jsxcs` (JSCS (JavaScript Code Style Checker) wrapper for JSX files)
-  # against any modified JavaScript files.
-  class Jsxcs < Base
-    def run
-      result = execute(command + applicable_files)
-      return :pass if result.success?
-
-      if result.status == 1
-        # No configuration found
-        return :warn, result.stderr.chomp
-      end
-
-      extract_messages(
-        result.stdout.split("\n"),
-        /^(?<file>[^:]+):[^\d]+(?<line>\d+)/,
-      )
-    end
-  end
-end