From 3c25d4a6aa196b9b685d6c27dfaf6a4998b24598 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Sun, 26 Oct 2025 09:34:33 -0500 Subject: new argv --- argv.custom.go | 45 ------------------------------- argv.go | 14 ++++++++++ argv.struct.go | 14 ---------- argv.template.go | 81 -------------------------------------------------------- complete.go | 59 +++++++++++++++++++++++++++++++++++++++++ main.go | 6 ++--- structs.go | 2 -- 7 files changed, 76 insertions(+), 145 deletions(-) delete mode 100644 argv.custom.go create mode 100644 argv.go delete mode 100644 argv.struct.go delete mode 100644 argv.template.go create mode 100644 complete.go 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.go b/argv.go new file mode 100644 index 0000000..4000267 --- /dev/null +++ b/argv.go @@ -0,0 +1,14 @@ +package main + +var argv args + +type args struct { + Repo string `arg:"--repo" help:"repo namespace"` + AutoWork bool `arg:"--work" default:"false" help:"recreate the go.work file"` + DryRun bool `arg:"--dry-run" help:"show what would be run"` + NonRecursive bool `arg:"--non-recursive" help:"recursively clone all dependencies"` + Build bool `arg:"--build" help:"try to build it after clone"` + Install bool `arg:"--install" help:"try to install it after clone"` + Ignore bool `arg:"--ignore" default:"false" help:"ignore weird clone errors from non-standard repos"` + // Fetch bool `arg:"--git-fetch" default:"false" help:"run 'git fetch' on all your repos"` +} diff --git a/argv.struct.go b/argv.struct.go deleted file mode 100644 index 4000267..0000000 --- a/argv.struct.go +++ /dev/null @@ -1,14 +0,0 @@ -package main - -var argv args - -type args struct { - Repo string `arg:"--repo" help:"repo namespace"` - AutoWork bool `arg:"--work" default:"false" help:"recreate the go.work file"` - DryRun bool `arg:"--dry-run" help:"show what would be run"` - NonRecursive bool `arg:"--non-recursive" help:"recursively clone all dependencies"` - Build bool `arg:"--build" help:"try to build it after clone"` - Install bool `arg:"--install" help:"try to install it after clone"` - Ignore bool `arg:"--ignore" default:"false" help:"ignore weird clone errors from non-standard repos"` - // Fetch bool `arg:"--git-fetch" default:"false" help:"run 'git fetch' on all your repos"` -} 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 -- cgit v1.2.3