overcommit 0.24.0 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1724df298bed7ee6665d38277209a8e87a879200
-  data.tar.gz: 6bb28a0b762eb3e730611210601d26da60f07a1b
+  metadata.gz: bbe6329a0cba58948e9ee76c415c994a7853076e
+  data.tar.gz: 8ccb39fc02ed962de60f1dd89398ed77e6c63187
 SHA512:
-  metadata.gz: 703cb3fb8202cecbe1a06723fe6f2e45ae224b4be04cc7b71f88fc4586b463bb560cefdbdb43ed635f3814c6fc9c785ee68a667d435cf959e3a3a8c2849779d6
-  data.tar.gz: ea54648808464b479781a4991b08de8225bd0d00b0b95813ec080e439725dcf193c56631d648a552d2694eee26d6d9fa37302faf996bbedbb01d14d68370ec85
+  metadata.gz: 8239e6a77a599153d4f6d30a23b329f7aa6d2c6b46ed001ce9dc1b0f4a3014b17fa65de8f8b004956271d989eb9a200dee2ee67ebb782e1bfa82b60fa2623744
+  data.tar.gz: 2e569ffcb8e328e0033913866e12230674b6ff42df2c955df0d0e87b0bdaa03fc0e628628bae01b42e68ba471d5cdb3b1ff26862c9baffc0916f3e9d550b7ab4

data/config/default.yml

@@ -204,9 +204,10 @@ PreCommit:
     install_command: 'gem install image_optim'
     include:
       - '**/*.gif'
-      - '**/*.jpg'
       - '**/*.jpeg'
+      - '**/*.jpg'
       - '**/*.png'
+      - '**/*.svg'
 
   JavaCheckstyle:
     enabled: false
@@ -257,7 +258,7 @@ PreCommit:
     enabled: false
     description: 'Checking for local paths in Gemfile'
     required_executable: 'grep'
-    flags: ['-IHnE', '^[^#]*((\bpath:)|(:path\s*=>))']
+    flags: ['-IHnE', "^[^#]*((\\bpath:)|(:path[ \t]*=>))"]
     include: '**/Gemfile'
 
   MergeConflicts:
@@ -265,7 +266,7 @@ PreCommit:
     description: 'Checking for merge conflicts'
     quiet: true
     required_executable: 'grep'
-    flags: ['-IHn', '^<<<<<<<\s']
+    flags: ['-IHn', "^<<<<<<<[ \t]"]
 
   Pep257:
     enabled: false
@@ -327,9 +328,9 @@ PreCommit:
       - '**/Gemfile'
       - '**/Rakefile'
 
-  Rubocop:
+  RuboCop:
     enabled: false
-    description: 'Analyzing with Rubocop'
+    description: 'Analyzing with RuboCop'
     required_executable: 'rubocop'
     flags: ['--format=emacs', '--force-exclusion', '--display-cop-names']
     install_command: 'gem install rubocop'
@@ -350,6 +351,13 @@ PreCommit:
       - '**/*.gemspec'
       - '**/*.rb'
 
+  Scalariform:
+    enabled: false
+    description: 'Checking formatting with Scalariform'
+    required_executable: 'scalariform'
+    flags: ['--test']
+    include: '**/*.scala'
+
   Scalastyle:
     enabled: false
     description: 'Analyzing with Scalastyle'
@@ -378,6 +386,13 @@ PreCommit:
     flags: ['--format=gcc']
     include: '**/*.sh'
 
+  SlimLint:
+    enabled: false
+    description: 'Analyzing with slim-lint'
+    required_executable: 'slim-lint'
+    install_command: 'gem install slim_lint'
+    include: '**/*.slim'
+
   Standard:
     enabled: false
     description: 'Analyzing with standard'
@@ -390,7 +405,7 @@ PreCommit:
     enabled: false
     description: 'Checking for trailing whitespace'
     required_executable: 'grep'
-    flags: ['-IHn', '\s$']
+    flags: ['-IHn', "[ \t]$"]
 
   TravisLint:
     enabled: false
@@ -400,6 +415,15 @@ PreCommit:
     install_command: 'gem install travis'
     include: '.travis.yml'
 
