From ab21730ec4ada72855b7c0d127100e82c70277af Mon Sep 17 00:00:00 2001
From: Graeme Porteous <graeme@rgbp.co.uk>
Date: Thu, 5 Jan 2023 17:15:34 +0000
Subject: [PATCH] WIP Add support for Ruby 3.2

---
 .github/workflows/ci.yml     |  2 ++
 Gemfile                      |  2 +-
 Gemfile.lock                 | 12 ++++++------
 Gemfile.rails_next.lock      | 12 ++++++------
 README.md                    |  1 +
 script/handle-mail-replies   |  2 ++
 script/load-mail-server-logs |  2 ++
 script/mailin                |  2 ++
 8 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index df87300d5c1..e69ee8242c4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -28,6 +28,8 @@ jobs:
         - { ruby: '3.0', postgres: 13.5, gemfile: 'Gemfile.rails_next' }
         - { ruby: '3.1', postgres: 13.5 }
         - { ruby: '3.1', postgres: 13.5, gemfile: 'Gemfile.rails_next' }
+        - { ruby: '3.2', postgres: 13.5 }
+        - { ruby: '3.2', postgres: 13.5, gemfile: 'Gemfile.rails_next' }
 
     services:
       postgres:
diff --git a/Gemfile b/Gemfile
index c78ea735690..0f42ab88071 100644
--- a/Gemfile
+++ b/Gemfile
@@ -109,7 +109,7 @@ gem 'iso_country_codes', '~> 0.7.8'
 gem 'mail', '~> 2.7.1'
 gem 'maxmind-db', '~> 1.0.0'
 gem 'mahoro', '~> 0.5'
-gem 'nokogiri', '~> 1.13.10'
+gem 'nokogiri', '~> 1.14.0.rc1'
 gem 'open4', '~> 1.3.0'
 gem 'rack', '~> 2.2.4'
 gem 'rack-utf8_sanitizer', '~> 1.7.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 5e3625f3bc8..53b731cbf69 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -328,16 +328,16 @@ GEM
     net-ssh-gateway (2.0.0)
       net-ssh (>= 4.0.0)
     nio4r (2.5.8)
-    nokogiri (1.13.10)
+    nokogiri (1.14.0.rc1)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    nokogiri (1.13.10-aarch64-linux)
+    nokogiri (1.14.0.rc1-aarch64-linux)
       racc (~> 1.4)
-    nokogiri (1.13.10-arm64-darwin)
+    nokogiri (1.14.0.rc1-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.10-x86_64-darwin)
+    nokogiri (1.14.0.rc1-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.10-x86_64-linux)
+    nokogiri (1.14.0.rc1-x86_64-linux)
       racc (~> 1.4)
     oink (0.10.1)
       activerecord
@@ -583,7 +583,7 @@ DEPENDENCIES
   money (~> 6.16.0)
   net-ssh (~> 7.0.1)
   net-ssh-gateway (>= 1.1.0, < 3.0.0)
-  nokogiri (~> 1.13.10)
+  nokogiri (~> 1.14.0.rc1)
   oink (~> 0.10.1)
   open4 (~> 1.3.0)
   pg (~> 1.4.4)
diff --git a/Gemfile.rails_next.lock b/Gemfile.rails_next.lock
index 9f5f4467aaa..7a0fbc4f677 100644
--- a/Gemfile.rails_next.lock
+++ b/Gemfile.rails_next.lock
@@ -333,16 +333,16 @@ GEM
     net-ssh-gateway (2.0.0)
       net-ssh (>= 4.0.0)
     nio4r (2.5.8)
-    nokogiri (1.13.10)
+    nokogiri (1.14.0.rc1)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    nokogiri (1.13.10-aarch64-linux)
+    nokogiri (1.14.0.rc1-aarch64-linux)
       racc (~> 1.4)
-    nokogiri (1.13.10-arm64-darwin)
+    nokogiri (1.14.0.rc1-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.10-x86_64-darwin)
+    nokogiri (1.14.0.rc1-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.10-x86_64-linux)
+    nokogiri (1.14.0.rc1-x86_64-linux)
       racc (~> 1.4)
     oink (0.10.1)
       activerecord
@@ -589,7 +589,7 @@ DEPENDENCIES
   money (~> 6.16.0)
   net-ssh (~> 7.0.1)
   net-ssh-gateway (>= 1.1.0, < 3.0.0)
-  nokogiri (~> 1.13.10)
+  nokogiri (~> 1.14.0.rc1)
   oink (~> 0.10.1)
   open4 (~> 1.3.0)
   pg (~> 1.4.4)
diff --git a/README.md b/README.md
index f24b81e40e4..bb044984fc0 100644
--- a/README.md
+++ b/README.md
@@ -39,6 +39,7 @@ Every Alaveteli commit is tested by GitHub Actions on the [following Ruby platfo
 
 * ruby-3.0
 * ruby-3.1
+* ruby-3.2
 
 If you use a ruby version management tool (such as RVM or .rbenv) and want to use the default development version used by the Alaveteli team (currently 3.0.4), you can create a `.ruby-version` symlink with a target of `.ruby-version.example` to switch to that automatically in the project directory.
 
diff --git a/script/handle-mail-replies b/script/handle-mail-replies
index 267ad563214..b2638c763bc 100755
--- a/script/handle-mail-replies
+++ b/script/handle-mail-replies
@@ -1,4 +1,6 @@
 #!/bin/bash
 
+export RUBYOPT="-W0"
+
 cd "`dirname "${BASH_SOURCE[0]}"`"
 exec bundle exec ./handle-mail-replies.rb "$@"
diff --git a/script/load-mail-server-logs b/script/load-mail-server-logs
index c5174343877..0e575dfc6c3 100755
--- a/script/load-mail-server-logs
+++ b/script/load-mail-server-logs
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+export RUBYOPT="-W0"
+
 LOC="`dirname "${BASH_SOURCE[0]}"`"/..
 cd "$LOC"
 
diff --git a/script/mailin b/script/mailin
index 4d00fcaa807..41dfbf5a5e3 100755
--- a/script/mailin
+++ b/script/mailin
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+export RUBYOPT="-W0"
+
 # Wire this script to receive incoming email for request responses.
 
 INPUT=$(mktemp -t foi-mailin-mail-XXXXXXXX)