Ruby 3 upgrade (#201)

* Initial Ruby 3 upgrades

* Yarn gumpf that should be ignored

* Newer yarn yml rc file

* Reinstate Dockerfile change to 3.1.2

* Swapping CircleCU 3.1.2 image

circleci/ruby:3.1.2-node-browsers not found

* Yarn install

* smtp gubbins for tests

Co-authored-by: timregan <[email protected]>

Author: grega

.circleci/config.yml

@@ -4,7 +4,7 @@ orbs:
 jobs:
   test:
     docker:
-      - image: circleci/ruby:2.7.2-node-browsers
+      - image: cimg/ruby:3.1.2-node
         environment:
           BUNDLE_JOBS: 3
           BUNDLE_RETRY: 3
@@ -71,4 +71,4 @@ workflows:
           filters:
             branches:
               only: main
-      
+

.gitignore

@@ -47,3 +47,10 @@ schema.json
 
 .history
 .idea
+
+# yarn https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/versions

.rubocop.yml

@@ -9,7 +9,7 @@ AllCops:
     - "vendor/**/*"
     - "spec/fixtures/**/*"
     - "tmp/**/*"
-  TargetRubyVersion: 2.7.2
+  TargetRubyVersion: 3.1.2
   NewCops: enable
 
 Layout/EndOfLine:

.ruby-version

@@ -1 +1 @@
-ruby-2.7.2
+ruby-3.1.2

.tool-versions

@@ -1,3 +1,3 @@
-ruby 2.7.2
+ruby 3.1.2
 nodejs 12.16.0
 yarn 1.22.4

.yarnrc.yml

@@ -0,0 +1 @@
+nodeLinker: node-modules

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.7.2-alpine
+FROM ruby:3.1.2-alpine
 RUN apk --no-cache add build-base curl postgresql-dev tzdata nodejs chromium chromium-chromedriver yarn
 RUN mkdir /app
 WORKDIR /app

Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '2.7.2'
+ruby '3.1.2'
 
 gem 'activestorage-validator'
 gem 'administrate', '~> 0.17.0'
@@ -15,6 +15,9 @@ gem 'graphiql-rails', '1.7.0'
 gem 'graphql', '<= 1.10.10'
 gem 'lograge', '~> 0.11.2'
 gem 'mimemagic', '~> 0.3.7'
+gem 'net-imap'
+gem 'net-pop'
+gem 'net-smtp'
 gem 'pg', '~> 1.1'
 gem 'puma', '~> 4.3'
 gem 'rails', '~> 6.1.4.1'
@@ -24,13 +27,14 @@ gem 'sentry-ruby'
 gem 'sidekiq', '~> 6.4'
 gem 'webpacker', '~> 5.4.3'
 
+
 # Use Active Storage variant
 # gem 'image_processing', '~> 1.2'
 
 group :development, :test do
   gem 'brakeman'
   gem 'byebug', platforms: %i[mri mingw x64_mingw]
-  gem 'debase'
+  gem 'debase', '>=0.2.5.beta2'
   gem 'dotenv-rails'
   gem 'erb_lint', require: false
   gem 'factory_bot_rails', '~> 5.2.0'
@@ -42,7 +46,7 @@ group :development, :test do
   gem 'rubocop'
   gem 'rubocop-rails'
   gem 'rubocop-rspec'
-  gem 'ruby-debug-ide'
+  gem 'ruby-debug-ide', '~> 0.7.3'
   gem 'simplecov'
   gem 'solargraph', '~> 0.39'
 end

Gemfile.lock

@@ -133,9 +133,9 @@ GEM
     crass (1.0.6)
     datetime_picker_rails (0.0.7)
       momentjs-rails (>= 2.8.1)
-    debase (0.2.4.1)
-      debase-ruby_core_source (>= 0.10.2)
-    debase-ruby_core_source (0.10.14)
+    debase (0.2.5.beta2)
+      debase-ruby_core_source (>= 0.10.12)
+    debase-ruby_core_source (0.10.16)
     diff-lcs (1.5.0)
     docile (1.4.0)
     dotenv (2.7.6)
@@ -257,6 +257,14 @@ GEM
     multi_json (1.15.0)
     multipart-post (2.1.1)
     nenv (0.3.0)
+    net-imap (0.3.1)
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.1.3)
+      timeout
+    net-smtp (0.3.2)
+      net-protocol
     nio4r (2.5.8)
     nokogiri (1.13.6)
       mini_portile2 (~> 2.8.0)
@@ -440,6 +448,7 @@ GEM
     statsd-ruby (1.5.0)
     thor (1.2.1)
     tilt (2.0.10)
+    timeout (0.3.0)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.1.0)
@@ -481,7 +490,7 @@ DEPENDENCIES
   brakeman
   byebug
   capybara (>= 2.15)
-  debase
+  debase (>= 0.2.5.beta2)
   dotenv-rails
   erb_lint
   factory_bot_rails (~> 5.2.0)
@@ -492,6 +501,9 @@ DEPENDENCIES
   listen (~> 3.2)
   lograge (~> 0.11.2)
   mimemagic (~> 0.3.7)
+  net-imap
+  net-pop
+  net-smtp
   pg (~> 1.1)
   pry-byebug
   puma (~> 4.3)
@@ -503,7 +515,7 @@ DEPENDENCIES
   rubocop
   rubocop-rails
   rubocop-rspec
-  ruby-debug-ide
+  ruby-debug-ide (~> 0.7.3)
   sass-rails (>= 6)
   selenium-webdriver
   sentry-rails
@@ -520,7 +532,7 @@ DEPENDENCIES
   webpacker (~> 5.4.3)
 
 RUBY VERSION
-   ruby 2.7.2p137
+   ruby 3.1.2p20
 
 BUNDLED WITH
    2.1.4

package.json

@@ -19,8 +19,8 @@
     "prettier": "1.14.3",
     "prettier-package-json": "2.0.1",
     "stylelint": "13.13",
-    "stylelint-config-recommended-scss": "^4.2.0",
     "stylelint-config-prettier": "^8.0.2",
+    "stylelint-config-recommended-scss": "^4.2.0",
     "stylelint-order": "^4.1.0",
     "stylelint-prettier": "^1.2.0",
     "stylelint-scss": "^3.19"