update rubocop

Author: ndbroadbent

.rubocop.yml

@@ -1,9 +1,9 @@
 require:
   - standard
   - rubocop-minitest
-  - rubocop-rails
   - rubocop-performance
   - rubocop-sorbet
+  # - rubocop-rails
 
 inherit_gem:
   standard: config/base.yml
@@ -18,7 +18,7 @@ AllCops:
     - sorbet/rbi/dsl/**/*
     - sorbet/rbi/gems/**/*
     - sorbet/rbi/annotations/**/*
-    - rails_test_app/logstruct_test_app/bin/**/*
+    - rails_test_app/logstruct_test_app/**/*
 
 Layout/MultilineHashKeyLineBreaks:
   Enabled: true
@@ -29,20 +29,20 @@ Bundler/DuplicatedGem:
   Enabled: false # ignore duplicated gem errors because we have duplicated gems for testing
 
 # We use UTC for all timestamps, no timezones required for logs
-Rails/TimeZone:
-  Enabled: false
-# We don't use ApplicationMailer in this gem
-Rails/ApplicationMailer:
-  Enabled: false
-# Not a Rails app
-Rails/RakeEnvironment:
-  Enabled: false
-Rails/Output:
-  Enabled: false
-Rails/NegateInclude:
-  Enabled: false
-Rails/RefuteMethods:
-  Enabled: false
+# Rails/TimeZone:
+#   Enabled: false
+# # We don't use ApplicationMailer in this gem
+# Rails/ApplicationMailer:
+#   Enabled: false
+# # Not a Rails app
+# Rails/RakeEnvironment:
+#   Enabled: false
+# Rails/Output:
+#   Enabled: false
+# Rails/NegateInclude:
+#   Enabled: false
+# Rails/RefuteMethods:
+#   Enabled: false
 
 Performance/OpenStruct:
   Exclude:

Gemfile

@@ -60,7 +60,7 @@ group :development do
   gem "amazing_print"
   gem "listen", require: false
   gem "rubocop-performance", require: false
-  gem "rubocop-rails", require: false
+  # gem "rubocop-rails", require: false
   gem "rubocop-minitest", require: false
   gem "rubocop-sorbet", require: false
   gem "rubocop", require: false

Gemfile.lock