+  Vint:
+    enabled: false
+    description: 'Analyzing with Vint'
+    required_executable: 'vint'
+    install_command: 'pip install vim-vint'
+    include:
+      - '**/*.vim'
+      - '**/*.vimrc'
+
   W3cCss:
     enabled: false
     description: 'Analyzing with W3C CSS validation service'
@@ -428,13 +452,17 @@ PreCommit:
     description: 'Analyzing with xmllint'
     required_executable: 'xmllint'
     flags: ['--noout']
-    include: '**/*.xml'
+    include:
+      - '**/*.xml'
+      - '**/*.svg'
 
   XmlSyntax:
     enabled: false
     description: 'Checking XML syntax'
     required_library: 'rexml/document'
-    include: '**/*.xml'
+    include:
+      - '**/*.xml'
+      - '**/*.svg'
 
   YamlSyntax:
     enabled: false
@@ -453,6 +481,7 @@ PostCheckout:
   IndexTags:
     enabled: false
     description: 'Generating tags file from source'
+    quiet: true
     required_executable: 'ctags'
 
   SubmoduleStatus:
@@ -479,6 +508,7 @@ PostCommit:
   IndexTags:
     enabled: false
     description: 'Generating tags file from source'
+    quiet: true
     required_executable: 'ctags'
 
   SubmoduleStatus:
@@ -496,6 +526,7 @@ PostMerge:
   IndexTags:
     enabled: false
     description: 'Generating tags file from source'
+    quiet: true
     required_executable: 'ctags'
 
   SubmoduleStatus:
@@ -513,6 +544,7 @@ PostRewrite:
   IndexTags:
     enabled: false
     description: 'Generating tags file from source'
+    quiet: true
     required_executable: 'ctags'
 
   SubmoduleStatus:
@@ -546,3 +578,8 @@ PreRebase:
     requires_files: false
     required: false
     quiet: false
+
+  MergedCommits:
+    enabled: false
+    description: 'Checking for commits that have already been merged'
+    branches: ['master']

data/lib/overcommit/git_repo.rb

@@ -69,7 +69,7 @@ module Overcommit
       refs = options[:refs]
       subcmd = options[:subcmd] || 'diff'
 
-      `git #{subcmd} --no-ext-diff -U0 #{flags} #{refs} -- '#{file_path}'`.
+      `git #{subcmd} --no-ext-diff -U0 #{flags} #{refs} -- "#{file_path}"`.
         scan(DIFF_HUNK_REGEX) do |start_line, lines_added|
         lines_added = (lines_added || 1).to_i # When blank, one line was added
         cur_line = start_line.to_i
@@ -134,7 +134,7 @@ module Overcommit
     #
     # Restored via [#restore_merge_state].
     def store_merge_state
-      merge_head = `git rev-parse MERGE_HEAD 2> /dev/null`.chomp
+      merge_head = `git rev-parse MERGE_HEAD 2> #{File::NULL}`.chomp
 
       # Store the merge state if we're in the middle of resolving a merge
       # conflict. This is necessary since stashing removes the merge state.
@@ -151,7 +151,7 @@ module Overcommit
     #
     # Restored via [#restore_cherry_pick_state].
     def store_cherry_pick_state
-      cherry_head = `git rev-parse CHERRY_PICK_HEAD 2> /dev/null`.chomp
+      cherry_head = `git rev-parse CHERRY_PICK_HEAD 2> #{File::NULL}`.chomp
 
       # Store the merge state if we're in the middle of resolving a merge
       # conflict. This is necessary since stashing removes the merge state.
@@ -167,7 +167,7 @@ module Overcommit
         FileUtils.touch(File.expand_path('MERGE_MODE', Overcommit::Utils.git_dir))
 
         File.open(File.expand_path('MERGE_HEAD', Overcommit::Utils.git_dir), 'w') do |f|
-          f.write("#{@merge_head}\n")
+          f.write(@merge_head)
         end
         @merge_head = nil
       end
@@ -186,7 +186,7 @@ module Overcommit
       if @cherry_head
         File.open(File.expand_path('CHERRY_PICK_HEAD',
                                    Overcommit::Utils.git_dir), 'w') do |f|
