From e5aa9ce491deb518471af995670b421c65a771d6 Mon Sep 17 00:00:00 2001
From: Yuri Smirnov <tycoooon@gmail.com>
Date: Mon, 16 Sep 2024 12:57:45 +0300
Subject: [PATCH 1/4] bundle update

---
 rubocop/Gemfile.lock    | 73 ++++++++++++++++++-----------------------
 rubocop/rubocop.gemspec | 10 +++---
 2 files changed, 37 insertions(+), 46 deletions(-)

diff --git a/rubocop/Gemfile.lock b/rubocop/Gemfile.lock
index a665ffd..0fd3e31 100644
--- a/rubocop/Gemfile.lock
+++ b/rubocop/Gemfile.lock
@@ -1,89 +1,80 @@
 PATH
   remote: .
   specs:
-    rubocop-config-umbrellio (1.63.0)
-      rubocop (~> 1.63.0)
-      rubocop-performance (~> 1.21.0)
-      rubocop-rails (~> 2.24.0)
+    rubocop-config-umbrellio (1.66.0)
+      rubocop (~> 1.66.0)
+      rubocop-performance (~> 1.22.0)
+      rubocop-rails (~> 2.26.0)
       rubocop-rake (~> 0.6.0)
-      rubocop-rspec (~> 2.29.0)
+      rubocop-rspec (~> 3.0.0)
       rubocop-sequel (~> 0.3.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.1.3.2)
+    activesupport (7.2.1)
       base64
       bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+      concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      mutex_m
