overcommit 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a23b361b3bac1357e190f81ea1912710b9bd62bf
-  data.tar.gz: d0d707d8f82ed50aff865fd170b769baf8d78869
+  metadata.gz: 7c3cf160d0c937fd468fe3b7324ab79f9c567c2d
+  data.tar.gz: 9e149912787db4bf6e259e7517f688fce95f14c6
 SHA512:
-  metadata.gz: a7a1110c6239f00662de316e677dab141db03ae87f9c13eca2c2a0dc2b78ed5b3bb41cbbf0d4c11a79436423b0a3cda2215de6a4d926c7b3a48e0b4ab586e1ca
-  data.tar.gz: 408ac82b4911e94f48670c674870eb79acfd93109f2edd1ca19993c49f6a40f193161a8cd1f26ec7b4121ee66e0391f3ce12715a332152bca128636ec218476d
+  metadata.gz: 16a6eaf4ea1ce8f03bcdfd7bf7b331c2e5a8b2c6c2c896aa10bbae88864a588741806325aa1a4a60c29a3021ef41db7d1a0573bb9c5fa9f76db10e05bea349a8
+  data.tar.gz: acf3efe320ede57d9d933f47b187e61c03a5e35646884da3f3fcfbc1f932dc3079d992b6016ba15128af301e27dd379c6aeae5f98829abd119f895902420eb88

data/lib/overcommit/configuration.rb

@@ -19,10 +19,11 @@ module Overcommit
     end
 
     # Returns the built-in hooks that have been enabled for a hook type.
-    def enabled_builtin_hooks(hook_type)
-      @hash[hook_type].keys.
+    def enabled_builtin_hooks(hook_context)
+      @hash[hook_context.hook_class_name].keys.
         select { |hook_name| hook_name != 'ALL' }.
-        select { |hook_name| hook_enabled?(hook_type, hook_name) }
+        select { |hook_name| built_in_hook?(hook_context, hook_name) }.
+        select { |hook_name| hook_enabled?(hook_context, hook_name) }
     end
 
     # Returns a non-modifiable configuration for a hook.
@@ -46,13 +47,14 @@ module Overcommit
 
     # Applies additional configuration settings based on the provided
     # environment variables.
-    def apply_environment!(hook_type, env)
+    def apply_environment!(hook_context, env)
       skipped_hooks = "#{env['SKIP']} #{env['SKIP_CHECKS']} #{env['SKIP_HOOKS']}".split(/[:, ]/)
+      hook_type = hook_context.hook_class_name
 
       if skipped_hooks.include?('all') || skipped_hooks.include?('ALL')
         @hash[hook_type]['ALL']['skip'] = true
       else
-        skipped_hooks.select { |hook_name| hook_exists?(hook_type, hook_name) }.
+        skipped_hooks.select { |hook_name| hook_exists?(hook_context, hook_name) }.
                       map { |hook_name| Overcommit::Utils.camel_case(hook_name) }.
                       each do |hook_name|
           @hash[hook_type][hook_name] ||= {}
@@ -67,15 +69,28 @@ module Overcommit
 
   private
 
-    def hook_exists?(hook_type, hook_name)
+    def built_in_hook?(hook_context, hook_name)
       hook_name = Overcommit::Utils.snake_case(hook_name)
-      underscored_hook_type = Overcommit::Utils.snake_case(hook_type)
 
       File.exist?(File.join(OVERCOMMIT_HOME, 'lib', 'overcommit', 'hook',
-                            underscored_hook_type, "#{hook_name}.rb"))
+                            hook_context.hook_type_name, "#{hook_name}.rb"))
     end
 