-          f.write("#{@cherry_head}\n")
+          f.write(@cherry_head)
         end
         @cherry_head = nil
       end
@@ -248,5 +248,16 @@ module Overcommit
       raise Overcommit::Exceptions::GitSubmoduleError,
             "Unable to read submodule information from #{ref}:.gitmodules file: #{ex.message}"
     end
+
+    # Returns the names of all branches containing the given commit.
+    #
+    # @param commit_ref [String] git tree ref that resolves to a commit
+    # @return [Array<String>] list of branches containing the given commit
+    def branches_containing_commit(commit_ref)
+      `git branch --column=dense --contains #{commit_ref}`.
+        sub(/\((HEAD )?detached (from|at) .*?\)/, ''). # ignore detached HEAD
+        split(/\s+/).
+        reject { |s| s.empty? || s == '*' }
+    end
   end
 end

data/lib/overcommit/git_version.rb

@@ -9,7 +9,7 @@
 #   end
 module Overcommit
   GIT_VERSION = begin
-    version = `git --version`.chomp[/[\d\.]+/, 0]
+    version = `git --version`.chomp[/\d+(\.\d+)+/, 0]
     Overcommit::Utils::Version.new(version)
   end
 end

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

@@ -5,7 +5,8 @@ module Overcommit::Hook::CommitMsg
   class Base < Overcommit::Hook::Base
     extend Forwardable
 
-    def_delegators :@context, :commit_message, :update_commit_message,
-                   :commit_message_lines, :commit_message_file
+    def_delegators :@context, :empty_message?, :commit_message,
+                   :update_commit_message, :commit_message_lines,
+                   :commit_message_file
   end
 end

data/lib/overcommit/hook/commit_msg/capitalized_subject.rb

@@ -2,6 +2,8 @@ module Overcommit::Hook::CommitMsg
   # Ensures commit message subject lines start with a capital letter.
   class CapitalizedSubject < Base
     def run
+      return :pass if empty_message?
+
       first_letter = commit_message_lines[0].to_s.match(/^[[:punct:]]*(.)/)[1]
       unless first_letter.match(/[[:upper:]]/)
         return :warn, 'Subject should start with a capital letter'

data/lib/overcommit/hook/commit_msg/hard_tabs.rb

@@ -2,6 +2,8 @@ module Overcommit::Hook::CommitMsg
   # Checks for hard tabs in commit messages.
   class HardTabs < Base
     def run
+      return :pass if empty_message?
+
       # Catches hard tabs entered by the user (not auto-generated)
       if commit_message.index(/\t/)
         return :warn, "Don't use hard tabs in commit messages"

data/lib/overcommit/hook/commit_msg/single_line_subject.rb

@@ -2,6 +2,8 @@ module Overcommit::Hook::CommitMsg
   # Ensures commit message subject lines are followed by a blank line.
   class SingleLineSubject < Base
     def run
+      return :pass if empty_message?
+
       unless commit_message_lines[1].to_s.strip.empty?
         return :warn, 'Subject should be one line and followed by a blank line'
       end

data/lib/overcommit/hook/commit_msg/text_width.rb

@@ -3,6 +3,8 @@ module Overcommit::Hook::CommitMsg
   # under the preferred limits.
   class TextWidth < Base
     def run
+      return :pass if empty_message?
+
       @errors = []
 
       find_errors_in_subject(commit_message_lines.first)

data/lib/overcommit/hook/commit_msg/trailing_period.rb

@@ -2,6 +2,8 @@ module Overcommit::Hook::CommitMsg
   # Ensures commit message subject lines do not have a trailing period
   class TrailingPeriod < Base
     def run
+      return :pass if empty_message?
+
       if commit_message_lines.first.rstrip.end_with?('.')
         return :warn, 'Please omit trailing period from commit message subject'
       end

data/lib/overcommit/hook/post_checkout/index_tags.rb

@@ -1,9 +1,8 @@
+require 'overcommit/hook/shared/index_tags'
+
 module Overcommit::Hook::PostCheckout
   # Updates ctags index for all source code in the repository.
   class IndexTags < Base
