Better help

wplib · Jun 22, 2020 · bdc7af7 · bdc7af7
1 parent f4d5111
commit bdc7af7
Show file tree

Hide file tree

Showing 7 changed files with 731 additions and 716 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/cmd/commands.go b/cmd/commands.go
@@ -1,7 +1,6 @@
 package cmd
 
 import (
-	"github.com/newclarity/scribeHelpers/loadTools"
 	"github.com/newclarity/scribeHelpers/ux"
 	"github.com/spf13/cobra"
 	"github.com/wplib/deploywp/defaults"
@@ -13,47 +12,75 @@ var onlyTwice = []string{"", ""}
 
 func init() {
 	rootCmd.AddCommand(buildCmd)
-	rootCmd.AddCommand(convertCmd)
-	rootCmd.AddCommand(toolsCmd)
-	rootCmd.AddCommand(loadCmd)
-	rootCmd.AddCommand(runCmd)
+	//rootCmd.AddCommand(toolsCmd)
+	//rootCmd.AddCommand(loadCmd)
+	//rootCmd.AddCommand(runCmd)
 }
 
 
 var buildCmd = &cobra.Command{
-	Use:   loadTools.CmdBuild,
+	Use:   "build",
 	Short: ux.SprintfMagenta(defaults.BinaryName) + ux.SprintfBlue(" - Build a Pantheon website."),
 	Long: ux.SprintfMagenta(defaults.BinaryName) + ux.SprintfBlue(" - Build a Pantheon website."),
 	Args: cobra.RangeArgs(1, 2),
 	Run: cmdBuild,
 }
 
-var toolsCmd = &cobra.Command{
-	Use:   loadTools.CmdTools,
-	Short: ux.SprintfMagenta("scribe") + ux.SprintfBlue(" - Show all built-in template helpers."),
-	Long:  ux.SprintfMagenta("scribe") + ux.SprintfBlue(" - Show all built-in template helpers."),
-	Run:   cmdTools,
-}
+func cmdBuild(cmd *cobra.Command, args []string) {
+	state := CmdScribe.State
 
-var convertCmd = &cobra.Command{
-	Use:   loadTools.CmdConvert,
-	Short: ux.SprintfMagenta("scribe") + ux.SprintfBlue(" - Convert a template file to the resulting output file."),
-	Long: ux.SprintfMagenta("scribe") + ux.SprintfBlue(" - Convert a template file to the resulting output file."),
-	Run: cmdConvert,
-}
-var loadCmd = &cobra.Command{
-	Use:   loadTools.CmdLoad,
-	Short: ux.SprintfMagenta("scribe") + ux.SprintfBlue(" - Load and execute a template file."),
-	Long: ux.SprintfMagenta("scribe") + ux.SprintfBlue(" - Load and execute a template file."),
-	Run: cmdLoad,
-	DisableFlagParsing: false,
-}
-var runCmd = &cobra.Command{
-	Use:   loadTools.CmdRun,
-	Short: ux.SprintfMagenta("scribe") + ux.SprintfBlue(" - Execute resulting output file as a BASH script."),
-	Long: ux.SprintfMagenta("scribe") + ux.SprintfBlue(`Execute resulting output file as a BASH script.
-You can also use this command as the start to '#!' scripts.
-For example: #!/usr/bin/env scribe --json gearbox.json run
-`),
-	Run: cmdRun,
+	for range onlyOnce {
+		CmdScribe.Chdir = true // In this mode we always change directory to the JSON file.
+
+		state = CmdScribe.ProcessArgs(cmd.Use, args)
+		if state.IsNotOk() {
+			state.PrintResponse()
+			break
+		}
+
+		state = CmdScribe.Load()
+		if state.IsNotOk() {
+			state.PrintResponse()
+			break
+		}
+
+		ux.PrintflnOk("Building website via deploywp.")
+		state = CmdScribe.Run()
+
+		state.PrintResponse()
+		ux.PrintflnBlue("\n# FINISHED")
+	}
+
+	CmdScribe.State = state
 }
+
+
+//var toolsCmd = &cobra.Command{
+//	Use:   loadTools.CmdTools,
+//	Short: ux.SprintfMagenta("scribe") + ux.SprintfBlue(" - Show all built-in template helpers."),
+//	Long:  ux.SprintfMagenta("scribe") + ux.SprintfBlue(" - Show all built-in template helpers."),
+//	Run:   cmdTools,
+//}
+//
+//var convertCmd = &cobra.Command{
+//	Use:   loadTools.CmdConvert,
+//	Short: ux.SprintfMagenta("scribe") + ux.SprintfBlue(" - Convert a template file to the resulting output file."),
+//	Long: ux.SprintfMagenta("scribe") + ux.SprintfBlue(" - Convert a template file to the resulting output file."),
+//	Run: cmdConvert,
+//}
+//var loadCmd = &cobra.Command{
+//	Use:   loadTools.CmdLoad,
+//	Short: ux.SprintfMagenta("scribe") + ux.SprintfBlue(" - Load and execute a template file."),
+//	Long: ux.SprintfMagenta("scribe") + ux.SprintfBlue(" - Load and execute a template file."),
+//	Run: cmdLoad,
+//	DisableFlagParsing: false,
+//}
+//var runCmd = &cobra.Command{
+//	Use:   loadTools.CmdRun,
+//	Short: ux.SprintfMagenta("scribe") + ux.SprintfBlue(" - Execute resulting output file as a BASH script."),
+//	Long: ux.SprintfMagenta("scribe") + ux.SprintfBlue(`Execute resulting output file as a BASH script.
+//You can also use this command as the start to '#!' scripts.
+//For example: #!/usr/bin/env scribe --json gearbox.json run
+//`),
+//	Run: cmdRun,
+//}