new argvv0.7.115

6 files changed, 62 insertions, 131 deletions

diff --git a/argv.custom.go b/argv.custom.go
deleted file mode 100644
index ce58303..0000000
--- a/argv.custom.go
+++ /dev/null
@@ -1,45 +0,0 @@
-package main
-
-import (
-	"os"
-
-	"go.wit.com/lib/protobuf/argvpb"
-)
-
-// sent via -ldflags
-var VERSION string
-var BUILDTIME string
-
-var APPNAME string = "go-clone"
-
-func (args) Version() string {
-	return "go-clone " + VERSION + "    Built on " + BUILDTIME
-}
-
-func (args) Buildtime() (string, string) {
-	return BUILDTIME, VERSION
-}
-
-func (a args) Description() string {
-	return `
-git clone go repositories recursively
-
-Examples:
-	go-clone go.wit.com/apps/go-clone              # 'git clone' go-clone
-`
-}
-
-func (args) Appname() string {
-	return APPNAME
-}
-
-func (a args) DoAutoComplete(pb *argvpb.Argv) {
-	// fmt.Fprintf(os.Stderr, "blah\n")
-	// fmt.Fprintf(os.Stderr, "\n")
-	if pb.GetCmd() == "" {
-		pb.SendStrings([]string{"--dry-run", "--non-recursive", "--work", "--version"})
-	} else {
-		pb.SubCommand(pb.Goargs...)
-	}
-	os.Exit(0)
-}
diff --git a/argv.struct.go b/argv.go
index 4000267..4000267 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..22b7a63
--- /dev/null
+++ b/complete.go
@@ -0,0 +1,59 @@
+package main
+
+import (
+	"fmt"
+	"strings"
+
+	"go.wit.com/dev/alexflint/arg"
+	"go.wit.com/lib/protobuf/argvpb"
+)
+
+// sent via -ldflags
+var VERSION string
+var BUILDTIME string
+
+var APPNAME string = "go-clone"
+
+func (args) Version() string {
+	return "go-clone " + VERSION + "    Built on " + BUILDTIME
+}
+
+func (args) Buildtime() (string, string) {
+	return BUILDTIME, VERSION
+}
+
+func (a args) Description() string {
+	return `
+git clone go repositories recursively
+
+Examples:
+	go-clone go.wit.com/apps/go-clone              # 'git clone' go-clone
+`
+}
+
+func (args) Appname() string {
+	return APPNAME
+}
+
+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{"--dry-run", "--non-recursive", "--work", "--version"}
+		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/main.go b/main.go
index ee8faa8..83a4296 100644
--- a/main.go
+++ b/main.go
@@ -12,7 +12,7 @@ var workingRepo *gitpb.Repo
 
 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
 
 	var err error
 	me.forge, err = forgepb.Init()
@@ -74,11 +74,11 @@ func okExit(thing string) {
 	}
 	log.Info("Finished clone on", workingRepo.GetGoPath(), "ok")
 	me.forge.Save()
-	me.argv.GoodExit(thing)
+	argvpb.GoodExit(thing)
 }
 
 func badExit(err error) {
 	log.Info("Total repositories:", me.forge.Repos.Len())
 	s := log.Sprintf("go-clone error in %s", env.Get("gopath"))
-	me.argv.BadExit(s, err)
+	argvpb.BadExit(s, err)
 }
diff --git a/structs.go b/structs.go
index c767cbb..d10069b 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