Convert a number of pre-commit hooks to use splittable args

Author: jawshooah

lib/overcommit/hook/pre_commit/chamber_security.rb

@@ -4,7 +4,7 @@ module Overcommit::Hook::PreCommit
   # @see https://github.com/thekompanee/chamber
   class ChamberSecurity < Base
     def run
-      result = execute(command + applicable_files)
+      result = execute(command, args: applicable_files)
 
       return :pass if result.stdout.empty?
       [:fail, "These settings appear to need to be secured but were not: #{result.stdout}"]

lib/overcommit/hook/pre_commit/coffee_lint.rb

@@ -15,7 +15,7 @@ class CoffeeLint < Base
     end
 
     def run
-      result = execute(command + applicable_files)
+      result = execute(command, args: applicable_files)
       parse_messages(result.stdout)
     end
 

lib/overcommit/hook/pre_commit/css_lint.rb

@@ -10,7 +10,7 @@ class CssLint < Base
     /x
 
     def run
-      result = execute(command + applicable_files)
+      result = execute(command, args: applicable_files)
       output = result.stdout.chomp
       return :pass if result.success? && output.empty?
 

lib/overcommit/hook/pre_commit/es_lint.rb

@@ -4,7 +4,7 @@ module Overcommit::Hook::PreCommit
   # @see http://eslint.org/
   class EsLint < Base
     def run
-      result = execute(command + applicable_files)
+      result = execute(command, args: applicable_files)
       output = result.stdout.chomp
       return :pass if result.success? && output.empty?
 

lib/overcommit/hook/pre_commit/go_lint.rb

@@ -4,7 +4,7 @@ module Overcommit::Hook::PreCommit
   # @see https://github.com/golang/lint
   class GoLint < Base
     def run
-      result = execute(command + applicable_files)
+      result = execute(command, args: applicable_files)
       output = result.stdout + result.stderr
       # Unfortunately the exit code is always 0
       return :pass if output.empty?

lib/overcommit/hook/pre_commit/go_vet.rb

@@ -4,7 +4,7 @@ module Overcommit::Hook::PreCommit
   # @see https://godoc.org/code.google.com/p/go-zh.tools/cmd/vet
   class GoVet < Base
     def run
-      result = execute(command + applicable_files)
+      result = execute(command, args: applicable_files)
       return :pass if result.success?
 
       if result.stderr =~ /no such tool "vet"/

lib/overcommit/hook/pre_commit/haml_lint.rb

@@ -8,7 +8,7 @@ class HamlLint < Base
     end
 
     def run
