new argvv0.23.146

7 files changed, 137 insertions, 71 deletions

diff --git a/argv.custom.go b/argv.custom.go
new file mode 100644
index 0000000..569f516
--- /dev/null
+++ b/argv.custom.go
@@ -0,0 +1,43 @@
+package main
+
+import (
+	"os"
+
+	"go.wit.com/gui"
+	"go.wit.com/lib/protobuf/argvpb"
+)
+
+var VERSION string
+var BUILDTIME string
+
+var APPNAME string = "guireleaser"
+
+func (a args) Description() string {
+	return `
+Example usage:
+	guireleaser go.wit.com/apps/go-clone --increment --release --dry-run --reason "blerg"
+
+This will pull down the go sources and
+the repositories in the go.sum file using git clone`
+}
+
+/*
+	handles shell autocomplete
+*/
+
+func (args) ArgvGui() error {
+	// me.myGui = fhelp.Gui() // adds the GUI package argv support
+	me.gui = gui.New()
+	return nil
+}
+
+// sends the strings to bash or zsh that will be your options
+func (a args) SendCompletionStrings(pb *argvpb.Argv) {
+	if pb.Cmd == "" {
+		base := []string{"--bash", "quick", "--dry-run", "--full", "--reason", "--version", "--auto-run", "--keep-gomod"}
+		pb.SendStrings(base)
+	} else {
+		pb.SubCommand(pb.Goargs...)
+	}
+	os.Exit(0)
+}
diff --git a/argv.go b/argv.struct.go
index 36176da..2958de4 100644
--- a/argv.go
+++ b/argv.struct.go
@@ -1,17 +1,6 @@
 package main
 
