Ruby 3.3.7

.github/dependencies.txt

@@ -20,6 +20,7 @@ icu-dev
 imagemagick
 lftp
 libcurl
+libffi-dev
 libgcc
 libintl
 libmagic

.github/workflows/asset_compilation.yml

@@ -33,7 +33,7 @@ jobs:
           - gha_production_load_6
 
     runs-on: ubuntu-22.04
-    container: ruby:3.1.6-alpine3.20
+    container: ruby:3.3.7-alpine3.20
 
     steps:
     - name: Checkout
@@ -84,7 +84,7 @@ jobs:
     - name: Install gems
       if: always()
       run: |
-        gem install bundler --version=2.5.17
+        gem install bundler --version=2.6.3
         bundle config set --local without 'production staging development'
         bundle install --jobs 10 --retry 3
 

.github/workflows/audit.yml

@@ -13,7 +13,7 @@ jobs:
   audit:
     runs-on: ubuntu-22.04
     # Docker Hub image that the job executes in
-    container: ruby:3.1.6-alpine3.20
+    container: ruby:3.3.7-alpine3.20
 
     steps:
       - name: Checkout
@@ -25,7 +25,7 @@ jobs:
 
       - name: 'Install gems'
         run: |
-          gem install bundler --version=2.5.17
+          gem install bundler --version=2.6.3
           bundle config set --local without 'production staging development'
           bundle install --jobs 4 --retry 3
 

.github/workflows/build_images.yml

@@ -41,8 +41,8 @@ jobs:
             trivy_skip_files: /app/config/key.pem,/app/docker/sftp/ssh_host_ed25519_key,/app/docker/sftp/ssh_host_rsa_key
             target: prod-build
             build-args: |
-              BUILD_TAG=3.1.6-alpine3.20
-              BUNDLER_VERSION=2.5.17
+              BUILD_TAG=3.3.7-alpine3.20
+              BUNDLER_VERSION=2.6.3
               USER_ID=10000
               GROUP_ID=10000
             tags: |

.github/workflows/rails_tests.yml

@@ -12,7 +12,7 @@ jobs:
   build:
     runs-on: ubuntu-22.04
     # Docker Hub image that the job executes in
-    container: ruby:3.1.6-alpine3.20
+    container: ruby:3.3.7-alpine3.20
 
     # Service containers to run with job
     services:
@@ -67,7 +67,7 @@ jobs:
 
       - name: Install gems
         run: |
-          gem install bundler --version=2.5.17
+          gem install bundler --version=2.6.3
           bundle config set --local without 'production staging development'
           bundle install --jobs 4 --retry 3
 

.github/workflows/rubocop.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-22.04
 
     # Docker Hub image that the job executes in
-    container: ruby:3.1.6-alpine3.20
+    container: ruby:3.3.7-alpine3.20
     steps:
       - name: Install git
         run: |
@@ -46,7 +46,7 @@ jobs:
       - id: gems
         name: Install gems
         run: |
-          gem install bundler --version=2.5.17
+          gem install bundler --version=2.6.3
           bundle config set --local without 'production staging'
           bundle install --jobs 4 --retry 3
 

.gitignore

@@ -72,6 +72,7 @@ docker-compose.override.yml
 *.sublime-workspace
 
 .env.local
+.pgpass
 
 # Ignore themes
 app/assets/stylesheets/theme/styles

.irbrc

@@ -1,4 +1,3 @@
-require 'irb/ext/save-history'
 IRB.conf[:SAVE_HISTORY] = 1_000
 IRB.conf[:HISTORY_FILE] = File.join(__dir__, '.pry_history')
 IRB.conf[:USE_AUTOCOMPLETE] = false

.rubocop.yml

@@ -4,22 +4,22 @@ require:
 
 AllCops:
   Exclude:
-    - 'db/**/*'
-    - 'config/*'
-    - 'config/environments/**/*.rb'
-    - 'config/initializers/**/*.rb'
-    - 'config/locales/**/*.rb'
-    - 'script/**/*'
-    - 'bin/{rails,rake,bundle}'
-    - 'app/assets/**/*'
-    - 'bin/db_prep'
+    - "db/**/*"
+    - "config/*"
+    - "config/environments/**/*.rb"
+    - "config/initializers/**/*.rb"
+    - "config/locales/**/*.rb"
+    - "script/**/*"
+    - "bin/{rails,rake,bundle}"
+    - "app/assets/**/*"
+    - "bin/db_prep"
 
   Include:
-    - '**/Rakefile'
-    - 'app/**/*.rb'
-    - 'spec/**/*.rb'
-    - 'drivers/**/*.rb'
-    - 'lib/**/*.rb'
+    - "**/Rakefile"
+    - "app/**/*.rb"
+    - "spec/**/*.rb"
+    - "drivers/**/*.rb"
+    - "lib/**/*.rb"
 
   NewCops: disable
 
@@ -62,15 +62,14 @@ Style/PercentLiteralDelimiters:
   PreferredDelimiters:
     # Using `[]` for string arrays instead of `()`, since normal arrays are
     # indicated with `[]` not `()`.
-    '%w': '[]'
-    '%W': '[]'
+    "%w": "[]"
+    "%W": "[]"
 
 Style/AndOr:
   Enabled: true
 
 Style/ClassAndModuleChildren:
-  Enabled:
-    false
+  Enabled: false
 
 Style/ConditionalAssignment:
   Enabled: false
