overcommit 0.29.0 → 0.29.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3062f9af5dd34f661b3a2fe4c57dff0455c58fc
-  data.tar.gz: 2a701f3f869be66540221aae63f3276f829b9d0d
+  metadata.gz: 91af002cf7828227351dd72b5c6bf2b27e3b217d
+  data.tar.gz: 025444e49ce27a05f6fc54134ae0ce70a466f851
 SHA512:
-  metadata.gz: 863155a463f38f3fb09c915a61d7e91e175ebeda1da177076bcdf8fbadcda30ea5908995e227b15c8162bffab6ee0236224655196e03d214411f257c1acf1a39
-  data.tar.gz: 841020568579082d8887466e0b4089759fc36f89f8f498c12fe2eaeb319737a0406bec7c82bdec0646aa49a405b85e025f31c81602d352b54c9af6bfe442cd36
+  metadata.gz: 602cf07b0687009d092330706d3f6d54179d2cbfcd1d58fb3cfa3c9fe92195ee1a0af3d452d5649666e534d5d352ab2ca52d5dd1711bda55ec1f20d7bc5fbbcc
+  data.tar.gz: 642bc0ec26c0af5dcfa44a30ea930f847f1cda71dd6bcd0d78003624f5b10c3c227918dea4d68d110c4b5844e7c40fe2a4538848685d185f28297516bddc4f62

data/lib/overcommit/cli.rb

@@ -95,7 +95,7 @@ module Overcommit
     end
 
     def add_other_options(opts)
-      opts.on('-s', '--sign', 'Update hook signatures') do |hook_to_sign|
+      opts.on('-s', '--sign [hook]', 'Update hook signatures', String) do |hook_to_sign|
         @options[:hook_to_sign] = hook_to_sign if hook_to_sign.is_a?(String)
         @options[:action] = :sign
       end

data/lib/overcommit/configuration_validator.rb

@@ -14,6 +14,7 @@ module Overcommit
 
       hash = convert_nils_to_empty_hashes(hash)
       ensure_hook_type_sections_exist(hash)
+      check_hook_name_format(hash)
       check_for_missing_enabled_option(hash) unless @options[:default]
       check_for_verify_plugin_signatures_option(hash)
 
@@ -48,6 +49,31 @@ module Overcommit
       end
     end
 
+    # Prints an error message and raises an exception if a hook has an
+    # invalid name, since this can result in strange errors elsewhere.
+    def check_hook_name_format(hash)
+      errors = []
+
+      Overcommit::Utils.supported_hook_type_classes.each do |hook_type|
+        hash.fetch(hook_type, {}).each do |hook_name, _|
+          next if hook_name == 'ALL'
+
+          unless hook_name =~ /\A[A-Za-z0-9]+\z/
+            errors << "#{hook_type}::#{hook_name} has an invalid name " \
+                      "#{hook_name}. It must contain only alphanumeric " \
+                      'characters (no underscores or dashes, etc.)'
+          end
+        end
+      end
+
+      if errors.any?
+        @log.error errors.join("\n") if @log
+        @log.newline if @log
+        raise Overcommit::Exceptions::ConfigurationError,
+              'One or more hooks had invalid names'
+      end
+    end
+
     # Prints a warning if there are any hooks listed in the configuration
     # without `enabled` explicitly set.
     def check_for_missing_enabled_option(hash)

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

@@ -11,13 +11,15 @@ module Overcommit::Hook::PreCommit
       ignored_files = execute(%w[git ls-files -o -i --exclude-standard]).stdout.split("\n")
       return :pass if ignored_files.include?(LOCK_FILE)
 
+      previous_lockfile = File.read(LOCK_FILE) if File.exist?(LOCK_FILE)
+
       result = execute(command)
       unless result.success?
         return :fail, result.stdout
       end
 
-      result = execute(%w[git diff --quiet --] + [LOCK_FILE])
-      unless result.success?
+      new_lockfile = File.read(LOCK_FILE) if File.exist?(LOCK_FILE)
+      if previous_lockfile != new_lockfile
         return :fail, "#{LOCK_FILE} is not up-to-date -- run `#{command.join(' ')}`"
       end
 

data/lib/overcommit/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: overcommit
 version: !ruby/object:Gem::Version
-  version: 0.29.0
+  version: 0.29.1
 platform: ruby
 authors:
 - Brigade Engineering