From 53e65d7362eb70d6ec4c9f2737bc02faf9511fe0 Mon Sep 17 00:00:00 2001 From: Tim Morgan Date: Fri, 12 Jan 2024 17:08:38 -0800 Subject: [PATCH] Ruby 3.3 --- .github/workflows/ruby.yml | 4 +- .ruby-version | 2 +- Gemfile | 2 +- Gemfile.lock | 59 ++++++++++++++------------ README.md | 8 ++-- app/controllers/sessions_controller.rb | 2 +- config/deploy.rb | 2 +- tmp/.gitignore | 1 + 8 files changed, 43 insertions(+), 37 deletions(-) create mode 100644 tmp/.gitignore diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index e96f0e7..6cec543 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -44,7 +44,7 @@ jobs: - name: Set up Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: "3.2" + ruby-version: "3.3" bundler-cache: true - name: Create test database env: @@ -68,7 +68,7 @@ jobs: - name: Set up Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: "3.2" + ruby-version: "3.3" bundler-cache: true - name: Run Rubocop run: | diff --git a/.ruby-version b/.ruby-version index be94e6f..15a2799 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.2.2 +3.3.0 diff --git a/Gemfile b/Gemfile index 67916cf..17b25c7 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby "3.2.2" +ruby "3.3.0" # CORE gem "puma" diff --git a/Gemfile.lock b/Gemfile.lock index e520b81..93dc447 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -75,17 +75,17 @@ GEM minitest (>= 5.1) mutex_m tzinfo (~> 2.0) - addressable (2.8.5) + addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) - airbrussh (1.5.0) + airbrussh (1.5.1) sshkit (>= 1.6.1, != 1.7.0) base64 (0.2.0) bcrypt (3.1.20) bcrypt_pbkdf (1.1.0) - bigdecimal (3.1.4) + bigdecimal (3.1.5) binding_of_caller (1.0.0) debug_inspector (>= 0.0.1) - bugsnag (6.26.0) + bugsnag (6.26.1) concurrent-ruby (~> 1.0) bugsnag-capistrano (2.1.0) builder (3.2.4) @@ -122,7 +122,7 @@ GEM database_cleaner-core (~> 2.0.0) database_cleaner-core (2.0.1) date (3.3.4) - debug_inspector (1.1.0) + debug_inspector (1.2.0) devise (4.9.3) bcrypt (~> 3.0) orm_adapter (~> 0.1) @@ -146,21 +146,21 @@ GEM zeitwerk (~> 2.6) ed25519 (1.3.0) erubi (1.12.0) - factory_bot (6.4.2) + factory_bot (6.4.5) activesupport (>= 5.0.0) - factory_bot_rails (6.4.2) + factory_bot_rails (6.4.3) factory_bot (~> 6.4) railties (>= 5.0.0) ffaker (2.23.0) globalid (1.2.1) activesupport (>= 6.1) - hashdiff (1.0.1) + hashdiff (1.1.0) i18n (1.14.1) concurrent-ruby (~> 1.0) - io-console (0.6.0) - irb (1.9.1) + io-console (0.7.1) + irb (1.11.1) rdoc - reline (>= 0.3.8) + reline (>= 0.4.2) jbuilder (2.11.5) actionview (>= 5.0.0) activesupport (>= 5.0.0) @@ -176,9 +176,9 @@ GEM net-smtp marcel (1.0.2) mini_mime (1.1.5) - minitest (5.20.0) + minitest (5.21.1) mutex_m (0.2.0) - net-imap (0.4.6) + net-imap (0.4.9.1) date net-protocol net-pop (0.1.2) @@ -187,20 +187,22 @@ GEM timeout net-scp (4.0.0) net-ssh (>= 2.6.5, < 8.0.0) - net-smtp (0.4.0) + net-sftp (4.0.0) + net-ssh (>= 5.0.0, < 8.0.0) + net-smtp (0.4.0.1) net-protocol - net-ssh (7.2.0) - nio4r (2.6.1) - nokogiri (1.15.5-arm64-darwin) + net-ssh (7.2.1) + nio4r (2.7.0) + nokogiri (1.16.0-arm64-darwin) racc (~> 1.4) - nokogiri (1.15.5-x86_64-linux) + nokogiri (1.16.0-x86_64-linux) racc (~> 1.4) orm_adapter (0.5.0) pg (1.5.4) - psych (5.1.1.1) + psych (5.1.2) stringio public_suffix (5.0.4) - puma (6.4.0) + puma (6.4.2) nio4r (~> 2.0) racc (1.7.3) rack (3.0.8) @@ -247,14 +249,14 @@ GEM thor (~> 1.0, >= 1.2.2) zeitwerk (~> 2.6) rake (13.1.0) - rdoc (6.6.0) + rdoc (6.6.2) psych (>= 4.0.0) redcarpet (3.6.0) redis (5.0.8) redis-client (>= 0.17.0) - redis-client (0.18.0) + redis-client (0.19.1) connection_pool - reline (0.4.0) + reline (0.4.2) io-console (~> 0.5) responders (3.1.1) actionpack (>= 5.2) @@ -283,10 +285,12 @@ GEM connection_pool (>= 2.3.0) rack (>= 2.2.4) redis-client (>= 0.14.0) - sshkit (1.21.6) + sshkit (1.22.0) + mutex_m net-scp (>= 1.1.2) + net-sftp (>= 2.1.2) net-ssh (>= 2.8.0) - stringio (3.0.9) + stringio (3.1.0) thor (1.3.0) timeout (0.4.1) tzinfo (2.0.6) @@ -311,6 +315,7 @@ GEM PLATFORMS arm64-darwin-22 + arm64-darwin-23 x86_64-linux DEPENDENCIES @@ -347,7 +352,7 @@ DEPENDENCIES yard RUBY VERSION - ruby 3.2.2p53 + ruby 3.3.0p0 BUNDLED WITH - 2.4.22 + 2.5.4 diff --git a/README.md b/README.md index 3c56cda..23b1bae 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ giving passengers a basic assurance of privacy. ### Installation and Running -FlyWeight requires Ruby 3.2, PostgreSQL, and Redis. (If you use Homebrew, +FlyWeight requires Ruby 3.3, PostgreSQL, and Redis. (If you use Homebrew, you can install those dependencies with `brew install`.) After cloning the repository, run `bundle install` to install all gem requirements. Run `rails db:create db:migrate` to create the development database. @@ -24,10 +24,10 @@ To run the server in development mode, you can create a `Procfile` with contents such as: ``` -backend: cd Backend && rvm 3.2.2@flyweight exec rails server +backend: cd Backend && rvm 3.3.0@flyweight exec rails server frontend: cd Frontend && yarn dev -jobs: cd Backend && rvm 3.2.2@flyweight exec bundle exec sidekiq -C config/sidekiq.yml -cable: cd Backend && rvm 3.2.2@flyweight exec ./bin/cable +jobs: cd Backend && rvm 3.3.0@flyweight exec bundle exec sidekiq -C config/sidekiq.yml +cable: cd Backend && rvm 3.3.0@flyweight exec ./bin/cable ``` Install the `foreman` gem to run the Procfile. diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index b026963..d673d46 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -8,7 +8,7 @@ class SessionsController < Devise::SessionsController def sign_in(resource_or_scope, *args) options = args.extract_options! - super resource_or_scope, *args, options.merge(store: false) + super(resource_or_scope, *args, options.merge(store: false)) end def respond_with(_resource, _opts={}) diff --git a/config/deploy.rb b/config/deploy.rb index f6bcc04..5e0ca9f 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -20,7 +20,7 @@ append :linked_dirs, "log", "tmp/pids", "tmp/cache", "tmp/sockets", "node_modules", "public/packs", "public/assets" -set :rvm_ruby_version, "3.2.2@#{fetch :application}" +set :rvm_ruby_version, "3.3.0@#{fetch :application}" set :sidekiq_config, "config/sidekiq.yml" diff --git a/tmp/.gitignore b/tmp/.gitignore new file mode 100644 index 0000000..d36f9b6 --- /dev/null +++ b/tmp/.gitignore @@ -0,0 +1 @@ +local_secret.txt