feat: env fix (#151)

Removing the need to have duplicate .env files - generate a single file

cmd/program/program.go

@@ -76,7 +76,6 @@ type Templater interface {
 type DBDriverTemplater interface {
 	Service() []byte
 	Env() []byte
-	EnvExample() []byte
 }
 
 type DockerTemplater interface {
@@ -273,13 +272,6 @@ func (p *Project) CreateMainFile() error {
 	// Create correct docker compose for the selected driver
 	if p.DBDriver != "none" {
 
-		err = p.CreateFileWithInjection(root, projectPath, ".env.example", "env-example")
-		if err != nil {
-			log.Printf("Error injecting .env.example file: %v", err)
-			cobra.CheckErr(err)
-			return err
-		}
-
 		if p.DBDriver != "sqlite" {
 			p.createDockerMap()
 			p.Docker = p.DBDriver
@@ -336,11 +328,20 @@ func (p *Project) CreateMainFile() error {
 
 	defer makeFile.Close()
 
-	// inject makefile template
-	makeFileTemplate := template.Must(template.New("makefile").Parse(string(framework.MakeTemplate())))
-	err = makeFileTemplate.Execute(makeFile, p)
-	if err != nil {
-		return err
+	if p.DBDriver == "sqlite" || p.DBDriver == "none" {
+		// inject makefile template
+		makeFileTemplate := template.Must(template.New("makefile").Parse(string(framework.NonDbMakeFileTemplate())))
+		err = makeFileTemplate.Execute(makeFile, p)
+		if err != nil {
+			return err
+		}
+	} else {
+		// inject makefile template for database excluding sqlite
+		makeFileTemplate := template.Must(template.New("makefile").Parse(string(framework.MakeTemplate())))
+		err = makeFileTemplate.Execute(makeFile, p)
+		if err != nil {
+			return err
+		}
 	}
 
 	readmeFile, err := os.Create(filepath.Join(projectPath, "README.md"))
@@ -654,9 +655,6 @@ func (p *Project) CreateFileWithInjection(pathToCreate string, projectPath strin
 	case "tests":
 		createdTemplate := template.Must(template.New(fileName).Parse(string(p.FrameworkMap[p.ProjectType].templater.TestHandler())))
 		err = createdTemplate.Execute(createdFile, p)
-	case "env-example":
-		createdTemplate := template.Must(template.New(fileName).Parse(string(p.DBDriverMap[p.DBDriver].templater.EnvExample())))
-		err = createdTemplate.Execute(createdFile, p)
 	case "env":
 		if p.DBDriver != "none" {
 

cmd/template/dbdriver/files/env/mongo.tmpl

@@ -1,4 +1,4 @@
-DB_HOST=
-DB_PORT=
-DB_USERNAME=
-DB_ROOT_PASSWORD=
+DB_HOST=localhost
+DB_PORT=27017
+DB_USERNAME=melkey
+DB_ROOT_PASSWORD=password1234

cmd/template/dbdriver/files/env/mysql.tmpl

@@ -1,6 +1,6 @@
-DB_HOST=
-DB_PORT=
-DB_DATABASE=
-DB_USERNAME=
-DB_PASSWORD=
-DB_ROOT_PASSWORD=
+DB_HOST=localhost
+DB_PORT=3306
+DB_DATABASE=blueprint
+DB_USERNAME=melkey
+DB_PASSWORD=password1234
+DB_ROOT_PASSWORD=password4321

cmd/template/dbdriver/files/env/postgres.tmpl

@@ -1,5 +1,5 @@
-DB_HOST=
-DB_PORT=
-DB_DATABASE=
-DB_USERNAME=
-DB_PASSWORD=
+DB_HOST=localhost
+DB_PORT=5432
+DB_DATABASE=blueprint
+DB_USERNAME=melkey
+DB_PASSWORD=password1234

cmd/template/dbdriver/files/env/sqlite.tmpl

@@ -1 +1 @@
-DB_URL=
+DB_URL=./test.db

cmd/template/dbdriver/mongo.go

@@ -12,8 +12,6 @@ var mongoServiceTemplate []byte
 //go:embed files/env/mongo.tmpl
 var mongoEnvTemplate []byte
 
-//go:embed files/env/mongo.example.tmpl
-var mongoEnvExampleTemplate []byte
 
 func (m MongoTemplate) Service() []byte {
 	return mongoServiceTemplate
@@ -23,6 +21,3 @@ func (m MongoTemplate) Env() []byte {
 	return mongoEnvTemplate
 }
 
-func (m MongoTemplate) EnvExample() []byte {
-	return mongoEnvExampleTemplate
-}

cmd/template/dbdriver/mysql.go

@@ -12,9 +12,6 @@ var mysqlServiceTemplate []byte
 //go:embed files/env/mysql.tmpl
 var mysqlEnvTemplate []byte
 
-//go:embed files/env/mysql.example.tmpl
-var mysqlEnvExampleTemplate []byte
-
 func (m MysqlTemplate) Service() []byte {
 	return mysqlServiceTemplate
 }
@@ -23,6 +20,3 @@ func (m MysqlTemplate) Env() []byte {
 	return mysqlEnvTemplate
 }
 
-func (m MysqlTemplate) EnvExample() []byte {
-	return mysqlEnvExampleTemplate
-}

cmd/template/dbdriver/postgres.go

@@ -12,17 +12,10 @@ var postgresServiceTemplate []byte
 //go:embed files/env/postgres.tmpl
 var postgresEnvTemplate []byte
 
-//go:embed files/env/postgres.example.tmpl
-var postgresEnvExampleTemplate []byte
-
 func (m PostgresTemplate) Service() []byte {
 	return postgresServiceTemplate
 }
 
 func (m PostgresTemplate) Env() []byte {
 	return postgresEnvTemplate
 }
-
-func (m PostgresTemplate) EnvExample() []byte {
-	return postgresEnvExampleTemplate
-}

cmd/template/dbdriver/sqlite.go

@@ -12,17 +12,10 @@ var sqliteServiceTemplate []byte
 //go:embed files/env/sqlite.tmpl
 var sqliteEnvTemplate []byte
 
-//go:embed files/env/sqlite.example.tmpl
-var sqliteEnvExampleTemplate []byte
-
 func (m SqliteTemplate) Service() []byte {
 	return sqliteServiceTemplate
 }
 
 func (m SqliteTemplate) Env() []byte {
 	return sqliteEnvTemplate
 }
-
-func (m SqliteTemplate) EnvExample() []byte {
-	return sqliteEnvExampleTemplate
-}

cmd/template/framework/files/nondbMakeFile.tmpl

@@ -0,0 +1,41 @@
+# Simple Makefile for a Go project
+
+# Build the application
+all: build
+
+build:
+	@echo "Building..."
+	@go build -o main cmd/api/main.go
+
+# Run the application
+run:
+	@go run cmd/api/main.go
+
+# Test the application
+test:
+	@echo "Testing..."
+	@go test ./tests -v
+
+# Clean the binary
+clean:
+	@echo "Cleaning..."
+	@rm -f main
+
+# Live Reload
+watch:
+	@if command -v air > /dev/null; then \
+	    air; \
+	    echo "Watching...";\
+	else \
+	    read -p "Go's 'air' is not installed on your machine. Do you want to install it? [Y/n] " choice; \
+	    if [ "$$choice" != "n" ] && [ "$$choice" != "N" ]; then \
+	        go install github.com/cosmtrek/air@latest; \
+	        air; \
+	        echo "Watching...";\
+	    else \
+	        echo "You chose not to install air. Exiting..."; \
+	        exit 1; \
+	    fi; \
+	fi
+
+.PHONY: all build run test clean

cmd/template/framework/main.go

@@ -9,6 +9,9 @@ import (
 //go:embed files/main/main.go.tmpl
 var mainTemplate []byte
 
+//go:embed files/nondbMakeFile.tmpl
+var nondbMakeFileTemplate []byte
+
 //go:embed files/air.toml.tmpl
 var airTomlTemplate []byte
 
@@ -40,3 +43,7 @@ func AirTomlTemplate() []byte {
 func ReadmeTemplate() []byte {
 	return readmeTemplate
 }
+
+func NonDbMakeFileTemplate() []byte {
+    return nondbMakeFileTemplate
+}

contributors.yml

@@ -8,7 +8,7 @@
 - nhlmg93
 - MitchellBerend
 - itschip
-- 20pa5a1210
+- SudoSurya
 - alexjoedt
 - sakelig
 - joshjms