overcommit 0.43.0 → 0.44.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7d0cda7604db99089da1104e74e50dddb00119f6
-  data.tar.gz: 97ac88f0a6772146b35cbc5e4cf93e1a16a6a024
+SHA256:
+  metadata.gz: 757f60633c3904f1c63681afc14f3a3e7874f05ad3bef92af6c9d9351ea45d29
+  data.tar.gz: fb3126490d063d44c9c1e27fdd67a84de2bcb87359b3db619e50f6f2f634ab6d
 SHA512:
-  metadata.gz: 92478e619197b1707b9646f809c8fa0bc102f6fb44106015f91e32e4707b6585518c0d41ede75ed17bee6dfb27aaf3c52cd64fafd9ea1e80180a67362d1a5503
-  data.tar.gz: 7b9cdc771310e3b140f254d7bf7b0472f9e5b5587627584bf140f7fed2fcd72fbf8312da85138909f12677bbf904105850d8db89e3e10b11fdef7d6928e3a53f
+  metadata.gz: 839e44ead515bfb13c13fab2e0e4b0859a1fb691d67c7ddb958bdbb3533b4945731cda5bb81b5c90d2e345ff08e069760d4dcfb4c099cd5798a380f24cef126d
+  data.tar.gz: ffc50fa2e8b3aa5c8be0ae8e73745062f465c4379bb07fbd4f8166378a2237bb0c32a9ab3c7f2e66f6cdec02ae4ce6fa275f858ec31edf4c13f0ded6e15fb956

data/lib/overcommit/git_config.rb

@@ -14,7 +14,7 @@ module Overcommit
     def hooks_path
       path = `git config --get core.hooksPath`.chomp
       return File.join(Overcommit::Utils.git_dir, 'hooks') if path.empty?
-      File.absolute_path(path)
+      File.absolute_path(path, Dir.pwd)
     end
   end
 end

data/lib/overcommit/git_repo.rb

@@ -236,7 +236,7 @@ module Overcommit
       ref = options[:ref]
 
       modules = []
-      IniParse.parse(`git show #{ref}:.gitmodules`).each do |section|
+      IniParse.parse(`git show #{ref}:.gitmodules 2> #{File::NULL}`).each do |section|
         # git < 1.8.5 does not update the .gitmodules file with submodule
         # changes, so when we are looking at the current state of the work tree,
         # we need to check if the submodule actually exists via another method,

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

@@ -1,4 +1,5 @@
 require 'forwardable'
+require 'overcommit/utils/messages_utils'
 
 module Overcommit::Hook::PreCommit
   # Functionality common to all pre-commit hooks.
@@ -9,71 +10,8 @@ module Overcommit::Hook::PreCommit
 
     private
 
-    # Extract file, line number, and type of message from an error/warning
-    # messages in output.
-    #
-    # Assumes each element of `output` is a separate error/warning with all
-    # information necessary to identify it.
-    #
-    # @param output_messages [Array<String>] unprocessed error/warning messages
-    # @param regex [Regexp] regular expression defining `file`, `line` and
-    #   `type` capture groups used to extract file locations and error/warning
-    #   type from each line of output
-    # @param type_categorizer [Proc] function executed against the `type`
-    #   capture group to convert it to a `:warning` or `:error` symbol. Assumes
-    #   `:error` if `nil`.
-    # @raise [Overcommit::Exceptions::MessageProcessingError] line of output did
-    #   not match regex
-    # @return [Array<Message>]
-    def extract_messages(output_messages, regex, type_categorizer = nil)
-      output_messages.map.with_index do |message, index|
-        unless match = message.match(regex)
-          raise Overcommit::Exceptions::MessageProcessingError,
-                'Unexpected output: unable to determine line number or type ' \
-                "of error/warning for output:\n" \
-                "#{output_messages[index..-1].join("\n")}"
-        end
-
-        file = extract_file(match, message)
-        line = extract_line(match, message) if match.names.include?('line') && match[:line]
-        type = extract_type(match, message, type_categorizer)
-
-        Overcommit::Hook::Message.new(type, file, line, message)
-      end
-    end
-
-    def extract_file(match, message)
-      return unless match.names.include?('file')
-
-      if match[:file].to_s.empty?
-        raise Overcommit::Exceptions::MessageProcessingError,
-              "Unexpected output: no file found in '#{message}'"
-      end
-
-      match[:file]
-    end
-
-    def extract_line(match, message)
-      return unless match.names.include?('line')
-      Integer(match[:line])
-    rescue ArgumentError, TypeError
-      raise Overcommit::Exceptions::MessageProcessingError,
-            "Unexpected output: invalid line number found in '#{message}'"
-    end
-
-    def extract_type(match, message, type_categorizer)
-      if type_categorizer
-        type_match = match.names.include?('type') ? match[:type] : nil
-        type = type_categorizer.call(type_match)
-        unless Overcommit::Hook::MESSAGE_TYPES.include?(type)
-          raise Overcommit::Exceptions::MessageProcessingError,
-                "Invalid message type '#{type}' for '#{message}': must " \
-                "be one of #{Overcommit::Hook::MESSAGE_TYPES.inspect}"
-        end
-        type
-      else
-        :error # Assume error since no categorizer was defined
-      end
+    def extract_messages(*args)
+      Overcommit::Utils::MessagesUtils.extract_messages(*args)
     end
   end
 end

data/lib/overcommit/installer.rb

@@ -138,8 +138,8 @@ module Overcommit
           FileUtils.mv(hook_file, old_hooks_path)
         end
       end