@@ -290,11 +290,6 @@ GEM
     rubocop-performance (1.23.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rails (2.29.1)
-      activesupport (>= 4.2.0)
-      rack (>= 1.1)
-      rubocop (>= 1.52.0, < 2.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-sorbet (0.8.9)
       rubocop (>= 1)
     ruby-progressbar (1.13.0)
@@ -434,7 +429,6 @@ DEPENDENCIES
   rubocop
   rubocop-minitest
   rubocop-performance
-  rubocop-rails
   rubocop-sorbet
   sentry-ruby (~> 5.15)
   shrine (~> 3.5)

rails_test_app/create_app.rb

@@ -119,6 +119,10 @@ def copy_template(file, target_path = nil)
   puts "=> Running command: #{rails_new_command}"
   system(clean_env, rails_new_command) || abort("Failed to create Rails application")
 
+  # Remove the default .rubocop.yml file since it messes up our own RuboCop
+  puts "=> Deleting default .rubocop.yml"
+  FileUtils.rm_f(File.join(RAILS_APP_DIR, ".rubocop.yml"))
+
   # Update Gemfile to include the local logstruct gem and test gems
   gemfile_path = File.join(RAILS_APP_DIR, "Gemfile")
   gemfile_content = File.read(gemfile_path)
@@ -133,22 +137,20 @@ def copy_template(file, target_path = nil)
   end
 
   # Common gems for all Rails versions
-  common_gems = <<~GEMS
-    # Common gems for all Rails versions
-    gem "bigdecimal"
-    gem "mutex_m"
-    gem "drb"
-    gem "benchmark"
-  GEMS
+  # Common gems for all Rails versions
+  gem "bigdecimal"
+  gem "mutex_m"
+  gem "drb"
+  gem "benchmark"
 
   # Add version-specific gems
   case rails_version
   when "7.0"
-    latest_version = "7.0.8.7"  # Updated by update_rails_versions.rb script
+    "7.0.8.7"  # Updated by update_rails_versions.rb script
   when "7.1"
-    latest_version = "7.1.5.1"  # Updated by update_rails_versions.rb script
+    "7.1.5.1"  # Updated by update_rails_versions.rb script
   when "8.0"
-    latest_version = "8.0.1"  # Updated by update_rails_versions.rb script
+    "8.0.1"  # Updated by update_rails_versions.rb script
   else
     puts "Warning: Using unrecognized Rails version #{rails_version}"
   end

scripts/update_rails_versions.rb

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# typed: strict
+
 # This script fetches the latest patch versions for each supported Rails version
 # and updates them in the codebase.
 
@@ -17,37 +19,37 @@ def fetch_latest_rails_versions
   uri = URI("https://rubygems.org/api/v1/versions/rails.json")
   response = Net::HTTP.get(uri)
   versions = JSON.parse(response)
-  
+
   # Filter out prerelease versions and map by version number
   stable_versions = versions.reject { |v| v["prerelease"] }.map { |v| v["number"] }
-  
+
   # Find latest patch version for each supported major.minor
   latest_patches = {}
   SUPPORTED_MAJOR_MINOR.each do |major_minor|
     matching = stable_versions.select { |v| v.start_with?("#{major_minor}.") }
     next if matching.empty?
-    
+
     # Sort by version parts to find latest
-    latest = matching.sort_by { |v| v.split(".").map(&:to_i) }.last
+    latest = matching.max_by { |v| v.split(".").map(&:to_i) }
     latest_patches[major_minor] = latest
   end
-  
+
   puts "Latest patch versions:"
   latest_patches.each do |mm, version|
     puts "  - Rails #{mm}: #{version}"
   end
-  
+
   latest_patches
 end
 
 def update_create_app_script(versions)
   puts "\nUpdating rails_test_app/create_app.rb..."
-  
+
   content = File.read(CREATE_APP_SCRIPT)
-  
+
   # Look for the case statement with Rails version mapping
   case_pattern = /case\s+rails_version\s*\n(.*?)end/m
-  
+
   if content.match(case_pattern)
     # Replace the case statement with updated versions
     new_case = "case rails_version\n"
@@ -58,7 +60,7 @@ def update_create_app_script(versions)
     new_case += "  else\n"
     new_case += "    puts \"Warning: Using unrecognized Rails version \#{rails_version}\"\n"
     new_case += "  end"
-    
+
     updated_content = content.gsub(case_pattern, new_case)
     File.write(CREATE_APP_SCRIPT, updated_content)
     puts "  Updated create_app.rb with latest versions"
@@ -70,30 +72,30 @@ def update_create_app_script(versions)
 
 def update_github_workflow(versions)
   puts "\nUpdating .github/workflows/test.yml..."
-  
+
   content = File.read(GITHUB_WORKFLOW)
   updated_content = content.dup
-  
+
   # Update the pilot test Rails version
-  if updated_content.match(/RAILS_VERSION:\s*'8\.0[\.\d]*'/)
-    updated_content.gsub!(/RAILS_VERSION:\s*'8\.0[\.\d]*'/, "RAILS_VERSION: '#{versions['8.0']}'")
-    puts "  Updated pilot test Rails version to #{versions['8.0']}"
+  if /RAILS_VERSION:\s*'8\.0[\.\d]*'/.match?(updated_content)
+    updated_content.gsub!(/RAILS_VERSION:\s*'8\.0[\.\d]*'/, "RAILS_VERSION: '#{versions["8.0"]}'")
+    puts "  Updated pilot test Rails version to #{versions["8.0"]}"
   else
     puts "  Warning: Could not find RAILS_VERSION for pilot test in test.yml"
   end
-  
+
   # Update the matrix versions
   versions.each do |major_minor, version|
     # Look for matrix entries with this major.minor version
     # Allow for different patch versions (e.g., .8, .8.7)
-    if updated_content.match(/rails:\s*'#{major_minor}[\.\d]+'/)
+    if /rails:\s*'#{major_minor}[\.\d]+'/.match?(updated_content)
       updated_content.gsub!(/rails:\s*'#{major_minor}[\.\d]+'/, "rails: '#{version}'")
       puts "  Updated matrix Rails #{major_minor} to version #{version}"
     else
       puts "  Warning: Could not find matrix entry for Rails #{major_minor} in test.yml"
     end
   end
-  
+
   File.write(GITHUB_WORKFLOW, updated_content)
   puts "  Updated test.yml with latest versions"
 end
@@ -104,4 +106,4 @@ def update_github_workflow(versions)
 update_github_workflow(versions)
 
 puts "\nDone! Rails versions have been updated to the latest patches."
-puts "Remember to commit these changes if they look good."
+puts "Remember to commit these changes if they look good."