From a841358f51da34d21669aaba959f54d2f2805dda Mon Sep 17 00:00:00 2001 From: Ajitem Sahasrabuddhe Date: Fri, 30 Aug 2024 07:38:00 +0530 Subject: [PATCH 1/3] fix package name for generated components --- cmd/fuego/commands/controller.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmd/fuego/commands/controller.go b/cmd/fuego/commands/controller.go index 991f7451..faf989a4 100644 --- a/cmd/fuego/commands/controller.go +++ b/cmd/fuego/commands/controller.go @@ -53,7 +53,8 @@ func createController(controllerName string) (string, error) { t := language.English titler := cases.Title(t) - newContent := strings.ReplaceAll(string(templateContent), "newController", controllerName) + newContent := strings.ReplaceAll(string(templateContent), "package controller", "package controllers") + newContent = strings.ReplaceAll(newContent, "newController", controllerName) newContent = strings.ReplaceAll(newContent, "NewController", titler.String(controllerName)) controllerPath := fmt.Sprintf("%s%s.go", controllerDir, controllerName) From 680b2458b42b65ce6a622ba1e072cc66f951331d Mon Sep 17 00:00:00 2001 From: Ajitem Sahasrabuddhe Date: Sat, 31 Aug 2024 14:10:24 +0530 Subject: [PATCH 2/3] apply feedback - update package name in template --- cmd/fuego/commands/controller.go | 3 +-- cmd/fuego/templates/controller/controller.go | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/cmd/fuego/commands/controller.go b/cmd/fuego/commands/controller.go index faf989a4..991f7451 100644 --- a/cmd/fuego/commands/controller.go +++ b/cmd/fuego/commands/controller.go @@ -53,8 +53,7 @@ func createController(controllerName string) (string, error) { t := language.English titler := cases.Title(t) - newContent := strings.ReplaceAll(string(templateContent), "package controller", "package controllers") - newContent = strings.ReplaceAll(newContent, "newController", controllerName) + newContent := strings.ReplaceAll(string(templateContent), "newController", controllerName) newContent = strings.ReplaceAll(newContent, "NewController", titler.String(controllerName)) controllerPath := fmt.Sprintf("%s%s.go", controllerDir, controllerName) diff --git a/cmd/fuego/templates/controller/controller.go b/cmd/fuego/templates/controller/controller.go index 9c636818..c3d70ac8 100644 --- a/cmd/fuego/templates/controller/controller.go +++ b/cmd/fuego/templates/controller/controller.go @@ -1,4 +1,4 @@ -package controller +package controllers import ( "github.com/go-fuego/fuego" From 9854bf19f5120156c2320db5092469ce0d5046d0 Mon Sep 17 00:00:00 2001 From: Ajitem Sahasrabuddhe Date: Sat, 31 Aug 2024 15:46:46 +0530 Subject: [PATCH 3/3] change name of the generated controller folder --- cmd/fuego/commands/controller.go | 2 +- cmd/fuego/templates/controller/controller.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/fuego/commands/controller.go b/cmd/fuego/commands/controller.go index 991f7451..d713e6c0 100644 --- a/cmd/fuego/commands/controller.go +++ b/cmd/fuego/commands/controller.go @@ -37,7 +37,7 @@ func Controller() *cli.Command { // createController creates a new controller file func createController(controllerName string) (string, error) { - controllerDir := "./controllers/" + controllerDir := "./controller/" if _, err := os.Stat(controllerDir); os.IsNotExist(err) { err = os.Mkdir(controllerDir, 0o755) if err != nil { diff --git a/cmd/fuego/templates/controller/controller.go b/cmd/fuego/templates/controller/controller.go index c3d70ac8..9c636818 100644 --- a/cmd/fuego/templates/controller/controller.go +++ b/cmd/fuego/templates/controller/controller.go @@ -1,4 +1,4 @@ -package controllers +package controller import ( "github.com/go-fuego/fuego"