summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--argv.custom.go20
-rw-r--r--argv.go (renamed from argv.struct.go)0
-rw-r--r--argv.template.go81
-rw-r--r--complete.go51
-rw-r--r--main.go2
-rw-r--r--structs.go2
6 files changed, 52 insertions, 104 deletions
diff --git a/argv.custom.go b/argv.custom.go
deleted file mode 100644
index 62c494a..0000000
--- a/argv.custom.go
+++ /dev/null
@@ -1,20 +0,0 @@
-package main
-
-/*
- this parses the command line arguements
-*/
-
-// are sent via -ldflags at buildtime
-var VERSION string
-var BUILDTIME string
-
-var APPNAME string = "going2git"
-
-func (a args) Description() string {
- return `
-This is a demo of git2go to show how it works.
-
-Actually, I don't know how to use libgit2 or git2go yet so really this is just
-an example of how to compile something against it.
-`
-}
diff --git a/argv.struct.go b/argv.go
index ce285ac..ce285ac 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..2932eb2
--- /dev/null
+++ b/complete.go
@@ -0,0 +1,51 @@
+package main
+
+import (
+ "fmt"
+ "strings"
+
+ "go.wit.com/dev/alexflint/arg"
+ "go.wit.com/lib/protobuf/argvpb"
+)
+
+/*
+ this parses the command line arguements
+*/
+
+// are sent via -ldflags at buildtime
+var VERSION string
+var BUILDTIME string
+
+var APPNAME string = "going2git"
+
+func (a args) Description() string {
+ return `
+This is a demo of git2go to show how it works.
+
+Actually, I don't know how to use libgit2 or git2go yet so really this is just
+an example of how to compile something against it.
+`
+}
+
+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{"drives", "gui", "--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 96f8904..44abd3c 100644
--- a/main.go
+++ b/main.go
@@ -10,7 +10,7 @@ import (
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
var repo *git.Repository
if argv.Refs {
diff --git a/structs.go b/structs.go
index eefb588..016ea33 100644
--- a/structs.go
+++ b/structs.go
@@ -6,14 +6,12 @@ package main
import (
"go.wit.com/dev/alexflint/arg"
"go.wit.com/lib/fhelp"
- "go.wit.com/lib/protobuf/argvpb"
)
var me *autoType
// this app's variables
type autoType 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
}