From d61b91f468d7fd23f8432605d993eba198d84c52 Mon Sep 17 00:00:00 2001
From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com>
Date: Wed, 13 Sep 2023 19:00:21 +0000
Subject: [PATCH 1/9] Update guard to version 2.18.1

---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 9015145a..1cb3b9d8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -52,7 +52,7 @@ GEM
       railties (>= 5.0.0)
     ffi (1.15.5)
     formatador (1.1.0)
-    guard (2.18.0)
+    guard (2.18.1)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
@@ -81,7 +81,7 @@ GEM
     loofah (2.21.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    lumberjack (1.2.8)
+    lumberjack (1.2.9)
     method_source (1.0.0)
     mini_portile2 (2.8.2)
     minitest (5.18.1)

From 840a1fa63d1b435b83ef1cad8fc9d34554b4bacd Mon Sep 17 00:00:00 2001
From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com>
Date: Wed, 3 Jan 2024 01:20:26 +0000
Subject: [PATCH 2/9] Update rubocop-rails to version 2.23.1

---
 Gemfile.lock | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 5af3b6fd..986712ba 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -73,7 +73,7 @@ GEM
     hashie (5.0.0)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    json (2.6.3)
+    json (2.7.1)
     language_server-protocol (3.17.0.3)
     listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
@@ -95,14 +95,14 @@ GEM
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    parallel (1.23.0)
-    parser (3.2.2.3)
+    parallel (1.24.0)
+    parser (3.2.2.4)
       ast (~> 2.4.1)
       racc
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    racc (1.7.1)
+    racc (1.7.3)
     rack (2.2.8)
     rack-test (2.1.0)
       rack (>= 1.3)
@@ -126,7 +126,7 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rbtree (0.4.4)
-    regexp_parser (2.8.1)
+    regexp_parser (2.8.3)
     rexml (3.2.6)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
@@ -149,18 +149,18 @@ GEM
       rspec-mocks (~> 3.12)
       rspec-support (~> 3.12)
     rspec-support (3.12.0)
-    rubocop (1.55.1)
+    rubocop (1.59.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.3)
+      parser (>= 3.2.2.4)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.1, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.29.0)
+    rubocop-ast (1.30.0)
       parser (>= 3.2.1.0)
     rubocop-capybara (2.18.0)
       rubocop (~> 1.41)
@@ -169,10 +169,11 @@ GEM
     rubocop-performance (1.18.0)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.20.2)
+    rubocop-rails (2.23.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
     rubocop-rspec (2.23.0)
       rubocop (~> 1.33)
       rubocop-capybara (~> 2.17)
@@ -197,7 +198,7 @@ GEM
     thor (1.2.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.4.2)
+    unicode-display_width (2.5.0)
     zeitwerk (2.6.11)
 
 PLATFORMS

From 9ee7694030157cc76c2c17f681f9fe264e8f04d3 Mon Sep 17 00:00:00 2001
From: Stephen <519327+stevieing@users.noreply.github.com>
Date: Thu, 25 Jan 2024 15:29:54 +0000
Subject: [PATCH 3/9] Updated ruby and rubocopped.

---
 .ruby-version                                               | 2 +-
 app/models/associated_with_roles.rb                         | 2 +-
 ...20230522131908_add_library_tube_barcode_to_pacbio_run.rb | 2 +-
 lib/resource_tools/json.rb                                  | 6 +++---
 lib/tasks/remove_duplicate_pac_bio_runs.rake                | 2 +-
 lib/tasks/update_pac_bio_run_name.rake                      | 2 +-
 .../update_pac_bio_run_sequencescape_plate_numbers.rake     | 2 +-
 spec/models/flowcell_spec.rb                                | 4 ++--
 spec/support/it_behaves_like_a_nested_resource.rb           | 4 ++--
 spec/support/it_behaves_like_associated_with_roles.rb       | 2 +-
 10 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.ruby-version b/.ruby-version
index 75a22a26..ef538c28 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.0.3
+3.1.2
diff --git a/app/models/associated_with_roles.rb b/app/models/associated_with_roles.rb
index fe5c8a50..e1d0704e 100644
--- a/app/models/associated_with_roles.rb
+++ b/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
       )
