overcommit 0.16.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e7a230157adc2af8bc8cf4b209e6b50d99d67a7
-  data.tar.gz: 190432fe93e3a69293a69b93bbd75460923f72b1
+  metadata.gz: 34fb07971b06d936af3a8a4b2cbd4584bfd96506
+  data.tar.gz: a6201349bc528c292c3173d3b4c631dd0fdf76aa
 SHA512:
-  metadata.gz: 4e98e7cbe0771bb681380819fc688d27c06b6106ebb884d8bbd71ef132a77916eacf8d4fe42b997e6d70edc868436c47a7a437215258d091e337fe2474b9d001
-  data.tar.gz: 8481d1109df9d34d2d6306fbfb56db74e20a002444d91775aba9d5553a3e149cb37b9a0dbfacd33868f7a328fcb1a55f5371fc3f22075e15da679329e7b1b37c
+  metadata.gz: 35ab2d145525645843ce83eada23ffda314dd443b792213e01dac7e19642a286c5e4fd719f14afcc25505a4fdd1a27f65ea7f1c721af0f572870dfd025d3d970
+  data.tar.gz: 7074b3298a4276c38096f5f6020bf669148cf46591c4be95b67ecfe3af12caddfb09d4c380eab8d3372fae16bc0c8d12f85269beaca362c2725445b2f9252f31

data/lib/overcommit/exceptions.rb

@@ -20,6 +20,10 @@ module Overcommit::Exceptions
   # Raised when a {HookRunner} could not be loaded.
   class HookContextLoadError < StandardError; end
 
+  # Raised when a pipe character is used in the `execute` helper, as this was
+  # likely used in error.
+  class InvalidCommandArgs < StandardError; end
+
   # Raised when an installation target is not a valid git repository.
   class InvalidGitRepo < StandardError; end
 

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

@@ -7,9 +7,16 @@ module Overcommit::Hook::PreCommit
       elsif migration_files.none? && schema_files.any?
         return :fail, "You're trying to change the schema without adding a migration file"
       elsif migration_files.any? && schema_files.any?
-        latest_version = migration_files.map  { |file| file[/\d+/] }.sort.last
-        schema         = schema_files.map     { |file| File.read(file) }.join
-        up_to_date     = schema.include?(latest_version)
+        # Get the latest version from the migration filename. Use
+        # `File.basename` to prevent finding numbers that could appear in
+        # directories, such as the home directory of a user with a number in
+        # their username.
+        latest_version = migration_files.map do |file|
+          File.basename(file)[/\d+/]
+        end.sort.last
+
+        schema     = schema_files.map { |file| File.read(file) }.join
+        up_to_date = schema.include?(latest_version)
 
         unless up_to_date
           return :fail, "The latest migration version you're committing is " \

data/lib/overcommit/hook_context/pre_commit.rb

@@ -28,7 +28,7 @@ module Overcommit::HookContext
           # issue (e.g. author/email not set or GPG signing key incorrect)
           raise Overcommit::Exceptions::HookSetupFailed,
                 "Unable to setup environment for #{hook_script_name} hook run:" \
-                "\n#{result.stderr}"
+                "\nSTDOUT:#{result.stdout}\nSTDERR:#{result.stderr}"
         end
 
         @changes_stashed = true
@@ -75,7 +75,7 @@ module Overcommit::HookContext
       unless result.success?
         raise Overcommit::Exceptions::HookCleanupFailed,
               "Unable to cleanup working tree after #{hook_script_name} hooks run:" \
-              "\n#{result.stderr}"
+              "\nSTDOUT:#{result.stdout}\nSTDERR:#{result.stderr}"
       end
     end
 
@@ -85,7 +85,7 @@ module Overcommit::HookContext
       unless result.success?
         raise Overcommit::Exceptions::HookCleanupFailed,
               "Unable to restore working tree after #{hook_script_name} hooks run:" \
-              "\n#{result.stderr}"
+              "\nSTDOUT:#{result.stdout}\nSTDERR:#{result.stderr}"
       end
     end
 

data/lib/overcommit/logger.rb

@@ -19,7 +19,7 @@ module Overcommit
     end
 
     def bold(str)
-      color('1;37', str)
+      color('1', str)
     end
 
     def error(str)

data/lib/overcommit/utils.rb

@@ -63,13 +63,16 @@ module Overcommit
       # specified in Overcommit's Gemfile--a nasty consequence of using
       # `bundle exec overcommit` while developing locally.
       def execute(args)
+        if args.include?('|')
+          raise Overcommit::Exceptions::InvalidCommandArgs,
+                'Cannot pipe commands with the `execute` helper'
+        end
+
         with_environment 'RUBYOPT' => nil do
           Subprocess.spawn(args)
         end
       end
 
-    private
-
       # Calls a block of code with a modified set of environment variables,
       # restoring them once the code has executed.
       def with_environment(env)

data/lib/overcommit/version.rb

@@ -1,4 +1,4 @@
 # Defines the gem version.
 module Overcommit
-  VERSION = '0.16.0'
+  VERSION = '0.17.0'
 end

data/template-dir/hooks/commit-msg

@@ -12,6 +12,12 @@ Signal.trap('INT') do
   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
+
 # Required for Ruby 1.8 compatibility (for older OSX versions)
 if RUBY_VERSION.split('.')[0..1] == %w[1 8]
   require 'rubygems'

data/template-dir/hooks/overcommit-hook

@@ -12,6 +12,12 @@ Signal.trap('INT') do
   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
+
 # Required for Ruby 1.8 compatibility (for older OSX versions)
 if RUBY_VERSION.split('.')[0..1] == %w[1 8]
   require 'rubygems'

data/template-dir/hooks/post-checkout

@@ -12,6 +12,12 @@ Signal.trap('INT') do
   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
+
 # Required for Ruby 1.8 compatibility (for older OSX versions)
 if RUBY_VERSION.split('.')[0..1] == %w[1 8]
   require 'rubygems'

data/template-dir/hooks/pre-commit

@@ -12,6 +12,12 @@ Signal.trap('INT') do
   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
+
 # Required for Ruby 1.8 compatibility (for older OSX versions)
 if RUBY_VERSION.split('.')[0..1] == %w[1 8]
   require 'rubygems'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: overcommit
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Causes Engineering
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-01 00:00:00.000000000 Z
+date: 2014-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
@@ -174,3 +174,4 @@ signing_key:
 specification_version: 4
 summary: Git hook manager
 test_files: []
+has_rdoc: