Makefile

@@ -37,6 +37,3 @@ clean:
 
 all: install
 	go-mod-clean --all --auto
-
-autocomplete:
-	go-mod-clean --bash > ~/.local/share/bash-completion/completions/go-mod-clean

argv.go

@@ -1,10 +1,5 @@
 package main
 
-import (
-	"fmt"
-	"os"
-)
-
 /*
 	this parses the command line arguements
 */
@@ -16,16 +11,13 @@ type args struct {
 	Verbose  bool     `arg:"--verbose"                      help:"show more"`
 	Restore  bool     `arg:"--restore"                      help:"only restore from go/pkg/mod/"`
 	Force    bool     `arg:"--force"                        help:"remove things and redo them no matter what"`
-	Purge    *EmptyCmd `arg:"subcommand:purge"               help:"purge all git notes. (this is where the autogenerated files are stored)"`
+	Strict   bool     `arg:"--strict"                       help:"never make go.* files unless everything is perfect"`
-	Smart    *EmptyCmd `arg:"subcommand:lax"                 help:"try something but never do os.Exit(-1)"`
+	Purge    bool     `arg:"--purge"                        help:"purge all the git notes. this might be bad for you."`
-	Strict   *EmptyCmd `arg:"subcommand:strict"              help:"never make go.* files unless everything is perfect"`
+	Smart    bool     `arg:"--smart"                        help:"whatever seems best at the time. never os.Exit(-1)"`
 	Bash     bool     `arg:"--bash"                               help:"generate bash completion"`
 	BashAuto []string `arg:"--auto-complete"                      help:"todo: move this to go-arg"`
 }
 
-type EmptyCmd struct {
-}
-
 func (args) Version() string {
 	return "go-mod-clean " + VERSION + "    Built on " + BUILDTIME
 }