-      tzinfo (~> 2.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
     ast (2.4.2)
     base64 (0.2.0)
-    bigdecimal (3.1.7)
-    concurrent-ruby (1.2.3)
+    bigdecimal (3.1.8)
+    concurrent-ruby (1.3.4)
     connection_pool (2.4.1)
     drb (2.2.1)
-    i18n (1.14.4)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
     json (2.7.2)
     language_server-protocol (3.17.0.3)
-    minitest (5.22.3)
-    mutex_m (0.2.0)
-    parallel (1.24.0)
-    parser (3.3.1.0)
+    logger (1.6.1)
+    minitest (5.25.1)
+    parallel (1.26.3)
+    parser (3.3.5.0)
       ast (~> 2.4.1)
       racc
-    racc (1.7.3)
-    rack (3.0.10)
+    racc (1.8.1)
+    rack (3.1.7)
     rainbow (3.1.1)
     rake (13.2.1)
-    regexp_parser (2.9.0)
-    rexml (3.2.6)
-    rubocop (1.63.4)
+    regexp_parser (2.9.2)
+    rubocop (1.66.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.4, < 3.0)
+      rubocop-ast (>= 1.32.2, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.3)
+    rubocop-ast (1.32.3)
       parser (>= 3.3.1.0)
-    rubocop-capybara (2.20.0)
-      rubocop (~> 1.41)
-    rubocop-factory_bot (2.25.1)
-      rubocop (~> 1.41)
-    rubocop-performance (1.21.0)
+    rubocop-performance (1.22.0)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rails (2.24.1)
+    rubocop-rails (2.26.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 1.33.0, < 2.0)
+      rubocop (>= 1.52.0, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.29.1)
-      rubocop (~> 1.40)
-      rubocop-capybara (~> 2.17)
-      rubocop-factory_bot (~> 2.22)
-      rubocop-rspec_rails (~> 2.28)
-    rubocop-rspec_rails (2.28.3)
-      rubocop (~> 1.40)
+    rubocop-rspec (3.0.5)
+      rubocop (~> 1.61)
     rubocop-sequel (0.3.4)
       rubocop (~> 1.0)
     ruby-progressbar (1.13.0)
+    securerandom (0.3.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.5.0)
+    unicode-display_width (2.6.0)
 
 PLATFORMS
   arm64-darwin-21
@@ -97,4 +88,4 @@ DEPENDENCIES
   rubocop-config-umbrellio!
 
 BUNDLED WITH
-   2.5.9
+   2.5.18
diff --git a/rubocop/rubocop.gemspec b/rubocop/rubocop.gemspec
index b0af2f2..2fe000b 100644
--- a/rubocop/rubocop.gemspec
+++ b/rubocop/rubocop.gemspec
@@ -2,9 +2,9 @@
 # frozen_string_literal: true
 
 Gem::Specification.new do |spec|
-  spec.required_ruby_version = ">= 2.5.0"
+  spec.required_ruby_version = ">= 3.0.0"
 
-  rubocop_version = "1.63.0"
+  rubocop_version = "1.66.0"
 
   if ENV.fetch("PUBLISH_JOB", nil)
     release_version = "#{rubocop_version}.#{ENV.fetch("GITHUB_RUN_NUMBER")}"
@@ -22,9 +22,9 @@ Gem::Specification.new do |spec|
   spec.files = Dir["lib/rubocop.*.yml"] << "lib/rubocop.yml"
 
   spec.add_dependency "rubocop", "~> #{rubocop_version}"
-  spec.add_dependency "rubocop-performance", "~> 1.21.0"
-  spec.add_dependency "rubocop-rails", "~> 2.24.0"
+  spec.add_dependency "rubocop-performance", "~> 1.22.0"
+  spec.add_dependency "rubocop-rails", "~> 2.26.0"
   spec.add_dependency "rubocop-rake", "~> 0.6.0"
-  spec.add_dependency "rubocop-rspec", "~> 2.29.0"
+  spec.add_dependency "rubocop-rspec", "~> 3.0.0"
   spec.add_dependency "rubocop-sequel", "~> 0.3.3"
 end

From b5e2b17cedf3a78fad527b478312c00a54ef2516 Mon Sep 17 00:00:00 2001
From: Yuri Smirnov <tycoooon@gmail.com>
Date: Mon, 16 Sep 2024 13:01:30 +0300
Subject: [PATCH 2/4] wip

---
 rubocop/.rubocop.yml          |  2 +-
 rubocop/Gemfile.lock          |  3 +++
 rubocop/lib/rubocop.rspec.yml | 24 +++++++++++++-----------
 rubocop/rubocop.gemspec       |  1 +
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/rubocop/.rubocop.yml b/rubocop/.rubocop.yml
index 038a000..c8f2587 100644
--- a/rubocop/.rubocop.yml
+++ b/rubocop/.rubocop.yml
@@ -2,4 +2,4 @@ inherit_gem:
   rubocop-config-umbrellio: lib/rubocop.yml
 
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 3.0
diff --git a/rubocop/Gemfile.lock b/rubocop/Gemfile.lock
index 0fd3e31..f9c2513 100644
--- a/rubocop/Gemfile.lock
+++ b/rubocop/Gemfile.lock
@@ -3,6 +3,7 @@ PATH
   specs:
     rubocop-config-umbrellio (1.66.0)
       rubocop (~> 1.66.0)
+      rubocop-factory_bot
       rubocop-performance (~> 1.22.0)
       rubocop-rails (~> 2.26.0)
       rubocop-rake (~> 0.6.0)
@@ -56,6 +57,8 @@ GEM
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.32.3)
       parser (>= 3.3.1.0)
+    rubocop-factory_bot (2.26.1)
+      rubocop (~> 1.61)
     rubocop-performance (1.22.0)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
diff --git a/rubocop/lib/rubocop.rspec.yml b/rubocop/lib/rubocop.rspec.yml
index f131a0f..7863d48 100644
--- a/rubocop/lib/rubocop.rspec.yml
+++ b/rubocop/lib/rubocop.rspec.yml
@@ -1,12 +1,14 @@
-require: rubocop-rspec
+require:
+  - rubocop-rspec
+  - rubocop-factory_bot
 
 # Capybara
 
-Capybara/CurrentPathExpectation:
-  Enabled: true
+# Capybara/CurrentPathExpectation:
+#   Enabled: true
 
-RSpec/Capybara/FeatureMethods:
-  Enabled: false
+# RSpec/Capybara/FeatureMethods:
+#   Enabled: false
 
 # RSpec
 
@@ -42,13 +44,13 @@ RSpec/ExpectInHook:
   # try not to use expect in before / after / around blocks anyway
   Enabled: false
 
