Bump Rails to 8.0.1 (#710)

* Bump Rails to 8.0.1 * Bump shoulda-matchers from 6.2.0 to 6.4.0 Bumps [shoulda-matchers](https://github.com/thoughtbot/shoulda-matchers) from 6.2.0 to 6.4.0. - [Release notes](https://github.com/thoughtbot/shoulda-matchers/releases) - [Changelog](https://github.com/thoughtbot/shoulda-matchers/blob/main/CHANGELOG.md) - [Commits](thoughtbot/shoulda-matchers@v6.2.0...v6.4.0) --- updated-dependencies: - dependency-name: shoulda-matchers dependency-type: direct:development update-type: version-update:semver-minor ... * Remove useless require statements --------- Signed-off-by: Yannis JAQUET <[email protected]> Signed-off-by: dependabot[bot] <[email protected]>
yannis · Dec 28, 2024 · 598ca90 · 598ca90
1 parent 73412dc
commit 598ca90
Show file tree

Hide file tree

Showing 34 changed files with 445 additions and 516 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -71,4 +71,4 @@ jobs:
         run: docker compose run --rm app bundle exec rake db:drop db:create db:migrate
 
       - name: Run Rspec
-        run: docker compose run --rm app bundle exec rails parallel:create parallel:load_schema parallel:spec
+        run: docker compose run --rm app bundle exec rspec
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-3.3.4
+3.3.6
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:3.3.4-alpine
+FROM ruby:3.3.6-alpine
 LABEL mainainer="[email protected]"
 LABEL org.opencontainers.image.source="https://github.com/yannis/kasaharacup"
 

diff --git a/Gemfile b/Gemfile
@@ -3,9 +3,9 @@
 source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby "3.3.4"
+ruby "3.3.6"
 
-gem "rails", "~> 7.1.3"
+gem "rails", "~> 8.0.0"
 
 # Database
 gem "pg", "~> 1.5"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -9,51 +9,45 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.1.5.1)
-      actionpack (= 7.1.5.1)
-      activesupport (= 7.1.5.1)
+    actioncable (8.0.1)
+      actionpack (= 8.0.1)
+      activesupport (= 8.0.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.1.5.1)
-      actionpack (= 7.1.5.1)
-      activejob (= 7.1.5.1)
-      activerecord (= 7.1.5.1)
-      activestorage (= 7.1.5.1)
-      activesupport (= 7.1.5.1)
-      mail (>= 2.7.1)
-      net-imap
-      net-pop
-      net-smtp
-    actionmailer (7.1.5.1)
-      actionpack (= 7.1.5.1)
-      actionview (= 7.1.5.1)
-      activejob (= 7.1.5.1)
-      activesupport (= 7.1.5.1)
-      mail (~> 2.5, >= 2.5.4)
-      net-imap
-      net-pop
-      net-smtp
+    actionmailbox (8.0.1)
+      actionpack (= 8.0.1)
+      activejob (= 8.0.1)
+      activerecord (= 8.0.1)
+      activestorage (= 8.0.1)
+      activesupport (= 8.0.1)
+      mail (>= 2.8.0)
+    actionmailer (8.0.1)
+      actionpack (= 8.0.1)
+      actionview (= 8.0.1)
+      activejob (= 8.0.1)
+      activesupport (= 8.0.1)
+      mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (7.1.5.1)
-      actionview (= 7.1.5.1)
-      activesupport (= 7.1.5.1)
+    actionpack (8.0.1)
+      actionview (= 8.0.1)
+      activesupport (= 8.0.1)
       nokogiri (>= 1.8.5)
-      racc
       rack (>= 2.2.4)
       rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    actiontext (7.1.5.1)
-      actionpack (= 7.1.5.1)
-      activerecord (= 7.1.5.1)
-      activestorage (= 7.1.5.1)
-      activesupport (= 7.1.5.1)
+      useragent (~> 0.16)
+    actiontext (8.0.1)
+      actionpack (= 8.0.1)
+      activerecord (= 8.0.1)
+      activestorage (= 8.0.1)
+      activesupport (= 8.0.1)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.1.5.1)
-      activesupport (= 7.1.5.1)
+    actionview (8.0.1)
+      activesupport (= 8.0.1)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
@@ -70,34 +64,34 @@ GEM
       kaminari (>= 1.2.1)
       railties (>= 6.1)
       ransack (>= 4.0)
-    activejob (7.1.5.1)
-      activesupport (= 7.1.5.1)
+    activejob (8.0.1)
+      activesupport (= 8.0.1)
       globalid (>= 0.3.6)
-    activemodel (7.1.5.1)
-      activesupport (= 7.1.5.1)
-    activerecord (7.1.5.1)
-      activemodel (= 7.1.5.1)
-      activesupport (= 7.1.5.1)
+    activemodel (8.0.1)
+      activesupport (= 8.0.1)
+    activerecord (8.0.1)
+      activemodel (= 8.0.1)
+      activesupport (= 8.0.1)
       timeout (>= 0.4.0)
-    activestorage (7.1.5.1)
-      actionpack (= 7.1.5.1)
-      activejob (= 7.1.5.1)
-      activerecord (= 7.1.5.1)
-      activesupport (= 7.1.5.1)
+    activestorage (8.0.1)
+      actionpack (= 8.0.1)
+      activejob (= 8.0.1)
+      activerecord (= 8.0.1)
+      activesupport (= 8.0.1)
       marcel (~> 1.0)
-    activesupport (7.1.5.1)
+    activesupport (8.0.1)
       base64
       benchmark (>= 0.3)
       bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+      concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
       logger (>= 1.4.2)
       minitest (>= 5.1)
-      mutex_m
       securerandom (>= 0.3)
-      tzinfo (~> 2.0)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     arbre (1.7.0)
@@ -327,7 +321,6 @@ GEM
     msgpack (1.7.5)
     multi_xml (0.7.1)
       bigdecimal (~> 3.1)
-    mutex_m (0.3.0)
     net-imap (0.5.4)
       date
       net-protocol
@@ -384,20 +377,20 @@ GEM
       rack (>= 1.3)
     rackup (2.2.1)
       rack (>= 3)
-    rails (7.1.5.1)
-      actioncable (= 7.1.5.1)
-      actionmailbox (= 7.1.5.1)
-      actionmailer (= 7.1.5.1)
-      actionpack (= 7.1.5.1)
-      actiontext (= 7.1.5.1)
-      actionview (= 7.1.5.1)
-      activejob (= 7.1.5.1)
-      activemodel (= 7.1.5.1)
-      activerecord (= 7.1.5.1)
-      activestorage (= 7.1.5.1)
-      activesupport (= 7.1.5.1)
+    rails (8.0.1)
+      actioncable (= 8.0.1)
+      actionmailbox (= 8.0.1)
+      actionmailer (= 8.0.1)
+      actionpack (= 8.0.1)
+      actiontext (= 8.0.1)
+      actionview (= 8.0.1)
+      activejob (= 8.0.1)
+      activemodel (= 8.0.1)
+      activerecord (= 8.0.1)
+      activestorage (= 8.0.1)
+      activesupport (= 8.0.1)
       bundler (>= 1.15.0)
-      railties (= 7.1.5.1)
+      railties (= 8.0.1)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
@@ -409,13 +402,13 @@ GEM
     rails-html-sanitizer (1.6.2)
       loofah (~> 2.21)
       nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
-    rails-i18n (7.0.10)
+    rails-i18n (8.0.1)
       i18n (>= 0.7, < 2)
-      railties (>= 6.0.0, < 8)
-    railties (7.1.5.1)
-      actionpack (= 7.1.5.1)
-      activesupport (= 7.1.5.1)
-      irb
+      railties (>= 8.0.0, < 9)
+    railties (8.0.1)
+      actionpack (= 8.0.1)
+      activesupport (= 8.0.1)
+      irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
@@ -586,6 +579,8 @@ GEM
       concurrent-ruby (~> 1.0)
     unaccent (0.4.0)
     unicode-display_width (2.6.0)
+    uri (1.0.2)
+    useragent (0.16.11)
     view_component (3.21.0)
       activesupport (>= 5.2.0, < 8.1)
       concurrent-ruby (~> 1.0)
@@ -654,7 +649,7 @@ DEPENDENCIES
   puma (~> 6.4)
   rack-cors
   rack-mini-profiler
-  rails (~> 7.1.3)
+  rails (~> 8.0.0)
   rails-controller-testing
   recaptcha
   redis (~> 5.0)
@@ -676,7 +671,7 @@ DEPENDENCIES
   webmock
 
 RUBY VERSION
-   ruby 3.3.4p94
+   ruby 3.3.6p108
 
 BUNDLED WITH
    2.5.6