-    def run
-      execute_in_background([Overcommit::Utils.script_path('index-tags')])
-      :pass
-    end
+    include Overcommit::Hook::Shared::IndexTags
   end
 end

data/lib/overcommit/hook/post_checkout/submodule_status.rb

@@ -1,30 +1,10 @@
+require 'overcommit/hook/shared/submodule_status'
+
 module Overcommit::Hook::PostCheckout
   # Checks the status of submodules in the current repository and
   # notifies the user if any are uninitialized, out of date with
   # the current index, or contain merge conflicts.
   class SubmoduleStatus < Base
-    def run
-      messages = []
-      submodule_statuses.each do |submodule_status|
-        path = submodule_status.path
-        if submodule_status.uninitialized?
-          messages << "Submodule #{path} is uninitialized."
-        elsif submodule_status.outdated?
-          messages << "Submodule #{path} is out of date with the current index."
-        elsif submodule_status.merge_conflict?
-          messages << "Submodule #{path} has merge conflicts."
-        end
-      end
-
-      return :pass if messages.empty?
-
-      [:warn, messages.join("\n")]
-    end
-
-    private
-
-    def submodule_statuses
-      Overcommit::GitRepo.submodule_statuses(recursive: config['recursive'])
-    end
+    include Overcommit::Hook::Shared::SubmoduleStatus
   end
 end

data/lib/overcommit/hook/post_commit/index_tags.rb

@@ -1,9 +1,8 @@
+require 'overcommit/hook/shared/index_tags'
+
 module Overcommit::Hook::PostCommit
   # Updates ctags index for all source code in the repository.
   class IndexTags < Base
-    def run
-      execute_in_background([Overcommit::Utils.script_path('index-tags')])
-      :pass
-    end
+    include Overcommit::Hook::Shared::IndexTags
   end
 end

data/lib/overcommit/hook/post_commit/submodule_status.rb

@@ -1,30 +1,10 @@
+require 'overcommit/hook/shared/submodule_status'
+
 module Overcommit::Hook::PostCommit
   # Checks the status of submodules in the current repository and
   # notifies the user if any are uninitialized, out of date with
   # the current index, or contain merge conflicts.
   class SubmoduleStatus < Base
-    def run
-      messages = []
-      submodule_statuses.each do |submodule_status|
-        path = submodule_status.path
-        if submodule_status.uninitialized?
-          messages << "Submodule #{path} is uninitialized."
-        elsif submodule_status.outdated?
-          messages << "Submodule #{path} is out of date with the current index."
-        elsif submodule_status.merge_conflict?
-          messages << "Submodule #{path} has merge conflicts."
-        end
-      end
-
-      return :pass if messages.empty?
-
-      [:warn, messages.join("\n")]
-    end
-
-    private
-
-    def submodule_statuses
-      Overcommit::GitRepo.submodule_statuses(recursive: config['recursive'])
-    end
+    include Overcommit::Hook::Shared::SubmoduleStatus
   end
 end

data/lib/overcommit/hook/post_merge/index_tags.rb

@@ -1,9 +1,8 @@
+require 'overcommit/hook/shared/index_tags'
+
 module Overcommit::Hook::PostMerge
   # Updates ctags index for all source code in the repository.
   class IndexTags < Base
-    def run
-      execute_in_background([Overcommit::Utils.script_path('index-tags')])
-      :pass
-    end
+    include Overcommit::Hook::Shared::IndexTags
   end
 end

data/lib/overcommit/hook/post_merge/submodule_status.rb

@@ -1,30 +1,10 @@
+require 'overcommit/hook/shared/submodule_status'
+
 module Overcommit::Hook::PostMerge
   # Checks the status of submodules in the current repository and
   # notifies the user if any are uninitialized, out of date with
   # the current index, or contain merge conflicts.
   class SubmoduleStatus < Base
