add bash autocomplete

3 files changed, 93 insertions, 80 deletions

diff --git a/argv.go b/argv.go
index fb3bf17..beee036 100644
--- a/argv.go
+++ b/argv.go
@@ -71,7 +71,7 @@ type FindCmd struct {
 }
 
 func (args) Version() string {
-	return "forge " + VERSION + "    Built on " + BUILDTIME
+	return ARGNAME + " " + VERSION + "    Built on " + BUILDTIME
 }
 
 func (a args) Description() string {
@@ -98,26 +98,6 @@ Examples:
 	`
 }
 
-// prints help to STDERR
-func (args) doBashHelp() {
-	name := "forge"
-	if argv.BashAuto[1] != "''" {
-		// if this is not blank, then the user has typed something
-		return
-	}
-	if argv.BashAuto[0] != name {
-		// if this is not the name of the command, the user already started doing something
-		return
-	}
-	if argv.BashAuto[0] == name {
-		me.pp.WriteHelp(os.Stderr)
-		return
-	}
-	fmt.Fprintln(os.Stderr, "")
-	fmt.Fprintln(os.Stderr, "hello world")
-	fmt.Fprintln(os.Stderr, "")
-}
-
 func (args) doBashHelpDebug() {
 	fmt.Fprintln(os.Stderr, "")
 	fmt.Fprintln(os.Stderr, "hello world")
@@ -134,62 +114,3 @@ func (args) doBashHelpDebug() {
 	fmt.Fprintln(os.Stderr, "pull something else", argv.BashAuto, len(argv.BashAuto), p0, p1, p2, p1a, "end", more)
 	fmt.Fprintln(os.Stderr, "")
 }
-
-func (args) doBashAuto() {
-	name := "forge"
-	argv.doBashHelp()
-	switch argv.BashAuto[0] {
-	case "checkout":
-		fmt.Println("user devel master")
-	case "config":
-		fmt.Println("add fix list delete")
-	case "list":
-		fmt.Println("--all --mine --favorites --private")
-	case "pull":
-		fmt.Println("--all --mine --favorites --private")
-	case "patch":
-		fmt.Println("--list --submit --show")
-	case "dirty":
-	case "user":
-	case "devel":
-	case "master":
-	default:
-		if argv.BashAuto[0] == name {
-			// list the subcommands here
-			fmt.Println("--bash checkout config dirty hard-reset list patch pull rescan")
-		}
-	}
-	os.Exit(0)
-}
-
-// complete -F forge --bash forge
-func (args) doBash() {
-	name := "forge"
-	fmt.Println("# add this in your bashrc:")
-	fmt.Println("")
-	fmt.Println("# todo: add this to go-arg as a 'hidden' go-arg option --bash")
-	fmt.Println("#")
-	fmt.Println("# todo: make this output work/parse with:")
-	fmt.Println("# complete -C " + name + " --bash go")
-	fmt.Println("")
-	fmt.Println("_" + name + "_complete()")
-	fmt.Println("{")
-	fmt.Println("	# sets local to this func vars")
-	fmt.Println("	local cur prev all")
-	fmt.Println("	cur=${COMP_WORDS[COMP_CWORD]}")
-	fmt.Println("	prev=${COMP_WORDS[COMP_CWORD-1]}")
-	fmt.Println("	all=${COMP_WORDS[@]}")
-	fmt.Println("")
-	fmt.Println("	# this is where we generate the go-arg output")
-	fmt.Println("        GOARGS=$(" + name + " --auto-complete $prev \\'$cur\\' $all)")
-	fmt.Println("")
-	fmt.Println("	# this compares the command line input from the user")
-	fmt.Println("	# to whatever strings we output")
-	fmt.Println("        COMPREPLY=( $(compgen -W \"$GOARGS\" -- $cur) )  # THIS WORKS")
-	fmt.Println("	return 0")
-	fmt.Println("}")
-	fmt.Println("complete -F _" + name + "_complete " + name)
-	fmt.Println("")
-	fmt.Println("# copy and paste the above into your bash shell should work")
-	os.Exit(0)
-}
diff --git a/argvAutocomplete.go b/argvAutocomplete.go
new file mode 100644
index 0000000..ac491ad
--- /dev/null
+++ b/argvAutocomplete.go
@@ -0,0 +1,89 @@
+package main
+
+import (
+	"fmt"
+	"os"
+)
+
+/*
+	handles shell autocomplete
+*/
+
+// used for shell auto completion
+// var ARGNAME string = "forge" // todo: get this from $0 ?
+
+func (args) doBashAuto() {
+	argv.doBashHelp()
+	switch argv.BashAuto[0] {
+	case "checkout":
+		fmt.Println("user devel master")
+	case "config":
+		fmt.Println("add fix list delete")
+	case "list":
+		fmt.Println("--all --mine --favorites --private")
+	case "pull":
+		fmt.Println("--all --mine --favorites --private")
+	case "patch":
+		fmt.Println("--list --submit --show")
+	case "dirty":
+	case "user":
+	case "devel":
+	case "master":
+	default:
+		if argv.BashAuto[0] == ARGNAME {
+			// list the subcommands here
+			fmt.Println("--bash checkout config dirty hard-reset list patch pull rescan")
+		}
+	}
+	os.Exit(0)
+}
+
+// prints help to STDERR // TODO: move everything below this to go-args
+func (args) doBashHelp() {
+	if argv.BashAuto[1] != "''" {
+		// if this is not blank, then the user has typed something
+		return
+	}
+	if argv.BashAuto[0] != ARGNAME {
+		// if this is not the name of the command, the user already started doing something
+		return
+	}
+	if argv.BashAuto[0] == ARGNAME {
+		me.pp.WriteHelp(os.Stderr)
+		return
+	}
+	fmt.Fprintln(os.Stderr, "")
+	fmt.Fprintln(os.Stderr, "hello world")
+	fmt.Fprintln(os.Stderr, "")
+}
+
+// complete -F forge --bash forge
+func (args) doBash() {
+	fmt.Println("# add this in your bashrc:")
+	fmt.Println("")
+	fmt.Println("# todo: add this to go-arg as a 'hidden' go-arg option --bash")
+	fmt.Println("#")
+	fmt.Println("# todo: make this output work/parse with:")
+	fmt.Println("# complete -C " + ARGNAME + " --bash go")
+	fmt.Println("")
+	fmt.Println("_" + ARGNAME + "_complete()")
+	fmt.Println("{")
+	fmt.Println("	# sets local to this func vars")
+	fmt.Println("	local cur prev all")
+	fmt.Println("	cur=${COMP_WORDS[COMP_CWORD]}")
+	fmt.Println("	prev=${COMP_WORDS[COMP_CWORD-1]}")
+	fmt.Println("	all=${COMP_WORDS[@]}")
+	fmt.Println("")
+	fmt.Println("	# this is where we generate the go-arg output")
+	fmt.Println("        GOARGS=$(" + ARGNAME + " --auto-complete $prev \\'$cur\\' $all)")
+	fmt.Println("")
+	fmt.Println("	# this compares the command line input from the user")
+	fmt.Println("	# to whatever strings we output")
+	fmt.Println("        COMPREPLY=( $(compgen -W \"$GOARGS\" -- $cur) )  # THIS WORKS")
+	fmt.Println("	return 0")
+	fmt.Println("}")
+	fmt.Println("complete -F _" + ARGNAME + "_complete " + ARGNAME)
+	fmt.Println("")
+	fmt.Println("# copy and paste the above into your bash shell should work")
+	os.Exit(0)
+}
diff --git a/main.go b/main.go
index d168b30..77cd01c 100644
--- a/main.go
+++ b/main.go
@@ -17,6 +17,9 @@ import (
 var VERSION string
 var BUILDTIME string
 
+// used for shell auto completion
+var ARGNAME string = "forge"
+
 // using this for now. triggers config save
 var configSave bool