-      # Remove old-hooks directory if empty
-      FileUtils.rmdir(old_hooks_path)
+      # Remove old-hooks directory if empty (i.e. no old hooks were preserved)
+      FileUtils.rmdir(old_hooks_path) if Dir.entries(old_hooks_path).size <= 2
     end
 
     def restore_old_hooks

data/lib/overcommit/utils.rb

@@ -43,38 +43,29 @@ module Overcommit
       def repo_root
         @repo_root ||=
           begin
-            git_dir = Pathname.new(File.expand_path('.')).enum_for(:ascend).find do |path|
-              File.exist?(File.join(path, '.git'))
+            result = execute(%w[git rev-parse --show-toplevel])
+            unless result.success?
+              raise Overcommit::Exceptions::InvalidGitRepo,
+                    'Unable to determine location of GIT_DIR. ' \
+                    'Not a recognizable Git repository!'
             end
-
-            unless git_dir
-              raise Overcommit::Exceptions::InvalidGitRepo, 'no .git directory found'
-            end
-
-            git_dir.to_s
+            result.stdout.chomp("\n")
           end
       end
 
       # Returns an absolute path to the .git directory for a repo.
       #
-      # @param repo_dir [String] root directory of git repo
       # @return [String]
-      def git_dir(repo_dir = repo_root)
+      def git_dir
         @git_dir ||=
           begin
-            git_dir = File.expand_path('.git', repo_dir)
-
-            # .git could also be a file that contains the location of the git directory
-            unless File.directory?(git_dir)
-              git_dir = File.read(git_dir)[/^gitdir: (.*)$/, 1]
-
-              # Resolve relative paths
-              unless git_dir.start_with?('/')
-                git_dir = File.expand_path(git_dir, repo_dir)
-              end
+            result = execute(%w[git rev-parse --git-common-dir])
+            unless result.success?
+              raise Overcommit::Exceptions::InvalidGitRepo,
+                    'Unable to determine location of GIT_DIR. ' \
+                    'Not a recognizable Git repository!'
             end
-
-            git_dir
+            File.expand_path(result.stdout.chomp("\n"), Dir.pwd)
           end
       end
 

data/lib/overcommit/utils/messages_utils.rb

@@ -0,0 +1,75 @@
+module Overcommit::Utils
+  # Utility to process messages
+  module MessagesUtils
+    class << self
+      # Extract file, line number, and type of message from an error/warning
+      # messages in output.
+      #
+      # Assumes each element of `output` is a separate error/warning with all
+      # information necessary to identify it.
+      #
+      # @param output_messages [Array<String>] unprocessed error/warning messages
+      # @param regex [Regexp] regular expression defining `file`, `line` and
+      #   `type` capture groups used to extract file locations and error/warning
+      #   type from each line of output
+      # @param type_categorizer [Proc] function executed against the `type`
+      #   capture group to convert it to a `:warning` or `:error` symbol. Assumes
+      #   `:error` if `nil`.
+      # @raise [Overcommit::Exceptions::MessageProcessingError] line of output did
+      #   not match regex
+      # @return [Array<Message>]
+      def extract_messages(output_messages, regex, type_categorizer = nil)
+        output_messages.map.with_index do |message, index|
+          unless match = message.match(regex)
+            raise Overcommit::Exceptions::MessageProcessingError,
+                  'Unexpected output: unable to determine line number or type ' \
+                  "of error/warning for output:\n" \
+                  "#{output_messages[index..-1].join("\n")}"
+          end
+
+          file = extract_file(match, message)
+          line = extract_line(match, message) if match.names.include?('line') && match[:line]
+          type = extract_type(match, message, type_categorizer)
+
+          Overcommit::Hook::Message.new(type, file, line, message)
+        end
+      end
+
+      private
+
+      def extract_file(match, message)
+        return unless match.names.include?('file')
+
+        if match[:file].to_s.empty?
+          raise Overcommit::Exceptions::MessageProcessingError,
+                "Unexpected output: no file found in '#{message}'"
+        end
+
+        match[:file]
+      end
+
+      def extract_line(match, message)
+        return unless match.names.include?('line')
+        Integer(match[:line])
+      rescue ArgumentError, TypeError
+        raise Overcommit::Exceptions::MessageProcessingError,
+              "Unexpected output: invalid line number found in '#{message}'"
+      end
+
+      def extract_type(match, message, type_categorizer)
+        if type_categorizer
+          type_match = match.names.include?('type') ? match[:type] : nil
+          type = type_categorizer.call(type_match)
+          unless Overcommit::Hook::MESSAGE_TYPES.include?(type)
+            raise Overcommit::Exceptions::MessageProcessingError,
+                  "Invalid message type '#{type}' for '#{message}': must " \
+                  "be one of #{Overcommit::Hook::MESSAGE_TYPES.inspect}"
+          end
+          type
+        else
+          :error # Assume error since no categorizer was defined
+        end
+      end
+    end
+  end
+end

data/lib/overcommit/version.rb

@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module Overcommit
-  VERSION = '0.43.0'.freeze
+  VERSION = '0.44.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: overcommit
 version: !ruby/object:Gem::Version
-  version: 0.43.0
+  version: 0.44.0
 platform: ruby
 authors:
 - Brigade Engineering
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-12 00:00:00.000000000 Z
+date: 2018-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
@@ -242,6 +242,7 @@ files:
 - lib/overcommit/subprocess.rb
 - lib/overcommit/utils.rb
 - lib/overcommit/utils/file_utils.rb
+- lib/overcommit/utils/messages_utils.rb
 - lib/overcommit/version.rb
 - libexec/gerrit-change-id
 - libexec/index-tags
@@ -275,7 +276,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.5
 signing_key: 
 specification_version: 4
 summary: Git hook manager