From 2f872f550572d62e1b1e2a7e187617be1c6838a8 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Fri, 20 Jun 2025 11:50:10 -0400
Subject: [PATCH 1/2] Update RuboCop in Gemfile to silence a deprecation
 warning in build

The version of RuboCop no longer works against other libraries without
deprecation warnings; rather than lock more dependencies, upgrade
RuboCop used in project.

```sh
Running pre-commit hooks
Check YAML syntax........................................[YamlSyntax] OK
Check Gemfile dependencies..............................[BundleCheck] OK
Check for trailing whitespace....................[TrailingWhitespace] OK
Analyze with RuboCop........................................[RuboCop] FAILED
Unexpected output: unable to determine line number or type of error/warning for output:
`EnsureNode#body` is deprecated and will be changed in the next major version of rubocop-ast. Use `EnsureNode#branch` instead to get the body of the `ensure` branch.
Called from:
/Users/broz/.rbenv/versions/3.1.6/lib/ruby/gems/3.1.0/gems/rubocop-1.63.0/lib/rubocop/cop/layout/indentation_width.rb:67:in `on_ensure'
/Users/broz/.rbenv/versions/3.1.6/lib/ruby/gems/3.1.0/gems/rubocop-1.63.0/lib/rubocop/cop/commissioner.rb:107:in `public_send'
/Users/broz/.rbenv/versions/3.1.6/lib/ruby/gems/3.1.0/gems/rubocop-1.63.0/lib/rubocop/cop/commissioner.rb:107:in `block (2 levels) in trigger_responding_cops'
/Users/broz/.rbenv/versions/3.1.6/lib/ruby/gems/3.1.0/gems/rubocop-1.63.0/lib/rubocop/cop/commissioner.rb:171:in `with_cop_error_handling'
/Users/broz/.rbenv/versions/3.1.6/lib/ruby/gems/3.1.0/gems/rubocop-1.63.0/lib/rubocop/cop/commissioner.rb:106:in `block in trigger_responding_cops'
/Users/broz/.rbenv/versions/3.1.6/lib/ruby/gems/3.1.0/gems/rubocop-1.63.0/lib/rubocop/cop/commissioner.rb:105:in `each'
/Users/broz/.rbenv/versions/3.1.6/lib/ruby/gems/3.1.0/gems/rubocop-1.63.0/lib/rubocop/cop/commissioner.rb:105:in
`trigger_responding_cops'
```
---
 .rubocop.yml                                 | 2 +-
 Gemfile                                      | 2 +-
 lib/overcommit/hook/pre_commit/scalastyle.rb | 2 +-
 template-dir/hooks/commit-msg                | 1 -
 template-dir/hooks/overcommit-hook           | 1 -
 template-dir/hooks/post-checkout             | 1 -
 template-dir/hooks/post-commit               | 1 -
 template-dir/hooks/post-merge                | 1 -
 template-dir/hooks/post-rewrite              | 1 -
 template-dir/hooks/pre-commit                | 1 -
 template-dir/hooks/pre-push                  | 1 -
 template-dir/hooks/pre-rebase                | 1 -
 template-dir/hooks/prepare-commit-msg        | 1 -
 13 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 1b4e7ad7..06fe033d 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -70,7 +70,7 @@ Naming/FileName:
 
 # Renaming `has_something?` to `something?` obfuscates whether it is a "is-a" or
 # a "has-a" relationship.
-Naming/PredicateName:
+Naming/PredicatePrefix:
   Enabled: false
 
 # commit_sha1 is indeed how we want to write such a variable, so ignore this cop
diff --git a/Gemfile b/Gemfile
index 49dc7923..2c3a8bb3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -15,7 +15,7 @@ gem 'simplecov-lcov', '~> 0.8.0'
 if RUBY_VERSION < '2.7.0'
   gem 'rubocop', '1.50.0'
 else
-  gem 'rubocop', '1.59.0'
+  gem 'rubocop', '1.77.0'
 end
 
 gem 'ffi' if Gem.win_platform?
diff --git a/lib/overcommit/hook/pre_commit/scalastyle.rb b/lib/overcommit/hook/pre_commit/scalastyle.rb
index 6494521d..cb41145c 100644
--- a/lib/overcommit/hook/pre_commit/scalastyle.rb
+++ b/lib/overcommit/hook/pre_commit/scalastyle.rb
@@ -24,7 +24,7 @@ def run
       extract_messages(
         messages,
         MESSAGE_REGEX,
-        lambda { |type| type.to_sym }
+        &:to_sym
       )
     end
   end
diff --git a/template-dir/hooks/commit-msg b/template-dir/hooks/commit-msg
index 87ffeb58..039e82a0 100755
--- a/template-dir/hooks/commit-msg
+++ b/template-dir/hooks/commit-msg
@@ -42,7 +42,6 @@ if gemfile
     exit 78 # EX_CONFIG
   end
 end