-    def run
-      messages = []
-      submodule_statuses.each do |submodule_status|
-        path = submodule_status.path
-        if submodule_status.uninitialized?
-          messages << "Submodule #{path} is uninitialized."
-        elsif submodule_status.outdated?
-          messages << "Submodule #{path} is out of date with the current index."
-        elsif submodule_status.merge_conflict?
-          messages << "Submodule #{path} has merge conflicts."
-        end
-      end
-
-      return :pass if messages.empty?
-
-      [:warn, messages.join("\n")]
-    end
-
-    private
-
-    def submodule_statuses
-      Overcommit::GitRepo.submodule_statuses(recursive: config['recursive'])
-    end
+    include Overcommit::Hook::Shared::SubmoduleStatus
   end
 end

data/lib/overcommit/hook/post_rewrite/index_tags.rb

@@ -1,12 +1,15 @@
+require 'overcommit/hook/shared/index_tags'
+
 module Overcommit::Hook::PostRewrite
   # Updates ctags index for all source code in the repository.
   class IndexTags < Base
+    include Overcommit::Hook::Shared::IndexTags
+
     def run
       # Ignore unless this is a rebase (amends are covered by post-commit hook)
       return :pass unless rebase?
 
-      execute_in_background([Overcommit::Utils.script_path('index-tags')])
-      :pass
+      super
     end
   end
 end

data/lib/overcommit/hook/post_rewrite/submodule_status.rb

@@ -1,30 +1,10 @@
+require 'overcommit/hook/shared/submodule_status'
+
 module Overcommit::Hook::PostRewrite
   # Checks the status of submodules in the current repository and
   # notifies the user if any are uninitialized, out of date with
   # the current index, or contain merge conflicts.
   class SubmoduleStatus < Base
-    def run
-      messages = []
-      submodule_statuses.each do |submodule_status|
-        path = submodule_status.path
-        if submodule_status.uninitialized?
-          messages << "Submodule #{path} is uninitialized."
-        elsif submodule_status.outdated?
-          messages << "Submodule #{path} is out of date with the current index."
-        elsif submodule_status.merge_conflict?
-          messages << "Submodule #{path} has merge conflicts."
-        end
-      end
-
-      return :pass if messages.empty?
-
-      [:warn, messages.join("\n")]
-    end
-
-    private
-
-    def submodule_statuses
-      Overcommit::GitRepo.submodule_statuses(recursive: config['recursive'])
-    end
+    include Overcommit::Hook::Shared::SubmoduleStatus
   end
 end

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

@@ -7,8 +7,8 @@ module Overcommit::Hook::PreCommit
 
       unless name.split(' ').count >= 2
         return :fail,
-               "Author must have at least first and last name, but was: #{name}." \
-               "\nSet your name with `git config --global user.name 'Your Name'`"
+               "Author must have at least first and last name, but was: #{name}.\n" \
+               'Set your name with `git config --global user.name "Your Name"`'
       end
 
       :pass

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

@@ -32,7 +32,7 @@ module Overcommit::Hook::PreCommit
         end
 
         file = extract_file(match, message)
-        line = extract_line(match, message) unless match[:line].nil?
+        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)

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

@@ -2,13 +2,12 @@ module Overcommit::Hook::PreCommit
   # Checks for hard tabs in files.
   class HardTabs < Base
     def run
-      # Catches hard tabs
       result = execute(command + applicable_files)
-      unless result.stdout.empty?
-        return :fail, "Hard tabs detected:\n#{result.stdout}"
-      end
 
-      :pass
+      extract_messages(
+        result.stdout.split("\n"),
+        /^(?<file>[^:]+):(?<line>\d+)/,
+      )
     end
   end
 end

data/lib/overcommit/hook/pre_commit/{rubocop.rb → rubo_cop.rb}

@@ -1,6 +1,6 @@
 module Overcommit::Hook::PreCommit
   # Runs `rubocop` against any modified Ruby files.
-  class Rubocop < Base
+  class RuboCop < Base
     MESSAGE_TYPE_CATEGORIZER = lambda do |type|
       type.include?('W') ? :warning : :error
     end

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

