overcommit 0.27.0 → 0.28.0

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

@@ -0,0 +1,24 @@
+module Overcommit::Hook::PreCommit
+  # Runs 'puppet-lint' against any modified Puppet files.
+  #
+  # @see http://puppet-lint.com/
+  class PuppetLint < Base
+    MESSAGE_REGEX = /(?<file>(?:\w:)?.+):(?<line>\d+):\d+:(?<type>\w+)/
+
+    MESSAGE_TYPE_CATEGORIZER = lambda do |type|
+      type == 'ERROR' ? :error : :warning
+    end
+
+    def run
+      result = execute(command, args: applicable_files)
+      output = result.stdout.chomp.gsub(/^"|"$/, '')
+      return :pass if result.success? && output.empty?
+
+      extract_messages(
+        output.split("\n"),
+        MESSAGE_REGEX,
+        MESSAGE_TYPE_CATEGORIZER
+      )
+    end
+  end
+end

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

@@ -3,10 +3,10 @@ module Overcommit::Hook::PreCommit
   #
   # @see https://pypi.python.org/pypi/pyflakes
   class Pyflakes < Base
-    MESSAGE_REGEX = /^(?<file>[^:]+):(?<line>\d+):/
+    MESSAGE_REGEX = /^(?<file>(?:\w:)?[^:]+):(?<line>\d+):/
 
     def run
-      result = execute(command + applicable_files)
+      result = execute(command, args: applicable_files)
       return :pass if result.success?
 
       errors = get_messages(result.stderr, :error)

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

@@ -3,7 +3,7 @@ module Overcommit::Hook::PreCommit
   #
   # @see http://www.pylint.org/
   class Pylint < Base
-    MESSAGE_REGEX = /^(?<file>.+):(?<line>\d+):(?<type>[CEFRW])/
+    MESSAGE_REGEX = /^(?<file>(?:\w:)?.+):(?<line>\d+):(?<type>[CEFRW])/
 
     # Classify 'E' and 'F' message codes as errors,
     # everything else as warnings.
@@ -13,7 +13,7 @@ module Overcommit::Hook::PreCommit
     end
 
     def run
-      result = execute(command + applicable_files)
+      result = execute(command, args: applicable_files)
       return :pass if result.success?
 
       output = result.stdout.chomp

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

@@ -3,7 +3,7 @@ module Overcommit::Hook::PreCommit
   #
   # @see https://pypi.python.org/pypi/flake8
   class PythonFlake8 < Base
-    MESSAGE_REGEX = /^(?<file>.+):(?<line>\d+):\d+:\s(?<type>\w\d+)/
+    MESSAGE_REGEX = /^(?<file>(?:\w:)?.+):(?<line>\d+):\d+:\s(?<type>\w\d+)/
 
     # Classify 'Exxx' and 'Fxxx' message codes as errors,
     # everything else as warnings.
@@ -13,7 +13,7 @@ module Overcommit::Hook::PreCommit
     end
 
     def run
-      result = execute(command + applicable_files)
+      result = execute(command, args: applicable_files)
       return :pass if result.success?
 
       output = result.stdout.chomp

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

@@ -4,14 +4,14 @@ module Overcommit::Hook::PreCommit
   # @see https://github.com/troessner/reek
   class Reek < Base
     def run
-      result = execute(command + applicable_files)
+      result = execute(command, args: applicable_files)
       return :pass if result.success?
 
       output = scrub_output(result.stdout + result.stderr)
 
       extract_messages(
         output,
-        /^\s*(?<file>[^:]+):(?<line>\d+):/,
+        /^\s*(?<file>(?:\w:)?[^:]+):(?<line>\d+):/,
       )
     end
 

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

@@ -8,12 +8,12 @@ module Overcommit::Hook::PreCommit
     end
 
     def run
-      result = execute(command + applicable_files)
+      result = execute(command, args: applicable_files)
       return :pass if result.success?
 
       extract_messages(
         result.stdout.split("\n"),
-        /^(?<file>[^:]+):(?<line>\d+):[^ ]+ (?<type>[^ ]+)/,
+        /^(?<file>(?:\w:)?[^:]+):(?<line>\d+):[^ ]+ (?<type>[^ ]+)/,
         MESSAGE_TYPE_CATEGORIZER,
       )
     end

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