-      result = execute(command + applicable_files)
+      result = execute(command, args: applicable_files)
       return :pass if result.success?
 
       extract_messages(

lib/overcommit/hook/pre_commit/image_optim.rb

@@ -4,7 +4,7 @@ module Overcommit::Hook::PreCommit
   # @see https://github.com/toy/image_optim
   class ImageOptim < Base
     def run
-      result = execute(command + applicable_files)
+      result = execute(command, args: applicable_files)
       return [:fail, result.stdout + result.stderr] unless result.success?
 
       optimized_files = extract_optimized_files(result.stdout)

lib/overcommit/hook/pre_commit/java_checkstyle.rb

@@ -6,7 +6,7 @@ class JavaCheckstyle < Base
     MESSAGE_REGEX = /^(?<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?
 

lib/overcommit/hook/pre_commit/js_hint.rb

@@ -4,7 +4,7 @@ module Overcommit::Hook::PreCommit
   # @see http://jshint.com/
   class JsHint < Base
     def run
-      result = execute(command + applicable_files)
+      result = execute(command, args: applicable_files)
       output = result.stdout.chomp
 
       return :pass if result.success? && output.empty?

lib/overcommit/hook/pre_commit/js_lint.rb

@@ -6,7 +6,7 @@ class JsLint < Base
     MESSAGE_REGEX = /(?<file>(?:\w:)?[^:]+):(?<line>\d+)/
 
     def run
-      result = execute(command + applicable_files)
+      result = execute(command, args: applicable_files)
       return :pass if result.success?
 
       # example message:

lib/overcommit/hook/pre_commit/jscs.rb

@@ -5,7 +5,7 @@ module Overcommit::Hook::PreCommit
   # @see http://jscs.info/
   class Jscs < Base
     def run
-      result = execute(command + applicable_files)
+      result = execute(command, args: applicable_files)
       return :pass if result.success?
 
       if result.status == 1

lib/overcommit/hook/pre_commit/pep257.rb

@@ -4,7 +4,7 @@ module Overcommit::Hook::PreCommit
   # @see https://pypi.python.org/pypi/pep257
   class Pep257 < Base
     def run
-      result = execute(command + applicable_files)
+      result = execute(command, args: applicable_files)
       return :pass if result.success?
 
       output = result.stderr.chomp

lib/overcommit/hook/pre_commit/pep8.rb

@@ -4,7 +4,7 @@ module Overcommit::Hook::PreCommit
   # @see https://pypi.python.org/pypi/pep8
   class Pep8 < Base
     def run
-      result = execute(command + applicable_files)
+      result = execute(command, args: applicable_files)
       output = result.stdout.chomp
 
       return :pass if result.success? && output.empty?

lib/overcommit/hook/pre_commit/puppet_lint.rb

@@ -10,7 +10,7 @@ class PuppetLint < Base
     end
 
     def run
-      result = execute(command + applicable_files)
+      result = execute(command, args: applicable_files)
       output = result.stdout.chomp.gsub(/^"|"$/, '')
       return :pass if result.success? && output.empty?
 

lib/overcommit/hook/pre_commit/pyflakes.rb

@@ -6,7 +6,7 @@ class Pyflakes < Base
     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)

lib/overcommit/hook/pre_commit/pylint.rb

@@ -13,7 +13,7 @@ class Pylint < Base
     end
 
     def run
-      result = execute(command + applicable_files)
+      result = execute(command, args: applicable_files)
       return :pass if result.success?
 
       output = result.stdout.chomp

lib/overcommit/hook/pre_commit/python_flake8.rb

@@ -13,7 +13,7 @@ class PythonFlake8 < Base
     end
 
     def run
-      result = execute(command + applicable_files)
+      result = execute(command, args: applicable_files)
       return :pass if result.success?
 
       output = result.stdout.chomp

lib/overcommit/hook/pre_commit/reek.rb

@@ -4,7 +4,7 @@ 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)

lib/overcommit/hook/pre_commit/ruby_lint.rb

@@ -8,7 +8,7 @@ class RubyLint < Base
     end
 
     def run
-      result = execute(command + applicable_files)
+      result = execute(command, args: applicable_files)
       return :pass if result.success?
 
       extract_messages(

lib/overcommit/hook/pre_commit/scalariform.rb

@@ -6,7 +6,7 @@ class Scalariform < Base
     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

lib/overcommit/hook/pre_commit/scalastyle.rb

@@ -11,7 +11,7 @@ class Scalastyle < Base
     /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?

lib/overcommit/hook/pre_commit/scss_lint.rb

@@ -8,7 +8,7 @@ class ScssLint < Base
     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

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>(?:\w:)?[^:]+):(?<line>\d+)/
+        output.split("\n").grep(MESSAGE_REGEX), # ignore header line
+        MESSAGE_REGEX
       )
     end
   end

lib/overcommit/hook/pre_commit/shell_check.rb

@@ -8,7 +8,7 @@ class ShellCheck < Base
     end
 
     def run
-      result = execute(command + applicable_files)
+      result = execute(command, args: applicable_files)
       return :pass if result.success?
 
       extract_messages(

lib/overcommit/hook/pre_commit/slim_lint.rb

@@ -8,7 +8,7 @@ class SlimLint < Base
     end
 
     def run
-      result = execute(command + applicable_files)
+      result = execute(command, args: applicable_files)
       return :pass if result.success?
 
       extract_messages(

lib/overcommit/hook/pre_commit/sqlint.rb

@@ -10,7 +10,7 @@ class Sqlint < Base
     end
 
     def run
-      result = execute(command + applicable_files)
+      result = execute(command, args: applicable_files)
       output = result.stdout.chomp
       return :pass if result.success? && output.empty?
 

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>(?:\w:)?[^:]+):(?<line>\d+)/
+        output.split("\n").grep(MESSAGE_REGEX), # ignore header line
+        MESSAGE_REGEX
       )
     end
   end

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]

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?

lib/overcommit/hook/pre_commit/xml_lint.rb

@@ -6,7 +6,7 @@ class XmlLint < Base
     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?