diff --git a/db/migrate/20230522131908_add_library_tube_barcode_to_pacbio_run.rb b/db/migrate/20230522131908_add_library_tube_barcode_to_pacbio_run.rb
index c69887a9..d9077f5f 100644
--- a/db/migrate/20230522131908_add_library_tube_barcode_to_pacbio_run.rb
+++ b/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
diff --git a/lib/resource_tools/json.rb b/lib/resource_tools/json.rb
index 28f19040..33e3a7e4 100644
--- a/lib/resource_tools/json.rb
+++ b/lib/resource_tools/json.rb
@@ -146,11 +146,11 @@ def custom_value(name, &block)
       end
     end
 
-    def initialize(*args, &block)
+    def initialize(...)
       super
       if self.class.custom_values.present?
-        self.class.custom_values.each do |k, block|
-          self[k] = instance_eval(&block)
+        self.class.custom_values.each_key do |k|
+          self[k] = instance_eval(...)
         end
       end
       convert_booleans
diff --git a/lib/tasks/remove_duplicate_pac_bio_runs.rake b/lib/tasks/remove_duplicate_pac_bio_runs.rake
index 25de3039..79c91293 100644
--- a/lib/tasks/remove_duplicate_pac_bio_runs.rake
+++ b/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
diff --git a/lib/tasks/update_pac_bio_run_name.rake b/lib/tasks/update_pac_bio_run_name.rake
index b4df5f2c..f5db66f5 100644
--- a/lib/tasks/update_pac_bio_run_name.rake
+++ b/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
diff --git a/lib/tasks/update_pac_bio_run_sequencescape_plate_numbers.rake b/lib/tasks/update_pac_bio_run_sequencescape_plate_numbers.rake
index 4c85d1dc..87c23bec 100644
--- a/lib/tasks/update_pac_bio_run_sequencescape_plate_numbers.rake
+++ b/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
diff --git a/spec/models/flowcell_spec.rb b/spec/models/flowcell_spec.rb
index 3e8c9eab..6eb0c3c0 100644
--- a/spec/models/flowcell_spec.rb
+++ b/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
 
diff --git a/spec/support/it_behaves_like_a_nested_resource.rb b/spec/support/it_behaves_like_a_nested_resource.rb
index ade0a271..cb15471d 100644
--- a/spec/support/it_behaves_like_a_nested_resource.rb
+++ b/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
diff --git a/spec/support/it_behaves_like_associated_with_roles.rb b/spec/support/it_behaves_like_associated_with_roles.rb
index 81cabcb2..e2dfb8f8 100644
--- a/spec/support/it_behaves_like_associated_with_roles.rb
+++ b/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
 

From b8f8cb446c009ef37a41a61cb5feb667d3ad0958 Mon Sep 17 00:00:00 2001
From: Stephen <519327+stevieing@users.noreply.github.com>
Date: Thu, 25 Jan 2024 15:48:02 +0000
Subject: [PATCH 4/9] Reverted rubocop for failing tests.

---
 .ruby-version                                                 | 2 +-
 app/models/associated_with_roles.rb                           | 2 +-
 .../20230522131908_add_library_tube_barcode_to_pacbio_run.rb  | 2 +-
 lib/resource_tools/json.rb                                    | 2 ++
 lib/tasks/remove_duplicate_pac_bio_runs.rake                  | 2 +-
 lib/tasks/update_pac_bio_run_name.rake                        | 2 +-
 lib/tasks/update_pac_bio_run_sequencescape_plate_numbers.rake | 2 +-
 spec/models/flowcell_spec.rb                                  | 4 ++--
 spec/support/it_behaves_like_a_nested_resource.rb             | 4 ++--
 spec/support/it_behaves_like_associated_with_roles.rb         | 2 +-
 10 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/.ruby-version b/.ruby-version
index 75a22a26..ef538c28 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.0.3
+3.1.2
diff --git a/app/models/associated_with_roles.rb b/app/models/associated_with_roles.rb
index fe5c8a50..e1d0704e 100644
--- a/app/models/associated_with_roles.rb
+++ b/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
       )
