Skip to content

Commit

Permalink
Updates Rails and Puma (#58)
Browse files Browse the repository at this point in the history 
* try this version of rails

* Regressed two gems not bundling on server

* Regress websokcet-driver

* regress nio4r

* Move puma to dev/test

* Adds comments and moves things around
  • Loading branch information
@ajkiessl
ajkiessl authored Nov 21, 2023
1 parent 671debc commit 32dcfce
Show file tree
Hide file tree
Showing 2 changed files with 96 additions and 81 deletions.
15 changes: 12 additions & 3 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,11 @@ gem 'ed25519'
# For scheduled tasks
gem 'whenever'

gem 'rails', '~> 7.0'
gem 'rails', '~> 7.0.5.1'
# Use mysql as the database for Active Record
# ActiveRecord only works with specific versions of mysql2.
gem 'mysql2', '~> 0.5.4'

# Use Puma as the app server
gem 'puma', '~> 4.3'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 6.0'
# Use Uglifier as compressor for JavaScript assets
Expand Down Expand Up @@ -75,6 +73,13 @@ gem 'exiftool_vendored', '~> 12.33'
# Needed for Ruby 3+
gem 'webrick'

# Pin date, racc, websocket-driver, and nio4r at these versions
# or else they fail to bundle on the RedHat server
gem 'date', '= 3.3.3'
gem 'nio4r', '= 2.5.8'
gem 'racc', '= 1.6.2'
gem 'websocket-driver', '= 0.7.5'

group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug', platforms: %i[mri mingw x64_mingw]
Expand All @@ -96,6 +101,10 @@ group :development, :test do
gem 'rubocop-rspec'
# Code coverage
gem 'simplecov', '~> 0.17.0'
# Use Puma as the app server
# Since passenger is used in production this doesn't need to be
# installed on the RedHat server (it fails anyway)
gem 'puma', '~> 5.6'
end

group :development do
Expand Down
162 changes: 84 additions & 78 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,67 +2,67 @@ GEM
remote: https://rubygems.org/
specs:
Ascii85 (1.1.0)
actioncable (7.0.4.3)
actionpack (= 7.0.4.3)
activesupport (= 7.0.4.3)
actioncable (7.0.5.1)
actionpack (= 7.0.5.1)
activesupport (= 7.0.5.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (7.0.4.3)
actionpack (= 7.0.4.3)
activejob (= 7.0.4.3)
activerecord (= 7.0.4.3)
activestorage (= 7.0.4.3)
activesupport (= 7.0.4.3)
actionmailbox (7.0.5.1)
actionpack (= 7.0.5.1)
activejob (= 7.0.5.1)
activerecord (= 7.0.5.1)
activestorage (= 7.0.5.1)
activesupport (= 7.0.5.1)
mail (>= 2.7.1)
net-imap
net-pop
net-smtp
actionmailer (7.0.4.3)
actionpack (= 7.0.4.3)
actionview (= 7.0.4.3)
activejob (= 7.0.4.3)
activesupport (= 7.0.4.3)
actionmailer (7.0.5.1)
actionpack (= 7.0.5.1)
actionview (= 7.0.5.1)
activejob (= 7.0.5.1)
activesupport (= 7.0.5.1)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
rails-dom-testing (~> 2.0)
actionpack (7.0.4.3)
actionview (= 7.0.4.3)
activesupport (= 7.0.4.3)
rack (~> 2.0, >= 2.2.0)
actionpack (7.0.5.1)
actionview (= 7.0.5.1)
activesupport (= 7.0.5.1)
rack (~> 2.0, >= 2.2.4)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (7.0.4.3)
actionpack (= 7.0.4.3)
activerecord (= 7.0.4.3)
activestorage (= 7.0.4.3)
activesupport (= 7.0.4.3)
actiontext (7.0.5.1)
actionpack (= 7.0.5.1)
activerecord (= 7.0.5.1)
activestorage (= 7.0.5.1)
activesupport (= 7.0.5.1)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.0.4.3)
activesupport (= 7.0.4.3)
actionview (7.0.5.1)
activesupport (= 7.0.5.1)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (7.0.4.3)
activesupport (= 7.0.4.3)
activejob (7.0.5.1)
activesupport (= 7.0.5.1)
globalid (>= 0.3.6)
activemodel (7.0.4.3)
activesupport (= 7.0.4.3)
activerecord (7.0.4.3)
activemodel (= 7.0.4.3)
activesupport (= 7.0.4.3)
activestorage (7.0.4.3)
actionpack (= 7.0.4.3)
activejob (= 7.0.4.3)
activerecord (= 7.0.4.3)
activesupport (= 7.0.4.3)
activemodel (7.0.5.1)
activesupport (= 7.0.5.1)
activerecord (7.0.5.1)
activemodel (= 7.0.5.1)
activesupport (= 7.0.5.1)
activestorage (7.0.5.1)
actionpack (= 7.0.5.1)
activejob (= 7.0.5.1)
activerecord (= 7.0.5.1)
activesupport (= 7.0.5.1)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
activesupport (7.0.4.3)
activesupport (7.0.5.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
Expand Down Expand Up @@ -169,16 +169,16 @@ GEM
factory_bot (6.2.1)
activesupport (>= 5.0.0)
ffi (1.15.5)
globalid (1.1.0)
activesupport (>= 5.0)
globalid (1.2.1)
activesupport (>= 6.1)
hashdiff (1.0.1)
hashery (2.1.2)
headless (2.3.1)
htmlentities (4.3.4)
httparty (0.21.0)
mini_mime (>= 1.0.0)
multi_xml (>= 0.5.2)
i18n (1.12.0)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
jbuilder (2.11.5)
actionview (>= 5.0.0)
Expand All @@ -193,9 +193,9 @@ 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.22.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
nokogiri (>= 1.12.0)
mail (2.8.1)
mini_mime (>= 0.1.1)
net-imap
Expand All @@ -204,29 +204,29 @@ GEM
marcel (1.0.2)
matrix (0.4.2)
method_source (1.0.0)
mini_mime (1.1.2)
mini_portile2 (2.8.2)
mini_mime (1.1.5)
mini_portile2 (2.8.5)
mini_racer (0.6.3)
libv8-node (~> 16.10.0.0)
minitest (5.18.0)
minitest (5.20.0)
multi_xml (0.6.0)
mysql2 (0.5.4)
namae (1.1.1)
net-imap (0.3.4)
net-imap (0.4.5)
date
net-protocol
net-ldap (0.17.1)
net-pop (0.1.2)
net-protocol
net-protocol (0.2.1)
net-protocol (0.2.2)
timeout
net-scp (4.0.0)
net-ssh (>= 2.6.5, < 8.0.0)
net-smtp (0.3.3)
net-smtp (0.4.0)
net-protocol
net-ssh (7.0.1)
nio4r (2.5.8)
nokogiri (1.15.1)
nokogiri (1.15.5)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
parallel (1.22.1)
Expand All @@ -240,44 +240,46 @@ GEM
ttfunk
popper_js (1.16.1)
public_suffix (5.0.1)
puma (4.3.12)
puma (5.6.7)
nio4r (~> 2.0)
racc (1.6.2)
rack (2.2.6.4)
rack (2.2.8)
rack-test (2.1.0)
rack (>= 1.3)
rails (7.0.4.3)
actioncable (= 7.0.4.3)
actionmailbox (= 7.0.4.3)
actionmailer (= 7.0.4.3)
actionpack (= 7.0.4.3)
actiontext (= 7.0.4.3)
actionview (= 7.0.4.3)
activejob (= 7.0.4.3)
activemodel (= 7.0.4.3)
activerecord (= 7.0.4.3)
activestorage (= 7.0.4.3)
activesupport (= 7.0.4.3)
rails (7.0.5.1)
actioncable (= 7.0.5.1)
actionmailbox (= 7.0.5.1)
actionmailer (= 7.0.5.1)
actionpack (= 7.0.5.1)
actiontext (= 7.0.5.1)
actionview (= 7.0.5.1)
activejob (= 7.0.5.1)
activemodel (= 7.0.5.1)
activerecord (= 7.0.5.1)
activestorage (= 7.0.5.1)
activesupport (= 7.0.5.1)
bundler (>= 1.15.0)
railties (= 7.0.4.3)
railties (= 7.0.5.1)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
actionview (>= 5.0.1.rc1)
activesupport (>= 5.0.1.rc1)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
rails-dom-testing (2.2.0)
activesupport (>= 5.0.0)
minitest
nokogiri (>= 1.6)
rails-html-sanitizer (1.5.0)
loofah (~> 2.19, >= 2.19.1)
railties (7.0.4.3)
actionpack (= 7.0.4.3)
activesupport (= 7.0.4.3)
rails-html-sanitizer (1.6.0)
loofah (~> 2.21)
nokogiri (~> 1.14)
railties (7.0.5.1)
actionpack (= 7.0.5.1)
activesupport (= 7.0.5.1)
method_source
rake (>= 12.2)
thor (~> 1.0)
zeitwerk (~> 2.5)
rainbow (3.1.1)
rake (13.0.6)
rake (13.1.0)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
Expand Down Expand Up @@ -367,9 +369,9 @@ GEM
sshkit (1.21.3)
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
thor (1.2.1)
thor (1.3.0)
tilt (2.0.11)
timeout (0.3.2)
timeout (0.4.1)
ttfunk (1.7.0)
turbolinks (5.2.1)
turbolinks-source (~> 5.2)
Expand Down Expand Up @@ -400,7 +402,7 @@ GEM
chronic (>= 0.6.3)
xpath (3.2.0)
nokogiri (~> 1.8)
zeitwerk (2.6.7)
zeitwerk (2.6.12)

PLATFORMS
ruby
Expand All @@ -424,6 +426,7 @@ DEPENDENCIES
coffee-rails (~> 5.0)
creek
database_cleaner
date (= 3.3.3)
ed25519
exiftool_vendored (~> 12.33)
factory_bot
Expand All @@ -434,9 +437,11 @@ DEPENDENCIES
mini_racer
mysql2 (~> 0.5.4)
net-ldap
nio4r (= 2.5.8)
pdf-reader
puma (~> 4.3)
rails (~> 7.0)
puma (~> 5.6)
racc (= 1.6.2)
rails (~> 7.0.5.1)
rails-controller-testing
rspec-rails (~> 6.0)
rspec-retry
Expand All @@ -456,6 +461,7 @@ DEPENDENCIES
web-console (~> 4.2)
webmock
webrick
websocket-driver (= 0.7.5)
whenever

BUNDLED WITH
Expand Down

0 comments on commit 32dcfce

Please sign in to comment.