From de890e1e633c430b897a5ae6d99c1de533217b61 Mon Sep 17 00:00:00 2001
From: "Michael J. Giarlo" <mjgiarlo@stanford.edu>
Date: Thu, 20 Jun 2024 13:16:54 -0700
Subject: [PATCH] Bump Ruby to 3.3.1

---
 .rubocop.yml                                     | 2 +-
 Gemfile                                          | 1 +
 Gemfile.lock                                     | 2 ++
 app/controllers/objects_controller.rb            | 2 --
 app/services/audit/checksum_validator_utils.rb   | 2 --
 app/services/moab_storage_root_report_service.rb | 2 --
 lib/tasks/prescat.rake                           | 2 --
 spec/services/catalog_utils_spec.rb              | 1 -
 8 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index e555d7b81..5b1ea4c97 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -12,7 +12,7 @@ inherit_mode:
     - Exclude
 
 AllCops:
-  TargetRubyVersion: 3.2
+  TargetRubyVersion: 3.3
   DisplayCopNames: true
   Include:
     - './Rakefile'
diff --git a/Gemfile b/Gemfile
index 558ff329c..2fd026b18 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,6 +5,7 @@ gem 'aws-sdk-s3', '~> 1.17'
 gem 'committee' # Validates HTTP requests/responses per OpenAPI specification
 gem 'connection_pool' # Used for redis
 gem 'config' # Settings to manage configs on different instances
+gem 'csv' # will be removed from standard library in Ruby 3.4
 gem 'honeybadger' # for error reporting / tracking / notifications
 gem "importmap-rails", "~> 1.2"
 gem 'jbuilder' # Build JSON APIs with ease.
diff --git a/Gemfile.lock b/Gemfile.lock
index aabc96496..9bdeed46f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -150,6 +150,7 @@ GEM
       bigdecimal
       rexml
     crass (1.0.6)
+    csv (3.2.8)
     date (3.3.4)
     debug (1.9.2)
       irb (~> 1.10)
@@ -469,6 +470,7 @@ DEPENDENCIES
   committee
   config
   connection_pool
+  csv
   debug
   dlss-capistrano
   dor-event-client
diff --git a/app/controllers/objects_controller.rb b/app/controllers/objects_controller.rb
index 5e118ebf0..1abe7d3ad 100644
--- a/app/controllers/objects_controller.rb
+++ b/app/controllers/objects_controller.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'csv'
-
 ##
 # ObjectsController allows consumers to interact with preserved objects
 #  (Note: methods will eventually be ported from sdr-services-app)
diff --git a/app/services/audit/checksum_validator_utils.rb b/app/services/audit/checksum_validator_utils.rb
index b200b9da2..8b8318eb9 100644
--- a/app/services/audit/checksum_validator_utils.rb
+++ b/app/services/audit/checksum_validator_utils.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'csv'
-
 module Audit
   # Helper methods for invoking Audit::ChecksumValidator.
   # These are for use from the Rails console; they are not called from the app.
diff --git a/app/services/moab_storage_root_report_service.rb b/app/services/moab_storage_root_report_service.rb
index b86d7e5a0..0131baf72 100644
--- a/app/services/moab_storage_root_report_service.rb
+++ b/app/services/moab_storage_root_report_service.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'csv'
-
 ##
 # run queries and produce reports from the results, for consumption
 # by preservation catalog maintainers
diff --git a/lib/tasks/prescat.rake b/lib/tasks/prescat.rake
index 25746eefd..c53315b68 100644
--- a/lib/tasks/prescat.rake
+++ b/lib/tasks/prescat.rake
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'csv'
-
 namespace :prescat do
   desc 'Diagnose failed replication'
   task :diagnose_replication, [:druid] => :environment do |_task, args|
diff --git a/spec/services/catalog_utils_spec.rb b/spec/services/catalog_utils_spec.rb
index b2f944cfc..338f76591 100644
--- a/spec/services/catalog_utils_spec.rb
+++ b/spec/services/catalog_utils_spec.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
-require 'csv'
 
 RSpec.describe CatalogUtils do
   let(:storage_dir) { 'spec/fixtures/storage_root01/sdr2objects' }