diff --git a/Gemfile b/Gemfile index aec9bf1..bb5e905 100644 --- a/Gemfile +++ b/Gemfile @@ -1,8 +1,8 @@ source 'https://rubygems.org' -ruby '3.0.4' +ruby '3.1.2' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '6.1.6.1' +gem 'rails', '7.0.3.1' # Use sqlite3 as the database for Active Record #gem 'sqlite3', '~> 1.3', '< 1.4', :group => :development gem 'sqlite3', :group => :development diff --git a/Gemfile.lock b/Gemfile.lock index a69d033..c324e3a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,68 +1,74 @@ GEM remote: https://rubygems.org/ specs: - actioncable (6.1.6.1) - actionpack (= 6.1.6.1) - activesupport (= 6.1.6.1) + actioncable (7.0.3.1) + actionpack (= 7.0.3.1) + activesupport (= 7.0.3.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.6.1) - actionpack (= 6.1.6.1) - activejob (= 6.1.6.1) - activerecord (= 6.1.6.1) - activestorage (= 6.1.6.1) - activesupport (= 6.1.6.1) + actionmailbox (7.0.3.1) + actionpack (= 7.0.3.1) + activejob (= 7.0.3.1) + activerecord (= 7.0.3.1) + activestorage (= 7.0.3.1) + activesupport (= 7.0.3.1) mail (>= 2.7.1) - actionmailer (6.1.6.1) - actionpack (= 6.1.6.1) - actionview (= 6.1.6.1) - activejob (= 6.1.6.1) - activesupport (= 6.1.6.1) + net-imap + net-pop + net-smtp + actionmailer (7.0.3.1) + actionpack (= 7.0.3.1) + actionview (= 7.0.3.1) + activejob (= 7.0.3.1) + activesupport (= 7.0.3.1) mail (~> 2.5, >= 2.5.4) + net-imap + net-pop + net-smtp rails-dom-testing (~> 2.0) - actionpack (6.1.6.1) - actionview (= 6.1.6.1) - activesupport (= 6.1.6.1) - rack (~> 2.0, >= 2.0.9) + actionpack (7.0.3.1) + actionview (= 7.0.3.1) + activesupport (= 7.0.3.1) + rack (~> 2.0, >= 2.2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.6.1) - actionpack (= 6.1.6.1) - activerecord (= 6.1.6.1) - activestorage (= 6.1.6.1) - activesupport (= 6.1.6.1) + actiontext (7.0.3.1) + actionpack (= 7.0.3.1) + activerecord (= 7.0.3.1) + activestorage (= 7.0.3.1) + activesupport (= 7.0.3.1) + globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (6.1.6.1) - activesupport (= 6.1.6.1) + actionview (7.0.3.1) + activesupport (= 7.0.3.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.1.6.1) - activesupport (= 6.1.6.1) + activejob (7.0.3.1) + activesupport (= 7.0.3.1) globalid (>= 0.3.6) - activemodel (6.1.6.1) - activesupport (= 6.1.6.1) - activerecord (6.1.6.1) - activemodel (= 6.1.6.1) - activesupport (= 6.1.6.1) - activestorage (6.1.6.1) - actionpack (= 6.1.6.1) - activejob (= 6.1.6.1) - activerecord (= 6.1.6.1) - activesupport (= 6.1.6.1) + activemodel (7.0.3.1) + activesupport (= 7.0.3.1) + activerecord (7.0.3.1) + activemodel (= 7.0.3.1) + activesupport (= 7.0.3.1) + activestorage (7.0.3.1) + actionpack (= 7.0.3.1) + activejob (= 7.0.3.1) + activerecord (= 7.0.3.1) + activesupport (= 7.0.3.1) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (6.1.6.1) + activesupport (7.0.3.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - zeitwerk (~> 2.3) ast (2.4.2) bcrypt (3.1.18) - brakeman (5.2.3) + brakeman (5.3.1) builder (3.2.4) bullet (7.0.2) activesupport (>= 3.0.0) @@ -98,11 +104,12 @@ GEM railties (>= 4.1.0) responders warden (~> 1.2.3) - erubi (1.10.0) + digest (3.1.0) + erubi (1.11.0) execjs (2.8.1) globalid (1.0.0) activesupport (>= 5.0) - i18n (1.11.0) + i18n (1.12.0) concurrent-ruby (~> 1.0) influxdb (0.8.1) influxdb-rails (1.0.3) @@ -125,16 +132,30 @@ GEM method_source (1.0.0) mini_mime (1.1.2) minitest (5.16.2) - mustermann (1.1.1) + mustermann (2.0.2) ruby2_keywords (~> 0.0.1) mysql2 (0.5.4) + net-imap (0.2.3) + digest + net-protocol + strscan + net-pop (0.1.1) + digest + net-protocol + timeout + net-protocol (0.1.3) + timeout + net-smtp (0.3.1) + digest + net-protocol + timeout newrelic_rpm (8.9.0) nio4r (2.5.8) - nokogiri (1.13.7-x86_64-linux) + nokogiri (1.13.8-x86_64-linux) racc (~> 1.4) orm_adapter (0.5.0) parallel (1.22.1) - parser (3.1.2.0) + parser (3.1.2.1) ast (~> 2.4.1) passenger (6.0.14) rack @@ -145,25 +166,24 @@ GEM nio4r (~> 2.0) racc (1.6.0) rack (2.2.4) - rack-protection (2.2.0) + rack-protection (2.2.2) rack rack-test (2.0.2) rack (>= 1.3) - rails (6.1.6.1) - actioncable (= 6.1.6.1) - actionmailbox (= 6.1.6.1) - actionmailer (= 6.1.6.1) - actionpack (= 6.1.6.1) - actiontext (= 6.1.6.1) - actionview (= 6.1.6.1) - activejob (= 6.1.6.1) - activemodel (= 6.1.6.1) - activerecord (= 6.1.6.1) - activestorage (= 6.1.6.1) - activesupport (= 6.1.6.1) + rails (7.0.3.1) + actioncable (= 7.0.3.1) + actionmailbox (= 7.0.3.1) + actionmailer (= 7.0.3.1) + actionpack (= 7.0.3.1) + actiontext (= 7.0.3.1) + actionview (= 7.0.3.1) + activejob (= 7.0.3.1) + activemodel (= 7.0.3.1) + activerecord (= 7.0.3.1) + activestorage (= 7.0.3.1) + activesupport (= 7.0.3.1) bundler (>= 1.15.0) - railties (= 6.1.6.1) - sprockets-rails (>= 2.0.0) + railties (= 7.0.3.1) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) @@ -174,12 +194,13 @@ GEM rails_stdout_logging rails_serve_static_assets (0.0.5) rails_stdout_logging (0.0.5) - railties (6.1.6.1) - actionpack (= 6.1.6.1) - activesupport (= 6.1.6.1) + railties (7.0.3.1) + actionpack (= 7.0.3.1) + activesupport (= 7.0.3.1) method_source rake (>= 12.2) thor (~> 1.0) + zeitwerk (~> 2.5) rainbow (3.1.1) rake (13.0.6) rb-readline (0.5.5) @@ -191,45 +212,40 @@ GEM railties (>= 5.0) rexml (3.2.5) round_robin_tournament (0.1.1) - rubocop (1.31.2) + rubocop (1.34.1) json (~> 2.3) parallel (~> 1.10) - parser (>= 3.1.0.0) + parser (>= 3.1.2.1) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.18.0, < 2.0) + rubocop-ast (>= 1.20.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.19.1) + rubocop-ast (1.21.0) parser (>= 3.1.1.0) ruby-progressbar (1.11.0) ruby2_keywords (0.0.5) sdoc (2.4.0) rdoc (>= 5.0) - sinatra (2.2.0) - mustermann (~> 1.0) + sinatra (2.2.2) + mustermann (~> 2.0) rack (~> 2.2) - rack-protection (= 2.2.0) + rack-protection (= 2.2.2) tilt (~> 2.0) spring (4.0.0) - sprockets (4.1.1) - concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.4.2) - actionpack (>= 5.2) - activesupport (>= 5.2) - sprockets (>= 3.0.0) sqlite3 (1.4.4) stringio (3.0.2) + strscan (3.0.4) thor (1.2.1) - tilt (2.0.10) + tilt (2.0.11) + timeout (0.3.0) turbolinks (5.2.1) turbolinks-source (~> 5.2) turbolinks-source (5.2.0) - tzinfo (2.0.4) + tzinfo (2.0.5) concurrent-ruby (~> 1.0) - tzinfo-data (1.2022.1) + tzinfo-data (1.2022.2) tzinfo (>= 1.0.0) uglifier (4.2.0) execjs (>= 0.3.0, < 3) @@ -263,7 +279,7 @@ DEPENDENCIES newrelic_rpm passenger puma - rails (= 6.1.6.1) + rails (= 7.0.3.1) rails_12factor rb-readline round_robin_tournament @@ -276,7 +292,7 @@ DEPENDENCIES uglifier RUBY VERSION - ruby 3.0.4p208 + ruby 3.1.2p20 BUNDLED WITH 2.2.30 diff --git a/README.md b/README.md index d00d1df..3c667b4 100644 --- a/README.md +++ b/README.md @@ -13,8 +13,8 @@ This application is being created to run a wrestling tournament. **Public Production Url:** [https://wrestlingdev.com](http://wrestlingdev.com) **App Info** -* Ruby 3.0.0 -* Rails 6.1.2 +* Ruby 3.1.2 +* Rails 7.0.3.1 * DB mysql or mariadb * Memcached * Delayed Jobs @@ -42,6 +42,14 @@ To run a single test inside a file: 1. Get a shell with ruby and rails: `bash bin/rails-dev-run.sh wrestlingdev-development` 2. `rake test TEST=test/models/match_test.rb TESTOPTS="--name='/test_Match_should_not_be_valid_if_an_incorrect_win_type_is_given/'"` +## Update gems + +1. `bash bin/run-rails-dev.sh wrestlingdev-dev` to open a contianer with a rails shell available +2. `bundle config --delete without` to remove the bundle config that ignores production gems +3. `bundle update` + +Note: If updating rails, do not change the version in `Gemfile` until after you run `bash bin/run-rails-dev.sh wrestlingdev-dev`. Creating the container will fail due to a mismatch in Gemfile and Gemfile.lock. + # Deployment The production version of this is currently deployed in Kubernetes. See [Deploying with Kubernetes](deploy/kubernetes/README.md) diff --git a/config/application.rb b/config/application.rb index 5af170e..3a13b98 100644 --- a/config/application.rb +++ b/config/application.rb @@ -21,10 +21,7 @@ module Wrestling # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] # config.i18n.default_locale = :de - #Add Bootstrap SAAS to asset pipeline - config.assets.initialize_on_precompile = false - config.assets.precompile += %w(*.png *.jpg *.jpeg *.gif) - #gzip assets + #gzip assets config.middleware.use Rack::Deflater config.active_job.queue_adapter = :delayed_job diff --git a/deploy/rails-dev-Dockerfile b/deploy/rails-dev-Dockerfile index d47d7b9..84de5e3 100644 --- a/deploy/rails-dev-Dockerfile +++ b/deploy/rails-dev-Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:3.0.4 +FROM ruby:3.1.2 RUN apt-get -qq update \ && apt-get -qq install -y \ diff --git a/deploy/rails-prod-Dockerfile b/deploy/rails-prod-Dockerfile index e44f23d..e65150e 100644 --- a/deploy/rails-prod-Dockerfile +++ b/deploy/rails-prod-Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:3.0.4-slim +FROM ruby:3.1.2-slim #HEALTHCHECK --start-period=60s CMD curl http://127.0.0.1/