Split command line interfaces and http server.

Author: RobyFerro

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to the "Go-Web Framework" will be documented in this file.
 
 ## [Unreleased]
 
+## [v0.6-0-beta] - 2021-08-25
+### Changed
+- Split command line interfaces and http server.
+
 ## [v0.5-9-beta] - 2021-08-23
 ### Added
 - Gzip compression over HTTP responses

application.go

@@ -21,24 +21,24 @@ type BaseEntities struct {
 	Models            register.ModelRegister
 }
 
-// Start method will start the main Go-Web HTTP Server.
-func Start(args []string, entities BaseEntities) {
-	c := kernel.BuildCommandContainer()
-	myFigure := figure.NewFigure("Go-Web", "graffiti", true)
-	myFigure.Print()
-
-	fmt.Println("Go-Web CLI tool - Author: [email protected]")
+// Start will run the HTTP web server
+func Start(e BaseEntities) {
+	startup(e)
+	kernel.RunServer()
+}
 
-	registerBaseEntities(entities)
+// StartCommand method runs specific CLI command
+func StartCommand(args []string, e BaseEntities) {
+	startup(e)
 
+	c := kernel.BuildCommandContainer()
 	cmd := kernel.Commands.List[args[0]]
 	if cmd == nil {
 		fmt.Println("Command not found!")
 		os.Exit(1)
 	}
 
 	rc := reflect.ValueOf(cmd)
-	// Set args if exists
 	if len(args) == 2 {
 		reflect.Indirect(rc).FieldByName("Args").SetString(args[1])
 	}
@@ -49,9 +49,16 @@ func Start(args []string, entities BaseEntities) {
 	}
 }
 
-// Register base entities in Go-Web kernel
+func startup(e BaseEntities) {
+	myFigure := figure.NewFigure("Go-Web", "graffiti", true)
+	myFigure.Print()
+	fmt.Println("Go-Web CLI tool - Author: [email protected]")
+	RegisterBaseEntities(e)
+}
+
+// RegisterBaseEntities base entities in Go-Web kernel
 // This method will register: Controllers, Models, CLI commands, Services and middleware
-func registerBaseEntities(entities BaseEntities) {
+func RegisterBaseEntities(entities BaseEntities) {
 	kernel.Controllers = entities.Controllers
 	kernel.Middleware = entities.Middlewares
 	kernel.Models = entities.Models

cli/autoregister.go

@@ -10,7 +10,7 @@ import (
 // Handles Go-Web component auto Register
 func autoRegister(re *regexp.Regexp, newElement string) {
 	var elements []string
-	content, err := ioutil.ReadFile("register.go")
+	content, err := ioutil.ReadFile("register/register.go")
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -26,7 +26,7 @@ func autoRegister(re *regexp.Regexp, newElement string) {
 	newString := strings.Join(elements, "")
 
 	newContent := strings.Replace(string(content), oldString, newString, 1)
-	if err := ioutil.WriteFile("register.go", []byte(newContent), 0644); err != nil {
+	if err := ioutil.WriteFile("register/register.go", []byte(newContent), 0644); err != nil {
 		log.Fatal(err)
 	}
 }

cli/show_commands.go

@@ -2,10 +2,9 @@ package cli
 
 import (
 	"github.com/RobyFerro/go-web-framework/register"
+	"github.com/olekukonko/tablewriter"
 	"os"
 	"reflect"
-
-	"github.com/olekukonko/tablewriter"
 )
 
 // ShowCommands will show all registered commands

kernel/register.go

@@ -12,9 +12,17 @@ var (
 	// Example: './goweb migration:up' will run '&command.MigrationUp{}' command.
 	Commands = register.CommandRegister{
 		List: map[string]interface{}{
-			"database:seed": &cli.Seeder{},
-			"show:commands": &cli.ShowCommands{},
-			"server:run":    &Run{},
+			"database:seed":      &cli.Seeder{},
+			"show:commands":      &cli.ShowCommands{},
+			"cmd:create":         &cli.CmdCreate{},
+			"controller:create":  &cli.ControllerCreate{},
+			"generate:key":       &cli.GenerateKey{},
+			"job:create":         &cli.JobCreate{},
+			"middleware:create":  &cli.MiddlewareCreate{},
+			"migration:create":   &cli.MigrationCreate{},
+			"migration:rollback": &cli.MigrateRollback{},
+			"migration:up":       &cli.MigrationUp{},
+			"model:create":       &cli.ModelCreate{},
 			// Here is where you've to register your custom controller
 		},
 	}

kernel/server.go

@@ -9,21 +9,8 @@ import (
 
 var appConf Conf
 
-// Run will run Go-Web HTTP server
-type Run struct {
-	Signature   string
-	Description string
-	Args        string
-}
-
-// Register this command
-func (c *Run) Register() {
-	c.Signature = "server:run"
-	c.Description = "Starts Go-Web server"
-}
-
-// Run this command
-func (c *Run) Run() {
+// RunServer this command
+func RunServer() {
 	router := WebRouter()
 	conf, _ := RetrieveAppConf()
 	server := GetHttpServer(router, conf)