Tweaks

Author: dbpolito

commands/root.go

@@ -34,7 +34,6 @@ var AddCommands AddCommandsFN = func(root *cobra.Command) {
 	AddKoolPreset(root)
 	AddKoolRestart(root)
 	AddKoolRun(root)
-	AddKoolScripts(root)
 	AddKoolSelfUpdate(root)
 	AddKoolShare(root)
 	AddKoolStart(root)

commands/root_test.go

@@ -249,7 +249,6 @@ func TestAddCommands(t *testing.T) {
 		"preset":      false,
 		"restart":     false,
 		"run":         false,
-		"scripts":     false,
 		"self-update": false,
 		"share":       false,
 		"start":       false,

commands/run.go

@@ -1,6 +1,7 @@
 package commands
 
 import (
+	"encoding/json"
 	"errors"
 	"kool-dev/kool/core/builder"
 	"kool-dev/kool/core/environment"
@@ -15,6 +16,7 @@ import (
 // KoolRunFlags holds the flags for the run command
 type KoolRunFlags struct {
 	EnvVariables []string
+	JSON         bool
 }
 
 // KoolRun holds handlers and functions to implement the run command logic
@@ -48,7 +50,7 @@ func AddKoolRun(root *cobra.Command) {
 func NewKoolRun() *KoolRun {
 	return &KoolRun{
 		*newDefaultKoolService(),
-		&KoolRunFlags{[]string{}},
+		&KoolRunFlags{[]string{}, false},
 		parser.NewParser(),
 		environment.NewEnvStorage(),
 		shell.NewPromptSelect(),
@@ -58,7 +60,15 @@ func NewKoolRun() *KoolRun {
 
 // Execute runs the run logic with incoming arguments.
 func (r *KoolRun) Execute(originalArgs []string) (err error) {
+	// look for kool.yml on current working directory
+	_ = r.parser.AddLookupPath(r.env.Get("PWD"))
+	// look for kool.yml on kool folder within user home directory
+	_ = r.parser.AddLookupPath(path.Join(r.env.Get("HOME"), "kool"))
+
 	if len(originalArgs) == 0 {
+		if r.Flags.JSON {
+			return r.printScriptsJSON("")
+		}
 		r.shell.Info("\nAvailable scripts:\n")
 		scripts := compListScripts("", r)
 		for _, cmd := range scripts {
@@ -74,11 +84,6 @@ func (r *KoolRun) Execute(originalArgs []string) (err error) {
 		args   []string = originalArgs[1:]
 	)
 
-	// look for kool.yml on current working directory
-	_ = r.parser.AddLookupPath(r.env.Get("PWD"))
-	// look for kool.yml on kool folder within user home directory
-	_ = r.parser.AddLookupPath(path.Join(r.env.Get("HOME"), "kool"))
-
 	if err = r.parseScript(script); err != nil {
 		return
 	}
@@ -125,6 +130,7 @@ A single-line SCRIPT can be run with optional arguments.`,
 	}
 
 	runCmd.Flags().StringArrayVarP(&run.Flags.EnvVariables, "env", "e", []string{}, "Environment variables.")
+	runCmd.Flags().BoolVar(&run.Flags.JSON, "json", false, "Output available scripts as JSON (use without script argument)")
 
 	// after a non-flag arg, stop parsing flags
 	runCmd.Flags().SetInterspersed(false)
@@ -246,3 +252,31 @@ func compListScripts(toComplete string, run *KoolRun) (scripts []string) {
 
 	return
 }
+
+func (r *KoolRun) printScriptsJSON(filter string) (err error) {
+	var details []parser.ScriptDetail
+	if details, err = r.parser.ParseAvailableScriptsDetails(filter); err != nil {
+		return
+	}
+
+	if details == nil {
+		details = []parser.ScriptDetail{}
+	}
+
+	for i := range details {
+		if details[i].Comments == nil {
+			details[i].Comments = []string{}
+		}
+		if details[i].Commands == nil {
+			details[i].Commands = []string{}
+		}
+	}
+
+	var payload []byte
+	if payload, err = json.Marshal(details); err != nil {
+		return
+	}
+
+	r.Shell().Println(string(payload))
+	return nil
+}

commands/run_test.go

@@ -18,7 +18,7 @@ import (
 func newFakeKoolRun(mockParsedCommands map[string][]builder.Command, mockParseError map[string]error) *KoolRun {
 	return &KoolRun{
 		*(newDefaultKoolService().Fake()),
-		&KoolRunFlags{[]string{}},
+		&KoolRunFlags{[]string{}, false},
 		&parser.FakeParser{MockParsedCommands: mockParsedCommands, MockParseError: mockParseError},
 		environment.NewFakeEnvStorage(),
 		&shell.FakePromptSelect{},