fixes due to 'go mod' behavior changes
This commit is contained in:
parent
2b85f5e17d
commit
a29e10e911
3
Makefile
3
Makefile
|
@ -37,3 +37,6 @@ clean:
|
||||||
|
|
||||||
all: install
|
all: install
|
||||||
go-mod-clean --all --auto
|
go-mod-clean --all --auto
|
||||||
|
|
||||||
|
autocomplete:
|
||||||
|
go-mod-clean --bash > ~/.local/share/bash-completion/completions/go-mod-clean
|
||||||
|
|
21
argv.go
21
argv.go
|
@ -7,15 +7,18 @@ package main
|
||||||
var argv args
|
var argv args
|
||||||
|
|
||||||
type args struct {
|
type args struct {
|
||||||
Trim bool `arg:"--trim" default:"true" help:"trim entries from go.sum"`
|
Trim bool `arg:"--trim" default:"true" help:"trim entries from go.sum"`
|
||||||
Verbose bool `arg:"--verbose" help:"show more"`
|
Verbose bool `arg:"--verbose" help:"show more"`
|
||||||
Restore bool `arg:"--restore" help:"only restore from go/pkg/mod/"`
|
Restore bool `arg:"--restore" help:"only restore from go/pkg/mod/"`
|
||||||
Force bool `arg:"--force" help:"remove things and redo them no matter what"`
|
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 *EmptyCmd `arg:"subcommand:purge" help:"purge all git notes. (this is where the autogenerated files are stored)"`
|
||||||
Purge bool `arg:"--purge" help:"purge all the git notes. this might be bad for you."`
|
Smart *EmptyCmd `arg:"subcommand:lax" help:"try something but never do os.Exit(-1)"`
|
||||||
Smart bool `arg:"--smart" help:"whatever seems best at the time. never 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"`
|
Bash bool `arg:"--bash" help:"generate bash completion"`
|
||||||
BashAuto []string `arg:"--auto-complete" help:"todo: move this to go-arg"`
|
BashAuto []string `arg:"--auto-complete" help:"todo: move this to go-arg"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type EmptyCmd struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (args) Version() string {
|
func (args) Version() string {
|
||||||
|
|
|
@ -28,7 +28,7 @@ func (args) doBashAuto() {
|
||||||
default:
|
default:
|
||||||
if argv.BashAuto[0] == ARGNAME {
|
if argv.BashAuto[0] == ARGNAME {
|
||||||
// list the subcommands here
|
// list the subcommands here
|
||||||
fmt.Println("--smart strict")
|
fmt.Println("strict restore purge lax")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
os.Exit(0)
|
os.Exit(0)
|
||||||
|
|
|
@ -15,13 +15,15 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
// This will recreate your go.sum and go.mod files
|
// This will recreate your go.sum and go.mod files
|
||||||
|
|
||||||
// checks to see if every 'master' git branch version
|
// checks to see if every 'master' git branch version
|
||||||
// matches the go.sum file
|
// 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 {
|
func cleanGoDepsCheckOk(check *gitpb.Repo) error {
|
||||||
// var err error = nil
|
// var err error = nil
|
||||||
// var fixes [][]string
|
// 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 {
|
if check.GoDeps == nil {
|
||||||
return errors.New("check.GoDeps == nil")
|
return errors.New("check.GoDeps == nil")
|
||||||
}
|
}
|
||||||
|
|
|
@ -37,7 +37,7 @@ func doSmart(repo *gitpb.Repo) error {
|
||||||
if err := redoGoMod(repo); err != nil {
|
if err := redoGoMod(repo); err != nil {
|
||||||
return err
|
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") {
|
if repo.Exists("go.mod") {
|
||||||
return nil
|
return nil
|
||||||
|
|
2
exit.go
2
exit.go
|
@ -18,7 +18,7 @@ func badExit(check *gitpb.Repo, err error) {
|
||||||
log.DaemonMode(true)
|
log.DaemonMode(true)
|
||||||
log.Info("go-mod-clean failed: ", err, forge.GetGoSrc())
|
log.Info("go-mod-clean failed: ", err, forge.GetGoSrc())
|
||||||
if check != nil {
|
if check != nil {
|
||||||
if argv.Strict {
|
if argv.Strict != nil {
|
||||||
// if in strict mode, remove the go.mod and go.sum
|
// if in strict mode, remove the go.mod and go.sum
|
||||||
eraseGoMod(check)
|
eraseGoMod(check)
|
||||||
}
|
}
|
||||||
|
|
16
main.go
16
main.go
|
@ -25,7 +25,6 @@ var configSave bool
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
var check *gitpb.Repo
|
var check *gitpb.Repo
|
||||||
log.Info("go-mod-clean version", VERSION, "built on", BUILDTIME)
|
|
||||||
pp = arg.MustParse(&argv)
|
pp = arg.MustParse(&argv)
|
||||||
|
|
||||||
if argv.Bash {
|
if argv.Bash {
|
||||||
|
@ -36,6 +35,8 @@ func main() {
|
||||||
argv.doBashAuto()
|
argv.doBashAuto()
|
||||||
os.Exit(0)
|
os.Exit(0)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
log.Info("go-mod-clean version", VERSION, "built on", BUILDTIME)
|
||||||
// load the ~/.config/forge/ config
|
// load the ~/.config/forge/ config
|
||||||
// this lets you configure repos you have read/write access too
|
// this lets you configure repos you have read/write access too
|
||||||
forge = forgepb.InitPB() // todo: make this scan only if pb file not found
|
forge = forgepb.InitPB() // todo: make this scan only if pb file not found
|
||||||
|
@ -48,8 +49,9 @@ func main() {
|
||||||
}
|
}
|
||||||
|
|
||||||
// deletes all the git notes
|
// deletes all the git notes
|
||||||
if argv.Purge {
|
if argv.Purge != nil {
|
||||||
purgeNotes(check)
|
purgeNotes(check) // purges all the 'git notes'
|
||||||
|
eraseGoMod(check) // erase the go.mod and go.sum files
|
||||||
okExit(check, "notes gone")
|
okExit(check, "notes gone")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -61,14 +63,14 @@ func main() {
|
||||||
okExit(check, "go.mod and go.sum restored from ~/go/pkg/mod/")
|
okExit(check, "go.mod and go.sum restored from ~/go/pkg/mod/")
|
||||||
}
|
}
|
||||||
|
|
||||||
if argv.Strict {
|
if argv.Strict != nil {
|
||||||
log.Info("Starting --strict mode")
|
log.Info("Starting --strict mode")
|
||||||
if err := doStrict(check); err != nil {
|
if err := doStrict(check); err != nil {
|
||||||
badExit(check, err)
|
badExit(check, err)
|
||||||
}
|
}
|
||||||
okExit(check, "go.mod seems clean")
|
okExit(check, "go.mod seems clean")
|
||||||
}
|
}
|
||||||
if argv.Smart {
|
if argv.Smart != nil {
|
||||||
// best effort
|
// best effort
|
||||||
if err := doSmart(check); err != nil {
|
if err := doSmart(check); err != nil {
|
||||||
// badExit(check, err)
|
// badExit(check, err)
|
||||||
|
@ -93,13 +95,13 @@ func findPwdRepo() *gitpb.Repo {
|
||||||
if strings.HasPrefix(pwd, forge.GetGoSrc()) {
|
if strings.HasPrefix(pwd, forge.GetGoSrc()) {
|
||||||
gopath := strings.TrimPrefix(pwd, forge.GetGoSrc())
|
gopath := strings.TrimPrefix(pwd, forge.GetGoSrc())
|
||||||
gopath = strings.Trim(gopath, "/")
|
gopath = strings.Trim(gopath, "/")
|
||||||
log.Info("findRepo() trying gopath", gopath)
|
|
||||||
check = forge.FindByGoPath(gopath)
|
check = forge.FindByGoPath(gopath)
|
||||||
if check != nil {
|
if check != nil {
|
||||||
log.Info("findRepo() worked", check.GetGoPath())
|
log.Info(check.GetGoPath(), "was found ok in forge")
|
||||||
return check
|
return check
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
log.Info("findRepo() forge could not find GO path:", pwd)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -45,11 +45,17 @@ func redoGoMod(repo *gitpb.Repo) error {
|
||||||
log.Warn("rm go.mod go.sum failed", err)
|
log.Warn("rm go.mod go.sum failed", err)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
if _, err := repo.RunQuiet([]string{"go", "mod", "init", repo.GetGoPath()}); err != nil {
|
if _, err := repo.RunQuiet([]string{"go", "mod", "init", repo.GetGoPath()}); err != nil {
|
||||||
log.Warn("go mod init failed", err)
|
log.Warn("go mod init failed", err)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if _, err := repo.RunQuiet([]string{"go", "mod", "tidy"}); err != nil {
|
||||||
|
log.Warn("go mod init failed", err)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
// parse the go.mod and go.sum files
|
// parse the go.mod and go.sum files
|
||||||
if repo.ParseGoSum() {
|
if repo.ParseGoSum() {
|
||||||
return nil
|
return nil
|
||||||
|
|
Loading…
Reference in New Issue