From d683fd43aceb654e552638495caf2f485f4ad651 Mon Sep 17 00:00:00 2001 From: Matt Wagner Date: Fri, 19 May 2023 16:54:12 -0400 Subject: [PATCH 1/3] Adds make tidy --- Makefile | 26 ++++++++++++++++++++++++++ bin/setup | 15 +++------------ 2 files changed, 29 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 151327b2445..b03fd88e273 100644 --- a/Makefile +++ b/Makefile @@ -15,6 +15,9 @@ ARTIFACT_DESTINATION_FILE ?= ./tmp/idp.tar.gz brakeman \ build_artifact \ check \ + clobber_db \ + clobber_assets \ + clobber_logs \ docker_setup \ download_acuant_sdk \ fast_setup \ @@ -34,6 +37,7 @@ ARTIFACT_DESTINATION_FILE ?= ./tmp/idp.tar.gz optimize_assets \ optimize_svg \ run \ + tidy \ update \ urn \ README.md \ @@ -268,3 +272,25 @@ README.md: docs/ ## Generates README.md based on the contents of the docs direct download_acuant_sdk: ## Downloads the most recent Acuant SDK release from Github @scripts/download_acuant_sdk.sh + +clobber_db: ## resets the database for make setup + bin/rake db:create + bin/rake db:environment:set + bin/rake db:reset + bin/rake db:environment:set + bin/rake dev:prime + +clobber_assets: ## removes assets + bin/rake assets:clobber + RAILS_ENV=test bin/rake assets:clobber + +clobber_logs: ## purges logs + rm -f log/* + rm -rf tmp/cache/* + rm -rf tmp/encrypted_doc_storage + rm -rf tmp/letter_opener + rm -rf tmp/mails + +## Remove assets and logs, and unused gems, but leave DB alone +tidy: clobber_assets clobber_logs + bundle clean diff --git a/bin/setup b/bin/setup index 323d382db4b..0b637303757 100755 --- a/bin/setup +++ b/bin/setup @@ -56,22 +56,13 @@ Dir.chdir APP_ROOT do run "yarn install" puts "\n== Preparing database ==" - run 'bin/rake db:create' - run 'bin/rake db:environment:set' - run 'bin/rake db:reset' - run 'bin/rake db:environment:set' - run 'bin/rake dev:prime' + run 'make clobber_db' puts "\n== Cleaning up old assets ==" - run "bin/rake assets:clobber" - run "RAILS_ENV=test bin/rake assets:clobber" + run "make clobber_assets" puts "\n== Removing old logs and tempfiles ==" - run "rm -f log/*" - run "rm -rf tmp/cache" - run "rm -rf tmp/encrypted_doc_storage" - run "rm -rf tmp/letter_opener" - run "rm -rf tmp/mails" + run "make clobber_logs" puts "\n== Restarting application server ==" run "mkdir -p tmp" From 0f7a28c4d4801aff8b023be0d991357a732541ed Mon Sep 17 00:00:00 2001 From: Matt Wagner Date: Fri, 19 May 2023 18:00:10 -0400 Subject: [PATCH 2/3] PR feedback [skip changelog] --- Makefile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index b03fd88e273..872650845ba 100644 --- a/Makefile +++ b/Makefile @@ -273,24 +273,23 @@ README.md: docs/ ## Generates README.md based on the contents of the docs direct download_acuant_sdk: ## Downloads the most recent Acuant SDK release from Github @scripts/download_acuant_sdk.sh -clobber_db: ## resets the database for make setup +clobber_db: ## Resets the database for make setup bin/rake db:create bin/rake db:environment:set bin/rake db:reset bin/rake db:environment:set bin/rake dev:prime -clobber_assets: ## removes assets +clobber_assets: ## Removes (clobbers) assets bin/rake assets:clobber RAILS_ENV=test bin/rake assets:clobber -clobber_logs: ## purges logs +clobber_logs: ## Purges logs and tmp/ rm -f log/* rm -rf tmp/cache/* rm -rf tmp/encrypted_doc_storage rm -rf tmp/letter_opener rm -rf tmp/mails -## Remove assets and logs, and unused gems, but leave DB alone -tidy: clobber_assets clobber_logs +tidy: clobber_assets clobber_logs ## Remove assets and logs, and unused gems, but leave DB alone bundle clean From 3839b7d71b18ffeb32b3001917156ec614df336f Mon Sep 17 00:00:00 2001 From: Matt Wagner Date: Wed, 24 May 2023 16:01:02 -0400 Subject: [PATCH 3/3] Update Makefile Co-authored-by: Andrew Duthie --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 872650845ba..08925bfd1fa 100644 --- a/Makefile +++ b/Makefile @@ -291,5 +291,5 @@ clobber_logs: ## Purges logs and tmp/ rm -rf tmp/letter_opener rm -rf tmp/mails -tidy: clobber_assets clobber_logs ## Remove assets and logs, and unused gems, but leave DB alone +tidy: clobber_assets clobber_logs ## Remove assets, logs, and unused gems, but leave DB alone bundle clean