-# rubocop:enable Style/RescueModifier
 
 begin
   require 'overcommit'
diff --git a/template-dir/hooks/overcommit-hook b/template-dir/hooks/overcommit-hook
index 87ffeb58..039e82a0 100755
--- a/template-dir/hooks/overcommit-hook
+++ b/template-dir/hooks/overcommit-hook
@@ -42,7 +42,6 @@ if gemfile
     exit 78 # EX_CONFIG
   end
 end
-# rubocop:enable Style/RescueModifier
 
 begin
   require 'overcommit'
diff --git a/template-dir/hooks/post-checkout b/template-dir/hooks/post-checkout
index 87ffeb58..039e82a0 100755
--- a/template-dir/hooks/post-checkout
+++ b/template-dir/hooks/post-checkout
@@ -42,7 +42,6 @@ if gemfile
     exit 78 # EX_CONFIG
   end
 end
-# rubocop:enable Style/RescueModifier
 
 begin
   require 'overcommit'
diff --git a/template-dir/hooks/post-commit b/template-dir/hooks/post-commit
index 87ffeb58..039e82a0 100755
--- a/template-dir/hooks/post-commit
+++ b/template-dir/hooks/post-commit
@@ -42,7 +42,6 @@ if gemfile
     exit 78 # EX_CONFIG
   end
 end
-# rubocop:enable Style/RescueModifier
 
 begin
   require 'overcommit'
diff --git a/template-dir/hooks/post-merge b/template-dir/hooks/post-merge
index 87ffeb58..039e82a0 100755
--- a/template-dir/hooks/post-merge
+++ b/template-dir/hooks/post-merge
@@ -42,7 +42,6 @@ if gemfile
     exit 78 # EX_CONFIG
   end
 end
-# rubocop:enable Style/RescueModifier
 
 begin
   require 'overcommit'
diff --git a/template-dir/hooks/post-rewrite b/template-dir/hooks/post-rewrite
index 87ffeb58..039e82a0 100755
--- a/template-dir/hooks/post-rewrite
+++ b/template-dir/hooks/post-rewrite
@@ -42,7 +42,6 @@ if gemfile
     exit 78 # EX_CONFIG
   end
 end
-# rubocop:enable Style/RescueModifier
 
 begin
   require 'overcommit'
diff --git a/template-dir/hooks/pre-commit b/template-dir/hooks/pre-commit
index 87ffeb58..039e82a0 100755
--- a/template-dir/hooks/pre-commit
+++ b/template-dir/hooks/pre-commit
@@ -42,7 +42,6 @@ if gemfile
     exit 78 # EX_CONFIG
   end
 end
-# rubocop:enable Style/RescueModifier
 
 begin
   require 'overcommit'
diff --git a/template-dir/hooks/pre-push b/template-dir/hooks/pre-push
index 87ffeb58..039e82a0 100755
--- a/template-dir/hooks/pre-push
+++ b/template-dir/hooks/pre-push
@@ -42,7 +42,6 @@ if gemfile
     exit 78 # EX_CONFIG
   end
 end
-# rubocop:enable Style/RescueModifier
 
 begin
   require 'overcommit'
diff --git a/template-dir/hooks/pre-rebase b/template-dir/hooks/pre-rebase
index 87ffeb58..039e82a0 100755
--- a/template-dir/hooks/pre-rebase
+++ b/template-dir/hooks/pre-rebase
@@ -42,7 +42,6 @@ if gemfile
     exit 78 # EX_CONFIG
   end
 end
-# rubocop:enable Style/RescueModifier
 
 begin
   require 'overcommit'
diff --git a/template-dir/hooks/prepare-commit-msg b/template-dir/hooks/prepare-commit-msg
index 87ffeb58..039e82a0 100755
--- a/template-dir/hooks/prepare-commit-msg
+++ b/template-dir/hooks/prepare-commit-msg
@@ -42,7 +42,6 @@ if gemfile
     exit 78 # EX_CONFIG
   end
 end
-# rubocop:enable Style/RescueModifier
 
 begin
   require 'overcommit'

From 9ed98aca9de647ceec1129d741780d51adc4f723 Mon Sep 17 00:00:00 2001
From: Vince Broz <vince@broz.cc>
Date: Fri, 20 Jun 2025 11:58:27 -0400
Subject: [PATCH 2/2] Fix ScalaStyle hook change

---
 lib/overcommit/hook/pre_commit/scalastyle.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/overcommit/hook/pre_commit/scalastyle.rb b/lib/overcommit/hook/pre_commit/scalastyle.rb
index cb41145c..b7a56c2a 100644
--- a/lib/overcommit/hook/pre_commit/scalastyle.rb
+++ b/lib/overcommit/hook/pre_commit/scalastyle.rb
@@ -24,7 +24,7 @@ def run
       extract_messages(
         messages,
         MESSAGE_REGEX,
-        &:to_sym
+        lambda(&:to_sym)
       )
     end
   end