reverted

Author: nProgrammer

controllers/execsAndBuild.go

@@ -1,22 +1,60 @@
 package controllers
 
 import (
+	"encoding/json"
+	"fmt"
 	"godemon/models"
+	"io/ioutil"
 	"os"
+	"os/exec"
 	"time"
 )
 
-func ProgramStarting(cnf *string, filepath string, modOrFile string, command string, help *bool, version string, init *bool, name string) (string, string) {
+func ExecMOD() {
+	cmd := exec.Command("./app-godemon-app-godemon-tmp-generated")
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	cmd.Run()
+}
+
+func ExecFile(filepath string) {
+	cmd := exec.Command("go", "run", filepath)
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	cmd.Run()
+}
+
+func TimeLog() {
+	log := time.Now().Format("2006-01-02, 15:04 \n\n")
+	log = `Building project: ` + log + `Program result: `
+	cmd := exec.Command("printf", "\\e[1;34m%-6s\\e[m\n", log)
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	cmd.Run()
+}
+
+func ProgramStarting(cnf *string, filepath string, modOrFile string, command string, help *bool, version string) (string, string) {
 	if *cnf == "cmd" {
 
 	} else if *cnf == "cnf" {
-		filepath, modOrFile = loadDataFromCnf(cnf, command, "", "")
-	} else if *cnf == "deploy" {
-		_, _ = loadDataFromCnf(cnf, command, "", "")
-	} else if *init == true {
-		initialization(name)
+		jsonFile, err := os.Open("godemon-cnf.json")
+		ErrorHandle(err)
+		defer jsonFile.Close()
+		byteValue, err := ioutil.ReadAll(jsonFile)
+		ErrorHandle(err)
+		var commands models.Commands
+		json.Unmarshal(byteValue, &commands)
+		for i := 0; i < len(commands.Commands); i++ {
+			if command == commands.Commands[i].Name {
+				fmt.Println(commands.Commands[i].Path)
+				fmt.Println(commands.Commands[i].Option)
+				filepath = commands.Commands[i].Path
+				modOrFile = commands.Commands[i].Option
+			}
+		}
 	} else if *help == true {
-		models.Help(version)
+		fmt.Printf("Godemon %v: \n 1. -cnf <- in this flag put info about what do you want to do - if use cmd option use -cnf=cmd, if config file use -cnf=cnf \n 2. -path <- path to file/directory \n 3. -modOrFile <- are you using modules or one file \n 4. -command <- binded command in config file \n", version)
+		os.Exit(1)
 	}
 	return filepath, modOrFile
 }
@@ -32,7 +70,10 @@ func WatchFiles(fileordirPath string) error {
 			return err
 		}
 		if stat.Size() != initialStat.Size() || stat.ModTime() != initialStat.ModTime() {
-			killProcess()
+			cmd := exec.Command("killall", "-9", "app-godemon-app-godemon-tmp-generated")
+			cmd.Stdout = os.Stdout
+			cmd.Stderr = os.Stderr
+			cmd.Run()
 			break
 		}
 		time.Sleep(1 * time.Second)

controllers/functions.go

@@ -4,24 +4,18 @@ import (
 	"flag"
 )
 
-func LoadCMD(filepath string, modOrFile string) (string, string, string, string, *bool, *bool, string) {
+func LoadCMD(filepath string, modOrFile string) (string, string, string, string, *bool) {
 	var filepathP *string
 	var modOrFileP *string
 	cnfP := flag.String("cnf", "", "a string")
 	filepathP = flag.String("path", "", "a string")
 	commandP := flag.String("command", "", "a string")
 	helpP := flag.Bool("help", false, "a bool")
-	initP := flag.Bool("init", false, "a bool")
-	nameP := flag.String("name", "", "a string")
 	modOrFileP = flag.String("modOrFile", "", "a string")
 	flag.Parse()
 	cnf := *cnfP
 	filepath = *filepathP
 	command := *commandP
-	name := *nameP
 	modOrFile = *modOrFileP
-	if cnf == "" {
-		*helpP = true
-	}
-	return filepath, modOrFile, cnf, command, helpP, initP, name
+	return filepath, modOrFile, cnf, command, helpP
 }

controllers/loadFlags.go

@@ -0,0 +1 @@
+github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=

controllers/privatesFuncs.go

@@ -3,15 +3,15 @@ package main
 import (
 	"fmt"
 	"godemon/controllers"
-	"godemon/models"
 	"os"
+	"os/exec"
 )
 
 func main() {
-	version := "2.0.6"
+	version := "2.0.0"
 	doneChan := make(chan bool)
-	filepath, modOrFile, cnf, command, help, init, name := controllers.LoadCMD("", "")
-	filepath, modOrFile = controllers.ProgramStarting(&cnf, filepath, modOrFile, command, help, version, init, name)
+	filepath, modOrFile, cnf, command, help := controllers.LoadCMD("", "")
+	filepath, modOrFile = controllers.ProgramStarting(&cnf, filepath, modOrFile, command, help, version)
 	for true {
 		go func(doneChan chan bool) {
 			defer func() {
@@ -24,11 +24,14 @@ func main() {
 			fmt.Println("File has been changed")
 			if modOrFile == "mod" {
 				os.Chdir(filepath)
-				models.TimeLog()
-				controllers.BuildMod()
+				controllers.TimeLog()
+				cmd := exec.Command("go", "build", "-o", "app-godemon-app-godemon-tmp-generated")
+				cmd.Stdout = os.Stdout
+				cmd.Stderr = os.Stderr
+				cmd.Run()
 				go controllers.ExecMOD()
 			} else if modOrFile == "file" {
-				models.TimeLog()
+				controllers.TimeLog()
 				go controllers.ExecFile(filepath)
 			}
 		}(doneChan)

go.sum

@@ -6,18 +6,6 @@ type Command struct {
 	Option string `json:"file"`
 }
 
-type Project struct {
-	Name string `json:"name"`
-	OS   string `json:"platformOS"`
-	Arch string `json:"platformArch"`
-	Path string `json:"path"`
-}
-
 type Commands struct {
 	Commands []Command `json:"commands"`
 }
-
-type ProjectInfo struct {
-	Project  Project `json:"project"`
-	Commands Commands
-}

main.go

@@ -40,27 +40,13 @@ If you need help with clie use command `./godemon -help`
 
 ```
 {
-  "project": {
-    "name": "api2",
-    "platformOS": "linux",
-    "platformArch": "amd64",
-    "path": "/home/nwagner/Desktop/godemon/api/"
-  },
-  "commands": [
-    {
-      "name": "run",
-      "path": "/home/nwagner/Desktop/godemon/api/",
-      "file": "mod"
-    },
-    {
-     "name": "run-single-file",
-      "path": "/home/nwagner/Desktop/godemon/api/main.go",
-      "option": "file"
-    }
-  ]
+    "commands": [
+        {
+            "name": "run",
+            "path": "/home/nwagner/Desktop/godemon/api/",
+            "file": "mod"
+        }
+    ]
 }
 ```
-3. Now use command: `godemon -cnf=cnf -command=<command-name>` or if you want to make full binary
-file you need to use command: `godemon -cnf=deploy`. This will create
-   binary file with env variables. Deploy is using command - `env GOOS=project.platformOS
-   GOARCH=projet.platformArch go build -o project.name`
+3. Now use command: `godemon -cnf=cnf -command=<command-name>`