Merge pull request 'fix(deps): update module github.com/spf13/cobra to v1.8.1' (#6) from renovate/github.com-spf13-cobra-1.x into master

Reviewed-on: #6

.gitignore

@@ -25,11 +25,13 @@ _testmain.go
 *.exe
 *.test
 *.prof
+/assets/
 
 .glide
 .idea
 .DS_Store
 /haunt/
+/haunt
 
 docker
 vendor

.goreleaser.yaml

@@ -1,6 +1,6 @@
 gitea_urls:
-  api: https://gitea.asdf.cafe/api/v1
+  api: https://git.asdf.cafe/api/v1
-  download: https://gitea.asdf.cafe
+  download: https://git.asdf.cafe
   skip_tls_verify: false
 
 before:

Makefile

@@ -5,6 +5,12 @@ ${pkgname}: $(shell find . -name '*.go')
 	mkdir -p bin
 	go build -o bin/${pkgname} .
 
+decode:
+	go run ./hack/unpack/main.go
+
+pack-site:
+	go-bindata -pkg haunt -o src/haunt/bindata.go -fs assets/...
+
 completions:
 	mkdir -p completions
 	./bin/${pkgname} completion zsh > completions/_${pkgname}
@@ -18,17 +24,18 @@ tidy:
 	go mod tidy
 
 clean:
-	rm -f bin
+	rm -rf bin
 	rm -rf completions
+	rm -rf assets
 
 uninstall:
-	rm -f /usr/bin/${pkgname}
+	rm -f /usr/local/bin/${pkgname}
 	rm -f /usr/share/zsh/site-functions/_${pkgname}
 	rm -f /usr/share/bash-completion/completions/${pkgname}
 	rm -f /usr/share/fish/vendor_completions.d/${pkgname}.fish
 
 install:
-	cp bin/${pkgname} /usr/bin
+	cp bin/${pkgname} /usr/local/bin
 	bin/${pkgname} completion zsh > /usr/share/zsh/site-functions/_${pkgname}
 	bin/${pkgname} completion bash > /usr/share/bash-completion/completions/${pkgname}
 	bin/${pkgname} completion fish > /usr/share/fish/vendor_completions.d/${pkgname}.fish

README.md

@@ -1,4 +1,5 @@
 ## Quickstart
+### Install
 ```
 go install github.com/abs3ntdev/haunt@latest
 ```
@@ -11,58 +12,59 @@ cd haunt
 make build && sudo make install
 ```
 
+#### aur
+
+```
+yay -S haunt-go-git
+```
+
+### Completions
+completions will be automatically installed if you used the Makefile, if you did not you can generate completions with `haunt completion [bash/fish/powershell/zsh]`
+
+for example: `haunt completion zsh > _haunt`
+
+you can also source the output of the completion command directly in your .zshrc with:\
+      `source <(haunt completion zsh) && compdef _haunt haunt`
+
 ## Commands List
 
-### Run Command
-From **project/projects** root execute:
-
-
-```
-haunt init
-```
-
-then
-
-```
-haunt start
-```
-
-haunt init will add your root directory if it contains a main.go file and will add any directory inside of cmd as projects. If you wish to add additional projects run haunt add [name] or edit the config file manually. By default projects are set to run go install and go run [project]
-
-***start*** command supports the following custom parameters:
-
-    --name="name"               -> Run by name on existing configuration
-    --path="haunt/server"     -> Custom Path (if not specified takes the working directory name)
-    --generate                  -> Enable go generate
-    --fmt                       -> Enable go fmt
-    --test                      -> Enable go test
-    --vet                       -> Enable go vet
-    --install                   -> Enable go install
-    --build                     -> Enable go build
-    --run                       -> Enable go run
-    --server                    -> Enable the web server
-    --open                      -> Open web ui in default browser
-    --no-config                 -> Ignore an existing config / skip the creation of a new one
-
-Some examples:
-
-    haunt start
-    haunt start --path="mypath"
-    haunt start --name="haunt" --build
-    haunt start --path="haunt" --run --no-config
-    haunt start --install --test --fmt --no-config
-    haunt start --path="/Users/username/go/src/github.com/oxequa/haunt-examples/coin/"
-
 ### Init Command
 This command will generate a .haunt.yaml with sane default for your current project/projects.\
 If there is a main.go in the root directory it will be added along with any directories inside the relative path `cmd`
 
     haunt init
 
-### Add Command
-Add a project to an existing config file or create a new one.
 
-    haunt add [name]
+### Run Command
+
+```
+haunt run
+```
+
+the run command allows for specifying projects by name, all provided will be ran according to the config file:
+
+Some examples:
+
+    haunt run
+    haunt run server api
+
+### Add Command
+Add a project, the same defaults init uses will be used for new projects unless flags are provided.
+
+    haunt add [name] [--flags]
+
+Possible flags are:
+   
+    -b, --build         Enable go build
+    -f, --fmt           Enable go fmt
+    -g, --generate      Enable go generate
+    -h, --help          help for add
+    -i, --install       Enable go install (default true)
+    -p, --path string   Project base path (default "./")
+    -r, --run           Enable go run (default true)
+    -t, --test          Enable go test
+    -v, --vet           Enable go vet
+
 
 ### Remove Command
 Remove a project by its name
@@ -88,7 +90,7 @@ Remove a project by its name
     schema:
     - name: coin
       path: cmd/coin                // project path
-      env:            // env variables available at startup
+      env:            // env variables for run
             test: test
             myvar: value
       commands:               // go commands supported
@@ -117,7 +119,8 @@ Remove a project by its name
       - --myarg
       watcher:
           paths:                 // watched paths are relative to directory you run haunt in
-          - /
+          - src
+          - cmd/coin
           ignore_paths:          // ignored paths
           - vendor
           extensions:                  // watched extensions
@@ -128,14 +131,21 @@ Remove a project by its name
             command: echo before global
             global: true
             output: true
+            env:            // env variables per script
+              test: test
+              myvar: value
           - type: before
             command: echo before change
             output: true
+            env:            // env variables per script
+              test: othertest
+              myvar: othervalue
           - type: after
             command: echo after change
             output: true
+            env:            // env variables per script
+              key: 1
           - type: after
             command: echo after global
             global: true
             output: true
-          errorOutputPattern: mypattern   //custom error pattern

cmd/add.go

@@ -14,6 +14,7 @@ var addConfig config.Flags
 
 var addCmd = &cobra.Command{
 	Use:     "add",
+	Aliases: []string{"a", "create", "new"},
 	Short:   "Adds a project by name",
 	Long:    "Adds a project by name, if path is provided it will use 'cmd/name', all flags provided will be saved in the config file. By default go install and go run will be ran",
 	Args:    cobra.MatchAll(cobra.ExactArgs(1)),
@@ -27,8 +28,8 @@ var addCmd = &cobra.Command{
 }
 
 func getPotentialProjets(in string) []string {
-	r := haunt.NewHaunt()
+	h := haunt.NewHaunt()
-	err := r.Settings.Read(&r)
+	err := h.Settings.Read(&h)
 	if err != nil {
 		return []string{}
 	}
@@ -39,7 +40,7 @@ func getPotentialProjets(in string) []string {
 	}
 	for _, dir := range cmdDir {
 		exists := false
-		for _, proj := range r.Projects {
+		for _, proj := range h.Projects {
 			if dir.Name() == proj.Name {
 				exists = true
 				continue
@@ -73,24 +74,24 @@ func init() {
 // Add a project to an existing config or create a new one
 func add(cmd *cobra.Command, args []string) (err error) {
 	addConfig.Name = args[0]
-	r := haunt.NewHaunt()
+	h := haunt.NewHaunt()
 	// read a config if exist
-	err = r.Settings.Read(&r)
+	err = h.Settings.Read(&h)
 	if err != nil {
 		return err
 	}
-	projects := len(r.Projects)
+	projects := len(h.Projects)
 	// create and add a new project
-	r.Add(r.New(addConfig))
+	h.Add(h.New(addConfig))
-	if len(r.Projects) > projects {
+	if len(h.Projects) > projects {
 		// update config
-		err = r.Settings.Write(r)
+		err = h.Settings.Write(h)
 		if err != nil {
 			return err
 		}
-		log.Println(r.Prefix(haunt.Green.Bold("project successfully added")))
+		log.Println(h.Prefix(haunt.Green.Bold("project successfully added")))
 	} else {
-		log.Println(r.Prefix(haunt.Green.Bold("project can't be added")))
+		log.Println(h.Prefix(haunt.Green.Bold("project can't be added")))
 	}
 	return nil
 }

cmd/clean.go

@@ -10,6 +10,7 @@ import (
 // cleanCmd represents the clean command
 var cleanCmd = &cobra.Command{
 	Use:     "clean",
+	Aliases: []string{"c"},
 	Short:   "Deletes the haunt config file",
 	RunE:    clean,
 }
@@ -20,10 +21,10 @@ func init() {
 
 // Clean remove haunt file
 func clean(cmd *cobra.Command, args []string) (err error) {
-	r := haunt.NewHaunt()
+	h := haunt.NewHaunt()
-	if err := r.Settings.Remove(haunt.RFile); err != nil {
+	if err := h.Settings.Remove(haunt.HFile); err != nil {
 		return err
 	}
-	log.Println(r.Prefix(haunt.Green.Bold("folder successfully removed")))
+	log.Println(h.Prefix(haunt.Green.Bold("config file removed successfully removed")))
 	return nil
 }

cmd/init.go

@@ -13,6 +13,7 @@ import (
 // initCmd represents the init command
 var initCmd = &cobra.Command{
 	Use:     "init",
+	Aliases: []string{"i"},
 	Short:   "Generates a haunt config file using sane defaults",
 	Long:    "Generates a haunt config file using sane defaults, haunt will look for a main.go file and any directories inside the relative path 'cmd' and add them all as projects",
 	RunE:    defaultConfig,
@@ -23,10 +24,10 @@ func init() {
 }
 
 func defaultConfig(cmd *cobra.Command, args []string) error {
-	r := haunt.NewHaunt()
+	h := haunt.NewHaunt()
 	write := true
-	if _, err := os.Stat(haunt.RFile); err == nil {
+	if _, err := os.Stat(haunt.HFile); err == nil {
-		fmt.Print(r.Prefix("Config file exists. Overwire? " + haunt.Magenta.Bold("[y/n] ") + haunt.Green.Bold("(n) ")))
+		fmt.Print(h.Prefix("Config file exists. Overwire? " + haunt.Magenta.Bold("[y/n] ") + haunt.Green.Bold("(n) ")))
 		var overwrite string
 		fmt.Scanf("%s", &overwrite)
 		write = false
@@ -36,15 +37,15 @@ func defaultConfig(cmd *cobra.Command, args []string) error {
 		}
 	}
 	if write {
-		r.SetDefaults()
+		h.SetDefaults()
-		err := r.Settings.Write(r)
+		err := h.Settings.Write(h)
 		if err != nil {
 			return err
 		}
-		log.Println(r.Prefix(
+		log.Println(h.Prefix(
 			"Config file has successfully been saved at .haunt.yaml",
 		))
-		log.Println(r.Prefix(
+		log.Println(h.Prefix(
 			"Run haunt add --help to see how to add more projects",
 		))
 		return nil

cmd/remove.go

@@ -10,6 +10,7 @@ import (
 
 var removeCmd = &cobra.Command{
 	Use:     "remove [names]",
+	Aliases: []string{"delete", "r"},
 	Short:   "Removes all projects by name from config file",
 	Args:    cobra.MatchAll(cobra.MinimumNArgs(1), cobra.OnlyValidArgs),
 	ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
@@ -23,14 +24,14 @@ func init() {
 }
 
 func getProjectNames(input string) []string {
-	r := haunt.NewHaunt()
+	h := haunt.NewHaunt()
 	// read a config if exist
-	err := r.Settings.Read(&r)
+	err := h.Settings.Read(&h)
 	if err != nil {
 		return []string{}
 	}
 	names := []string{}
-	for _, project := range r.Projects {
+	for _, project := range h.Projects {
 		if strings.HasPrefix(project.Name, input) {
 			names = append(names, project.Name)
 		}
@@ -40,22 +41,22 @@ func getProjectNames(input string) []string {
 
 // Remove a project from an existing config
 func remove(cmd *cobra.Command, args []string) (err error) {
-	r := haunt.NewHaunt()
+	h := haunt.NewHaunt()
 	// read a config if exist
-	err = r.Settings.Read(&r)
+	err = h.Settings.Read(&h)
 	if err != nil {
 		return err
 	}
 	for _, arg := range args {
-		err := r.Remove(arg)
+		err = h.Remove(arg)
 		if err != nil {
-			log.Println(r.Prefix(haunt.Red.Bold(arg + " project not found")))
+			log.Println(h.Prefix(haunt.Red.Bold(arg + " project not found")))
 			continue
 		}
-		log.Println(r.Prefix(haunt.Green.Bold(arg + " successfully removed")))
+		log.Println(h.Prefix(haunt.Green.Bold(arg + " successfully removed")))
 	}
 	// update config
-	err = r.Settings.Write(r)
+	err = h.Settings.Write(h)
 	if err != nil {
 		return err
 	}

cmd/run.go

@@ -0,0 +1,95 @@
+package cmd
+
+import (
+	"fmt"
+	"log"
+	"os"
+	"strings"
+
+	"github.com/abs3ntdev/haunt/src/haunt"
+	"github.com/spf13/cobra"
+)
+
+var startCmd = &cobra.Command{
+	Use:     "start",
+	Aliases: []string{"s", "run"},
+	Short:   "run haunt, optionally provide the name of projects to only run those otherwise will run all configured projects",
+	Args:    cobra.MatchAll(cobra.OnlyValidArgs),
+	ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+		return getProjectNamesToRun(toComplete), cobra.ShellCompDirectiveNoFileComp
+	},
+	RunE: start,
+}
+
+func init() {
+	rootCmd.AddCommand(startCmd)
+}
+
+func getProjectNamesToRun(input string) []string {
+	h := haunt.NewHaunt()
+	// read a config if exist
+	err := h.Settings.Read(&h)
+	if err != nil {
+		return []string{}
+	}
+	names := []string{}
+	for _, project := range h.Projects {
+		if strings.HasPrefix(project.Name, input) {
+			names = append(names, project.Name)
+		}
+	}
+	return names
+}
+
+// haunt workflow
+func start(cmd *cobra.Command, args []string) (err error) {
+	h := haunt.NewHaunt()
+
+	// read a config if exist
+	err = h.Settings.Read(&h)
+	if err != nil {
+		if os.IsNotExist(err) {
+			log.Println(h.Prefix("No config file found, initializing one for you"))
+			err = defaultConfig(cmd, args)
+			if err != nil {
+				log.Println(h.Prefix("Failed to generate default config: " + err.Error()))
+			}
+			err = h.Settings.Read(&h)
+			if err != nil {
+				return fmt.Errorf(h.Prefix("Failed to read config file: " + err.Error()))
+			}
+		} else {
+			return err
+		}
+	}
+	if len(args) >= 1 {
+		// filter by name flag if exist
+		h.Projects = h.Filter(args)
+		if len(h.Projects) == 0 {
+			log.Println(h.Prefix("No valid project found, exiting. Check your config file or run haunt add"))
+			return
+		}
+	}
+	// increase file limit
+	if h.Settings.FileLimit != 0 {
+		if err = h.Settings.Flimit(); err != nil {
+			return err
+		}
+	}
+
+	//  web server
+	if h.Server.Status {
+		h.Server.Parent = h
+		err = h.Server.Start()
+		if err != nil {
+			return err
+		}
+		err = h.Server.OpenURL()
+		if err != nil {
+			return err
+		}
+	}
+
+	// start workflow
+	return h.Start()
+}

cmd/start.go

@@ -1,120 +0,0 @@
-package cmd
-
-import (
-	"log"
-	"strings"
-
-	"github.com/abs3ntdev/haunt/src/config"
-	"github.com/abs3ntdev/haunt/src/haunt"
-	"github.com/spf13/cobra"
-)
-
-var startConfig config.Flags
-
-var startCmd = &cobra.Command{
-	Use:   "start",
-	Short: "Start haunt on a given path, generates a config file if one does not already exist",
-	Args:  cobra.MatchAll(cobra.OnlyValidArgs),
-	ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-		return getProjectNamesToStart(toComplete), cobra.ShellCompDirectiveNoFileComp
-	},
-	RunE: start,
-}
-
-func init() {
-	rootCmd.AddCommand(startCmd)
-	startCmd.Flags().StringVarP(&startConfig.Path, "path", "p", "", "Project base path")
-	startCmd.Flags().BoolVarP(&startConfig.Format, "fmt", "f", false, "Enable go fmt")
-	startCmd.Flags().BoolVarP(&startConfig.Vet, "vet", "v", false, "Enable go vet")
-	startCmd.Flags().BoolVarP(&startConfig.Test, "test", "t", false, "Enable go test")
-	startCmd.Flags().BoolVarP(&startConfig.Generate, "generate", "g", false, "Enable go generate")
-	startCmd.Flags().BoolVarP(&startConfig.Server, "server", "s", false, "Start server")
-	startCmd.Flags().BoolVarP(&startConfig.Open, "open", "o", false, "Open into the default browser")
-	startCmd.Flags().BoolVarP(&startConfig.Install, "install", "i", true, "Enable go install")
-	startCmd.Flags().BoolVarP(&startConfig.Build, "build", "b", true, "Enable go build")
-	startCmd.Flags().BoolVarP(&startConfig.Run, "run", "r", true, "Enable go run")
-	startCmd.Flags().BoolVarP(&startConfig.Legacy, "legacy", "l", false, "Legacy watch by polling instead fsnotify")
-	startCmd.Flags().BoolVarP(&startConfig.NoConfig, "no-config", "c", false, "Ignore existing config and doesn't create a new one")
-}
-
-func getProjectNamesToStart(input string) []string {
-	r := haunt.NewHaunt()
-	// read a config if exist
-	err := r.Settings.Read(&r)
-	if err != nil {
-		return []string{}
-	}
-	names := []string{}
-	for _, project := range r.Projects {
-		if strings.HasPrefix(project.Name, input) {
-			names = append(names, project.Name)
-		}
-	}
-	return names
-}
-
-// Start haunt workflow
-func start(cmd *cobra.Command, args []string) (err error) {
-	r := haunt.NewHaunt()
-	// set legacy watcher
-	if startConfig.Legacy {
-		r.Settings.Legacy.Set(startConfig.Legacy, 1)
-	}
-	// set server
-	if startConfig.Server {
-		r.Server.Set(startConfig.Server, startConfig.Open, haunt.Port, haunt.Host)
-	}
-
-	// check no-config and read
-	if !startConfig.NoConfig {
-		// read a config if exist
-		err = r.Settings.Read(&r)
-		if err != nil {
-			return err
-		}
-		if len(args) >= 1 {
-			// filter by name flag if exist
-			r.Projects = r.Filter(args)
-			if len(r.Projects) == 0 {
-				log.Println(r.Prefix("Project not found, exiting"))
-				return
-			}
-			startConfig.Name = args[0]
-		}
-		// increase file limit
-		if r.Settings.FileLimit != 0 {
-			if err = r.Settings.Flimit(); err != nil {
-				return err
-			}
-		}
-
-	}
-	// check project list length
-	if len(r.Projects) == 0 {
-		// create a new project based on given params
-		project := r.New(startConfig)
-		// Add to projects list
-		r.Add(project)
-		// save config
-		if !startConfig.NoConfig {
-			err = r.Settings.Write(r)
-			if err != nil {
-				return err
-			}
-		}
-	}
-	// Start web server
-	if r.Server.Status {
-		r.Server.Parent = r
-		err = r.Server.Start()
-		if err != nil {
-			return err
-		}
-		err = r.Server.OpenURL()
-		if err != nil {
-			return err
-		}
-	}
-	// start workflow
-	return r.Start()
-}

cmd/version.go

@@ -7,18 +7,12 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var Version = "v0.1.9"
+var Version = "v0.2.11"
 
 // versionCmd represents the version command
 var versionCmd = &cobra.Command{
 	Use:   "version",
-	Short: "A brief description of your command",
+	Short: "Prints current verison",
-	Long: `A longer description that spans multiple lines and likely contains examples
-and usage of using your command. For example:
-
-Cobra is a CLI library for Go that empowers applications.
-This application is a tool to generate the needed files
-to quickly create a Cobra application.`,
 	Run:   version,
 }
 
@@ -38,6 +32,6 @@ func init() {
 
 // Version print current version
 func version(cmd *cobra.Command, args []string) {
-	r := haunt.NewHaunt()
+	h := haunt.NewHaunt()
-	log.Println(r.Prefix(haunt.Green.Bold(Version)))
+	log.Println(h.Prefix(haunt.Green.Bold(Version)))
 }

go.mod

@@ -3,13 +3,14 @@ module github.com/abs3ntdev/haunt
 go 1.19
 
 require (
-	github.com/fatih/color v1.14.1
+	github.com/fatih/color v1.17.0
-	github.com/fsnotify/fsnotify v1.6.0
+	github.com/fsnotify/fsnotify v1.7.0
 	github.com/labstack/echo v3.3.10+incompatible
-	github.com/sirupsen/logrus v1.9.0
+	github.com/sirupsen/logrus v1.9.3
-	github.com/spf13/cobra v1.6.1
+	github.com/spf13/cobra v1.8.1
-	golang.org/x/net v0.7.0
+	golang.org/x/net v0.27.0
 	gopkg.in/yaml.v2 v2.4.0
+	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
@@ -17,12 +18,12 @@ require (
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/labstack/gommon v0.4.0 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.17 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/stretchr/testify v1.8.1 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
 	github.com/valyala/fasttemplate v1.2.2 // indirect
-	golang.org/x/crypto v0.6.0 // indirect
+	golang.org/x/crypto v0.25.0 // indirect
-	golang.org/x/sys v0.5.0 // indirect
+	golang.org/x/sys v0.22.0 // indirect
-	golang.org/x/text v0.7.0 // indirect
+	golang.org/x/text v0.16.0 // indirect
 )

go.sum

@@ -1,4 +1,5 @@
 github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -6,8 +7,12 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumC
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/fatih/color v1.14.1 h1:qfhVLaG5s+nCROl1zJsZRxFeYrHLqWroPOQ8BWiNb4w=
 github.com/fatih/color v1.14.1/go.mod h1:2oHN61fhTpgcxD3TSWCgKDiH1+x4OiDVVGH8WlgGZGg=
+github.com/fatih/color v1.17.0 h1:GlRw1BRJxkpqUCBKzKOw098ed57fEsKeNjpTe3cSjK4=
+github.com/fatih/color v1.17.0/go.mod h1:YZ7TlrGPkiz6ku9fK3TLD/pl3CpsiFyu8N92HLgmosI=
 github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
 github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
+github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
+github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
 github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
@@ -22,13 +27,19 @@ github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27k
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
 github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
+github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
 github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
+github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
+github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA=
 github.com/spf13/cobra v1.6.1/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY=
+github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM=
+github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -46,8 +57,12 @@ github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQ
 github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
 golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc=
 golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
+golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30=
+golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M=
 golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
 golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys=
+golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211103235746-7861aae1554b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -56,8 +71,15 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
+golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
+golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
+golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=

hack/unpack/main.go

@@ -0,0 +1,22 @@
+package main
+
+import (
+	"fmt"
+
+	"github.com/abs3ntdev/haunt/src/haunt"
+)
+
+func main() {
+	names := haunt.AssetNames()
+	fmt.Println("Assets in bindata:")
+	fmt.Println(names)
+
+	wd := "assets"
+	for i, v := range names {
+		fmt.Printf("Restoring asset [%v] [%s]\n", i, v)
+		err := haunt.RestoreAsset(wd, v)
+		if err != nil {
+			fmt.Println("Failed to restore", v)
+		}
+	}
+}

main.go

@@ -3,5 +3,14 @@ package main
 import "github.com/abs3ntdev/haunt/cmd"
 
 func main() {
+	// names := haunt.AssetNames()
+	// fmt.Println("Assets in bindata:")
+	// fmt.Println(names)
+	//
+	// wd := "www"
+	// for i, v := range names {
+	// 	fmt.Printf("Restoring asset [%v] [%s]\n", i, v)
+	// 	haunt.RestoreAsset(wd, v)
+	// }
 	cmd.Execute()
 }

renovate.json

@@ -0,0 +1,3 @@
+{
+  "extends": ["config:recommended"]
+}

src/haunt/cli.go

@@ -16,14 +16,14 @@ import (
 )
 
 var (
-	// RPrefix tool name
+	// HPrefix tool name
-	RPrefix = "haunt"
+	HPrefix = "haunt"
-	// RExt file extension
+	// HExt file extension
-	RExt = ".yaml"
+	HExt = ".yaml"
-	// RFile config file name
+	// HFile config file name
-	RFile = "." + RPrefix + RExt
+	HFile = "." + HPrefix + HExt
-	// RExtWin windows extension
+	// HExtWin windows extension
-	RExtWin = ".exe"
+	HExtWin = ".exe"
 )
 
 type (
@@ -76,26 +76,23 @@ func init() {
 	}
 }
 
-func (r *Haunt) SetDefaults() {
+func (h *Haunt) SetDefaults() {
-	r.Server = Server{Parent: r, Status: true, Open: false, Port: Port}
+	h.Server = Server{Parent: h, Status: true, Open: false, Port: Port}
-	r.Settings.FileLimit = 0
+	h.Settings.FileLimit = 0
-	r.Settings.Legacy.Interval = 100 * time.Millisecond
+	h.Settings.Legacy.Interval = 100 * time.Millisecond
-	r.Settings.Legacy.Force = false
+	h.Settings.Legacy.Force = false
-	r.Settings.Files.Errors = Resource{Name: FileErr, Status: false}
+	h.Settings.Errors = Resource{Name: FileErr, Status: false}
-	r.Settings.Files.Errors = Resource{Name: FileOut, Status: false}
+	h.Settings.Errors = Resource{Name: FileOut, Status: false}
-	r.Settings.Files.Errors = Resource{Name: FileLog, Status: false}
+	h.Settings.Errors = Resource{Name: FileLog, Status: false}
 	if _, err := os.Stat("main.go"); err == nil {
-		log.Println(r.Prefix(Green.Bold("Adding: " + filepath.Base(Wdir()))))
+		log.Println(h.Prefix(Green.Bold("Adding: " + filepath.Base(Wdir()))))
-		r.Projects = append(r.Projects, Project{
+		h.Projects = append(h.Projects, Project{
 			Name: filepath.Base(Wdir()),
 			Path: Wdir(),
 			Tools: Tools{
 				Install: Tool{
 					Status: true,
 				},
-				Build: Tool{
-					Status: true,
-				},
 				Run: Tool{
 					Status: true,
 				},
@@ -106,26 +103,23 @@ func (r *Haunt) SetDefaults() {
 			},
 		})
 	} else {
-		log.Println(r.Prefix(Magenta.Bold("Skipping: " + filepath.Base(Wdir()) + " no main.go file in root")))
+		log.Println(h.Prefix(Magenta.Bold("Skipping: " + filepath.Base(Wdir()) + " no main.go file in root")))
 	}
 	subDirs, err := os.ReadDir("cmd")
 	if err != nil {
-		log.Println(r.Prefix("cmd directory not found, skipping"))
+		log.Println(h.Prefix("cmd directory not found, skipping"))
 		return
 	}
 	for _, dir := range subDirs {
 		if dir.IsDir() {
-			log.Println(r.Prefix(Green.Bold("Adding: " + dir.Name())))
+			log.Println(h.Prefix(Green.Bold("Adding: " + dir.Name())))
-			r.Projects = append(r.Projects, Project{
+			h.Projects = append(h.Projects, Project{
 				Name: dir.Name(),
 				Path: "cmd/" + dir.Name(),
 				Tools: Tools{
 					Install: Tool{
 						Status: true,
 					},
-					Build: Tool{
-						Status: true,
-					},
 					Run: Tool{
 						Status: true,
 					},
@@ -136,31 +130,31 @@ func (r *Haunt) SetDefaults() {
 				},
 			})
 		} else {
-			log.Println(r.Prefix(Magenta.Bold("Skipping: " + dir.Name() + " not a directory")))
+			log.Println(h.Prefix(Magenta.Bold("Skipping: " + dir.Name() + " not a directory")))
 		}
 	}
 }
 
 // Stop haunt workflow
-func (r *Haunt) Stop() error {
+func (h *Haunt) Stop() error {
-	for k := range r.Schema.Projects {
+	for k := range h.Projects {
-		if r.Schema.Projects[k].exit != nil {
+		if h.Schema.Projects[k].exit != nil {
-			close(r.Schema.Projects[k].exit)
+			close(h.Schema.Projects[k].exit)
 		}
 	}
 	return nil
 }
 
 // Start haunt workflow
-func (r *Haunt) Start() error {
+func (h *Haunt) Start() error {
-	if len(r.Projects) > 0 {
+	if len(h.Projects) > 0 {
 		var wg sync.WaitGroup
-		wg.Add(len(r.Projects))
+		wg.Add(len(h.Projects))
-		for k := range r.Projects {
+		for k := range h.Projects {
-			r.Schema.Projects[k].exit = make(chan os.Signal, 1)
+			h.Schema.Projects[k].exit = make(chan os.Signal, 1)
-			signal.Notify(r.Schema.Projects[k].exit, os.Interrupt)
+			signal.Notify(h.Schema.Projects[k].exit, os.Interrupt)
-			r.Schema.Projects[k].parent = r
+			h.Schema.Projects[k].parent = h
-			go r.Schema.Projects[k].Watch(&wg)
+			go h.Schema.Projects[k].Watch(&wg)
 		}
 		wg.Wait()
 	} else {
@@ -170,9 +164,9 @@ func (r *Haunt) Start() error {
 }
 
 // Prefix a given string with tool name
-func (r *Haunt) Prefix(input string) string {
+func (h *Haunt) Prefix(input string) string {
 	if len(input) > 0 {
-		return fmt.Sprint(Yellow.Bold("["), strings.ToUpper(RPrefix), Yellow.Bold("]"), ": ", input)
+		return fmt.Sprint(Yellow.Bold("["), strings.ToUpper(HPrefix), Yellow.Bold("]"), ": ", input)
 	}
 	return input
 }

src/haunt/notify.go

@@ -250,13 +250,13 @@ func (w *filePoller) watch(f *os.File, lastFi os.FileInfo, chClose chan struct{}
 			// If it doesn't exist at this point, it must have been removed
 			// no need to send the error here since this is a valid operation
 			if os.IsNotExist(err) {
-				if err := w.sendEvent(fsnotify.Event{Op: fsnotify.Remove, Name: f.Name()}, chClose); err != nil {
+				if err = w.sendEvent(fsnotify.Event{Op: fsnotify.Remove, Name: f.Name()}, chClose); err != nil {
 					return
 				}
 				lastFi = nil
 			}
 			// at this point, send the error
-			err := w.sendErr(err, chClose)
+			err = w.sendErr(err, chClose)
 			if err != nil {
 				log.Println(log.Prefix(), err.Error())
 			}

src/haunt/projects.go

@@ -43,6 +43,7 @@ type Ignore struct {
 type Command struct {
 	Cmd    string            `yaml:"command" json:"command"`
 	Type   string            `yaml:"type" json:"type"`
+	Env    map[string]string `yaml:"env,omitempty" json:"env,omitempty"`
 	Path   string            `yaml:"path,omitempty" json:"path,omitempty"`
 	Global bool              `yaml:"global,omitempty" json:"global,omitempty"`
 	Output bool              `yaml:"output,omitempty" json:"output,omitempty"`
@@ -542,7 +543,7 @@ func (p *Project) stamp(t string, o BufferOut, msg string, stream string) {
 	case "out":
 		p.Buffer.StdOut = append(p.Buffer.StdOut, o)
 		if p.parent.Settings.Files.Outputs.Status {
-			f := p.parent.Settings.Create(p.Path, p.parent.Settings.Files.Outputs.Name)
+			f := p.parent.Settings.Create(p.Path, p.parent.Settings.Outputs.Name)
 			if _, err := f.WriteString(strings.Join(content, " ")); err != nil {
 				p.parent.Settings.Fatal(err, "")
 			}
@@ -550,7 +551,7 @@ func (p *Project) stamp(t string, o BufferOut, msg string, stream string) {
 	case "log":
 		p.Buffer.StdLog = append(p.Buffer.StdLog, o)
 		if p.parent.Settings.Files.Logs.Status {
-			f := p.parent.Settings.Create(p.Path, p.parent.Settings.Files.Logs.Name)
+			f := p.parent.Settings.Create(p.Path, p.parent.Settings.Logs.Name)
 			if _, err := f.WriteString(strings.Join(content, " ")); err != nil {
 				p.parent.Settings.Fatal(err, "")
 			}
@@ -558,7 +559,7 @@ func (p *Project) stamp(t string, o BufferOut, msg string, stream string) {
 	case "error":
 		p.Buffer.StdErr = append(p.Buffer.StdErr, o)
 		if p.parent.Settings.Files.Errors.Status {
-			f := p.parent.Settings.Create(p.Path, p.parent.Settings.Files.Errors.Name)
+			f := p.parent.Settings.Create(p.Path, p.parent.Settings.Errors.Name)
 			if _, err := f.WriteString(strings.Join(content, " ")); err != nil {
 				p.parent.Settings.Fatal(err, "")
 			}
@@ -577,7 +578,14 @@ func (p *Project) stamp(t string, o BufferOut, msg string, stream string) {
 
 func (p Project) buildEnvs() (envs []string) {
 	for k, v := range p.Env {
-		envs = append(envs, fmt.Sprintf("%s=%s", strings.Replace(k, "=", "", -1), v))
+		envs = append(envs, fmt.Sprintf("%s=%s", strings.ReplaceAll(k, "=", ""), v))
+	}
+	return
+}
+
+func (c Command) buildEnvs() (envs []string) {
+	for k, v := range c.Env {
+		envs = append(envs, fmt.Sprintf("%s=%s", strings.ReplaceAll(k, "=", ""), v))
 	}
 	return
 }
@@ -591,7 +599,7 @@ func (p *Project) run(path string, stream chan Response, stop <-chan bool) (err
 		// https://github.com/golang/go/issues/5615
 		// https://github.com/golang/go/issues/6720
 		if build != nil {
-			err := build.Process.Signal(os.Interrupt)
+			err = build.Process.Signal(os.Interrupt)
 			if err != nil {
 				log.Println(p.parent.Prefix("Failed to send interrupt: " + err.Error()))
 			}
@@ -635,15 +643,15 @@ func (p *Project) run(path string, stream chan Response, stop <-chan bool) (err
 	if p.Tools.Run.Method != "" {
 		path = p.Tools.Run.Method
 	}
-	if _, err := os.Stat(path); err == nil {
+	if _, err = os.Stat(path); err == nil {
 		build = exec.Command(path, args...)
-	} else if _, err := os.Stat(path + RExtWin); err == nil {
+	} else if _, err = os.Stat(path + HExtWin); err == nil {
-		build = exec.Command(path+RExtWin, args...)
+		build = exec.Command(path+HExtWin, args...)
 	} else {
 		if _, err = os.Stat(path); err == nil {
 			build = exec.Command(path, args...)
-		} else if _, err = os.Stat(path + RExtWin); err == nil {
+		} else if _, err = os.Stat(path + HExtWin); err == nil {
-			build = exec.Command(path+RExtWin, args...)
+			build = exec.Command(path+HExtWin, args...)
 		} else {
 			return errors.New("project not found")
 		}
@@ -715,6 +723,10 @@ func (c *Command) exec(base string, stop <-chan bool) (response Response) {
 	done := make(chan error)
 	args := strings.Split(strings.Replace(strings.Replace(c.Cmd, "'", "", -1), "\"", "", -1), " ")
 	ex := exec.Command(args[0], args[1:]...)
+	appendEnvs := c.buildEnvs()
+	if len(appendEnvs) > 0 {
+		ex.Env = append(ex.Env, appendEnvs...)
+	}
 	ex.Dir = base
 	// make cmd path
 	if c.Path != "" {

src/haunt/settings.go

@@ -13,9 +13,9 @@ import (
 const (
 	Permission = 0o775
 	File       = ".haunt.yaml"
-	FileOut    = ".r.outputs.log"
+	FileOut    = ".h.outputs.log"
-	FileErr    = ".r.errors.log"
+	FileErr    = ".h.errors.log"
-	FileLog    = ".r.logs.log"
+	FileLog    = ".h.logs.log"
 )
 
 // Settings defines a group of general settings and options
@@ -71,10 +71,10 @@ func (s *Settings) Remove(d string) error {
 // Read config file
 func (s *Settings) Read(out interface{}) error {
 	// backward compatibility
-	if _, err := os.Stat(RFile); err != nil {
+	if _, err := os.Stat(HFile); err != nil {
 		return err
 	}
-	content, err := s.Stream(RFile)
+	content, err := s.Stream(HFile)
 	if err == nil {
 		err = yaml.Unmarshal(content, out)
 		return err
@@ -88,7 +88,7 @@ func (s *Settings) Write(out interface{}) error {
 	if err != nil {
 		return err
 	}
-	s.Fatal(os.WriteFile(RFile, y, Permission))
+	s.Fatal(os.WriteFile(HFile, y, Permission))
 	return nil
 }