-import (
-	"os"
-
-	"go.wit.com/gui"
-	"go.wit.com/lib/protobuf/argvpb"
-)
-
-/*
-	this parses the command line arguements
-
-	this enables command line options from other packages like 'gui' and 'log'
-*/
+var argv args
 
 type args struct {
 	Quick     *QuickCmd `arg:"subcommand:quick"                  help:"only do repos with patches"`
@@ -42,45 +31,3 @@ type QuickCmd struct {
 
 type EmptyCmd struct {
 }
-
-func (a args) Description() string {
-	return `
-Example usage:
-	guireleaser go.wit.com/apps/go-clone --increment --release --dry-run --reason "blerg"
-
-This will pull down the go sources and
-the repositories in the go.sum file using git clone`
-}
-
-/*
-	handles shell autocomplete
-*/
-
-func (args) Appname() string {
-	return ARGNAME
-}
-
-func (args) Buildtime() (string, string) {
-	return BUILDTIME, VERSION
-}
-
-func (args) ArgvGui() error {
-	// me.myGui = fhelp.Gui() // adds the GUI package argv support
-	me.origGui = gui.New()
-	return nil
-}
-
-func (args) Version() string {
-	return argvpb.StandardVersion(ARGNAME, VERSION, BUILDTIME)
-}
-
-// sends the strings to bash or zsh that will be your options
-func (a args) SendCompletionStrings(pb *argvpb.Argv) {
-	if pb.Cmd == "" {
-		base := []string{"--bash", "quick", "--dry-run", "--full", "--reason", "--version", "--auto-run", "--keep-gomod"}
-		pb.SendStrings(base)
-	} else {
-		pb.SubCommand(pb.Goargs...)
-	}
-	os.Exit(0)
-}
diff --git a/argv.template.go b/argv.template.go
new file mode 100644
index 0000000..e7a9948
--- /dev/null
+++ b/argv.template.go
@@ -0,0 +1,80 @@
+package main
+
+// these are stubbed in functions needed
+// just copy this file from another working app for now
+// you shouldn't need to change anything here
+// TODO: clean this up in argv
+
+import (
+	"os"
+
+	"go.wit.com/dev/alexflint/arg"
+	"go.wit.com/gui"
+	"go.wit.com/lib/fhelp"
+	"go.wit.com/log"
+)
+
+func (args) InitArgv() (string, string, string) {
+	return APPNAME, BUILDTIME, VERSION
+}
+
+// this function will send the current argv PB to go-args for parsing
+func (args) ParseFlags(flags []string) error {
+	var err error
+	if me.pp == nil {
+		// log.Info("Parse Flags GOT flags:", flags)
+		me.pp, err = arg.ParseFlags(flags, &argv)
+		// panic("got to the app's ParseFlags()")
+	} else {
+		panic("me.pp was not nil")
+	}
+	return err
+}
+
+// add this funcgion: this will print the help
+func (args) WriteHelpForSubcommand(cmd string) error {
+	me.pp.WriteHelpForSubcommand(os.Stderr, cmd)
+	return nil
+}
+
+// this will print the help for the subcmd
+func (args) WriteHelpForAutocomplete(part string, subcmd ...string) error {
+	return me.pp.WriteHelpForAutocomplete(os.Stderr, os.Stdout, part, subcmd...)
+}
+
+func (args) WriteHelpForAutocompleteDebug(part string, subcmd ...string) error {
+	f, _ := os.OpenFile("/tmp/argv.junk", os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
+	return me.pp.WriteHelpForAutocomplete(f, os.Stdout, part, subcmd...)
+}
+
+// add this funcgion: this will print the help
+func (args) WriteHelp() error {
+	me.pp.WriteHelp(os.Stderr)
+	return nil
+}
+
+func (args) InitGui() error {
+	// panic("got here")
+	arg.Register(&gui.ArgvGui)
+	// me.gui = gui.PreInit()
+	me.myGui = fhelp.Gui()
+	return nil
+}
+
+func (args) Exit() {
+	gui.UnloadToolkits()
+	if me.argv.Verbose() {
+		log.Info("argv.Exit() called", APPNAME+".Exit()")
+	}
+	// remove this from the template for your app (or make one for youself if you need it)
+	// forgeExit() // custom forge shutdown function
+}
+
+func (args) Help() string {
+	return "got app help"
+}
+
+func (args) MustParse() error {
+	me.pp = arg.MustParse(&argv)
+	return nil
+}
diff --git a/doRelease.go b/doRelease.go
index 5fe8b1b..1defc0c 100644
--- a/doRelease.go
+++ b/doRelease.go
@@ -198,7 +198,7 @@ func doRelease() error {
 		if !me.current.RunAll(retag) {
 			log.Info("delete failed")
 			findOk = false
-			me.sh.BadExit("--keep-gomod testing", fmt.Errorf("DELETE TAG FAILED %s", check.GetGoPath()))
+			me.argv.BadExit("--keep-gomod testing", fmt.Errorf("DELETE TAG FAILED %s", check.GetGoPath()))
 		}
 
 		// switch to devel branch ?
@@ -206,16 +206,16 @@ func doRelease() error {
 			// ok?
 		} else {
 			// holy crap. die here
-			me.sh.BadExit("CheckoutDevel() failed", nil)
+			me.argv.BadExit("CheckoutDevel() failed", nil)
 		}
 		retag = append(retag, []string{"git", "tag", "-m", me.releaseReasonS, me.release.version.String()})
 		retag = append(retag, []string{"git", "push", "origin", me.release.version.String()})
 
 		if !me.current.RunAll(retag) {
 			log.Info("retag failed")
-			me.sh.BadExit("--keep-gomod testing", fmt.Errorf("RETAG FAILED %s", check.GetGoPath()))
+			me.argv.BadExit("--keep-gomod testing", fmt.Errorf("RETAG FAILED %s", check.GetGoPath()))
 		}
-		me.sh.BadExit("did --keep-gomod work?", nil) // MUST FAIL HERE
+		me.argv.BadExit("did --keep-gomod work?", nil) // MUST FAIL HERE
 	} else {
 		// unwind and re-tag. Now that the go.mod and go.sum are published, revert
 		// to the development branch
diff --git a/exit.go b/exit.go
index e025cc5..91a4c99 100644
--- a/exit.go
+++ b/exit.go
@@ -7,10 +7,10 @@ import (
 func okExit(thing string) {
 	log.Info(thing, "ok")
 	// log.Info("Finished go-clean on", check.GetNamespace(), "ok")
-	me.sh.GoodExit(thing)
+	me.argv.GoodExit(thing)
 }
 
 func badExit(err error) {
 	log.Info("forge failed: ", err, me.forge.Config.ReposDir)
-	me.sh.BadExit("guireleaser", err)
+	me.argv.BadExit("guireleaser", err)
 }
diff --git a/main.go b/main.go
index b361009..f81428c 100644
--- a/main.go
+++ b/main.go
@@ -17,19 +17,12 @@ import (
 	"go.wit.com/log"
 )
 
-var VERSION string
-var BUILDTIME string
-
-var ARGNAME string = "guireleaser"
-
 //go:embed resources/*
 var resources embed.FS
 
-var argv args
-
 func main() {
 	me = new(autoType)
-	me.sh = argvpb.Autocomplete(&argv) // adds shell auto complete to go-args
+	me.argv = argvpb.Autocomplete(&argv) // adds shell auto complete to go-args
 
 	me.forge, _ = forgepb.Init()
 	me.found = new(gitpb.Repos)
diff --git a/structs.go b/structs.go
index 6cb0f0c..c7fe2a8 100644
--- a/structs.go
+++ b/structs.go
@@ -2,7 +2,9 @@
 package main
 
 import (
+	"go.wit.com/dev/alexflint/arg"
 	"go.wit.com/gui"
+	"go.wit.com/lib/fhelp"
 	"go.wit.com/lib/gadgets"
 	"go.wit.com/lib/protobuf/argvpb"
 	"go.wit.com/lib/protobuf/forgepb"
@@ -12,9 +14,10 @@ import (
 var me *autoType
 
 type autoType struct {
-	sh             *argvpb.Argv           // shell autocomplete
-	myGui          *argvpb.GuiPrep        // the gui handle itself
-	origGui        *gui.Node              // the gui handle itself
+	argv           *argvpb.Argv           // shell autocomplete
+	pp             *arg.Parser            // for parsing the command line args.  Yay to alexf lint!
+	myGui          *fhelp.GuiPrep         // the gui handle itself
+	gui            *gui.Node              // the gui toolkit handle
 	releaseReasonS string                 // = "gocui dropdown select"
 	release        releaseStruct          // notsure
 	reposbox       *gui.Node              // notsure