@@ -8,12 +8,12 @@ module Overcommit::Hook::PreCommit
     end
 
     def run
-      result = execute(command + applicable_files)
+      result = execute(command, args: applicable_files)
       return :pass if result.success?
 
       extract_messages(
         result.stdout.split("\n"),
-        /^(?<file>[^:]+):(?<type>[^:]+):(?<line>\d+)/,
+        /^(?<file>(?:\w:)?[^:]+):(?<type>[^:]+):(?<line>\d+)/,
         MESSAGE_TYPE_CATEGORIZER
       )
     end

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

@@ -3,10 +3,10 @@ module Overcommit::Hook::PreCommit
   #
   # @see https://github.com/mdr/scalariform
   class Scalariform < Base
-    MESSAGE_REGEX = /^\[(?<type>FAILED|ERROR)\]\s+(?<file>.+)/
+    MESSAGE_REGEX = /^\[(?<type>FAILED|ERROR)\]\s+(?<file>(?:\w:)?.+)/
 
     def run
-      result = execute(command + applicable_files)
+      result = execute(command, args: applicable_files)
 
       # example message:
       #   [FAILED] path/to/file.scala

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

@@ -5,13 +5,13 @@ module Overcommit::Hook::PreCommit
   class Scalastyle < Base
     MESSAGE_REGEX = /
       ^(?<type>error|warning)\s
-      file=(?<file>.+)\s
+      file=(?<file>(?:\w:)?.+)\s
       message=.+\s
       line=(?<line>\d+)
     /x
 
     def run
-      result = execute(command + applicable_files)
+      result = execute(command, args: applicable_files)
       output = result.stdout.chomp
       messages = output.split("\n").grep(MESSAGE_REGEX)
       return :pass if result.success? && messages.empty?

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

@@ -8,7 +8,7 @@ module Overcommit::Hook::PreCommit
     end
 
     def run
-      result = execute(command + applicable_files)
+      result = execute(command, args: applicable_files)
 
       # Status code 81 indicates the applicable files were all filtered by
       # exclusions defined by the configuration. In this case, we're happy to
@@ -20,7 +20,7 @@ module Overcommit::Hook::PreCommit
 
       extract_messages(
         result.stdout.split("\n"),
-        /^(?<file>[^:]+):(?<line>\d+)[^ ]* (?<type>[^ ]+)/,
+        /^(?<file>(?:\w:)?[^:]+):(?<line>\d+)[^ ]* (?<type>[^ ]+)/,
         MESSAGE_TYPE_CATEGORIZER,
       )
     end

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

@@ -3,16 +3,18 @@ module Overcommit::Hook::PreCommit
   #
   # @see https://github.com/Flet/semistandard
   class SemiStandard < Base
+    MESSAGE_REGEX = /^\s*(?<file>(?:\w:)?[^:]+):(?<line>\d+)/
+
     def run
-      result = execute(command + applicable_files)
+      result = execute(command, args: applicable_files)
       output = result.stdout.chomp
       return :pass if result.success? && output.empty?
 
       # example message:
       #   path/to/file.js:1:1: Error message (ruleName)
       extract_messages(
-        output.split("\n")[1..-1], # ignore header line
-        /^\s*(?<file>[^:]+):(?<line>\d+)/
+        output.split("\n").grep(MESSAGE_REGEX), # ignore header line
+        MESSAGE_REGEX
       )
     end
   end

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

@@ -8,12 +8,12 @@ module Overcommit::Hook::PreCommit
     end
 
     def run
-      result = execute(command + applicable_files)
+      result = execute(command, args: applicable_files)
       return :pass if result.success?
 
       extract_messages(
         result.stdout.split("\n"),
-        /^(?<file>[^:]+):(?<line>\d+):[^ ]+ (?<type>[^ ]+)/,
+        /^(?<file>(?:\w:)?[^:]+):(?<line>\d+):[^ ]+ (?<type>[^ ]+)/,
         MESSAGE_TYPE_CATEGORIZER,
       )
     end

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