@@ -0,0 +1,18 @@
+module Overcommit::Hook::PreCommit
+  # Runs `scalariform` against any modified Scala files.
+  class Scalariform < Base
+    MESSAGE_REGEX = /^\[(?<type>FAILED|ERROR)\]\s+(?<file>.+)/
+
+    def run
+      result = execute(command + applicable_files)
+
+      # example message:
+      #   [FAILED] path/to/file.scala
+      extract_messages(
+        result.stdout.split("\n").grep(MESSAGE_REGEX),
+        MESSAGE_REGEX,
+        lambda { |type| type == 'ERROR' ? :error : :warning }
+      )
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+module Overcommit::Hook::PreCommit
+  # Runs `slim-lint` against any modified Slim templates.
+  class SlimLint < Base
+    MESSAGE_TYPE_CATEGORIZER = lambda do |type|
+      type.include?('W') ? :warning : :error
+    end
+
+    def run
+      result = execute(command + applicable_files)
+      return :pass if result.success?
+
+      extract_messages(
+        result.stdout.split("\n"),
+        /^(?<file>[^:]+):(?<line>\d+)[^ ]* (?<type>[^ ]+)/,
+        MESSAGE_TYPE_CATEGORIZER,
+      )
+    end
+  end
+end

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

@@ -3,11 +3,11 @@ module Overcommit::Hook::PreCommit
   class TrailingWhitespace < Base
     def run
       result = execute(command + applicable_files)
-      unless result.stdout.empty?
-        return :fail, "Trailing whitespace detected:\n#{result.stdout}"
-      end
 
-      :pass
+      extract_messages(
+        result.stdout.split("\n"),
+        /^(?<file>[^:]+):(?<line>\d+)/,
+      )
     end
   end
 end

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

@@ -0,0 +1,18 @@
+module Overcommit::Hook::PreCommit
+  # Runs `vint` against any modified Vim script files.
+  class Vint < Base
+    def run
+      result = execute(command + applicable_files)
+      return :pass if result.success?
+
+      return [:fail, result.stderr] unless result.stderr.empty?
+
+      # example message:
+      #   path/to/file.vim:1:1: Error message
+      extract_messages(
+        result.stdout.split("\n"),
+        /^(?<file>[^:]+):(?<line>\d+)/
+      )
+    end
+  end
+end

data/lib/overcommit/hook/pre_rebase/merged_commits.rb

@@ -0,0 +1,29 @@
+module Overcommit::Hook::PreRebase
+  # Prevents rebasing commits that have already been merged into one of
+  # a specified set of branches.
+  class MergedCommits < Base
+    def run
+      # Allow rebasing a detached HEAD since no refs are changed.
+      return :pass if detached_head? || illegal_commits.empty?
+
+      message = 'Cannot rebase commits that have already been merged into ' \
+                "one of #{branches.join(', ')}"
+
+      [:fail, message]
+    end
+
+    private
+
+    def branches
+      @branches ||= config['branches']
+    end
+
+    def illegal_commits
+      @illegal_commits ||= rebased_commits.select do |commit_sha1|
+        branches_containing_commit =
+          Overcommit::GitRepo.branches_containing_commit(commit_sha1)
+        (branches_containing_commit & branches).any?
+      end
+    end
+  end
+end

data/lib/overcommit/hook/shared/index_tags.rb

@@ -0,0 +1,10 @@
+module Overcommit::Hook::Shared
+  # Shared code used by all IndexTags hooks. It runs ctags in the background so
+  # your tag definitions are up-to-date.
+  module IndexTags
+    def run
+      execute_in_background([Overcommit::Utils.script_path('index-tags')])
+      :pass
+    end
+  end
+end

data/lib/overcommit/hook/shared/submodule_status.rb

@@ -0,0 +1,30 @@
+module Overcommit::Hook::Shared
+  # Shared code used by all `SubmoduleStatus` hooks to notify the user if any
+  # submodules are uninitialized, out of date with the current index, or contain
+  # merge conflicts.
+  module SubmoduleStatus
+    def run
+      messages = []
+      submodule_statuses.each do |submodule_status|
+        path = submodule_status.path
+        if submodule_status.uninitialized?
+          messages << "Submodule #{path} is uninitialized."
+        elsif submodule_status.outdated?
+          messages << "Submodule #{path} is out of date with the current index."
+        elsif submodule_status.merge_conflict?
+          messages << "Submodule #{path} has merge conflicts."
+        end
+      end
+
+      return :pass if messages.empty?
+
+      [:warn, messages.join("\n")]
+    end
+
+    private
+
+    def submodule_statuses
+      Overcommit::GitRepo.submodule_statuses(recursive: config['recursive'])
+    end
+  end
+end

