Merge pull request #584 from sanger/upgrade-ruby

Update ruby to 3.1.2

.rubocop.yml

@@ -24,6 +24,7 @@ AllCops:
     - 'vendor/**/*'
     - db/schema.rb
     - db/views_schema.rb
+    - db/migrate/*
   SuggestExtensions: false
 
 Style/DocumentDynamicEvalDefinition:

.ruby-version

@@ -1 +1 @@
-3.0.3
+3.1.2

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.7
+FROM ruby:3.1.2
 
 RUN gem install bundler -v 2.4.22
 

app/models/associated_with_roles.rb

@@ -43,7 +43,7 @@ def maintain_users
       users.create!(
         users_to_maintain.map do |role, user_details|
           user_details.map do |details|
-            details.reverse_merge(role: role.to_s, associated_id: id, last_updated: last_updated)
+            details.reverse_merge(role: role.to_s, associated_id: id, last_updated:)
           end
         end
       )

db/migrate/20230522131908_add_library_tube_barcode_to_pacbio_run.rb

@@ -14,7 +14,7 @@ def down
       t.remove :pac_bio_library_tube_barcode
     end
     # Here we add a placeholder value in case any plate barcodes were added as null since the migration
-    PacBioRun.where(plate_barcode: nil).each do |run|
+    PacBioRun.where(plate_barcode: nil).find_each do |run|
       run.plate_barcode = 'plate_barcode placeholder'
       run.save
     end

lib/resource_tools/json.rb

@@ -146,6 +146,7 @@ def custom_value(name, &block)
       end
     end
 
+    # rubocop:disable Naming/BlockForwarding
     def initialize(*args, &block)
       super
       if self.class.custom_values.present?
@@ -156,6 +157,7 @@ def initialize(*args, &block)
       convert_booleans
       delete_if { |k, _| ignoreable.include?(k) }
     end
+    # rubocop:enable Naming/BlockForwarding
 
     def convert_booleans
       self.stored_as_boolean.each do |key|

lib/tasks/remove_duplicate_pac_bio_runs.rake

@@ -186,7 +186,7 @@ namespace :pac_bio_run_table do
     9993
   ]
   task remove_duplicate_pac_bio_runs: :environment do
-    PacBioRun.where(id_pac_bio_run_lims: list_of_runs).each do |pac_bio_run|
+    PacBioRun.where(id_pac_bio_run_lims: list_of_runs).find_each do |pac_bio_run|
       puts "Going to remove #{pac_bio_run.id_pac_bio_run_lims}"
       puts pac_bio_run.attributes
       pac_bio_run.delete

lib/tasks/update_pac_bio_run_name.rake

@@ -4,7 +4,7 @@ namespace :pac_bio_run_table do
   desc 'Update pac_bio_run_name column with the values from id_pac_bio_run_lims'
 
   task update_pac_bio_run_name: :environment do
-    PacBioRun.all.each do |run|
+    PacBioRun.find_each do |run|
       next if run.pac_bio_run_name.present?
 
       run.pac_bio_run_name = run.id_pac_bio_run_lims

lib/tasks/update_pac_bio_run_sequencescape_plate_numbers.rake

@@ -6,7 +6,7 @@ namespace :pac_bio_run_table do
   desc 'Update pac_bio_run plate_number column with the value 1 for sequencescape plates'
 
   task update_pac_bio_run_sequencescape_plate_numbers: :environment do
-    PacBioRun.where(id_lims: 'SQSCP').each do |run|
+    PacBioRun.where(id_lims: 'SQSCP').find_each do |run|
       run.plate_number = 1
       run.save!
     end

spec/models/flowcell_spec.rb

@@ -39,7 +39,7 @@
     include_examples 'full flowcell json'
 
     it 'flags all entries as spiked' do
-      Flowcell.all.each { |fc| expect(fc.spiked).to be_true }
+      Flowcell.find_each { |fc| expect(fc.spiked).to be_true }
     end
 
     context 'when update with identical tag indexes' do
@@ -130,7 +130,7 @@
     end
 
     it 'flags all entries as not-spiked' do
-      Flowcell.all.each { |fc| expect(fc.spiked).to be_false }
+      Flowcell.find_each { |fc| expect(fc.spiked).to be_false }
     end
   end
 

spec/support/it_behaves_like_a_nested_resource.rb

@@ -6,13 +6,13 @@
   end
 
   it 'ensures that the all rows are current' do
-    described_class.all.each do |row|
+    described_class.find_each do |row|
       expect(row.last_updated).to eq(most_recent_time)
     end
   end
 
   it 'ensures the row is marked with recorded time' do
-    described_class.all.each do |row|
+    described_class.find_each do |row|
       expect(row.recorded_at).to eq(recorded_time)
     end
   end

spec/support/it_behaves_like_associated_with_roles.rb

@@ -2,7 +2,7 @@
 
 shared_examples_for 'maintains roles correctly' do
   after(:each) do
-    described_class.create_or_update_from_json(timestamped_json.merge(updated_roles).merge(updated_at: updated_at), 'example')
+    described_class.create_or_update_from_json(timestamped_json.merge(updated_roles).merge(updated_at:), 'example')
     users_fit_exactly(expected_roles)
   end