diff --git a/RULES.md b/RULES.md
@@ -84,6 +84,6 @@ After the pool system, the first and second out of every pool will be put on the
 
 The combat time is 3 minutes for seniors and juniors, following the "sanbon shobu" rule, with the possibility of one prolongation (encho).
 
-There is time limit of three minutes for the “encho”. 
+There is time limit of three minutes for the “encho”.
 
 If the "encho" is not enough to determine a winner after three minutes, the fight will be decided by shinpan-decisions (hantei) except for semi-final and finals, where encho without time limit will apply.
diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js
@@ -1,4 +1,4 @@
 //= link_tree ../images
 //= link_tree ../pdfs
-//= link_directory ../stylesheets .css
+//= link_tree ../stylesheets
 //= link_tree ../builds
diff --git a/app/models/concerns/acts_as_category.rb b/app/models/concerns/acts_as_category.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "translate"
-require "smart_pooler"
 
 module ActsAsCategory
   extend ActiveSupport::Concern

diff --git a/app/pdfs/individual_category_pool_matches_pdf.rb b/app/pdfs/individual_category_pool_matches_pdf.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "poster_size"
 class IndividualCategoryPoolMatchesPdf < Prawn::Document
   include PosterSize
 

diff --git a/app/pdfs/kenshi_pdf.rb b/app/pdfs/kenshi_pdf.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "poster_size"
 class KenshiPdf < Prawn::Document
   include PosterSize
 

diff --git a/app/pdfs/kenshis_pdf.rb b/app/pdfs/kenshis_pdf.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "poster_size"
 class KenshisPdf < Prawn::Document
   include PosterSize
   def initialize(kenshis)

diff --git a/app/pdfs/team_categories_pdf.rb b/app/pdfs/team_categories_pdf.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "poster_size"
 class TeamCategoriesPdf < Prawn::Document
   include PosterSize
   def initialize(teams)

diff --git a/app/pdfs/team_category_pdf.rb b/app/pdfs/team_category_pdf.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "poster_size"
 class TeamCategoryPdf < Prawn::Document
   include PosterSize
   def initialize(team_category)

diff --git a/app/pdfs/team_pdf.rb b/app/pdfs/team_pdf.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "poster_size"
 class TeamPdf < Prawn::Document
   include PosterSize
   def initialize(team)

diff --git a/bin/brakeman b/bin/brakeman
@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+require "rubygems"
+require "bundler/setup"
+
+ARGV.unshift("--ensure-latest")
+
+load Gem.bin_path("brakeman", "brakeman")
diff --git a/bin/dev b/bin/dev
@@ -1,9 +1,2 @@
-#!/usr/bin/env bash
-
-if ! command -v foreman &> /dev/null
-then
-  echo "Installing foreman..."
-  gem install foreman
-fi
-
-foreman start -f Procfile.dev
+#!/usr/bin/env ruby
+exec "./bin/rails", "server", *ARGV
diff --git a/bin/rubocop b/bin/rubocop
@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+require "rubygems"
+require "bundler/setup"
+
+# explicit rubocop config increases performance slightly while avoiding config confusion.
+ARGV.unshift("--config", File.expand_path("../.rubocop.yml", __dir__))
+
+load Gem.bin_path("rubocop", "rubocop")
diff --git a/bin/setup b/bin/setup
@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 require "fileutils"
 
-# path to your application root.
 APP_ROOT = File.expand_path("..", __dir__)
 
 def system!(*args)
@@ -14,7 +13,6 @@ FileUtils.chdir APP_ROOT do
   # Add necessary setup steps to this file.
 
   puts "== Installing dependencies =="
-  system! "gem install bundler --conservative"
   system("bundle check") || system!("bundle install")
 
   # puts "\n== Copying sample files =="
@@ -28,6 +26,9 @@ FileUtils.chdir APP_ROOT do
   puts "\n== Removing old logs and tempfiles =="
   system! "bin/rails log:clear tmp:clear"
 
-  puts "\n== Restarting application server =="
-  system! "bin/rails restart"
+  unless ARGV.include?("--skip-server")
+    puts "\n== Starting development server =="
+    STDOUT.flush # flush the output before exec(2) so that it displays
+    exec "bin/dev"
+  end
 end
diff --git a/config/application.rb b/config/application.rb
@@ -23,7 +23,7 @@
 module Kasaharacup
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 7.0
+    config.load_defaults 8.0
 
     # Please, add to the `ignore` list any other `lib` subdirectories that do
     # not contain `.rb` files, or that should not be reloaded or eager loaded.