From 4858d4fde09fa96f5dfbc18d91cc72d6822aeccb Mon Sep 17 00:00:00 2001
From: Jason Gessner <jason@multiply.org>
Date: Wed, 11 Dec 2024 01:37:29 +0000
Subject: [PATCH] Update rubocop version and fix new lint issues.

---
 Gemfile.lock           | 23 ++++++++++++-----------
 lib/deck_validation.rb |  4 ++--
 lib/tasks/cards.rake   |  2 +-
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 7e3b1bea..03c4935f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -152,7 +152,7 @@ GEM
     io-console (0.6.0)
     irb (1.7.4)
       reline (>= 0.3.6)
-    json (2.7.2)
+    json (2.9.0)
     jsonapi-renderer (0.2.2)
     jsonapi-serializable (0.3.1)
       jsonapi-renderer (~> 0.2.0)
@@ -395,8 +395,8 @@ GEM
     opentelemetry-semantic_conventions (1.10.0)
       opentelemetry-api (~> 1.0)
     ostruct (0.6.0)
-    parallel (1.24.0)
-    parser (3.3.1.0)
+    parallel (1.26.3)
+    parser (3.3.6.0)
       ast (~> 2.4.1)
       racc
     parslet (2.0.0)
@@ -445,7 +445,7 @@ GEM
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
     rake (13.1.0)
-    regexp_parser (2.9.2)
+    regexp_parser (2.9.3)
     reline (0.3.8)
       io-console (~> 0.5)
     rescue_registry (1.0.0)
@@ -481,18 +481,17 @@ GEM
       activesupport (>= 3.0.0)
       mustache (~> 1.0, >= 0.99.4)
       rspec (~> 3.0)
-    rubocop (1.63.5)
+    rubocop (1.69.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.36.2, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.3)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.36.2)
       parser (>= 3.3.1.0)
     rubocop-capybara (2.20.0)
       rubocop (~> 1.41)
@@ -535,7 +534,9 @@ GEM
     timeout (0.4.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.5.0)
+    unicode-display_width (3.1.2)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
     uniform_notifier (1.16.0)
     webrick (1.8.2)
     websocket-driver (0.7.6)
diff --git a/lib/deck_validation.rb b/lib/deck_validation.rb
index 1c1279ff..e0650f3d 100644
--- a/lib/deck_validation.rb
+++ b/lib/deck_validation.rb
@@ -39,8 +39,8 @@ def expand_implied_ids
         @snapshot_id = format.active_snapshot_id if @snapshot_id.nil?
         active_snapshot = format.snapshot
         unless active_snapshot.nil?
-          @card_pool_id = active_snapshot.card_pool_id if @card_pool_id.nil? # rubocop:disable Metrics/BlockNesting
-          @restriction_id = active_snapshot.restriction_id if @restriction_id.nil? # rubocop:disable Metrics/BlockNesting
+          @card_pool_id = active_snapshot.card_pool_id if @card_pool_id.nil?
+          @restriction_id = active_snapshot.restriction_id if @restriction_id.nil?
         end
       end
     elsif !@card_pool_id.nil? && @format_id.nil?
diff --git a/lib/tasks/cards.rake b/lib/tasks/cards.rake
index ac69441b..ff0b0d5a 100644
--- a/lib/tasks/cards.rake
+++ b/lib/tasks/cards.rake
@@ -175,7 +175,7 @@ namespace :cards do
         new_card.num_printed_subroutines = num_printed_subroutines
       end
 
-      if new_card.text&.include?(' can be advanced') && new_card.text&.match("#{new_card.title} can be advanced")
+      if new_card.text&.include?(' can be advanced') && new_card.text.match("#{new_card.title} can be advanced")
         new_card.advanceable = true
       end