Merge pull request #343 from cookpad/nekketsuuu-ruby-3-1

Upgrade Ruby to 3.1 and roll gems

Author: nekketsuuu

.ruby-version

@@ -1 +1 @@
-3.0.0
+3.1.4

Dockerfile

@@ -1,16 +1,20 @@
 FROM public.ecr.aws/docker/library/node:20 as assets-builder
 WORKDIR /app
 COPY package.json package-lock.json ./
-RUN npm install
+RUN npm ci
 COPY webpack.config.js ./
 COPY app/javascript ./app/javascript
 RUN NODE_ENV=production npm run webpack
 
-FROM public.ecr.aws/docker/library/ruby:3.0.0-slim-buster
+FROM public.ecr.aws/docker/library/ruby:3.1.4-slim-bookworm
 RUN apt-get update -qq && apt-get install -y build-essential libpq-dev default-libmysqlclient-dev
 
 COPY Gemfile Gemfile.lock /tmp/
-RUN cd /tmp && bundle install -j5 --deployment --path /gems --without test
+RUN cd /tmp && \
+  bundle config deployment 'true' && \
+  bundle config path '/gems' && \
+  bundle config without 'test' && \
+  bundle install
 
 WORKDIR /app
 COPY . ./

Gemfile

@@ -14,10 +14,10 @@ gem 'active_decorator'
 gem 'addressable'
 gem 'anbt-sql-formatter', require: 'anbt-sql-formatter/formatter'
 gem 'bootsnap'
-gem 'commonmarker'
+gem 'commonmarker', '< 1'  # html-pipeline v2 depends on commonmarker v0
 gem 'diffy'
 gem 'haml-rails'
-gem 'html-pipeline'
+gem 'html-pipeline', '< 3'  # html-pipeline v3 has an issue around context handling https://github.com/gjtorikian/html-pipeline/issues/402
 gem 'jbuilder'
 gem 'kaminari'
 gem 'omniauth-google-oauth2'

Gemfile.lock

@@ -111,7 +111,7 @@ GEM
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
-    foreman (0.87.2)
+    foreman (0.88.1)
     globalid (1.2.1)
       activesupport (>= 6.1)
     google-apis-bigquery_v2 (0.61.0)
@@ -130,12 +130,12 @@ GEM
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    google-cloud-core (1.6.1)
+    google-cloud-core (1.7.0)
       google-cloud-env (>= 1.0, < 3.a)
       google-cloud-errors (~> 1.0)
     google-cloud-env (1.6.0)
       faraday (>= 0.17.3, < 3.0)
-    google-cloud-errors (1.3.1)
+    google-cloud-errors (1.4.0)
     googleauth (1.8.1)
       faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
@@ -161,7 +161,7 @@ GEM
     jbuilder (2.11.5)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
-    json (2.7.1)
+    json (2.7.2)
     jwt (2.8.1)
       base64
     kaminari (1.2.2)
@@ -192,7 +192,7 @@ GEM
     matrix (0.4.2)
     method_source (1.0.0)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.5)
+    mini_portile2 (2.8.6)
     minitest (5.22.3)
     msgpack (1.7.2)
     multi_json (1.15.0)
@@ -206,10 +206,10 @@ GEM
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.4.0.1)
+    net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.1)
-    nokogiri (1.16.3)
+    nokogiri (1.16.4)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     oauth2 (2.0.9)
@@ -223,11 +223,11 @@ GEM
       hashie (>= 3.4.6)
       rack (>= 2.2.3)
       rack-protection
-    omniauth-google-oauth2 (1.1.1)
+    omniauth-google-oauth2 (1.1.2)
       jwt (>= 2.0)
-      oauth2 (~> 2.0.6)
+      oauth2 (~> 2.0)
       omniauth (~> 2.0)
-      omniauth-oauth2 (~> 1.8.0)
+      omniauth-oauth2 (~> 1.8)
     omniauth-oauth2 (1.8.0)
       oauth2 (>= 1.4, < 3)
       omniauth (~> 2.0)
@@ -252,7 +252,7 @@ GEM
       pry (>= 0.13, < 0.15)
     pry-rails (0.3.9)
       pry (>= 0.10.4)
-    public_suffix (5.0.4)
+    public_suffix (5.0.5)
     puma (6.4.2)
       nio4r (~> 2.0)
     racc (1.7.3)
@@ -298,7 +298,7 @@ GEM
       thor (~> 1.0)
       zeitwerk (~> 2.5)
     rainbow (3.1.1)
-    rake (13.1.0)
+    rake (13.2.1)
     regexp_parser (2.9.0)
     representable (3.2.0)
       declarative (< 0.1.0)
@@ -312,7 +312,7 @@ GEM
       activerecord (>= 6.1, < 7.2)
       diffy
     rinku (2.0.6)
-    rouge (4.2.0)
+    rouge (4.2.1)
     rspec-core (3.13.0)
       rspec-support (~> 3.13.0)
     rspec-expectations (3.13.0)
@@ -321,41 +321,44 @@ GEM
     rspec-mocks (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-rails (6.1.1)
+    rspec-rails (6.1.2)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       railties (>= 6.1)
-      rspec-core (~> 3.12)
-      rspec-expectations (~> 3.12)
-      rspec-mocks (~> 3.12)
-      rspec-support (~> 3.12)
+      rspec-core (~> 3.13)
+      rspec-expectations (~> 3.13)
+      rspec-mocks (~> 3.13)
+      rspec-support (~> 3.13)
     rspec-support (3.13.1)
-    rubocop (1.61.0)
+    rubocop (1.63.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.1)
+    rubocop-ast (1.31.2)
       parser (>= 3.3.0.4)
     rubocop-capybara (2.20.0)
       rubocop (~> 1.41)
     rubocop-factory_bot (2.25.1)
       rubocop (~> 1.41)
-    rubocop-rails (2.24.0)
+    rubocop-rails (2.24.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rspec (2.27.1)
+    rubocop-rspec (2.29.1)
       rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
+      rubocop-rspec_rails (~> 2.28)
+    rubocop-rspec_rails (2.28.3)
+      rubocop (~> 1.40)
     ruby-prof (1.7.0)
     ruby-progressbar (1.13.0)
     signet (0.19.0)
@@ -384,7 +387,7 @@ GEM
       concurrent-ruby (~> 1.0)
     uber (0.1.0)
     unicode-display_width (2.5.0)
-    version_gem (1.1.3)
+    version_gem (1.1.4)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -404,15 +407,15 @@ DEPENDENCIES
   brakeman
   byebug
   capybara
-  commonmarker
+  commonmarker (< 1)
   database_rewinder
   denv
   diffy
   factory_bot_rails
   foreman
   google-cloud-bigquery
   haml-rails
-  html-pipeline
+  html-pipeline (< 3)
   jbuilder
   kaminari
   launchy
@@ -443,4 +446,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-   2.5.7
+   2.5.9

config/initializers/html_pipeline.rb

@@ -1,7 +1,5 @@
 require 'html/pipeline'
 
-# TODO(nekketsuuu): The following `require` can be removed after upgrading html-pipeline gem to v3.
-# https://github.com/gjtorikian/html-pipeline/pull/383
 require 'html/pipeline/autolink_filter'
 require 'html/pipeline/autolink_keyword_filter'
 require 'html/pipeline/inner_text_filter'