@@ -8,12 +8,12 @@ module Overcommit::Hook::PreCommit
     end
 
     def run
-      result = execute(command + applicable_files)
+      result = execute(command, args: applicable_files)
       return :pass if result.success?
 
       extract_messages(
         result.stdout.split("\n"),
-        /^(?<file>[^:]+):(?<line>\d+)[^ ]* (?<type>[^ ]+)/,
+        /^(?<file>(?:\w:)?[^:]+):(?<line>\d+)[^ ]* (?<type>[^ ]+)/,
         MESSAGE_TYPE_CATEGORIZER,
       )
     end

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

@@ -0,0 +1,24 @@
+module Overcommit::Hook::PreCommit
+  # Runs 'sqlint' against any modified SQL files.
+  #
+  # @see https://github.com/purcell/sqlint
+  class Sqlint < Base
+    MESSAGE_REGEX = /(?<file>(?:\w:)?.+):(?<line>\d+):\d+:(?<type>\w+)/
+
+    MESSAGE_TYPE_CATEGORIZER = lambda do |type|
+      type == 'ERROR' ? :error : :warning
+    end
+
+    def run
+      result = execute(command, args: applicable_files)
+      output = result.stdout.chomp
+      return :pass if result.success? && output.empty?
+
+      extract_messages(
+        output.split("\n"),
+        MESSAGE_REGEX,
+        MESSAGE_TYPE_CATEGORIZER
+      )
+    end
+  end
+end

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

@@ -3,16 +3,18 @@ module Overcommit::Hook::PreCommit
   #
   # @see https://github.com/feross/standard
   class Standard < Base
+    MESSAGE_REGEX = /^\s*(?<file>(?:\w:)?[^:]+):(?<line>\d+)/
+
     def run
-      result = execute(command + applicable_files)
+      result = execute(command, args: applicable_files)
       output = result.stdout.chomp
       return :pass if result.success? && output.empty?
 
       # example message:
       #   path/to/file.js:1:1: Error message (ruleName)
       extract_messages(
-        output.split("\n")[1..-1], # ignore header line
-        /^\s*(?<file>[^:]+):(?<line>\d+)/
+        output.split("\n").grep(MESSAGE_REGEX), # ignore header line
+        MESSAGE_REGEX
       )
     end
   end

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

@@ -6,7 +6,7 @@ module Overcommit::Hook::PreCommit
 
       extract_messages(
         result.stdout.split("\n"),
-        /^(?<file>[^:]+):(?<line>\d+)/,
+        /^(?<file>(?:\w:)?[^:]+):(?<line>\d+)/,
       )
     end
   end

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

@@ -4,7 +4,7 @@ module Overcommit::Hook::PreCommit
   # @see https://github.com/travis-ci/travis.rb
   class TravisLint < Base
     def run
-      result = execute(command + applicable_files)
+      result = execute(command, args: applicable_files)
       return :pass if result.success?
 
       [:fail, (result.stdout + result.stderr).strip]

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

@@ -4,7 +4,7 @@ module Overcommit::Hook::PreCommit
   # @see https://github.com/Kuniwak/vint
   class Vint < Base
     def run
-      result = execute(command + applicable_files)
+      result = execute(command, args: applicable_files)
       return :pass if result.success?
 
       return [:fail, result.stderr] unless result.stderr.empty?
@@ -13,7 +13,7 @@ module Overcommit::Hook::PreCommit
       #   path/to/file.vim:1:1: Error message
       extract_messages(
         result.stdout.split("\n"),
-        /^(?<file>[^:]+):(?<line>\d+)/
+        /^(?<file>(?:\w:)?[^:]+):(?<line>\d+)/
       )
     end
   end

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

@@ -3,10 +3,10 @@ module Overcommit::Hook::PreCommit
   #
   # @see http://xmlsoft.org/xmllint.html
   class XmlLint < Base
-    MESSAGE_REGEX = /^(?<file>[^:]+):(?<line>\d+):/
+    MESSAGE_REGEX = /^(?<file>(?:\w:)?[^:]+):(?<line>\d+):/
 
     def run
