Merge pull request #424 from better-together-org/ruby-3-upgrade

Ruby 3 upgrade

Author: rsmithlal

.ruby-version

@@ -1 +1 @@
-ruby-2.5.3
+ruby-3.2.2

Dockerfile

@@ -1,5 +1,5 @@
 
-FROM ruby:2.6.5
+FROM ruby:3.2
 
 RUN apt-get update -qq \
   && apt-get install -y build-essential postgresql-client libpq-dev nodejs libssl-dev apt-transport-https ca-certificates
@@ -15,6 +15,6 @@ COPY Gemfile /btc/Gemfile
 COPY Gemfile.lock /btc/Gemfile.lock
 
 RUN gem uninstall bundler
-RUN gem install bundler:2.0.2
+RUN gem install bundler:2.4.13
 
 COPY . /btc

Gemfile

@@ -15,13 +15,13 @@ group :development, :test do
 end
 
 group :test do
-  gem 'capybara', '>= 2.15'
-  gem 'chromedriver-helper'
+  # gem 'capybara'
+  # gem 'chromedriver-helper'
   gem 'coveralls'
   gem 'fuubar'
   gem 'rspec-rails'
   gem 'shoulda-callback-matchers'
   gem 'shoulda-matchers'
   gem 'simplecov', require: false
-  gem 'selenium-webdriver'
+  # gem 'selenium-webdriver'
 end

Gemfile.lock

@@ -15,9 +15,9 @@ PATH
       devise
       devise-jwt
       friendly_id (>= 5.2, < 5.5)
-      friendly_id-mobility (~> 0.5.4)
+      friendly_id-mobility (~> 1.0.4)
       jsonapi-resources (>= 0.10.0)
-      mobility (~> 0.8.6)
+      mobility (~> 1.2, >= 1.2.9)
       pundit (~> 2.1.0)
       pundit-resources
       rack-cors (~> 1.1.1)
@@ -86,10 +86,8 @@ GEM
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    addressable (2.8.1)
+    addressable (2.8.4)
       public_suffix (>= 2.0.2, < 6.0)
-    archive-zip (0.12.0)
-      io-like (~> 0.3.0)
     ast (2.4.2)
     bcrypt (3.1.18)
     better_errors (2.9.1)
@@ -101,18 +99,6 @@ GEM
       debug_inspector (>= 0.0.1)
     builder (3.2.4)
     byebug (11.1.3)
-    capybara (3.38.0)
-      addressable
-      matrix
-      mini_mime (>= 0.1.3)
-      nokogiri (~> 1.8)
-      rack (>= 1.6.0)
-      rack-test (>= 0.6.3)
-      regexp_parser (>= 1.5, < 3.0)
-      xpath (~> 3.2)
-    chromedriver-helper (2.1.1)
-      archive-zip (~> 0.10)
-      nokogiri (~> 1.8)
     coderay (1.1.3)
     concurrent-ruby (1.2.2)
     coveralls (0.7.1)
@@ -149,19 +135,19 @@ GEM
       zeitwerk (~> 2.6)
     erubi (1.12.0)
     execjs (2.8.1)
-    factory_bot (6.1.0)
+    factory_bot (6.2.1)
       activesupport (>= 5.0.0)
-    factory_bot_rails (6.1.0)
-      factory_bot (~> 6.1.0)
+    factory_bot_rails (6.2.0)
+      factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
     faker (3.0.0)
       i18n (>= 1.8.11, < 2)
     ffi (1.15.5)
-    friendly_id (5.4.0)
+    friendly_id (5.4.2)
       activerecord (>= 4.0.0)
-    friendly_id-mobility (0.5.5)
-      friendly_id (>= 5.0.0, <= 5.4.0)
-      mobility (>= 0.5.1, < 1.0)
+    friendly_id-mobility (1.0.4)
+      friendly_id (>= 5.0.0, < 5.5)
+      mobility (>= 1.0.1, < 2.0)
     fuubar (2.5.1)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
