argv: sometimes things work better than beforeHEADv0.22.135v0.22.134masterdevel

7 files changed, 44 insertions, 112 deletions

diff --git a/argv.custom.go b/argv.custom.go
deleted file mode 100644
index 7a1a9d3..0000000
--- a/argv.custom.go
+++ /dev/null
@@ -1,25 +0,0 @@
-package main
-
-import (
-	"os"
-
-	"go.wit.com/lib/protobuf/argvpb"
-)
-
-// are sent via -ldflags at buildtime
-var VERSION string
-var BUILDTIME string
-
-// used for shell auto completion
-var APPNAME string = "gowebd"
-
-// sends the strings to bash or zsh that will be your options
-func (a args) SendCompletionStrings(pb *argvpb.Argv) {
-	if pb.GetCmd() == "" {
-		base := []string{"test", "--version", "--force"}
-		pb.SendStrings(base)
-	} else {
-		pb.SubCommand(pb.Goargs...)
-	}
-	os.Exit(0)
-}
diff --git a/argv.struct.go b/argv.go
index 93b4f42..93b4f42 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/complete.go b/complete.go
new file mode 100644
index 0000000..462fa09
--- /dev/null
+++ b/complete.go
@@ -0,0 +1,39 @@
+package main
+
+import (
+	"fmt"
+	"strings"
+
+	"go.wit.com/dev/alexflint/arg"
+	"go.wit.com/lib/protobuf/argvpb"
+)
+
+// are sent via -ldflags at buildtime
+var VERSION string
+var BUILDTIME string
+
+// used for shell auto completion
+var APPNAME string = "gowebd"
+
+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) DoAutoComplete() error {
+	if argvpb.PB.GetCmd() == "" {
+		matches := []string{"test", "--version", "--force"}
+		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
+		}
+	}
+	err = me.pp.WriteHelpForAutocomplete(argvpb.PB.Partial, argvpb.PB.Real...)
+	return err
+}
diff --git a/http.go b/http.go
index 78343e5..95ce105 100644
--- a/http.go
+++ b/http.go
@@ -8,6 +8,7 @@ import (
 	"path/filepath"
 	"strings"
 
+	"go.wit.com/lib/protobuf/argvpb"
 	"go.wit.com/log"
 )
 
@@ -80,7 +81,7 @@ func okHandler(w http.ResponseWriter, r *http.Request) {
 
 	if route == "/lookup" {
 		w.Header().Set("Content-Type", "text")
-		fmt.Fprintf(w, "go.wit.com/apps/utils/gowebd Version: %s\n", me.argv.Version())
+		fmt.Fprintf(w, "go.wit.com/apps/utils/gowebd Version: %s\n", argvpb.Version())
 		fmt.Fprintf(w, "\n")
 
 		all := me.forge.Repos.SortByFullPath()
diff --git a/main.go b/main.go
index 13e137c..5000e92 100644
--- a/main.go
+++ b/main.go
@@ -28,7 +28,7 @@ var LIBDIR string = "/var/lib/gowebd/"
 
 func main() {
 	me = new(mainType)
-	me.argv = argvpb.Autocomplete(&argv) // adds shell auto complete to go-args
+	argvpb.Init(&argv, APPNAME, BUILDTIME, VERSION) // adds shell auto-complete
 
 	if argv.RepoMap != "" {
 		REPOMAP = argv.RepoMap
@@ -47,9 +47,9 @@ func main() {
 
 	if argv.Test != nil {
 		if s, err := newMakeRepomap(); err != nil {
-			me.argv.BadExit(s, err)
+			argvpb.BadExit(s, err)
 		} else {
-			me.argv.GoodExit(s)
+			argvpb.GoodExit(s)
 		}
 	}
 
diff --git a/structs.go b/structs.go
index e80d018..b99d91d 100644
--- a/structs.go
+++ b/structs.go
@@ -6,7 +6,6 @@ package main
 import (
 	"go.wit.com/dev/alexflint/arg"
 	"go.wit.com/lib/fhelp"
-	"go.wit.com/lib/protobuf/argvpb"
 	"go.wit.com/lib/protobuf/forgepb"
 )
 
@@ -14,7 +13,6 @@ var me *mainType
 
 // this app's variables
 type mainType struct {
-	argv  *argvpb.Argv   // more experiments for bash handling
 	pp    *arg.Parser    // for parsing the command line args.  Yay to alexf lint!
 	myGui *fhelp.GuiPrep // for initializing the GUI toolkits
 	forge *forgepb.Forge // your customized repo preferences and settings