-    def hook_enabled?(hook_type, hook_name)
+    def plugin_hook?(hook_context, hook_name)
+      hook_name = Overcommit::Utils.snake_case(hook_name)
+
+      File.exist?(File.join(plugin_directory,
+                            hook_context.hook_type_name,
+                            "#{hook_name}.rb"))
+    end
+
+    def hook_exists?(hook_context, hook_name)
+      built_in_hook?(hook_context, hook_name) ||
+        plugin_hook?(hook_context, hook_name)
+    end
+
+    def hook_enabled?(hook_context, hook_name)
+      hook_type = hook_context.hook_class_name
       individual_enabled = @hash[hook_type][hook_name]['enabled']
       return individual_enabled unless individual_enabled.nil?
 

data/lib/overcommit/hook_context.rb

@@ -1,11 +1,12 @@
 # Utility module which manages the creation of {HookContext}s.
 module Overcommit::HookContext
   def self.create(hook_type, config, args, input)
+    hook_type_class = Overcommit::Utils.camel_case(hook_type)
     underscored_hook_type = Overcommit::Utils.snake_case(hook_type)
 
     require "overcommit/hook_context/#{underscored_hook_type}"
 
-    Overcommit::HookContext.const_get(hook_type).new(config, args, input)
+    Overcommit::HookContext.const_get(hook_type_class).new(config, args, input)
   rescue LoadError, NameError => error
     # Could happen when a symlink was created for a hook type Overcommit does
     # not yet support.

data/lib/overcommit/hook_runner.rb

@@ -116,7 +116,7 @@ module Overcommit
     # Load hooks that ship with Overcommit, ignoring ones that are excluded from
     # the repository's configuration.
     def load_builtin_hooks
-      @config.enabled_builtin_hooks(@context.hook_class_name).each do |hook_name|
+      @config.enabled_builtin_hooks(@context).each do |hook_name|
         underscored_hook_name = Overcommit::Utils.snake_case(hook_name)
         require "overcommit/hook/#{@context.hook_type_name}/#{underscored_hook_name}"
         @hooks << create_hook(hook_name)

data/lib/overcommit/version.rb

@@ -1,3 +1,4 @@
+# Defines the gem version.
 module Overcommit
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
 end

data/template-dir/hooks/commit-msg

@@ -49,16 +49,11 @@ if Gem::Version.new(Overcommit::VERSION) < Gem::Version.new('0.6.0')
 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, config, ARGV, STDIN)
+  config.apply_environment!(context, ENV)
 
-  context = Overcommit::HookContext.create(hook_type_class, config, ARGV, STDIN)
   logger = Overcommit::Logger.new(STDOUT)
   runner = Overcommit::HookRunner.new(config, logger, context)
 

data/template-dir/hooks/overcommit-hook

@@ -49,16 +49,11 @@ if Gem::Version.new(Overcommit::VERSION) < Gem::Version.new('0.6.0')
 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, config, ARGV, STDIN)
+  config.apply_environment!(context, ENV)
 
-  context = Overcommit::HookContext.create(hook_type_class, config, ARGV, STDIN)
   logger = Overcommit::Logger.new(STDOUT)
   runner = Overcommit::HookRunner.new(config, logger, context)
 

data/template-dir/hooks/post-checkout

@@ -49,16 +49,11 @@ if Gem::Version.new(Overcommit::VERSION) < Gem::Version.new('0.6.0')
 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, config, ARGV, STDIN)
+  config.apply_environment!(context, ENV)
 
-  context = Overcommit::HookContext.create(hook_type_class, config, ARGV, STDIN)
   logger = Overcommit::Logger.new(STDOUT)
   runner = Overcommit::HookRunner.new(config, logger, context)
 

data/template-dir/hooks/pre-commit

@@ -49,16 +49,11 @@ if Gem::Version.new(Overcommit::VERSION) < Gem::Version.new('0.6.0')
 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, config, ARGV, STDIN)
+  config.apply_environment!(context, ENV)
 
-  context = Overcommit::HookContext.create(hook_type_class, config, ARGV, STDIN)
   logger = Overcommit::Logger.new(STDOUT)
   runner = Overcommit::HookRunner.new(config, logger, context)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: overcommit
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Causes Engineering
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2014-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: wopen3