data/lib/overcommit/hook_context/base.rb

@@ -1,5 +1,3 @@
-require 'set'
-
 module Overcommit::HookContext
   # Contains helpers related to the context with which a hook is being run.
   #
@@ -10,9 +8,14 @@ module Overcommit::HookContext
   # This is also important to house in a separate object so that any
   # calculations can be memoized across all hooks in a single object, which
   # helps with performance.
+  #
+  # @abstract
   class Base
+    # Creates a hook context from the given configuration and input options.
+    #
     # @param config [Overcommit::Configuration]
     # @param args [Array<String>]
+    # @param input [IO] standard input stream
     def initialize(config, args, input)
       @config = config
       @args = args
@@ -20,16 +23,22 @@ module Overcommit::HookContext
     end
 
     # Returns the camel-cased type of this hook (e.g. PreCommit)
+    #
+    # @return [String]
     def hook_class_name
       self.class.name.split('::').last
     end
 
     # Returns the snake-cased type of this hook (e.g. pre_commit)
+    #
+    # @return [String]
     def hook_type_name
       Overcommit::Utils.snake_case(hook_class_name)
     end
 
     # Returns the actual name of the hook script being run (e.g. pre-commit).
+    #
+    # @return [String]
     def hook_script_name
       hook_type_name.gsub('_', '-')
     end
@@ -39,7 +48,7 @@ module Overcommit::HookContext
     # This is called before the hooks are run by the [HookRunner]. Different
     # hook types can perform different setup.
     def setup_environment
-      # Implemented by subclass
+      # Implemented by subclass, if applicable
     end
 
     # Resets the environment to an appropriate state.
@@ -48,18 +57,23 @@ module Overcommit::HookContext
     # Different hook types can perform different cleanup operations, which are
     # intended to "undo" the results of the call to {#setup_environment}.
     def cleanup_environment
-      # Implemented by subclass
+      # Implemented by subclass, if applicable
     end
 
     # Returns a list of files that have been modified.
     #
     # By default, this returns an empty list. Subclasses should implement if
     # there is a concept of files changing for the type of hook being run.
+    #
+    # @return [Array<String>]
     def modified_files
       []
     end
 
-    # Returns an array of lines passed to the hook via STDIN.
+    # Returns an array of lines passed to the hook via the standard input
+    # stream.
+    #
+    # @return [Array<String>]
     def input_lines
       @input_lines ||= @input.read.split("\n")
     end

data/lib/overcommit/hook_context/commit_msg.rb

@@ -1,6 +1,10 @@
 module Overcommit::HookContext
   # Contains helpers related to contextual information used by commit-msg hooks.
   class CommitMsg < Base
+    def empty_message?
+      commit_message.strip.empty?
+    end
+
     # User commit message stripped of comments and diff (from verbose output).
     def commit_message
       commit_message_lines.join

data/lib/overcommit/hook_context/pre_commit.rb

