From ed4f8ad6d96fec99d98820cc5475cc7c4d4ec287 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Sat, 22 Jul 2023 03:03:42 +0200 Subject: [PATCH] Simplify development environment setup Rails provides a script that already did most of the steps. --- README.md | 7 +------ README_ES.md | 7 +------ bin/setup | 13 +++++++++---- 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 5d580d5ce..8275db92b 100644 --- a/README.md +++ b/README.md @@ -43,13 +43,8 @@ Prerequisites: install git, Ruby 3.1.4, CMake, pkg-config, shared-mime-info, Nod ```bash git clone https://github.com/consuldemocracy/consuldemocracy.git cd consuldemocracy -bundle install -cp config/database.yml.example config/database.yml -cp config/secrets.yml.example config/secrets.yml -bin/rake db:create -bin/rake db:migrate +bin/setup bin/rake db:dev_seed -RAILS_ENV=test rake db:setup ``` Run the app locally: diff --git a/README_ES.md b/README_ES.md index 0704e6f98..ad8c5e105 100644 --- a/README_ES.md +++ b/README_ES.md @@ -41,13 +41,8 @@ Prerequisitos: tener instalado git, Ruby 3.1.4, CMake, pkg-config, shared-mime-i ```bash git clone https://github.com/consuldemocracy/consuldemocracy.git cd consuldemocracy -bundle install -cp config/database.yml.example config/database.yml -cp config/secrets.yml.example config/secrets.yml -bin/rake db:create -bin/rake db:migrate +bin/setup bin/rake db:dev_seed -RAILS_ENV=test rake db:setup ``` Para ejecutar la aplicación en local: diff --git a/bin/setup b/bin/setup index 50fe75198..0fa8d7173 100755 --- a/bin/setup +++ b/bin/setup @@ -17,13 +17,18 @@ FileUtils.chdir APP_ROOT do system! "gem install bundler --conservative" 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 + puts "\n== Copying sample files ==" + unless File.exist?("config/database.yml") + FileUtils.cp "config/database.yml.example", "config/database.yml" + end + + unless File.exist?("config/secrets.yml") + FileUtils.cp "config/secrets.yml.example", "config/secrets.yml" + end puts "\n== Preparing database ==" system! "bin/rails db:prepare" + system! "RAILS_ENV=test bin/rails db:prepare" puts "\n== Removing old logs and tempfiles ==" system! "bin/rails log:clear tmp:clear"