Update dev dependencies and docker-compose

And move to propshaft from sprockets.

Gemfile

@@ -3,25 +3,3 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 # Specify your gem's dependencies in audits1984.gemspec.
 gemspec
-
-gem 'sqlite3'
-gem 'pg'
-gem 'mysql2'
-
-group :development do
-  gem 'rubocop-rails-omakase', require: false
-end
-
-group :test do
-  gem 'minitest'
-
-  gem 'rails'
-  gem 'sprockets-rails'
-  gem 'puma'
-
-  gem 'capybara'
-  gem 'cuprite'
-end
-
-# To use a debugger
-# gem 'byebug', group: [:development, :test]

Gemfile.lock

@@ -3,6 +3,7 @@ PATH
   specs:
     audits1984 (0.1.7)
       console1984
+      importmap-rails (>= 1.2.1)
       rinku
       rouge
       turbo-rails
@@ -99,6 +100,9 @@ GEM
       capybara (~> 3.0)
       ferrum (~> 0.14.0)
     date (3.3.4)
+    debug (1.9.2)
+      irb (~> 1.10)
+      reline (>= 0.3.8)
     erubi (1.12.0)
     ferrum (0.14)
       addressable (~> 2.5)
@@ -109,6 +113,10 @@ GEM
       activesupport (>= 5.0)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
+    importmap-rails (2.0.3)
+      actionpack (>= 6.0.0)
+      activesupport (>= 6.0.0)
+      railties (>= 6.0.0)
     io-console (0.7.2)
     irb (1.14.0)
       rdoc (>= 4.0.0)
@@ -145,6 +153,11 @@ GEM
     parser (3.2.2.1)
       ast (~> 2.4.1)
     pg (1.5.3)
+    propshaft (1.1.0)
+      actionpack (>= 7.0.0)
+      activesupport (>= 7.0.0)
+      rack
+      railties (>= 7.0.0)
     psych (5.1.2)
       stringio
     public_suffix (5.0.1)
@@ -220,13 +233,6 @@ GEM
       rubocop-performance
       rubocop-rails
     ruby-progressbar (1.13.0)
-    sprockets (4.2.0)
-      concurrent-ruby (~> 1.0)
-      rack (>= 2.2.4, < 4)
-    sprockets-rails (3.4.2)
-      actionpack (>= 5.2)
-      activesupport (>= 5.2)
-      sprockets (>= 3.0.0)
     sqlite3 (1.6.3)
       mini_portile2 (~> 2.8.0)
     stringio (3.1.1)
@@ -257,13 +263,15 @@ DEPENDENCIES
   audits1984!
   capybara
   cuprite
+  debug
   minitest
   mysql2
   pg
+  propshaft
   puma
-  rails
+  rubocop (~> 1.52.0)
+  rubocop-performance
   rubocop-rails-omakase
-  sprockets-rails
   sqlite3
 
 BUNDLED WITH

audits1984.gemspec

@@ -21,6 +21,20 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "rouge"
   spec.add_dependency "turbo-rails"
+  spec.add_dependency "importmap-rails", ">= 1.2.1"
   spec.add_dependency "rinku"
   spec.add_dependency "console1984"
+
+  spec.add_development_dependency "sqlite3"
+  spec.add_development_dependency "pg"
+  spec.add_development_dependency "mysql2"
+  spec.add_development_dependency "debug"
+  spec.add_development_dependency "rubocop", "~> 1.52.0"
+  spec.add_development_dependency "rubocop-performance"
+  spec.add_development_dependency "rubocop-rails-omakase"
+  spec.add_development_dependency "propshaft"
+  spec.add_development_dependency "puma"
+  spec.add_development_dependency "minitest"
+  spec.add_development_dependency "capybara"
+  spec.add_development_dependency "cuprite"
 end

bin/setup

@@ -2,8 +2,14 @@
 set -eu
 cd "$(dirname "${BASH_SOURCE[0]}")"
 
-docker-compose up -d --remove-orphans
-docker-compose ps
+if docker compose version &> /dev/null; then
+  DOCKER_COMPOSE_CMD="docker compose"
+else
+  DOCKER_COMPOSE_CMD="docker-compose"
+fi
+
+$DOCKER_COMPOSE_CMD up -d --remove-orphans
+$DOCKER_COMPOSE_CMD ps
 
 bundle
 

docker-compose.yml

@@ -5,12 +5,12 @@ volumes:
 
 services:
   mysql:
-    image: percona:5.7.22
+    image: mysql:8.0.31
     environment:
       MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
     volumes:
       - db:/var/lib/mysql
-    ports: [ "127.0.0.1:33307:3306" ]
+    ports: [ "127.0.0.1:33060:3306" ]
   postgres:
     image: postgres:13.4
     environment: