From 456305122d43bdabf26a1c16f7f550de40cc2a5c Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Sun, 26 Oct 2025 10:17:06 -0500 Subject: new argv (much better) --- argv.custom.go | 43 ------------------------------ argv.go | 33 +++++++++++++++++++++++ argv.struct.go | 33 ----------------------- argv.template.go | 81 -------------------------------------------------------- complete.go | 57 +++++++++++++++++++++++++++++++++++++++ doRelease.go | 9 ++++--- exit.go | 5 ++-- main.go | 6 ++--- structs.go | 2 -- 9 files changed, 101 insertions(+), 168 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 de54dd6..0000000 --- a/argv.custom.go +++ /dev/null @@ -1,43 +0,0 @@ -package main - -import ( - "os" - - "go.wit.com/gui" - "go.wit.com/lib/protobuf/argvpb" -) - -var VERSION string -var BUILDTIME string - -var APPNAME string = "guireleaser" - -func (a args) Description() string { - return ` -Example usage: - guireleaser go.wit.com/apps/go-clone --increment --release --dry-run --reason "blerg" - -This will pull down the go sources and -the repositories in the go.sum file using git clone` -} - -/* - handles shell autocomplete -*/ - -func (args) ArgvGui() error { - // me.myGui = fhelp.Gui() // adds the GUI package argv support - me.gui = gui.New() - return nil -} - -// sends the strings to bash or zsh that will be your options -func (a args) SendCompletionStrings(pb *argvpb.Argv) { - if pb.GetCmd() == "" { - base := []string{"--bash", "quick", "--dry-run", "--full", "--reason", "--version", "--auto-run", "--keep-gomod"} - pb.SendStrings(base) - } else { - pb.SubCommand(pb.Goargs...) - } - os.Exit(0) -} diff --git a/argv.go b/argv.go new file mode 100644 index 0000000..2958de4 --- /dev/null +++ b/argv.go @@ -0,0 +1,33 @@ +package main + +var argv args + +type args struct { + Quick *QuickCmd `arg:"subcommand:quick" help:"only do repos with patches"` + Gui *EmptyCmd `arg:"subcommand:gui" help:"triggers the gui"` + DryRun bool `arg:"--dry-run,env:DRYRUN" help:"don't actually do the release"` + Minor bool `arg:"--minor" help:"increment minor verion numbers"` + Protobuf bool `arg:"--protobuf" help:"increment protobuf repos"` + KeepGOMOD bool `arg:"--keep-gomod" help:"keep go.* and *.pb.go files in master"` + Verbose bool `arg:"--verbose" help:"talk alot"` + Full bool `arg:"--full" help:"build every package"` + Reason string `arg:"--reason" help:"tag message"` + Force bool `arg:"--force" help:"try harder than normal"` + AutoRun bool `arg:"--auto-run" help:"automatically process everything"` + Port int `arg:"--port" default:"9419" help:"do fun stuff with curl"` +} + +func (args) Examples() string { + var out string + out += "guireleaser --full # release everything\n" + return out +} + +type QuickCmd struct { + List *EmptyCmd `arg:"subcommand:list" help:"list available patches"` + Show *EmptyCmd `arg:"subcommand:show" help:"show a specific patch"` + NoLibs *EmptyCmd `arg:"subcommand:show" help:"skip libraries that aren't changed"` +} + +type EmptyCmd struct { +} diff --git a/argv.struct.go b/argv.struct.go deleted file mode 100644 index 2958de4..0000000 --- a/argv.struct.go +++ /dev/null @@ -1,33 +0,0 @@ -package main - -var argv args - -type args struct { - Quick *QuickCmd `arg:"subcommand:quick" help:"only do repos with patches"` - Gui *EmptyCmd `arg:"subcommand:gui" help:"triggers the gui"` - DryRun bool `arg:"--dry-run,env:DRYRUN" help:"don't actually do the release"` - Minor bool `arg:"--minor" help:"increment minor verion numbers"` - Protobuf bool `arg:"--protobuf" help:"increment protobuf repos"` - KeepGOMOD bool `arg:"--keep-gomod" help:"keep go.* and *.pb.go files in master"` - Verbose bool `arg:"--verbose" help:"talk alot"` - Full bool `arg:"--full" help:"build every package"` - Reason string `arg:"--reason" help:"tag message"` - Force bool `arg:"--force" help:"try harder than normal"` - AutoRun bool `arg:"--auto-run" help:"automatically process everything"` - Port int `arg:"--port" default:"9419" help:"do fun stuff with curl"` -} - -func (args) Examples() string { - var out string - out += "guireleaser --full # release everything\n" - return out -} - -type QuickCmd struct { - List *EmptyCmd `arg:"subcommand:list" help:"list available patches"` - Show *EmptyCmd `arg:"subcommand:show" help:"show a specific patch"` - NoLibs *EmptyCmd `arg:"subcommand:show" help:"skip libraries that aren't changed"` -} - -type EmptyCmd struct { -} 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..c82bcde --- /dev/null +++ b/complete.go @@ -0,0 +1,57 @@ +package main + +import ( + "fmt" + "strings" + + "go.wit.com/dev/alexflint/arg" + "go.wit.com/gui" + "go.wit.com/lib/protobuf/argvpb" +) + +var VERSION string +var BUILDTIME string + +var APPNAME string = "guireleaser" + +func (a args) Description() string { + return ` +Example usage: + guireleaser go.wit.com/apps/go-clone --increment --release --dry-run --reason "blerg" + +This will pull down the go sources and +the repositories in the go.sum file using git clone` +} + +/* + handles shell autocomplete +*/ + +func (args) ArgvGui() error { + // me.myGui = fhelp.Gui() // adds the GUI package argv support + me.gui = gui.New() + return nil +} + +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{"--bash", "quick", "--dry-run", "--full", "--reason", "--version", "--auto-run", "--keep-gomod"} + 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/doRelease.go b/doRelease.go index fd419a6..20810f5 100644 --- a/doRelease.go +++ b/doRelease.go @@ -9,6 +9,7 @@ import ( "time" "go.wit.com/lib/gui/shell" + "go.wit.com/lib/protobuf/argvpb" "go.wit.com/log" ) @@ -198,7 +199,7 @@ func doRelease() error { if !me.current.RunAll(retag) { log.Info("delete failed") findOk = false - me.argv.BadExit("--keep-gomod testing", fmt.Errorf("DELETE TAG FAILED %s", check.GetGoPath())) + argvpb.BadExit("--keep-gomod testing", fmt.Errorf("DELETE TAG FAILED %s", check.GetGoPath())) } // switch to devel branch ? @@ -206,16 +207,16 @@ func doRelease() error { // ok? } else { // holy crap. die here - me.argv.BadExit("CheckoutDevel() failed", nil) + argvpb.BadExit("CheckoutDevel() failed", nil) } retag = append(retag, []string{"git", "tag", "-m", me.releaseReasonS, me.release.version.String()}) retag = append(retag, []string{"git", "push", "origin", me.release.version.String()}) if !me.current.RunAll(retag) { log.Info("retag failed") - me.argv.BadExit("--keep-gomod testing", fmt.Errorf("RETAG FAILED %s", check.GetGoPath())) + argvpb.BadExit("--keep-gomod testing", fmt.Errorf("RETAG FAILED %s", check.GetGoPath())) } - me.argv.BadExit("did --keep-gomod work?", nil) // MUST FAIL HERE + argvpb.BadExit("did --keep-gomod work?", nil) // MUST FAIL HERE } else { // unwind and re-tag. Now that the go.mod and go.sum are published, revert // to the development branch diff --git a/exit.go b/exit.go index c09e912..d3aad10 100644 --- a/exit.go +++ b/exit.go @@ -2,16 +2,17 @@ package main import ( "go.wit.com/lib/env" + "go.wit.com/lib/protobuf/argvpb" "go.wit.com/log" ) func okExit(thing string) { log.Info(thing, "ok") // log.Info("Finished go-clean on", check.GetNamespace(), "ok") - me.argv.GoodExit(thing) + argvpb.GoodExit(thing) } func badExit(err error) { log.Info("forge failed: ", err, env.Get("gopath")) - me.argv.BadExit("guireleaser", err) + argvpb.BadExit("guireleaser", err) } diff --git a/main.go b/main.go index d99e502..41d6812 100644 --- a/main.go +++ b/main.go @@ -23,7 +23,7 @@ var resources embed.FS 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 env.PrintTable() me.forge, _ = forgepb.Init() @@ -92,11 +92,11 @@ func main() { // me.startRepo = me.forge.FindWorkingDirRepo() wd, err := os.Getwd() if err != nil { - me.argv.BadExit("your current directory does not exist err=", err) + argvpb.BadExit("your current directory does not exist err=", err) } me.startRepo, err = gitpb.NewRepo(wd) if err != nil { - me.argv.BadExit("is this really a .git directory? err=", err) + argvpb.BadExit("is this really a .git directory? err=", err) } if _, count, _, err := me.forge.IsEverythingOnMaster(); err != nil { diff --git a/structs.go b/structs.go index c7fe2a8..a55e6ec 100644 --- a/structs.go +++ b/structs.go @@ -6,7 +6,6 @@ import ( "go.wit.com/gui" "go.wit.com/lib/fhelp" "go.wit.com/lib/gadgets" - "go.wit.com/lib/protobuf/argvpb" "go.wit.com/lib/protobuf/forgepb" "go.wit.com/lib/protobuf/gitpb" ) @@ -14,7 +13,6 @@ import ( var me *autoType type autoType struct { - argv *argvpb.Argv // shell autocomplete pp *arg.Parser // for parsing the command line args. Yay to alexf lint! myGui *fhelp.GuiPrep // the gui handle itself gui *gui.Node // the gui toolkit handle -- cgit v1.2.3