overcommit 0.57.0 → 0.58.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5c35b43073b67da5cd0f8218c5ffd914b0601f1aac6d5ac9263ec3945893259
-  data.tar.gz: 9c08bf2a7153993c48e3d15f30dee2c846edbb5f8500f89a41e027ec80ffb767
+  metadata.gz: b0d6feac2b1b10b983db054fa8931f302ff8eb8105c6d8788ad965ce986c990c
+  data.tar.gz: bf03cf18734e6139e5d7885ea1dcffb5d2aa0dcbad07ac8ec4d3cceff53d62e1
 SHA512:
-  metadata.gz: 6cdcab7f4b31feed71b3f584f1e025a930d9b767e4e9acf00562ed57fac38442381454f57758bd967a657c9f966842f44212b53e2b482fe50613723590383d02
-  data.tar.gz: 6d763e1d1eca286dd9c8861ee265bd8b3ed29e740d10d430e82c461ae64b313ef2057b11db654c0f694c21dcefcf187b8e7ea27bfbf1a16eba3d6f47776b4772
+  metadata.gz: 915b83736de391fe61565da7bd5caca5bf427cca3bf8f6f6aa4d6a639bf151e55d3fc61578b06eab6ffda215abe8e77e209b34d95a0ad4f6988b66fea4773a67
+  data.tar.gz: 445041c3c00b3d5cfa34c65aae868459f515c24ed4bc40017dd6bfdb91a3a6060c305a24eb03537a3ab0be401241f480fe12c42f3b70cf8fb6835f2d65f8dc6c

data/config/default.yml

@@ -266,6 +266,14 @@ PreCommit:
     install_command: 'npm install -g csslint'
     include: '**/*.css'
 
+  DartAnalyzer:
+    enabled: false
+    description: 'Analyze with dartanalyzer'
+    required_executable: 'dartanalyzer'
+    flags: []
+    include:
+      - '**/*.dart'
+
   Dogma:
     enabled: false
     description: 'Analyze with dogma'
@@ -1276,6 +1284,12 @@ PrePush:
     flags: ['test']
     include: 'src/**/*.rs'
 
+  FlutterTest:
+    enabled: false
+    description: 'Run flutter test suite'
+    required_executable: 'flutter'
+    flags: ['test']
+
   GitLfs:
     enabled: false
     description: 'Upload files tracked by Git LFS'
@@ -1322,6 +1336,12 @@ PrePush:
     destructive_only: true
     branches: ['master']
 
+  PubTest:
+    enabled: false
+    description: 'Run pub test suite'
+    required_executable: 'pub'
+    flags: ['run', 'test']
+
   Pytest:
     enabled: false
     description: 'Run pytest test suite'

data/lib/overcommit/configuration_loader.rb

@@ -24,13 +24,16 @@ module Overcommit
       # @option logger [Overcommit::Logger]
       # @return [Overcommit::Configuration]
       def load_from_file(file, options = {})
-        hash =
-          if yaml = YAML.load_file(file)
-            yaml.to_hash
-          else
-            {}
+        # Psych 4 introduced breaking behavior that doesn't support aliases by
+        # default. Explicitly enable aliases if the option is available.
+        yaml =
+          begin
+            YAML.load_file(file, aliases: true)
+          rescue ArgumentError
+            YAML.load_file(file)
           end
 
+        hash = yaml ? yaml.to_hash : {}
         Overcommit::Configuration.new(hash, options)
       end
     end

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Overcommit::Hook::PreCommit
+  # Runs `dartanalyzer` against modified Dart files.
+  # @see https://dart.dev/tools/dartanalyzer
+  class DartAnalyzer < Base
+    MESSAGE_REGEX = /(?<type>.*)•\ (?<message>[^•]+)•\ (?<file>[^:]+):(?<line>\d+):(\d+)\.*/
+
+    def run
+      result = execute(command, args: applicable_files)
+      return :pass if result.success?
+
+      extract_messages(
+        result.stdout.split("\n").grep(MESSAGE_REGEX),
+        MESSAGE_REGEX,
+        lambda do |type|
+          type.include?('error') ? :error : :warning
+        end
+      )
+    end
+  end
+end

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

@@ -19,20 +19,17 @@ module Overcommit::Hook::PreCommit
   # @see http://eslint.org/
   class EsLint < Base
     def run
+      eslint_regex = /^(?<file>[^\s](?:\w:)?[^:]+):[^\d]+(?<line>\d+).*?(?<type>Error|Warning)/
       result = execute(command, args: applicable_files)
       output = result.stdout.chomp
-      messages = output.split("\n").grep(/Warning|Error/)
+      messages = output.split("\n").grep(eslint_regex)
 
       return [:fail, result.stderr] if messages.empty? && !result.success?
       return :pass if result.success? && output.empty?
 
       # example message:
       #   path/to/file.js: line 1, col 0, Error - Error message (ruleName)
-      extract_messages(
-        messages,
-        /^(?<file>(?:\w:)?[^:]+):[^\d]+(?<line>\d+).*?(?<type>Error|Warning)/,
-        lambda { |type| type.downcase.to_sym }
-      )
+      extract_messages(messages, eslint_regex, lambda { |type| type.downcase.to_sym })
     end
   end
 end

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

@@ -5,13 +5,34 @@ module Overcommit::Hook::PreCommit
   #
   # @see https://github.com/adrienverge/yamllint
   class YamlLint < Base
