overcommit 0.71.0 → 0.73.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5826d552313c4de8f5ee1f3f322e16d9193be5be215f4a1203deebd67e8b9333
-  data.tar.gz: 1e013ca830726957ede05edefbeef7e2133851ea039bf819bdd0a22e506b94cb
+  metadata.gz: 887ad3a2999ba4744c926ad05bc61e453901822b378645d1dfbc10d4be0a0648
+  data.tar.gz: 66d06d2f6216a1e480c3e5ec053ea4fb967b6e8a80a7302d70a0cdd1a05207ef
 SHA512:
-  metadata.gz: 7ba0463239dcab4fc78aa972f17d374e205e261ad86bf4eebcbdf4e7bc08af0b8b3b1b601276e25d98f9b22c2cf2835e87ca007cfad50dbe54bbdf996f311a56
-  data.tar.gz: 3c5338c547754f27157ee427ac1c25eed520b036e91e8f901ea31919b5278a9dc99909d10268f8da54e27a1fcdb76fca8c7f1b10e419b0512a2b9eba5ea976e6
+  metadata.gz: 189138eaa9cf531fa861c87014ec420e9580c1d11f1492243050c542c32a8762e1f5d58ac82bdf18fc7526d257f0bb428192d9f8b6901c2b38a8717f0fd30a8a
+  data.tar.gz: 917260eb13fc2f85e828fbebdbd1f04c30c6acbaeb7e02b594452d35d8974dede978d8e882c41e35348e529e09d94e0ab54aa046087c9bbf80d62437eaf7e798

data/config/default.yml

@@ -413,6 +413,12 @@ PreCommit:
       - '**/Makefile'
       - '**/*.go'
 
+  HerbLint:
+    enabled: false
+    description: 'Analyze with herb-lint'
+    required_executable: 'herb-lint'
+    include: '**/*.html.erb'
+
   Hlint:
     enabled: false
     description: 'Analyze with hlint'
@@ -569,8 +575,42 @@ PreCommit:
     enabled: false
     description: 'Analyze with oxfmt'
     required_executable: 'oxfmt'
-    flags: ['--check']
+    flags: ['--check', '--no-error-on-unmatched-pattern']
     install_command: 'npm install -g oxfmt'
+    include:
+      - '**/*.js'
+      - '**/*.jsx'
+      - '**/*.mjs'
+      - '**/*.cjs'
+      - '**/*.ts'
+      - '**/*.tsx'
+      - '**/*.mts'
+      - '**/*.cts'
+      - '**/*.json'
+      - '**/*.jsonc'
+      - '**/*.json5'
+      - '**/*.css'
+      - '**/*.scss'
+      - '**/*.less'
+      - '**/*.pcss'
+      - '**/*.postcss'
+      - '**/*.graphql'
+      - '**/*.gql'
+      - '**/*.graphqls'
+      - '**/*.toml'
+      - '**/*.yml'
+      - '**/*.yaml'
+      - '**/*.html'
+      - '**/*.htm'
+      - '**/*.xhtml'
+      - '**/*.vue'
+      - '**/*.svelte'
+      - '**/*.md'
+      - '**/*.markdown'
+      - '**/*.mdx'
+      - '**/*.hbs'
+      - '**/*.handlebars'
+      - '**/*.mjml'
 
   OxLint:
     enabled: false
@@ -578,6 +618,18 @@ PreCommit:
     required_executable: 'oxlint'
     flags: ['--format=unix']
     install_command: 'npm install -g oxlint'
+    include:
+      - '**/*.js'
+      - '**/*.jsx'
+      - '**/*.mjs'
+      - '**/*.cjs'
+      - '**/*.ts'
+      - '**/*.tsx'
+      - '**/*.mts'
+      - '**/*.cts'
+      - '**/*.vue'
+      - '**/*.svelte'
+      - '**/*.astro'
 
   Pep257:  # Deprecated – use Pydocstyle instead.
     enabled: false

data/lib/overcommit/git_repo.rb

@@ -160,7 +160,10 @@ module Overcommit
         @merge_head = merge_head
       end
 
-      merge_msg_file = File.expand_path('MERGE_MSG', Overcommit::Utils.git_dir)
+      merge_mode_file = Overcommit::Utils.git_path('MERGE_MODE')
+      @merge_mode = File.open(merge_mode_file).read if File.exist?(merge_mode_file)
+
+      merge_msg_file = Overcommit::Utils.git_path('MERGE_MSG')
       @merge_msg = File.open(merge_msg_file).read if File.exist?(merge_msg_file)
     end
 
@@ -182,17 +185,22 @@ module Overcommit
     # of a merge.
     def restore_merge_state
       if @merge_head
-        FileUtils.touch(File.expand_path('MERGE_MODE', Overcommit::Utils.git_dir))
+        if @merge_mode
+          File.open(Overcommit::Utils.git_path('MERGE_MODE'), 'w') do |f|
+            f.write(@merge_mode)
+          end
+          @merge_mode = nil
+        end
 