@@ -170,9 +156,8 @@ GEM
     http-accept (1.7.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    i18n (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    io-like (0.3.1)
     json (2.6.3)
     json-schema (2.8.1)
       addressable (>= 2.4)
@@ -184,24 +169,23 @@ GEM
     listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.19.1)
+    loofah (2.21.3)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
+      nokogiri (>= 1.12.0)
     mail (2.8.1)
       mini_mime (>= 0.1.1)
       net-imap
       net-pop
       net-smtp
     marcel (1.0.2)
-    matrix (0.4.2)
     method_source (1.0.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2020.1104)
     mini_mime (1.1.2)
-    mini_portile2 (2.8.1)
+    mini_portile2 (2.8.2)
     minitest (5.18.0)
-    mobility (0.8.13)
+    mobility (1.2.9)
       i18n (>= 0.6.10, < 2)
       request_store (~> 1.0)
     msgpack (1.3.3)
@@ -217,15 +201,15 @@ GEM
       net-protocol
     netrc (0.11.0)
     nio4r (2.5.8)
-    nokogiri (1.14.2)
-      mini_portile2 (~> 2.8.0)
+    nokogiri (1.15.2)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     optimist (3.0.1)
     orm_adapter (0.5.0)
     parallel (1.22.1)
     parser (3.1.3.0)
       ast (~> 2.4.1)
-    pg (1.2.3)
+    pg (1.5.3)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -235,7 +219,7 @@ GEM
     pundit (2.1.1)
       activesupport (>= 3.0.0)
     racc (1.6.2)
-    rack (2.2.6.4)
+    rack (2.2.7)
     rack-cors (1.1.1)
       rack (>= 2.0.0)
     rack-mini-profiler (3.0.0)
@@ -260,8 +244,9 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.5.0)
-      loofah (~> 2.19, >= 2.19.1)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
     railties (6.1.7.3)
       actionpack (= 6.1.7.3)
       activesupport (= 6.1.7.3)
@@ -278,7 +263,7 @@ GEM
       ffi (>= 1.0.6)
       msgpack (>= 0.4.3)
       optimist (>= 3.0.0)
-    regexp_parser (2.6.1)
+    regexp_parser (2.8.0)
     request_store (1.5.1)
       rack (>= 1.4)
     responders (3.0.1)
@@ -333,11 +318,6 @@ GEM
     rubocop-ast (1.24.0)
       parser (>= 3.1.1.0)
     ruby-progressbar (1.11.0)
-    rubyzip (2.3.2)
-    selenium-webdriver (4.7.1)
-      rexml (~> 3.2, >= 3.2.5)
-      rubyzip (>= 1.2.2, < 3.0)
-      websocket (~> 1.0)
     shoulda-callback-matchers (1.1.4)
       activesupport (>= 3)
     shoulda-matchers (5.0.0)
@@ -362,7 +342,7 @@ GEM
     sync (0.5.0)
     term-ansicolor (1.7.1)
       tins (~> 1.0)
-    thor (1.2.1)
+    thor (1.2.2)
     timeout (0.3.2)
     tins (1.26.0)
       sync
@@ -384,13 +364,10 @@ GEM
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    websocket (1.2.9)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    xpath (3.2.0)
-      nokogiri (~> 1.8)
-    zeitwerk (2.6.7)
+    zeitwerk (2.6.8)
 
 PLATFORMS
   ruby
@@ -400,8 +377,6 @@ DEPENDENCIES
   better_together!
   binding_of_caller
   byebug
-  capybara (>= 2.15)
-  chromedriver-helper
   coveralls
   execjs
   factory_bot_rails
@@ -418,7 +393,6 @@ DEPENDENCIES
   rspec-rails
   rswag
   rubocop
-  selenium-webdriver
   shoulda-callback-matchers
   shoulda-matchers
   simplecov
@@ -427,4 +401,4 @@ DEPENDENCIES
   web-console (>= 3.3.0)
 
 BUNDLED WITH
-   1.17.3
+   2.4.13

README.md

@@ -36,4 +36,5 @@ This gem is developed using Docker and Docker Compose. In order to get the app r
 
 - Build the application image: `docker-compose build`
 - Bundle the gems: `docker-compose run app bundle`
+- Bundle the gems: `docker-compose run app db:setup`
 - Run the rspec tests `docker-compose run app bundle exec rspec`

better_together.gemspec

@@ -31,8 +31,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rails', '>= 5.2.2', '< 7.1.0'
   spec.add_dependency 'friendly_id', '>= 5.2', '< 5.5'
   spec.add_dependency 'jsonapi-resources', '>= 0.10.0'
-  spec.add_dependency 'mobility', '~> 0.8.6'
-  spec.add_dependency 'friendly_id-mobility', '~> 0.5.4'
+  spec.add_dependency 'mobility', '~> 1.2', '>= 1.2.9'
+  spec.add_dependency 'friendly_id-mobility', '~> 1.0.4'
   spec.add_dependency 'pundit', '~> 2.1.0'
   spec.add_dependency 'pundit-resources'
   spec.add_dependency 'rack-cors', '~> 1.1.1'