+    MESSAGE_REGEX = /
+      ^(?<file>.+)
+      :(?<line>\d+)
+      :(?<col>\d+)
+      :\s\[(?<type>\w+)\]
+      \s(?<msg>.+)$
+    /x
+
     def run
       result = execute(command, args: applicable_files)
+      parse_messages(result.stdout)
+    end
+
+    private
+
+    def parse_messages(output)
+      repo_root = Overcommit::Utils.repo_root
+
+      output.scan(MESSAGE_REGEX).map do |file, line, col, type, msg|
+        line = line.to_i
+        type = type.to_sym
+        # Obtain the path relative to the root of the repository
+        # for nicer output:
+        relpath = file.dup
+        relpath.slice!("#{repo_root}/")
 
-      if result.success?
-        :pass
-      else
-        return [:warn, result.stdout]
+        text = "#{relpath}:#{line}:#{col}:#{type} #{msg}"
+        Overcommit::Hook::Message.new(type, file, line, text)
       end
     end
   end

data/lib/overcommit/hook/pre_push/flutter_test.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Overcommit::Hook::PrePush
+  # Runs Flutter test suite (`flutter test`) before push
+  #
+  # @see https://api.flutter.dev/flutter/flutter_test/flutter_test-library.html
+  class FlutterTest < Base
+    def run
+      result = execute(command)
+      return :pass if result.success?
+
+      output = result.stdout + result.stderr
+      [:fail, output]
+    end
+  end
+end

data/lib/overcommit/hook/pre_push/pub_test.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Overcommit::Hook::PrePush
+  # Runs Dart test suite (`pub run test`) before push
+  #
+  # @see https://pub.dev/packages/test#running-tests
+  class PubTest < Base
+    def run
+      result = execute(command)
+      return :pass if result.success?
+
+      output = result.stdout + result.stderr
+      [:fail, output]
+    end
+  end
+end

data/lib/overcommit/hook_context/helpers/stash_unstaged_changes.rb

@@ -129,7 +129,7 @@ module Overcommit::HookContext
 
       # Applies the stash to the working tree to restore the user's state.
       def restore_working_tree
-        result = Overcommit::Utils.execute(%w[git stash pop --index --quiet])
+        result = Overcommit::Utils.execute(%w[git stash pop --index])
         unless result.success?
           raise Overcommit::Exceptions::HookCleanupFailed,
                 "Unable to restore working tree after #{hook_script_name} hooks run:" \

data/lib/overcommit/version.rb

@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module Overcommit
-  VERSION = '0.57.0'
+  VERSION = '0.58.0'
 end

data/libexec/index-tags

@@ -6,10 +6,12 @@
 
 set -e
 
-trap "rm -f $GIT_DIR/tags.$$" EXIT
-err_file=$GIT_DIR/ctags.err
-if ctags --tag-relative -Rf$GIT_DIR/tags.$$ --exclude=.git "$@" 2>${err_file}; then
-  mv $GIT_DIR/tags.$$ $GIT_DIR/tags
+dir="`git rev-parse --git-dir`"
+
+trap "rm -f $dir/tags.$$" EXIT
+err_file=$dir/ctags.err
+if ctags --tag-relative -Rf$dir/tags.$$ --exclude=.git "$@" 2>${err_file}; then
+  mv $dir/tags.$$ $dir/tags
   [ -e ${err_file} ] && rm -f ${err_file}
 else
   # Ignore STDERR unless `ctags` returned a non-zero exit code

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: overcommit
 version: !ruby/object:Gem::Version
-  version: 0.57.0
+  version: 0.58.0
 platform: ruby
 authors:
 - Shane da Silva
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-03 00:00:00.000000000 Z
+date: 2021-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
@@ -44,6 +44,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
 description: Utility to install, configure, and extend Git hooks
 email:
 - shane@dasilva.io
@@ -129,6 +143,7 @@ files:
 - lib/overcommit/hook/pre_commit/cook_style.rb
 - lib/overcommit/hook/pre_commit/credo.rb
 - lib/overcommit/hook/pre_commit/css_lint.rb
+- lib/overcommit/hook/pre_commit/dart_analyzer.rb
 - lib/overcommit/hook/pre_commit/dogma.rb
 - lib/overcommit/hook/pre_commit/erb_lint.rb
 - lib/overcommit/hook/pre_commit/es_lint.rb
@@ -213,12 +228,14 @@ files:
 - lib/overcommit/hook/pre_push/base.rb
 - lib/overcommit/hook/pre_push/brakeman.rb
 - lib/overcommit/hook/pre_push/cargo_test.rb
+- lib/overcommit/hook/pre_push/flutter_test.rb
 - lib/overcommit/hook/pre_push/go_test.rb
 - lib/overcommit/hook/pre_push/golangci_lint.rb
 - lib/overcommit/hook/pre_push/minitest.rb
 - lib/overcommit/hook/pre_push/php_unit.rb
 - lib/overcommit/hook/pre_push/pronto.rb
 - lib/overcommit/hook/pre_push/protected_branches.rb
+- lib/overcommit/hook/pre_push/pub_test.rb
 - lib/overcommit/hook/pre_push/pytest.rb
 - lib/overcommit/hook/pre_push/python_nose.rb
 - lib/overcommit/hook/pre_push/r_spec.rb
@@ -299,8 +316,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.1
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Git hook manager
 test_files: []