@@ -88,7 +87,7 @@ Style/RescueStandardError:
   Enabled: true
 
 Style/FrozenStringLiteralComment:
-  Enabled: false
+  Enabled: true
 
 Style/CommentedKeyword:
   Enabled: false

.rubocop_todo.yml

@@ -94,7 +94,6 @@ Layout/EmptyLineBetweenDefs:
 # Cop supports --auto-correct.
 Layout/EmptyLines:
   Exclude:
-    - 'bin/setup'
     - 'spec/factories/match_decisions/match_recommendation_shelter_agency.rb'
     - 'spec/models/rules/interested_in_neighborhood_spec.rb'
     - 'spec/models/rules/rank_below_spec.rb'
@@ -795,7 +794,6 @@ Style/IfInsideElse:
 # Cop supports --auto-correct.
 Style/IfUnlessModifier:
   Exclude:
-    - 'bin/setup'
 
 # Offense count: 3
 # Cop supports --auto-correct.
@@ -880,7 +878,6 @@ Style/ParenthesesAroundCondition:
 # Configuration parameters: PreferredDelimiters.
 Style/PercentLiteralDelimiters:
   Exclude:
-    - 'bin/setup'
 
 # Offense count: 90
 # Cop supports --auto-correct.
@@ -981,7 +978,6 @@ Style/StringLiterals:
     - 'bin/deploy'
     - 'bin/guard'
     - 'bin/rspec'
-    - 'bin/setup'
     - 'bin/update'
     - 'spec/controllers/account_emails_controller_spec.rb'
     - 'spec/controllers/account_passwords_controller_spec.rb'
@@ -1032,7 +1028,6 @@ Style/TrailingCommaInArguments:
 # SupportedStylesForMultiline: comma, consistent_comma, no_comma
 Style/TrailingCommaInArrayLiteral:
   Exclude:
-    - 'bin/setup'
 
 # Offense count: 21
 # Cop supports --auto-correct.

.ruby-version

@@ -1 +1 @@
-ruby-3.1.6
+ruby-3.3.7

Gemfile

@@ -2,21 +2,29 @@
 source 'https://rubygems.org'
 
 gem 'activerecord-import'
-gem 'rack', '>= 2.2.8.1'
+gem 'rack', '>= 2.2.11'
 gem 'pg', '~> 1.1'
 gem 'rails', '~> 7.0.8.5'
-gem "sprockets-rails"
-gem 'rails-html-sanitizer', '>= 1.4.4' # >= 1.4.4 due to CVE-2022-23519
-gem 'loofah', '>= 2.19.1' # >= 2.19.1 due to GHSA-228g-948r-83gx
+gem 'sprockets-rails'
+gem 'rails-html-sanitizer'
+gem 'loofah'
 gem 'tzinfo', '>= 1.2.10' # CVE-2022-31163
 
+# No longer default gems
+gem 'irb'
+gem 'reline'
+gem 'benchmark'
+gem 'rdoc'
+gem 'mutex_m'
+gem 'drb'
+
 gem 'bcrypt'
 gem 'bootsnap'
 gem 'composite_primary_keys', '~> 14.0.9'
-gem 'csv', '>= 1.0.2' # support for bom|utf-8 in ruby 2.5
+gem 'csv'
 gem 'order_as_specified'
 gem 'with_advisory_lock'
-gem 'nokogiri', '>= 1.16.4' # GHSA-r95h-9x8f-r3f7
+gem 'nokogiri'
 
 gem 'autoprefixer-rails'
 gem 'haml-rails'
@@ -68,14 +76,14 @@ gem 'aws-sdk-cloudwatchlogs', require: false
 gem 'json'
 gem 'amazing_print'
 
-gem 'puma', '>= 6.4.2'
+gem 'puma', '~> 6'
 gem 'redis'
 
 gem 'activerecord-session_store'
 gem 'lograge'
 gem 'logstop'
-gem 'paper_trail'
-gem 'paranoia', '~> 2.0'
+gem 'paper_trail'#, '~> 15' # 16 breaks models with inherited has_paper_trail, need to update significant code
+gem 'paranoia'
 gem 'validate_url'
 gem 'StreetAddress', require: false
 gem 'marginalia'
@@ -117,9 +125,6 @@ gem 'auto-session-timeout'
 
 gem 'ruby_parser', require: false
 
-# gem 'axlsx', git: 'https://github.com/randym/axlsx.git'
-# gem 'axlsx_rails'
-# gem 'spreadsheet', require: false
 gem 'caxlsx'
 gem 'caxlsx_rails'
 gem 'xlsxtream', require: false
@@ -140,10 +145,11 @@ gem 'yabeda-puma-plugin'
 gem 'yabeda-http_requests'
 gem 'roda'
 
-gem 'k8s-ruby'
+# Once 0.17 is released we should be able to unpin this
+# https://github.com/k8s-ruby/k8s-ruby/pull/57
+gem 'k8s-ruby', github: 'k8s-ruby/k8s-ruby', branch: 'master'
 
 group :development do
-  # gem 'spring'
   gem 'capistrano'
   gem 'capistrano-bundler'
   gem 'capistrano-passenger'
@@ -157,7 +163,6 @@ group :development do
   gem 'rails-erd'
   gem 'ruby-prof'
   gem 'web-console'
-  # gem 'rb-readline'
   gem 'active_record_query_trace'
 end