From 045681a0060ff7ca3ec85c71b8714368479a58dc Mon Sep 17 00:00:00 2001 From: crimson-knight Date: Tue, 8 Nov 2022 12:41:41 -0500 Subject: [PATCH 1/3] added "/myapp" to be excluded from git tracking --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 0a2ac06f0..951538812 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,5 @@ lib/ /tmp shard.lock package-lock.json -node_modules \ No newline at end of file +node_modules +/myapp \ No newline at end of file From 8bc70fa33871b9e56fd26ab388df3d3e2c0e7173 Mon Sep 17 00:00:00 2001 From: crimson-knight Date: Tue, 8 Nov 2022 16:16:04 -0500 Subject: [PATCH 2/3] Added cli and cli.dwarf to the git ignore so less clean-up is required when working on the cli tool --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 951538812..00904b16f 100644 --- a/.gitignore +++ b/.gitignore @@ -11,4 +11,6 @@ lib/ shard.lock package-lock.json node_modules -/myapp \ No newline at end of file +/myapp +cli +cli.dwarf \ No newline at end of file From c0ab79f055a211840299031b986852deab004422 Mon Sep 17 00:00:00 2001 From: crimson-knight Date: Tue, 8 Nov 2022 16:16:46 -0500 Subject: [PATCH 3/3] Changed PG to check for the current user and omit the password for a speedier way to get started --- shard.yml | 2 +- spec/support/helpers/cli_helper.cr | 2 +- .../cli/templates/app/config/environments/development.yml.ecr | 2 +- .../cli/templates/app/config/environments/production.yml.ecr | 2 +- src/amber/version.cr | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/shard.yml b/shard.yml index e19af5311..e4d585973 100644 --- a/shard.yml +++ b/shard.yml @@ -1,6 +1,6 @@ name: amber -version: 1.3.1 +version: 1.3.2 authors: - Amber Team and Contributors diff --git a/spec/support/helpers/cli_helper.cr b/spec/support/helpers/cli_helper.cr index b7a48de73..e7a3ed3a6 100644 --- a/spec/support/helpers/cli_helper.cr +++ b/spec/support/helpers/cli_helper.cr @@ -40,7 +40,7 @@ module CLIHelper def expected_db_url(db_key, env) case db_key when "pg" - "postgres://postgres:password@localhost:5432/#{TEST_APP_NAME}_#{env}" + "postgres://#{`whoami`.strip("\n")}:@localhost:5432/#{TEST_APP_NAME}_#{env}" when "mysql" "#{db_key}://root@localhost:3306/#{TEST_APP_NAME}_#{env}" else diff --git a/src/amber/cli/templates/app/config/environments/development.yml.ecr b/src/amber/cli/templates/app/config/environments/development.yml.ecr index 8a270636d..fc2fb35ee 100644 --- a/src/amber/cli/templates/app/config/environments/development.yml.ecr +++ b/src/amber/cli/templates/app/config/environments/development.yml.ecr @@ -19,7 +19,7 @@ redis_url: "redis://localhost:6379" when "mysql" -%> database_url: mysql://root@localhost:3306/<%= database_name %>_development <% when "pg" -%> -database_url: postgres://postgres:password@localhost:5432/<%= database_name %>_development +database_url: postgres://<%= `whoami`.strip("\n") -%>:@localhost:5432/<%= database_name %>_development <% when "sqlite" -%> database_url: sqlite3:./db/<%= database_name %>_development.db <% else diff --git a/src/amber/cli/templates/app/config/environments/production.yml.ecr b/src/amber/cli/templates/app/config/environments/production.yml.ecr index 3e95b621f..dcf46ab28 100644 --- a/src/amber/cli/templates/app/config/environments/production.yml.ecr +++ b/src/amber/cli/templates/app/config/environments/production.yml.ecr @@ -19,7 +19,7 @@ redis_url: "redis://localhost:6379" when "mysql" -%> database_url: mysql://root@localhost:3306/<%= database_name %> <% when "pg" -%> -database_url: postgres://postgres:password@localhost:5432/<%= database_name %> +database_url: postgres://<%= `whoami`.strip("\n") %>:@localhost:5432/<%= database_name %> <% when "sqlite" -%> database_url: sqlite3:./db/<%= database_name %>.db <% else diff --git a/src/amber/version.cr b/src/amber/version.cr index c076a8bb6..a6f64f583 100644 --- a/src/amber/version.cr +++ b/src/amber/version.cr @@ -1,3 +1,3 @@ module Amber - VERSION = "1.3.1" + VERSION = "1.3.2" end