-        File.open(File.expand_path('MERGE_HEAD', Overcommit::Utils.git_dir), 'w') do |f|
+        File.open(Overcommit::Utils.git_path('MERGE_HEAD'), 'w') do |f|
           f.write(@merge_head)
         end
         @merge_head = nil
       end
 
       if @merge_msg
-        File.open(File.expand_path('MERGE_MSG', Overcommit::Utils.git_dir), 'w') do |f|
-          f.write("#{@merge_msg}\n")
+        File.open(Overcommit::Utils.git_path('MERGE_MSG'), 'w') do |f|
+          f.write(@merge_msg)
         end
         @merge_msg = nil
       end
@@ -202,8 +210,7 @@ module Overcommit
     # of a cherry-pick.
     def restore_cherry_pick_state
       if @cherry_head
-        File.open(File.expand_path('CHERRY_PICK_HEAD',
-                                   Overcommit::Utils.git_dir), 'w') do |f|
+        File.open(Overcommit::Utils.git_path('CHERRY_PICK_HEAD'), 'w') do |f|
           f.write(@cherry_head)
         end
         @cherry_head = nil

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

@@ -24,6 +24,14 @@ module Overcommit::Hook::PreCommit
       # Run the command for each file
       applicable_files.each do |file|
         result = execute(command, args: [file])
+        # flay exits non-zero both when it finds duplication (with output on
+        # stdout) and when it crashes internally. A crash leaves stdout empty
+        # and writes a backtrace to stderr, so treat that as an error instead
+        # of silently passing.
+        if !result.success? && result.stdout.strip.empty?
+          return :fail, result.stderr
+        end
+
         results = result.stdout.split("\n\n")
         results.shift
         unless results.empty?

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

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Overcommit::Hook::PreCommit
+  # Runs `herb-lint` against any modified ERB files.
+  #
+  # @see https://herb-tools.dev/projects/linter
+  class HerbLint < Base
+    def run
+      result = execute(command + ['--json'], args: applicable_files)
+      return :pass if result.success?
+
+      json_output = JSON.parse(result.stdout)
+      json_output['offenses'].map do |offense|
+        severity = offense['severity'] == 'error' ? :error : :warning
+        filename = offense['filename']
+        line = offense['location']['start']['line']
+        message = offense['message']
+        code = offense['code']
+
+        Overcommit::Hook::Message.new(
+          severity, filename, line,
+          "#{filename}:#{line} #{code} #{message}"
+        )
+      end
+    end
+  end
+end

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

@@ -10,7 +10,7 @@ module Overcommit
       #
       # @see https://github.com/castwide/solargraph
       class Solargraph < Base
-        MESSAGE_REGEX = /^\s*(?<file>(?:\w:)?[^:]+):(?<line>\d+)( -|:) /.freeze
+        MESSAGE_REGEX = /^\s*(?<file>(?:\w:)?[^:]+):(?<line>\d+)(?: -|:) /.freeze
 
         def run
           result = execute(command, args: applicable_files)

data/lib/overcommit/utils.rb

@@ -74,6 +74,31 @@ module Overcommit
           end
       end
 
+      # Returns an absolute path to a file in the current worktree's Git
+      # directory.
+      #
+      # @param path [String]
+      # @return [String]
+      def git_path(path)
+        cmd = %w[git rev-parse]
+        if GIT_VERSION < '2.5'
+          cmd << '--git-dir'
+        else
+          cmd += ['--git-path', path]
+        end
+
+        result = execute(cmd)
+        unless result.success?
+          raise Overcommit::Exceptions::InvalidGitRepo,
+                'Unable to determine Git path. ' \
+                'Not a recognizable Git repository!'
+        end
+
+        resolved_path = result.stdout.chomp("\n")
+        resolved_path = File.join(resolved_path, path) if GIT_VERSION < '2.5'
+        File.expand_path(resolved_path, Dir.pwd)
+      end
+
       # Remove ANSI escape sequences from a string.
       #
       # This is useful for stripping colorized output from external tools.

data/lib/overcommit/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: overcommit
 version: !ruby/object:Gem::Version
-  version: 0.71.0
+  version: 0.73.0
 platform: ruby
 authors:
 - Shane da Silva
@@ -49,14 +49,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.9
+        version: 3.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.9
+        version: 3.4.2
 description: Utility to install, configure, and extend Git hooks
 email:
 - shane@dasilva.io
@@ -161,6 +161,7 @@ files:
 - lib/overcommit/hook/pre_commit/hadolint.rb
 - lib/overcommit/hook/pre_commit/haml_lint.rb
 - lib/overcommit/hook/pre_commit/hard_tabs.rb
+- lib/overcommit/hook/pre_commit/herb_lint.rb
 - lib/overcommit/hook/pre_commit/hlint.rb
 - lib/overcommit/hook/pre_commit/html_hint.rb
 - lib/overcommit/hook/pre_commit/html_tidy.rb
@@ -325,7 +326,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Git hook manager
 test_files: []