-RSpec/FactoryBot:
-  Include:
-    - spec/factories.rb
-    - spec/factories/**/*.rb
-    - features/support/factories/**/*.rb
+# RSpec/FactoryBot:
+#   Include:
+#     - spec/factories.rb
+#     - spec/factories/**/*.rb
+#     - features/support/factories/**/*.rb
 
-RSpec/FilePath:
+RSpec/SpecFilePathFormat:
   Enabled: false
 
 RSpec/LeadingSubject:
diff --git a/rubocop/rubocop.gemspec b/rubocop/rubocop.gemspec
index 2fe000b..af210e8 100644
--- a/rubocop/rubocop.gemspec
+++ b/rubocop/rubocop.gemspec
@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.files = Dir["lib/rubocop.*.yml"] << "lib/rubocop.yml"
 
   spec.add_dependency "rubocop", "~> #{rubocop_version}"
+  spec.add_dependency "rubocop-factory_bot"
   spec.add_dependency "rubocop-performance", "~> 1.22.0"
   spec.add_dependency "rubocop-rails", "~> 2.26.0"
   spec.add_dependency "rubocop-rake", "~> 0.6.0"

From f3478eeee051054c176e3744601edd61a1e8975a Mon Sep 17 00:00:00 2001
From: Yuri Smirnov <tycoooon@gmail.com>
Date: Mon, 16 Sep 2024 13:05:44 +0300
Subject: [PATCH 3/4] wip

---
 rubocop/lib/rubocop.rspec.yml | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/rubocop/lib/rubocop.rspec.yml b/rubocop/lib/rubocop.rspec.yml
index 7863d48..75c6619 100644
--- a/rubocop/lib/rubocop.rspec.yml
+++ b/rubocop/lib/rubocop.rspec.yml
@@ -2,14 +2,6 @@ require:
   - rubocop-rspec
   - rubocop-factory_bot
 
-# Capybara
-
-# Capybara/CurrentPathExpectation:
-#   Enabled: true
-
-# RSpec/Capybara/FeatureMethods:
-#   Enabled: false
-
 # RSpec
 
 RSpec/AlignLeftLetBrace:
@@ -44,12 +36,6 @@ RSpec/ExpectInHook:
   # try not to use expect in before / after / around blocks anyway
   Enabled: false
 
-# RSpec/FactoryBot:
-#   Include:
-#     - spec/factories.rb
-#     - spec/factories/**/*.rb
-#     - features/support/factories/**/*.rb
-
 RSpec/SpecFilePathFormat:
   Enabled: false
 

From 4e5cc5f348ec65a24551a26817f73843c4b72b7d Mon Sep 17 00:00:00 2001
From: Yuri Smirnov <tycoooon@gmail.com>
Date: Mon, 16 Sep 2024 14:33:08 +0300
Subject: [PATCH 4/4] fix gemspec

---
 rubocop/Gemfile.lock    | 2 +-
 rubocop/rubocop.gemspec | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rubocop/Gemfile.lock b/rubocop/Gemfile.lock
index f9c2513..b87ce29 100644
--- a/rubocop/Gemfile.lock
+++ b/rubocop/Gemfile.lock
@@ -3,7 +3,7 @@ PATH
   specs:
     rubocop-config-umbrellio (1.66.0)
       rubocop (~> 1.66.0)
-      rubocop-factory_bot
+      rubocop-factory_bot (~> 2.26.0)
       rubocop-performance (~> 1.22.0)
       rubocop-rails (~> 2.26.0)
       rubocop-rake (~> 0.6.0)
diff --git a/rubocop/rubocop.gemspec b/rubocop/rubocop.gemspec
index af210e8..e33e28c 100644
--- a/rubocop/rubocop.gemspec
+++ b/rubocop/rubocop.gemspec
@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.files = Dir["lib/rubocop.*.yml"] << "lib/rubocop.yml"
 
   spec.add_dependency "rubocop", "~> #{rubocop_version}"
-  spec.add_dependency "rubocop-factory_bot"
+  spec.add_dependency "rubocop-factory_bot", "~> 2.26.0"
   spec.add_dependency "rubocop-performance", "~> 1.22.0"
   spec.add_dependency "rubocop-rails", "~> 2.26.0"
   spec.add_dependency "rubocop-rake", "~> 0.6.0"