@@ -40,16 +32,3 @@ go-mod-clean will try to verify your go.* files are using the newest package ver
 * Try to trim go.sum of non-existent entries
 `
 }
-
-func (a args) DoAutoComplete(argv []string) {
-	switch argv[0] {
-	case "checkout":
-		fmt.Println("user devel master ")
-	default:
-		if argv[0] == ARGNAME {
-			// list the subcommands here
-			fmt.Println("strict restore purge lax")
-		}
-	}
-	os.Exit(0)
-}

argvAutoshell.go

@@ -0,0 +1,82 @@
+// Copyright 2017-2025 WIT.COM Inc. All rights reserved.
+// Use of this source code is governed by the GPL 3.0
+
+package main
+
+import (
+	"fmt"
+	"os"
+)
+
+/*
+	handles shell autocomplete
+*/
+
+// used for shell auto completion
+// var ARGNAME string = "forge" // todo: get this from $0 ?
+
+func deleteMatch() {
+	// f := forgedb.InitSimple()
+	fmt.Println("go.wit.com/lib/gui/repostatus todo: need to do this")
+}
+
+func (args) doBashAuto() {
+	argv.doBashHelp()
+	switch argv.BashAuto[0] {
+	case "checkout":
+		fmt.Println("user devel master ")
+	default:
+		if argv.BashAuto[0] == ARGNAME {
+			// list the subcommands here
+			fmt.Println("--smart strict")
+		}
+	}
+	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 {
+		// pp.WriteHelp(os.Stderr)
+		return
+	}
+}
+
+// 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: can this output work/parse with:")
+	fmt.Println("# complete -C `" + ARGNAME + " --bash` " + ARGNAME)
+	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)
+}

cleanGoSum.go

@@ -15,15 +15,13 @@ import (
 )
 
 // This will recreate your go.sum and go.mod files
+
 // checks to see if every 'master' git branch version
 // matches the go.sum file
-
-// THIS IS IN lib/forgepb AND THIS SHOULD BE SWITCHED TO THERE
-// but I can't do it because forge as an app and forge packages aren't yet strong enough to use here (2025 may)
 func cleanGoDepsCheckOk(check *gitpb.Repo) error {
 	// var err error = nil
 	// var fixes [][]string
-	log.Printf("%s repo go dependancy count: %d\n", check.GetGoPath(), check.GoDepsLen())
+	log.Printf("current repo %s go dependancy count: %d", check.GetGoPath(), check.GoDepsLen())
 	if check.GoDeps == nil {
 		return errors.New("check.GoDeps == nil")
 	}
@@ -50,20 +48,20 @@ func cleanGoDepsCheckOk(check *gitpb.Repo) error {
 			if forge.Config.IsReadOnly(check.GetGoPath()) {
 				ends += "(ignoring read-only) "
 				if argv.Verbose {
-					log.Printf("%-48s  ok error .%s. vs .%s. %s\n", depRepo.GetGoPath(),
+					log.Printf("%-48s  ok error .%s. vs .%s. %s", depRepo.GetGoPath(),
 						depRepo.GetVersion(), found.GetMasterVersion(), ends)
 				}
 			} else {
 				if forge.CheckOverride(depRepo.GetGoPath()) {
 					ends += "(override) "
 					if argv.Verbose {
-						log.Printf("%-48s  ok error .%s. vs .%s. %s\n", depRepo.GetGoPath(),
+						log.Printf("%-48s  ok error .%s. vs .%s. %s", depRepo.GetGoPath(),
 							depRepo.GetVersion(), found.GetMasterVersion(), ends)
 						// skip this gopath because it's probably broken forever
 					}
 					continue
 				} else {
-					log.Printf("%-48s     error %10s vs %10s %s\n", depRepo.GetGoPath(),
+					log.Printf("%-48s     error %10s vs %10s %s", depRepo.GetGoPath(),
 						depRepo.GetVersion(), found.GetMasterVersion(), ends)
 					errs := fmt.Sprintf("%s error %s vs %s %s", depRepo.GetGoPath(),
 						depRepo.GetVersion(), found.GetMasterVersion(), ends)

doSmart.go

@@ -37,7 +37,7 @@ func doSmart(repo *gitpb.Repo) error {
 	if err := redoGoMod(repo); err != nil {
 		return err
 	}
-	log.Info(repo.GetGoPath(), "the files should have been restored with redoGoMod()")
+	log.Info(repo.GetGoPath(), "the files were restored with redoGoMod()")
 	/*
 		if repo.Exists("go.mod") {
 			return nil

doStrict.go

@@ -38,8 +38,8 @@ func doStrict(repo *gitpb.Repo) error {
 		return errors.New(repo.GetGoPath() + " not in the git master branch")
 	}
 
-	// not sure if this really needs to be run a second time. probably not, but whatever. who cares
+	err = repo.RepoIgnoresGoMod()
-	if err := repo.RepoIgnoresGoMod(); err != nil {
+	if err != nil {
 		log.Info(repo.GetGoPath(), "some wierd git error happened. investigate.", err)
 		return err
 	}
@@ -78,7 +78,7 @@ func doStrict(repo *gitpb.Repo) error {
 	}
 
 	os.Unsetenv("GO111MODULE")
-	if result, err := repo.RunQuiet([]string{"go", "mod", "tidy"}); err != nil {
+	if result, err := repo.RunQuiet([]string{"go", "mod", "tidy", "-go=" + golangVersion}); err != nil {
 		// I guess the thing to do, if go mod tidy fails, is to just leave the repo alone
 		// it's either primitive or could be a go support project but not in go
 		for _, line := range result.Stdout {
@@ -91,17 +91,15 @@ func doStrict(repo *gitpb.Repo) error {
 	}
 
 	// the first time, it'll attempt to fix some stuff
-	log.Info(repo.GetGoPath(), "Running: updateToNewestReleases()")
+	log.Info("Running: updateToNewestReleases()")
 	cleanGoDepsCheckOk(repo)
 
-	if repo.Exists("go.sum") {
 	// try to trim junk
-		log.Info(repo.GetGoPath(), "Running: trimGoSum()")
+	log.Info("Running: trimGoSum()")
 	if err := trimGoSum(repo); err != nil {
 		log.Info(repo.GetGoPath(), "trimGoSum() failed", err)
 		return err
 	}
-	}
 
 	if repo.ParseGoSum() {
 		log.Info(repo.GetGoPath(), "ParseGoSum() ok")
@@ -109,28 +107,17 @@ func doStrict(repo *gitpb.Repo) error {
 		log.Info(repo.GetGoPath(), "ParseGoSum() failed")
 	}
 
-	if !repo.GetGoPrimitive() {
 	// check go.sum file
 	if err := cleanGoDepsCheckOk(repo); err != nil {
-			log.Info(repo.GetGoPath(), "forge.FinalGoDepsCheck() failed. boo.")
+		log.Info("forge.FinalGoDepsCheck() failed. boo. :", repo.GetGoPath())
 		return err
 	}
-	}
-
-	if repo.Exists("go.sum") {
-		// try to trim junk
-		log.Info(repo.GetGoPath(), "Running: trimGoSum()")
-		if err := trimGoSum(repo); err != nil {
-			log.Info(repo.GetGoPath(), "trimGoSum() failed", err)
-			return err
-		}
-	}
 
 	// put the files in the notes section in git
 	// this way, git commits are not messed up
 	// with this autogenerated code
 	if err := saveAsMetadata(repo); err != nil {
-		log.Info(repo.GetGoPath(), "save go.mod as git metadata failed", err)
+		log.Info("save go.mod as git metadata failed", repo.GetGoPath(), err)
 		return err
 	}
 

exit.go

@@ -8,7 +8,7 @@ import (
 )
 
 func okExit(check *gitpb.Repo, msg string) {
-	log.Info("exit() go-mod-clean on", check.Namespace, "ok")
+	log.Info("exit() go-mod-clean on", check.GetGoPath(), "ok")
 	log.DaemonMode(true)
 	log.Info(msg)
 	os.Exit(0)
@@ -16,9 +16,9 @@ func okExit(check *gitpb.Repo, msg string) {
 
 func badExit(check *gitpb.Repo, err error) {
 	log.DaemonMode(true)
-	log.Info("go-mod-clean failed: ", err, forge.Config.ReposDir)
+	log.Info("go-mod-clean failed: ", err, forge.GetGoSrc())
 	if check != nil {
-		if argv.Strict != nil {
+		if argv.Strict {
 			// if in strict mode, remove the go.mod and go.sum
 			eraseGoMod(check)
 		}

main.go

@@ -5,7 +5,6 @@ import (
 	"strings"
 
 	"go.wit.com/dev/alexflint/arg"
-	"go.wit.com/lib/gui/prep"
 	"go.wit.com/lib/protobuf/forgepb"
 	"go.wit.com/lib/protobuf/gitpb"
 	"go.wit.com/log"
@@ -18,6 +17,8 @@ var BUILDTIME string
 // used for shell auto completion
 var ARGNAME string = "go-mod-clean"
 
+var golangVersion string = "1.22"
+
 var pp *arg.Parser
 var forge *forgepb.Forge
 
@@ -25,25 +26,32 @@ var forge *forgepb.Forge
 var configSave bool
 
 func main() {
+	var check *gitpb.Repo
 	log.Info("go-mod-clean version", VERSION, "built on", BUILDTIME)
-
-	// command line parsing & handling
-	prep.Bash(ARGNAME, argv.DoAutoComplete) // todo: make this: prep.Bash(argv)
 	pp = arg.MustParse(&argv)
 
-	forge = forgepb.Init()
+	if argv.Bash {
+		argv.doBash()
+		os.Exit(0)
+	}
+	if len(argv.BashAuto) != 0 {
+		argv.doBashAuto()
+		os.Exit(0)
+	}
+	// load the ~/.config/forge/ config
+	// this lets you configure repos you have read/write access too
+	forge = forgepb.InitPB() // todo: make this scan only if pb file not found
 
 	// figure out what directory we are running in
-	check := findPwdRepo()
+	check = findPwdRepo()
 	if check == nil {
 		log.Info("this directory isn't in a golang project (not in ~/go/src nor a go.work file)")
 		badExit(nil, nil)
 	}
 
 	// deletes all the git notes
-	if argv.Purge != nil {
+	if argv.Purge {
-		purgeNotes(check) // purges all the 'git notes'
+		purgeNotes(check)
-		eraseGoMod(check) // erase the go.mod and go.sum files
 		okExit(check, "notes gone")
 	}
 
@@ -55,14 +63,14 @@ func main() {
 		okExit(check, "go.mod and go.sum restored from ~/go/pkg/mod/")
 	}
 
-	if argv.Strict != nil {
+	if argv.Strict {
 		log.Info("Starting --strict mode")
 		if err := doStrict(check); err != nil {
 			badExit(check, err)
 		}
 		okExit(check, "go.mod seems clean")
 	}
-	if argv.Smart != nil {
+	if argv.Smart {
 		// best effort
 		if err := doSmart(check); err != nil {
 			// badExit(check, err)
@@ -84,16 +92,16 @@ func findPwdRepo() *gitpb.Repo {
 	// attempt to use the working directory
 	// this is probably what happens most of the time
 	pwd, _ := os.Getwd()
-	if strings.HasPrefix(pwd, forge.Config.ReposDir) {
+	if strings.HasPrefix(pwd, forge.GetGoSrc()) {
-		gopath := strings.TrimPrefix(pwd, forge.Config.ReposDir)
+		gopath := strings.TrimPrefix(pwd, forge.GetGoSrc())
 		gopath = strings.Trim(gopath, "/")
+		log.Info("findRepo() trying gopath", gopath)
 		check = forge.FindByGoPath(gopath)
 		if check != nil {
-			log.Info(check.Namespace, "was found ok in forge")
+			log.Info("findRepo() worked", check.GetGoPath())
 			return check
 		}
 	}
-	log.Info("findRepo() forge could not find GO path:", pwd)
 	return nil
 }
 

redoGoMod.go

@@ -5,6 +5,7 @@ package main
 import (
 	"fmt"
 	"os"
+	"strings"
 
 	"github.com/go-cmd/cmd"
 	"go.wit.com/lib/protobuf/gitpb"
@@ -30,7 +31,7 @@ func setGoVersion(repo *gitpb.Repo, version string) error {
 }
 
 func goTidy(fullpath string) (cmd.Status, error) {
-	if result, err := runVerbose(fullpath, []string{"go", "mod", "tidy"}); err == nil {
+	if result, err := runVerbose(fullpath, []string{"go", "mod", "tidy", "-go=" + golangVersion}); err == nil {
 		return result, nil
 	} else {
 		return result, err
@@ -45,14 +46,22 @@ func redoGoMod(repo *gitpb.Repo) error {
 		log.Warn("rm go.mod go.sum failed", err)
 		return err
 	}
-
 	if _, err := repo.RunQuiet([]string{"go", "mod", "init", repo.GetGoPath()}); err != nil {
 		log.Warn("go mod init failed", err)
 		return err
 	}
 
-	if _, err := repo.RunQuiet([]string{"go", "mod", "tidy"}); err != nil {
+	if result, err := goTidy(repo.FullPath); err != nil {
-		log.Warn("go mod init failed", err)
+		if tinyFixer(result) {
+			if _, err := goTidy(repo.FullPath); err != nil {
+				return err
+			}
+		}
+	}
+
+	// most things should build with golang after 1.21 // todo: allow this to be set somewhere
+	if err := setGoVersion(repo, golangVersion); err != nil {
+		log.Warn(repo.GetGoPath(), "go mod edit failed", err)
 		return err
 	}
 
@@ -63,3 +72,19 @@ func redoGoMod(repo *gitpb.Repo) error {
 
 	return fmt.Errorf("check.ParseGoSum() failed")
 }
+
+func tinyFixer(result cmd.Status) bool {
+	for _, line := range result.Stdout {
+		if strings.Contains(line, "requires go@") {
+			log.Info("tinyFixer:", line)
+			parts := strings.Split(line, "requires go@")
+			if len(parts) == 2 {
+				parts = strings.Split(parts[1], ",")
+				golangVersion = parts[0]
+				return true
+			}
+			log.Info("tinyFixer:", line, "golangVersion", golangVersion)
+		}
+	}
+	return false
+}