new argv (much better)

7 files changed, 33 insertions, 100 deletions

diff --git a/argv.struct.go b/argv.go
index 2958de4..2958de4 100644
--- a/argv.struct.go
+++ b/argv.go
diff --git a/argv.template.go b/argv.template.go
deleted file mode 100644
index 6948afe..0000000
--- a/argv.template.go
+++ /dev/null
@@ -1,81 +0,0 @@
-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/env"
-	"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 env.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/argv.custom.go b/complete.go
index de54dd6..c82bcde 100644
--- a/argv.custom.go
+++ b/complete.go
@@ -1,8 +1,10 @@
 package main
 
 import (
-	"os"
+	"fmt"
+	"strings"
 
+	"go.wit.com/dev/alexflint/arg"
 	"go.wit.com/gui"
 	"go.wit.com/lib/protobuf/argvpb"
 )
@@ -31,13 +33,25 @@ func (args) ArgvGui() error {
 	return nil
 }
 
+func (args) MustParse() error {
+	me.pp = arg.MustParse(&argv)
+	return nil
+}
+
 // sends the strings to bash or zsh that will be your options
-func (a args) SendCompletionStrings(pb *argvpb.Argv) {
-	if pb.GetCmd() == "" {
-		base := []string{"--bash", "quick", "--dry-run", "--full", "--reason", "--version", "--auto-run", "--keep-gomod"}
-		pb.SendStrings(base)
-	} else {
-		pb.SubCommand(pb.Goargs...)
+func (a args) DoAutoComplete() error {
+	if argvpb.PB.GetCmd() == "" {
+		matches := []string{"--bash", "quick", "--dry-run", "--full", "--reason", "--version", "--auto-run", "--keep-gomod"}
+		fmt.Fprintf(argvpb.Stdout, " %s", strings.Join(matches, " "))
+		return nil
+	}
+	var err error
+	if me.pp == nil {
+		me.pp, err = arg.ParseFlagsArgv(&argv)
+		if err != nil {
+			return err
+		}
 	}
-	os.Exit(0)
+	err = me.pp.WriteHelpForAutocomplete(argvpb.PB.Partial, argvpb.PB.Real...)
+	return err
 }
diff --git a/doRelease.go b/doRelease.go
index fd419a6..20810f5 100644
--- a/doRelease.go
+++ b/doRelease.go
@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"go.wit.com/lib/gui/shell"
+	"go.wit.com/lib/protobuf/argvpb"
 	"go.wit.com/log"
 )
 
@@ -198,7 +199,7 @@ func doRelease() error {
 		if !me.current.RunAll(retag) {
 			log.Info("delete failed")
 			findOk = false
-			me.argv.BadExit("--keep-gomod testing", fmt.Errorf("DELETE TAG FAILED %s", check.GetGoPath()))
+			argvpb.BadExit("--keep-gomod testing", fmt.Errorf("DELETE TAG FAILED %s", check.GetGoPath()))
 		}
 
 		// switch to devel branch ?
@@ -206,16 +207,16 @@ func doRelease() error {
 			// ok?
 		} else {
 			// holy crap. die here
-			me.argv.BadExit("CheckoutDevel() failed", nil)
+			argvpb.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.argv.BadExit("--keep-gomod testing", fmt.Errorf("RETAG FAILED %s", check.GetGoPath()))
+			argvpb.BadExit("--keep-gomod testing", fmt.Errorf("RETAG FAILED %s", check.GetGoPath()))
 		}
-		me.argv.BadExit("did --keep-gomod work?", nil) // MUST FAIL HERE
+		argvpb.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 c09e912..d3aad10 100644
--- a/exit.go
+++ b/exit.go
@@ -2,16 +2,17 @@ package main
 
 import (
 	"go.wit.com/lib/env"
+	"go.wit.com/lib/protobuf/argvpb"
 	"go.wit.com/log"
 )
 
 func okExit(thing string) {
 	log.Info(thing, "ok")
 	// log.Info("Finished go-clean on", check.GetNamespace(), "ok")
-	me.argv.GoodExit(thing)
+	argvpb.GoodExit(thing)
 }
 
 func badExit(err error) {
 	log.Info("forge failed: ", err, env.Get("gopath"))
-	me.argv.BadExit("guireleaser", err)
+	argvpb.BadExit("guireleaser", err)
 }
diff --git a/main.go b/main.go
index d99e502..41d6812 100644
--- a/main.go
+++ b/main.go
@@ -23,7 +23,7 @@ var resources embed.FS
 
 func main() {
 	me = new(autoType)
-	me.argv = argvpb.Autocomplete(&argv) // adds shell auto complete to go-args
+	argvpb.Init(&argv, APPNAME, BUILDTIME, VERSION) // adds shell auto-complete
 	env.PrintTable()
 
 	me.forge, _ = forgepb.Init()
@@ -92,11 +92,11 @@ func main() {
 	// me.startRepo = me.forge.FindWorkingDirRepo()
 	wd, err := os.Getwd()
 	if err != nil {
-		me.argv.BadExit("your current directory does not exist err=", err)
+		argvpb.BadExit("your current directory does not exist err=", err)
 	}
 	me.startRepo, err = gitpb.NewRepo(wd)
 	if err != nil {
-		me.argv.BadExit("is this really a .git directory? err=", err)
+		argvpb.BadExit("is this really a .git directory? err=", err)
 	}
 
 	if _, count, _, err := me.forge.IsEverythingOnMaster(); err != nil {
diff --git a/structs.go b/structs.go
index c7fe2a8..a55e6ec 100644
--- a/structs.go
+++ b/structs.go
@@ -6,7 +6,6 @@ import (
 	"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"
 	"go.wit.com/lib/protobuf/gitpb"
 )
@@ -14,7 +13,6 @@ import (
 var me *autoType
 
 type autoType struct {
-	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