diff --git a/db/migrate/20230522131908_add_library_tube_barcode_to_pacbio_run.rb b/db/migrate/20230522131908_add_library_tube_barcode_to_pacbio_run.rb
index c69887a9..d9077f5f 100644
--- a/db/migrate/20230522131908_add_library_tube_barcode_to_pacbio_run.rb
+++ b/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
diff --git a/lib/resource_tools/json.rb b/lib/resource_tools/json.rb
index 28f19040..87d980dc 100644
--- a/lib/resource_tools/json.rb
+++ b/lib/resource_tools/json.rb
@@ -146,6 +146,7 @@ def custom_value(name, &block)
       end
     end
 
+    # rubocop:disable Style/ArgumentsForwarding
     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 Style/ArgumentsForwarding
 
     def convert_booleans
       self.stored_as_boolean.each do |key|
diff --git a/lib/tasks/remove_duplicate_pac_bio_runs.rake b/lib/tasks/remove_duplicate_pac_bio_runs.rake
index 25de3039..79c91293 100644
--- a/lib/tasks/remove_duplicate_pac_bio_runs.rake
+++ b/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
diff --git a/lib/tasks/update_pac_bio_run_name.rake b/lib/tasks/update_pac_bio_run_name.rake
index b4df5f2c..f5db66f5 100644
--- a/lib/tasks/update_pac_bio_run_name.rake
+++ b/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
diff --git a/lib/tasks/update_pac_bio_run_sequencescape_plate_numbers.rake b/lib/tasks/update_pac_bio_run_sequencescape_plate_numbers.rake
index 4c85d1dc..87c23bec 100644
--- a/lib/tasks/update_pac_bio_run_sequencescape_plate_numbers.rake
+++ b/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
diff --git a/spec/models/flowcell_spec.rb b/spec/models/flowcell_spec.rb
index 3e8c9eab..6eb0c3c0 100644
--- a/spec/models/flowcell_spec.rb
+++ b/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
 
diff --git a/spec/support/it_behaves_like_a_nested_resource.rb b/spec/support/it_behaves_like_a_nested_resource.rb
index ade0a271..cb15471d 100644
--- a/spec/support/it_behaves_like_a_nested_resource.rb
+++ b/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
diff --git a/spec/support/it_behaves_like_associated_with_roles.rb b/spec/support/it_behaves_like_associated_with_roles.rb
index 81cabcb2..e2dfb8f8 100644
--- a/spec/support/it_behaves_like_associated_with_roles.rb
+++ b/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
 

From ddbb79191690e7bb8a9d414e5661d78b6041c356 Mon Sep 17 00:00:00 2001
From: Stephen <519327+stevieing@users.noreply.github.com>
Date: Thu, 25 Jan 2024 15:50:50 +0000
Subject: [PATCH 5/9] Tried again to revert and fix.

---
 lib/resource_tools/json.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/resource_tools/json.rb b/lib/resource_tools/json.rb
index 1671b57c..87d980dc 100644
--- a/lib/resource_tools/json.rb
+++ b/lib/resource_tools/json.rb
@@ -150,8 +150,8 @@ def custom_value(name, &block)
     def initialize(*args, &block)
       super
       if self.class.custom_values.present?
-        self.class.custom_values.each_key do |k|
-          self[k] = instance_eval(...)
+        self.class.custom_values.each do |k, block|
+          self[k] = instance_eval(&block)
         end
       end
       convert_booleans

From 50c3b7c929cf92390ef623df3dbc80b4b6dc8f1e Mon Sep 17 00:00:00 2001
From: Stephen <519327+stevieing@users.noreply.github.com>
Date: Thu, 25 Jan 2024 16:01:03 +0000
Subject: [PATCH 6/9] Trying something.

---
 lib/resource_tools/json.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/resource_tools/json.rb b/lib/resource_tools/json.rb
index 87d980dc..74a85ac9 100644
--- a/lib/resource_tools/json.rb
+++ b/lib/resource_tools/json.rb
@@ -146,7 +146,7 @@ def custom_value(name, &block)
       end
     end
 
-    # rubocop:disable Style/ArgumentsForwarding
+    # rubocop:disable Naming/BlockForwarding
     def initialize(*args, &block)
       super
       if self.class.custom_values.present?
@@ -157,7 +157,7 @@ def initialize(*args, &block)
       convert_booleans
       delete_if { |k, _| ignoreable.include?(k) }
     end
-    # rubocop:enable Style/ArgumentsForwarding
+    # rubocop:enable Naming/BlockForwarding
 
     def convert_booleans
       self.stored_as_boolean.each do |key|

From a07ad8d24a66b3402ed587e9a4a940bf2bfd1ef3 Mon Sep 17 00:00:00 2001
From: Stephen <519327+stevieing@users.noreply.github.com>
Date: Fri, 26 Jan 2024 11:59:23 +0000
Subject: [PATCH 7/9] Code review comments.

---
 .rubocop.yml | 1 +
 Dockerfile   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 8ba9e9da..5a9dd502 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -24,6 +24,7 @@ AllCops:
     - 'vendor/**/*'
     - db/schema.rb
     - db/views_schema.rb
+    - db/migrate/*
   SuggestExtensions: false
 
 Style/DocumentDynamicEvalDefinition:
diff --git a/Dockerfile b/Dockerfile
index ec8efe12..ddab96c2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:2.7
+FROM ruby:3.1.2
 
 RUN gem install bundler -v 2.4.22
 

From 12113a4c00036b3a950605dd2cda45e72d3aae8e Mon Sep 17 00:00:00 2001
From: Stephen <519327+stevieing@users.noreply.github.com>
Date: Fri, 26 Jan 2024 15:34:43 +0000
Subject: [PATCH 8/9] Update Dockerfile and JSON.rb

---
 Dockerfile                 | 2 +-
 lib/resource_tools/json.rb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ddab96c2..4a2d6f7f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ruby:3.1.2
 
-RUN gem install bundler -v 2.4.22
+RUN gem install bundler
 
 # throw errors if Gemfile has been modified since Gemfile.lock
 RUN bundle config --global frozen 1
diff --git a/lib/resource_tools/json.rb b/lib/resource_tools/json.rb
index 74a85ac9..87d980dc 100644
--- a/lib/resource_tools/json.rb
+++ b/lib/resource_tools/json.rb
@@ -146,7 +146,7 @@ def custom_value(name, &block)
       end
     end
 
-    # rubocop:disable Naming/BlockForwarding
+    # rubocop:disable Style/ArgumentsForwarding
     def initialize(*args, &block)
       super
       if self.class.custom_values.present?
@@ -157,7 +157,7 @@ def initialize(*args, &block)
       convert_booleans
       delete_if { |k, _| ignoreable.include?(k) }
     end
-    # rubocop:enable Naming/BlockForwarding
+    # rubocop:enable Style/ArgumentsForwarding
 
     def convert_booleans
       self.stored_as_boolean.each do |key|

From bfd769891f9f96d79aad9e5e0d10463265981c17 Mon Sep 17 00:00:00 2001
From: Stephen <519327+stevieing@users.noreply.github.com>
Date: Fri, 26 Jan 2024 15:41:54 +0000
Subject: [PATCH 9/9] Disable block forwarding in JSON module

---
 lib/resource_tools/json.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/resource_tools/json.rb b/lib/resource_tools/json.rb
index 87d980dc..74a85ac9 100644
--- a/lib/resource_tools/json.rb
+++ b/lib/resource_tools/json.rb
@@ -146,7 +146,7 @@ def custom_value(name, &block)
       end
     end
 
-    # rubocop:disable Style/ArgumentsForwarding
+    # rubocop:disable Naming/BlockForwarding
     def initialize(*args, &block)
       super
       if self.class.custom_values.present?
@@ -157,7 +157,7 @@ def initialize(*args, &block)
       convert_booleans
       delete_if { |k, _| ignoreable.include?(k) }
     end
-    # rubocop:enable Style/ArgumentsForwarding
+    # rubocop:enable Naming/BlockForwarding
 
     def convert_booleans
       self.stored_as_boolean.each do |key|