fix output formatting errors

Makefile

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

argv.go

@@ -7,15 +7,18 @@ package main
 var argv args
 
 type args struct {
-	Trim     bool     `arg:"--trim"      default:"true"     help:"trim entries from go.sum"`
-	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"`
-	Strict   bool     `arg:"--strict"                       help:"never make go.* files unless everything is perfect"`
-	Purge    bool     `arg:"--purge"                        help:"purge all the git notes. this might be bad for you."`
-	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"`
+	Trim     bool      `arg:"--trim"      default:"true"     help:"trim entries from go.sum"`
+	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)"`
+	Smart    *EmptyCmd `arg:"subcommand:lax"                 help:"try something but never do os.Exit(-1)"`
+	Strict   *EmptyCmd `arg:"subcommand:strict"              help:"never make go.* files unless everything is perfect"`
+	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 {

argvAutoshell.go

@@ -28,7 +28,7 @@ func (args) doBashAuto() {
 	default:
 		if argv.BashAuto[0] == ARGNAME {
 			// list the subcommands here
-			fmt.Println("--smart strict")
+			fmt.Println("strict restore purge lax")
 		}
 	}
 	os.Exit(0)

cleanGoSum.go

@@ -15,13 +15,15 @@ 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("current repo %s go dependancy count: %d", check.GetGoPath(), check.GoDepsLen())
+	log.Printf("%s repo go dependancy count: %d\n", check.GetGoPath(), check.GoDepsLen())
 	if check.GoDeps == nil {
 		return errors.New("check.GoDeps == nil")
 	}
@@ -48,20 +50,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", depRepo.GetGoPath(),
+					log.Printf("%-48s  ok error .%s. vs .%s. %s\n", 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", depRepo.GetGoPath(),
+						log.Printf("%-48s  ok error .%s. vs .%s. %s\n", 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", depRepo.GetGoPath(),
+					log.Printf("%-48s     error %10s vs %10s %s\n", 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 were restored with redoGoMod()")
+	log.Info(repo.GetGoPath(), "the files should have been 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")
 	}
 
-	err = repo.RepoIgnoresGoMod()
-	if err != nil {
+	// not sure if this really needs to be run a second time. probably not, but whatever. who cares
+	if err := repo.RepoIgnoresGoMod(); 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", "-go=" + golangVersion}); err != nil {
+	if result, err := repo.RunQuiet([]string{"go", "mod", "tidy"}); 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,14 +91,16 @@ func doStrict(repo *gitpb.Repo) error {
 	}
 
 	// the first time, it'll attempt to fix some stuff
-	log.Info("Running: updateToNewestReleases()")
+	log.Info(repo.GetGoPath(), "Running: updateToNewestReleases()")
 	cleanGoDepsCheckOk(repo)
 
-	// try to trim junk
-	log.Info("Running: trimGoSum()")
-	if err := trimGoSum(repo); err != nil {
-		log.Info(repo.GetGoPath(), "trimGoSum() failed", err)
-		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
+		}
 	}
 
 	if repo.ParseGoSum() {
@@ -107,17 +109,28 @@ func doStrict(repo *gitpb.Repo) error {
 		log.Info(repo.GetGoPath(), "ParseGoSum() failed")
 	}
 
-	// check go.sum file
-	if err := cleanGoDepsCheckOk(repo); err != nil {
-		log.Info("forge.FinalGoDepsCheck() failed. boo. :", repo.GetGoPath())
-		return err
+	if !repo.GetGoPrimitive() {
+		// check go.sum file
+		if err := cleanGoDepsCheckOk(repo); err != nil {
+			log.Info(repo.GetGoPath(), "forge.FinalGoDepsCheck() failed. boo.")
+			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("save go.mod as git metadata failed", repo.GetGoPath(), err)
+		log.Info(repo.GetGoPath(), "save go.mod as git metadata failed", err)
 		return err
 	}
 

exit.go

@@ -18,7 +18,7 @@ func badExit(check *gitpb.Repo, err error) {
 	log.DaemonMode(true)
 	log.Info("go-mod-clean failed: ", err, forge.GetGoSrc())
 	if check != nil {
-		if argv.Strict {
+		if argv.Strict != nil {
 			// if in strict mode, remove the go.mod and go.sum
 			eraseGoMod(check)
 		}

main.go

@@ -17,8 +17,6 @@ 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
 
@@ -27,7 +25,6 @@ var configSave bool
 
 func main() {
 	var check *gitpb.Repo
-	log.Info("go-mod-clean version", VERSION, "built on", BUILDTIME)
 	pp = arg.MustParse(&argv)
 
 	if argv.Bash {
@@ -38,6 +35,8 @@ func main() {
 		argv.doBashAuto()
 		os.Exit(0)
 	}
+
+	log.Info("go-mod-clean version", VERSION, "built on", BUILDTIME)
 	// 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
@@ -50,8 +49,9 @@ func main() {
 	}
 
 	// deletes all the git notes
-	if argv.Purge {
-		purgeNotes(check)
+	if argv.Purge != nil {
+		purgeNotes(check) // purges all the 'git notes'
+		eraseGoMod(check) // erase the go.mod and go.sum files
 		okExit(check, "notes gone")
 	}
 
@@ -63,14 +63,14 @@ func main() {
 		okExit(check, "go.mod and go.sum restored from ~/go/pkg/mod/")
 	}
 
-	if argv.Strict {
+	if argv.Strict != nil {
 		log.Info("Starting --strict mode")
 		if err := doStrict(check); err != nil {
 			badExit(check, err)
 		}
 		okExit(check, "go.mod seems clean")
 	}
-	if argv.Smart {
+	if argv.Smart != nil {
 		// best effort
 		if err := doSmart(check); err != nil {
 			// badExit(check, err)
@@ -95,13 +95,13 @@ func findPwdRepo() *gitpb.Repo {
 	if strings.HasPrefix(pwd, forge.GetGoSrc()) {
 		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("findRepo() worked", check.GetGoPath())
+			log.Info(check.GetGoPath(), "was found ok in forge")
 			return check
 		}
 	}
+	log.Info("findRepo() forge could not find GO path:", pwd)
 	return nil
 }
 

redoGoMod.go

@@ -5,7 +5,6 @@ package main
 import (
 	"fmt"
 	"os"
-	"strings"
 
 	"github.com/go-cmd/cmd"
 	"go.wit.com/lib/protobuf/gitpb"
@@ -31,7 +30,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", "-go=" + golangVersion}); err == nil {
+	if result, err := runVerbose(fullpath, []string{"go", "mod", "tidy"}); err == nil {
 		return result, nil
 	} else {
 		return result, err
@@ -46,22 +45,14 @@ 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 result, err := goTidy(repo.FullPath); err != nil {
-		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)
+	if _, err := repo.RunQuiet([]string{"go", "mod", "tidy"}); err != nil {
+		log.Warn("go mod init failed", err)
 		return err
 	}
 
@@ -72,19 +63,3 @@ 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
-}