@@ -20,7 +20,7 @@ module Overcommit::HookContext
         @amendment = !(/\s#{amend_pattern}/ =~ cmd).nil?
 
       # Check for git aliases that call `commit --amend`
-      `git config --get-regexp '^alias\\.' '#{amend_pattern}'`.
+      `git config --get-regexp "^alias\\." "#{amend_pattern}"`.
         scan(/alias\.([-\w]+)/). # Extract the alias
         each do |match|
           return @amendment if
@@ -94,6 +94,13 @@ module Overcommit::HookContext
         if amendment?
           subcmd = 'show --format=%n'
           @modified_files += Overcommit::GitRepo.modified_files(subcmd: subcmd)
+
+          # Filter out directories. This could happen when changing a symlink to
+          # a directory as part of an amendment, since the symlink will still
+          # appear as a file, but the actual working tree will have a directory.
+          @modified_files.reject! do |file|
+            File.directory?(file) && !File.symlink?(file)
+          end
         end
       end
       @modified_files

data/lib/overcommit/hook_context/run_all.rb

@@ -17,7 +17,7 @@ module Overcommit::HookContext
     # @return [Set]
     def modified_lines_in_file(file)
       @modified_lines_in_file ||= {}
-      @modified_lines_in_file[file] ||= Set.new(1..(count_lines(file) + 1))
+      @modified_lines_in_file[file] ||= Set.new(1..count_lines(file))
     end
 
     def hook_class_name
@@ -35,8 +35,7 @@ module Overcommit::HookContext
     private
 
     def count_lines(file)
-      result = Overcommit::Utils.execute(%w[wc -l] + [file])
-      result.success? ? result.stdout.to_i : 0
+      File.foreach(file).count
     end
   end
 end

data/lib/overcommit/installer.rb

@@ -100,7 +100,7 @@ module Overcommit
     end
 
     def uninstall_master_hook
-      FileUtils.rm_rf(master_hook_install_path)
+      FileUtils.rm_rf(master_hook_install_path, secure: true)
     end
 
     def install_hook_symlinks
@@ -162,7 +162,7 @@ module Overcommit
 
       Dir.chdir(hooks_path) do
         Overcommit::Utils.supported_hook_types.each do |hook_type|
-          FileUtils.rm_rf(hook_type) if overcommit_hook?(hook_type)
+          FileUtils.rm_rf(hook_type, secure: true) if overcommit_hook?(hook_type)
         end
       end
     end

data/lib/overcommit/interrupt_handler.rb

@@ -7,6 +7,7 @@ class InterruptHandler
 
   attr_accessor :isolate_signals, :signal_received, :reenable_on_interrupt
 
+  # Initialize safe interrupt signal handling.
   def initialize
     self.isolate_signals = false
     self.signal_received = false
@@ -64,14 +65,19 @@ class InterruptHandler
       instance.isolate_signals = true
     end
 
+    # Disable interrupt isolation.
     def disable!
       instance.isolate_signals = false
     end
 
+    # Enable interrupt isolation.
     def enable!
       instance.isolate_signals = true
     end
 
+    # Enable interrupt isolation while executing the provided block.
+    #
+    # @yield block to execute with interrupt isolation
     def isolate_from_interrupts
       instance.signal_received = false
       instance.isolate_signals = true
@@ -79,9 +85,5 @@ class InterruptHandler
       instance.isolate_signals = false
       result
     end
-
-    def signal_received?
-      instance.signal_received
-    end
   end
 end

data/lib/overcommit/logger.rb

@@ -3,7 +3,7 @@ module Overcommit
   class Logger
     # Helper for creating a logger which outputs nothing.
     def self.silent
-      new(File.open('/dev/null', 'w'))
+      new(File.open(File::NULL, 'w'))
     end
 
     # Creates a logger that will write to the given output stream.

data/lib/overcommit/utils.rb

@@ -91,6 +91,7 @@ module Overcommit
       def supported_hook_types
         Dir[File.join(HOOK_DIRECTORY, '*')].
           select { |file| File.directory?(file) }.
+          reject { |file| File.basename(file) == 'shared' }.
           map { |file| File.basename(file).gsub('_', '-') }
       end
 

data/lib/overcommit/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: overcommit
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.25.0
 platform: ruby
 authors:
 - Brigade Engineering
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-13 00:00:00.000000000 Z
+date: 2015-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
@@ -158,15 +158,18 @@ files:
 - 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/rubo_cop.rb
 - lib/overcommit/hook/pre_commit/ruby_lint.rb
+- lib/overcommit/hook/pre_commit/scalariform.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/slim_lint.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/vint.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
@@ -176,6 +179,9 @@ files:
 - lib/overcommit/hook/pre_push/protected_branches.rb
 - lib/overcommit/hook/pre_push/r_spec.rb
 - lib/overcommit/hook/pre_rebase/base.rb
+- lib/overcommit/hook/pre_rebase/merged_commits.rb
+- lib/overcommit/hook/shared/index_tags.rb
+- lib/overcommit/hook/shared/submodule_status.rb
 - lib/overcommit/hook_context.rb
 - lib/overcommit/hook_context/base.rb
 - lib/overcommit/hook_context/commit_msg.rb
@@ -232,7 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Git hook manager