Update setup

bin/setup

@@ -7,29 +7,75 @@ def system!(*args)
   system(*args, exception: true)
 end
 
+# def run_sql_file(path)
+#   puts "== Running SQL file: #{path} =="
+#
+#   config = ActiveRecord::Base.connection_db_config.configuration_hash
+#
+#   command = [
+#     db_client,
+#     "-h", config[:host] || "127.0.0.1",
+#     "-P", (config[:port] || 3306).to_s,
+#     "-u", config[:username] || "root",
+#     "-D", config[:database]
+#   ].join(" ")
+#
+#   command << " -p#{config[:password]}" if config[:password]
+#
+#   # Use shell input redirection
+#   system!("#{command} < #{path}")
+#   puts "✓ Successfully executed #{path}"
+# rescue => e
+#   puts "Warning: failed to run #{path}: #{e.message}"
+# end
+
+# Choose mariadb or mysql client
+def db_client
+  if system("command -v mariadb > /dev/null", out: File::NULL)
+    "mariadb"
+  elsif system("command -v mysql > /dev/null", out: File::NULL)
+    "mysql"
+  else
+    raise "No MySQL/MariaDB client found on PATH. Install mariadb-clients or mysql-client."
+  end
+end
+
+# ------------------------------------------------------------------------------
+# Main setup sequence
+# ------------------------------------------------------------------------------
 FileUtils.chdir APP_ROOT do
-  # This script is a way to set up or update your development environment automatically.
-  # This script is idempotent, so that you can run it at any time and get an expectable outcome.
-  # Add necessary setup steps to this file.
+  require_relative "../config/environment"
 
   puts "== Installing dependencies =="
   system("bundle check") || system!("bundle install")
 
-  # puts "\n== Copying sample files =="
-  # unless File.exist?("config/database.yml")
-  #   FileUtils.cp "config/database.yml.sample", "config/database.yml"
-  # end
+  if File.exist?("package.json")
+    puts "\n== Installing npm packages =="
+    system!("npm install")
+  end
 
   puts "\n== Preparing database =="
-  system! "bin/rails db:prepare"
-  system! "bin/rails db:reset" if ARGV.include?("--reset")
+  system! "bin/rails db:drop"
+  system! "bin/rails db:create"
+
+  # puts "\n== Running SQL files in db/init =="
+  # Dir["db/init/*.sql"].sort.each { |file| run_sql_file(file) }
+
+  puts "\n== Running Rails migrations and seeds =="
+  system! "bin/rails db:migrate"
+  system! "bin/rails db:seed"
+
+  puts "\n== Preparing test database =="
+  system! "RAILS_ENV=test bin/rails db:drop"
+  system! "RAILS_ENV=test bin/rails db:create"
+  system! "RAILS_ENV=test bin/rails db:migrate"
 
-  puts "\n== Removing old logs and tempfiles =="
+  puts "\n== Cleaning logs and tempfiles =="
   system! "bin/rails log:clear tmp:clear"
 
   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"
+    STDOUT.flush
+    exec "mise server"
   end
 end

db/seeds.rb

@@ -1,15 +1,30 @@
 puts "Creating Users…"
-admin = User.where(first_name: "Umberto", last_name: "User",
-                   email: "umberto.user@example.com",
-                   super_user: true)
-            .first_or_create!(password: "password")
-nonadmin = User.where(first_name: "Amy", last_name: "User",
-                      email: "amy.user@example.com",
-                      super_user: false)
-               .first_or_create!(password: "password")
-User.where(first_name: "Orphaned Reports", last_name: "User",
-           email: "orphaned_reports@awbw.org").first_or_create!(password: "password")
-user_password = Devise::Encryptor.digest(User, 'password')
+
+# Admin
+User.find_or_create_by!(email: "umberto.user@example.com") do |user|
+  user.first_name = "Umberto"
+  user.last_name = "User"
+  user.password = "password"
+  user.super_user = true
+end
+
+# Non-Admin
+User.find_or_create_by!(email: "amy.user@example.com") do |user|
+  user.first_name = "Amy"
+  user.last_name = "User"
+  user.password = "password"
+  user.super_user = false
+end
+
+# Orphaned
+User.find_or_create_by!(email: "orphaned_reports@awbw.org") do |user|
+  user.first_name = "Orphaned Reports"
+  user.last_name = "User"
+  user.password = "password"
+  user.super_user = false
+end
+
+user_password = Devise::Encryptor.digest(User, "password")
 User.in_batches do |batch|
   batch.update_all(encrypted_password: user_password)
 end