Merge pull request #4253 from Crown-Commercial-Service/update-ruby-to…

…-v3.3.0

Update ruby to v3.3.0

.rubocop.yml

@@ -8,7 +8,7 @@ require:
 
 AllCops:
  NewCops: enable
- TargetRubyVersion: 3.2
+ TargetRubyVersion: 3.3
  Exclude:
  - 'db/schema.rb'
  - 'db/seeds.rb'

.ruby-version

@@ -1 +1 @@
-3.2.2
+3.3.0

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:3.2.2-alpine
+FROM ruby:3.3.0-alpine
 
 # Build information
 ARG GIT_OWNER

Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https:/#{repo}.git" }
 
-ruby '3.2.2'
+ruby '3.3.0'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 7.1.3'

Gemfile.lock

@@ -749,7 +749,7 @@ DEPENDENCIES
  webmock (>= 3.12.1)
 
 RUBY VERSION
- ruby 3.2.2p53
+ ruby 3.3.0p0
 
 BUNDLED WITH
  2.4.8

README.md

@@ -27,9 +27,9 @@ For any other services relating to the Crown Marketplace, please view [Crown Mar
 This guide assumes you have Homebrew installed
 
 #### Check the Ruby version
-> **_NOTE:_** The project currently runs on 3.2.2 (Ocotober 2023)
+> **_NOTE:_** The project currently runs on 3.3.0 (March 2024)
 
-Ensure that a ruby version manager (e.g. rvm or rbenv) is installed and set up properly, using 3.2.2 as the Ruby version before trying anything else. 
+Ensure that a ruby version manager (e.g. rvm or rbenv) is installed and set up properly, using 3.3.0 as the Ruby version before trying anything else. 
 
 #### Software requirements
 

lib/tasks/os_data_processing.rb

@@ -125,7 +125,7 @@ def self.process_csv_data(type, csv_stream)
  upsert_csv_data(csv_stream) unless type == :dat
  end
 
- def self.handle_tar_contents(tar, summary, &)
+ def self.handle_tar_contents(tar, summary, &block)
  tar.each do |entry|
  next unless entry.file?
 
@@ -138,7 +138,7 @@ def self.handle_tar_contents(tar, summary, &)
  else
  :dat
  end)) and file_stream.rewind
- summary[:md5] = chunk_file_data(file_stream, meta_type, &)
+ summary[:md5] = chunk_file_data(file_stream, meta_type, &block)
  end
  end
 

lib/tasks/os_file_handler.rb

@@ -46,24 +46,24 @@ def self.stream_file(filename, data_summary, &)
  file_io&.try(&:close)
  end
 
- def self.untar_file(filename, summary, &)
+ def self.untar_file(filename, summary, &block)
  summary[:updated_time] = File.mtime(filename)
  Gem::Package::TarReader.new(Zlib::GzipReader.open(filename)) do |tar|
- handle_tar_contents(tar, summary, &)
+ handle_tar_contents(tar, summary, &block)
  end
  end
 
- def self.gunzip_file(filename, summary, &)
+ def self.gunzip_file(filename, summary, &block)
  summary[:updated_time] = File.mtime(filename)
  Zlib::GzipReader.open(filename) do |gz|
- handle_gzip_contents(gz, summary, &)
+ handle_gzip_contents(gz, summary, &block)
  end
  end
 
- def self.unzip_file(filename, summary, &)
+ def self.unzip_file(filename, summary, &block)
  summary[:updated_time] = File.mtime(filename)
  Zip::InputStream.open(filename) do |io|
- handle_zip_contents(io, summary, &)
+ handle_zip_contents(io, summary, &block)
  end
  end
 end

lib/tasks/os_stream_handler.rb

@@ -52,21 +52,21 @@ def self.stream_url(obj, data_summary, &)
  raise e
  end
 
- def self.untar_stream(url, summary, &)
+ def self.untar_stream(url, summary, &block)
  Gem::Package::TarReader.new(Zlib::GzipReader.new(File.open(url))) do |tar|
- handle_tar_contents(tar, summary, &)
+ handle_tar_contents(tar, summary, &block)
  end
  end
 
- def self.gunzip_url(url, summary, &)
+ def self.gunzip_url(url, summary, &block)
  Zlib::GzipReader.open(File.open(url)) do |gz|
- handle_gzip_contents(gz, summary, &)
+ handle_gzip_contents(gz, summary, &block)
  end
  end
 
- def self.unzip_url(url, summary, &)
+ def self.unzip_url(url, summary, &block)
  Zip::InputStream.open(IO.popen(url)) do |io|
- handle_zip_contents(io, summary, &)
+ handle_zip_contents(io, summary, &block)
  end
  end
 end