-      result = execute(command + applicable_files)
+      result = execute(command, args: applicable_files)
       output = result.stderr.chomp
 
       return :pass if result.success? && output.empty?

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

@@ -0,0 +1,13 @@
+module Overcommit::Hook::Shared
+  # Shared code used by all BowerInstall hooks. Runs `bower install` when a
+  # change is detected in the repository's dependencies.
+  #
+  # @see http://bower.io/
+  module BowerInstall
+    def run
+      result = execute(command)
+      return :fail, result.stderr unless result.success?
+      :pass
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+module Overcommit::Hook::Shared
+  # Shared code used by all BundleInstall hooks. Runs `bundle install` when a
+  # change is detected in the repository's dependencies.
+  #
+  # @see http://bundler.io/
+  module BundleInstall
+    def run
+      result = execute(command)
+      return :fail, result.stdout unless result.success?
+      :pass
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+module Overcommit::Hook::Shared
+  # Shared code used by all NpmInstall hooks. Runs `npm install` when a change
+  # is detected in the repository's dependencies.
+  #
+  # @see https://www.npmjs.com/
+  module NpmInstall
+    def run
+      result = execute(command)
+      return :fail, result.stderr unless result.success?
+      :pass
+    end
+  end
+end

data/lib/overcommit/hook_context/base.rb

@@ -49,7 +49,7 @@ module Overcommit::HookContext
     #
     # @return [String]
     def hook_script_name
-      hook_type_name.gsub('_', '-')
+      hook_type_name.tr('_', '-')
     end
 
     # Initializes anything related to the environment.
@@ -116,7 +116,7 @@ module Overcommit::HookContext
     # a file, but the actual working tree will have a directory.
     def filter_directories(modified_files)
       modified_files.reject do |file|
-        File.directory?(file) && !File.symlink?(file)
+        File.directory?(file) && !Overcommit::Utils::FileUtils.symlink?(file)
       end
     end
   end

data/lib/overcommit/hook_context/pre_commit.rb

@@ -25,7 +25,7 @@ module Overcommit::HookContext
         each do |match|
           return @amendment if
             # True if the command uses a git alias for `commit --amend`
-            @amendment = !(/git\s+#{match[0]}/ =~ cmd).nil?
+            @amendment = !(/git(\.exe)?\s+#{match[0]}/ =~ cmd).nil?
         end
 
       @amendment

data/lib/overcommit/hook_context/run_all.rb

@@ -32,6 +32,11 @@ module Overcommit::HookContext
       'pre-commit'
     end
 
+    def initial_commit?
+      return @initial_commit unless @initial_commit.nil?
+      @initial_commit = Overcommit::GitRepo.initial_commit?
+    end
+
     private
 
     def count_lines(file)

data/lib/overcommit/hook_signer.rb

@@ -49,7 +49,8 @@ module Overcommit
     end
 
     def signable_file?(file)
-      file.start_with?(".#{File::SEPARATOR}") &&
+      sep = Overcommit::OS.windows? ? '\\' : File::SEPARATOR
+      file.start_with?(".#{sep}") &&
         Overcommit::GitRepo.tracked?(file)
     end
 

data/lib/overcommit/installer.rb

@@ -114,7 +114,8 @@ module Overcommit
                   "Hook '#{File.expand_path(hook_type)}' already exists and " \
                   'was not installed by Overcommit'
           end
-          FileUtils.ln_sf('overcommit-hook', hook_type)
+          FileUtils.rm_f(hook_type)
+          Overcommit::Utils::FileUtils.symlink('overcommit-hook', hook_type)
         end
       end
     end
@@ -177,7 +178,8 @@ module Overcommit
     def overcommit_hook?(file)
       return true if File.read(file) =~ /OVERCOMMIT_DISABLE/
       # TODO: Remove these checks once we hit version 1.0
-      File.symlink?(file) && File.readlink(file) == 'overcommit-hook'
+      Overcommit::Utils::FileUtils.symlink?(file) &&
+        Overcommit::Utils::FileUtils.readlink(file) == 'overcommit-hook'
     rescue Errno::ENOENT
       # Some Ruby implementations (e.g. JRuby) raise an error when the file
       # doesn't exist. Standardize the behavior to return false.