rm GoSrc()

argv.go

@@ -1,5 +1,10 @@
 package main
 
+import (
+	"fmt"
+	"os"
+)
+
 /*
 	this parses the command line arguements
 */
@@ -35,3 +40,16 @@ 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

@@ -1,82 +0,0 @@
-// 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("strict restore purge lax")
-		}
-	}
-	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

@@ -50,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)

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()
+	// not sure if this really needs to be run a second time. probably not, but whatever. who cares
-	if err != nil {
+	if err := repo.RepoIgnoresGoMod(); err != nil {
 		log.Info(repo.GetGoPath(), "some wierd git error happened. investigate.", err)
 		return err
 	}
@@ -91,15 +91,17 @@ 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)
 
+	if repo.Exists("go.sum") {
 		// try to trim junk
-	log.Info("Running: trimGoSum()")
+		log.Info(repo.GetGoPath(), "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")
@@ -107,17 +109,28 @@ 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("forge.FinalGoDepsCheck() failed. boo. :", repo.GetGoPath())
+			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

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

main.go

@@ -5,6 +5,7 @@ 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"
@@ -24,25 +25,16 @@ 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)
 
-	if argv.Bash {
+	forge = forgepb.Init()
-		argv.doBash()
-		os.Exit(0)
-	}
-	if len(argv.BashAuto) != 0 {
-		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
 
 	// 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)
@@ -92,12 +84,12 @@ 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.GetGoSrc()) {
+	if strings.HasPrefix(pwd, forge.Config.ReposDir) {
-		gopath := strings.TrimPrefix(pwd, forge.GetGoSrc())
+		gopath := strings.TrimPrefix(pwd, forge.Config.ReposDir)
 		gopath = strings.Trim(gopath, "/")
 		check = forge.FindByGoPath(gopath)
 		if check != nil {
-			log.Info(check.GetGoPath(), "was found ok in forge")
+			log.Info(check.Namespace, "was found ok in forge")
 			return check
 		}
 	}