build-quick

Makefile

@@ -58,9 +58,6 @@ findNext:
 showNext:
 	curl --silent http://localhost:9419/showNext
 
-testNext:
-	curl --silent http://localhost:9419/testNext
-
 doRelease:
 	reset
 	make showNext
@@ -96,8 +93,33 @@ safe-build: install
 
 build-quick: install
 	wit-test install --verbose
-	rm -f go.* ; git checkout go.mod ; cd ~/go/src/go.wit.com/lib/xgb/ && time GUIRELEASE_REASON="safe-build" guireleaser --gui andlabs quick
+	# rm -f go.* ; git checkout go.mod ;cd ~/go/src/go.wit.com/lib/xgb/ && time GUIRELEASE_REASON="safe-build" guireleaser --gui andlabs quick
 	sudo "wit update"
 
 autocomplete:
 	guireleaser --bash > ~/.local/share/bash-completion/completions/guireleaser
+
+test-build-force:
+	GUIRELEASE_REASON="safe-build" guireleaser --gui andlabs --force
+
+# time GUIRELEASE_REASON="safe-build" make test-build
+test-build:
+	wit-test install --verbose
+	rm ~/go/bin/forged
+	cd ~/go/src/go.wit.com/lib/xgb/ && rm -f go.*
+	cd ~/go/src/go.wit.com/lib/xgb/ && git checkout go.mod
+	cd ~/go/src/go.wit.com/lib/xgb/ && time guireleaser --gui andlabs
+	cd ~/go/src/go.wit.com/apps/guireleaser
+	wit-test debian --verbose
+	do-aptly
+
+# time GUIRELEASE_REASON="safe-build" make test-build-quick
+test-build-quick:
+	wit-test install --verbose
+	rm ~/go/bin/forged
+	cd ~/go/src/go.wit.com/lib/xgb/ && rm -f go.*
+	cd ~/go/src/go.wit.com/lib/xgb/ && git checkout go.mod
+	cd ~/go/src/go.wit.com/lib/xgb/ && time guireleaser --gui andlabs quick
+	cd ~/go/src/go.wit.com/apps/guireleaser
+	wit-test debian --verbose
+	do-aptly

argv.go

@@ -1,5 +1,11 @@
 package main
 
+import (
+	"fmt"
+	"os"
+	"os/user"
+)
+
 /*
 	this parses the command line arguements
 
@@ -41,3 +47,39 @@ the repositories in the go.sum file using git clone`
 func (args) Version() string {
 	return "guireleaser " + VERSION
 }
+
+/*
+	handles shell autocomplete
+*/
+
+func (a args) DoAutoComplete(argv []string) {
+	switch argv[0] {
+	case "checkout":
+		usr, _ := user.Current()
+		fmt.Println("user devel master " + usr.Username)
+	case "commit":
+		fmt.Println("--all")
+	case "config":
+		fmt.Println("add fix list delete")
+	case "list":
+		fmt.Println("--all --mine --favorites --private")
+	case "pull":
+		fmt.Println("--all --mine --favorites --private")
+	case "patch":
+		fmt.Println("--list --submit --show")
+	case "dirty":
+		fmt.Println("--show-files")
+	case "user":
+		fmt.Println("--force")
+	case "devel":
+		fmt.Println("--force")
+	case "master":
+		fmt.Println("--force")
+	default:
+		if argv[0] == ARGNAME {
+			// list the subcommands here
+			fmt.Println("--bash quick")
+		}
+	}
+	os.Exit(0)
+}

argvAutoshell.go

@@ -1,97 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"os"
-	"os/user"
-)
-
-/*
-	handles shell autocomplete
-*/
-
-// used for shell auto completion
-// var ARGNAME string = "forge" // todo: get this from $0 ?
-
-func (args) doBashAuto() {
-	argv.doBashHelp()
-	switch argv.BashAuto[0] {
-	case "checkout":
-		usr, _ := user.Current()
-		fmt.Println("user devel master " + usr.Username)
-	case "commit":
-		fmt.Println("--all")
-	case "config":
-		fmt.Println("add fix list delete")
-	case "list":
-		fmt.Println("--all --mine --favorites --private")
-	case "pull":
-		fmt.Println("--all --mine --favorites --private")
-	case "patch":
-		fmt.Println("--list --submit --show")
-	case "dirty":
-		fmt.Println("--show-files")
-	case "user":
-		fmt.Println("--force")
-	case "devel":
-		fmt.Println("--force")
-	case "master":
-		fmt.Println("--force")
-	default:
-		if argv.BashAuto[0] == ARGNAME {
-			// list the subcommands here
-			fmt.Println("--bash quick")
-		}
-	}
-	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 {
-		me.pp.WriteHelp(os.Stderr)
-		return
-	}
-	fmt.Fprintln(os.Stderr, "")
-	fmt.Fprintln(os.Stderr, "hello world")
-	fmt.Fprintln(os.Stderr, "")
-}
-
-// 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: make this output work/parse with:")
-	fmt.Println("# complete -C " + ARGNAME + " --bash go")
-	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)
-}

doRelease.go

@@ -54,9 +54,19 @@ func doRelease() error {
 		log.Info("doRelease() WARNING. should have never gotten here. return true. already done", check.GetGoPath())
 		log.Info("doRelease() WARNING. should have never gotten here. return true. already done", check.GetGoPath())
 		log.Info("doRelease() WARNING. should have never gotten here. return true. already done", check.GetGoPath())
-		check.Reload()
+		check.ReloadCheck()
 		return fmt.Errorf("already released %s", check.GetGoPath())
 	}
+
+	// check if the git tag already exists somehow
+	testtag := me.release.version.String()
+	if check.LocalTagExists(testtag) {
+		log.Info("TAG ALREADY EXISTS", testtag)
+		return log.Errorf("%s TAG ALREADY EXISTS %s", check.FullPath, testtag)
+	} else {
+		log.Info("TAG IS NEW", testtag)
+	}
+
 	if me.forge.Config.IsPrivate(me.current.GetGoPath()) {
 		// do not self update private repos
 		log.Info("This is a private repo.")

exit.go

@@ -8,11 +8,12 @@ import (
 
 func okExit(thing string) {
 	log.Info(thing, "ok")
-	// log.Info("Finished go-clean on", check.GetGoPath(), "ok")
+	// log.Info("Finished go-clean on", check.GetNamespace(), "ok")
+	me.forge.Exit()
 	os.Exit(0)
 }
 
 func badExit(err error) {
-	log.Info("forge failed: ", err, me.forge.GetGoSrc())
+	log.Info("forge failed: ", err, me.forge.Config.ReposDir)
 	os.Exit(-1)
 }

findNext.go

@@ -1,4 +1,3 @@
-// This is a simple example
 package main
 
 import (
@@ -9,7 +8,6 @@ import (
 
 	"go.wit.com/log"
 
-	"go.wit.com/lib/gui/shell"
 	"go.wit.com/lib/protobuf/gitpb"
 )
 
@@ -19,15 +17,15 @@ var findOk bool = true
 
 func checkDeps(repo *gitpb.Repo) error {
 	if repo.GoDeps == nil {
-		return fmt.Errorf("%s has GoDeps == nil", repo.GetGoPath())
+		return fmt.Errorf("%s has GoDeps == nil", repo.GetNamespace())
 	}
 	for dep := range repo.GoDeps.IterAll() {
-		// log.Info(repo.GetGoPath(), dep.GoPath, dep.Version)
+		// log.Info(repo.GetNamespace(), dep.GoPath, dep.Version)
 
 		// check if the package in question is waiting for another package to publish
 		found := me.forge.FindByGoPath(dep.GoPath)
 		if found == nil {
-			return fmt.Errorf("%s has dep == nil", repo.GetGoPath(), dep.GoPath)
+			return fmt.Errorf("%s has dep == nil", repo.GetNamespace(), dep.GoPath)
 		}
 
 		// loop through all the repos that need to be published with new go versions
@@ -35,9 +33,9 @@ func checkDeps(repo *gitpb.Repo) error {
 		for all.Scan() {
 			check := all.Next()
 
-			if found.GetGoPath() == check.GetGoPath() {
+			if found.GetNamespace() == check.GetNamespace() {
 				// this package is waiting on other packages to publish
-				return fmt.Errorf("%s is waiting on %s", repo.GetGoPath(), found.GetGoPath())
+				return fmt.Errorf("%s is waiting on %s", repo.GetNamespace(), found.GetNamespace())
 			}
 		}
 		// found package isn't being published. is the version correct?
@@ -46,7 +44,7 @@ func checkDeps(repo *gitpb.Repo) error {
 			if found.GetLastTag() == dep.Version {
 				// everything is normal
 			} else {
-				return fmt.Errorf("%s version mismatch on %s (%s vs %s)", repo.GetGoPath(), found.GetGoPath(), found.GetLastTag(), dep.Version)
+				return fmt.Errorf("%s version mismatch on %s (%s vs %s)", repo.GetNamespace(), found.GetNamespace(), found.GetLastTag(), dep.Version)
 			}
 		*/
 	}
@@ -63,21 +61,21 @@ func findNext() bool {
 	for all.Scan() {
 		check := all.Next()
 		if check.GetMasterBranchName() != check.GetCurrentBranchName() {
-			log.Info("YOU MUST BE ON THE MASTER BRANCH", check.GetGoPath())
+			log.Info("YOU MUST BE ON THE MASTER BRANCH", check.GetNamespace())
 			continue
 		}
 		if check.IsDirty() {
-			log.Info("CAN NOT RELEASE DIRTY REPO", check.GetGoPath())
+			log.Info("CAN NOT RELEASE DIRTY REPO", check.GetNamespace())
 			continue
 		}
 		if alreadyDone(check) {
-			log.Info("findNext() alreadyDone. WHY IS THIS STILL CHECKING?", check.GetGoPath())
+			log.Info("findNext() alreadyDone. WHY IS THIS STILL CHECKING?", check.GetNamespace())
 			continue
 		}
-		log.Info("CHECKING START:", check.GetGoPath())
+		log.Info("CHECKING START:", check.GetNamespace())
 
-		if me.forge.Config.IsPrivate(check.GetGoPath()) {
-			log.Info("GOOD TO GO ON PRIVATE REPO", check.GetGoPath())
+		if me.forge.Config.IsPrivate(check.GetNamespace()) {
+			log.Info("GOOD TO GO ON PRIVATE REPO", check.GetNamespace())
 			setCurrentRepo(check, "should be good to release", "pretty sure")
 			return true
 		}
@@ -107,31 +105,20 @@ func findNext() bool {
 
 		if err := me.forge.FinalGoDepsCheckOk(check, argv.Verbose); err != nil {
 			// if err := me.forge.FinalGoDepsCheckOk(check, false); err != nil {
-			log.Info("FinalGoDepsCheckOk() repo=", check.GetGoPath(), "err:", err)
-			log.Info("CHECKING END:", check.GetGoPath())
+			log.Info("FinalGoDepsCheckOk() repo=", check.GetNamespace(), "err:", err)
+			log.Info("CHECKING END:", check.GetNamespace())
 			log.Info("")
 			continue
 		}
-		log.Info("GOOD TO GO ON", check.GetGoPath())
+		log.Info("GOOD TO GO ON", check.GetNamespace())
 		setCurrentRepo(check, "should be good to release", "pretty sure")
 		return true
 	}
+
 	if findCounter == 0 {
 		log.Info("NOTHING TO UPDATE. findCounter =", findCounter, "found len =", me.found.Len())
 		if me.found.Len() == 0 {
 			printDone()
-			log.Info("cd lib/; make debian")
-			wit := me.forge.FindByGoPath("go.wit.com/apps/utils/wit-test")
-			if wit != nil {
-				log.Info("cd", wit.GetFullPath())
-				os.Chdir(wit.GetFullPath())
-				shell.Exec([]string{"ls", "-l"})
-				if argv.Full {
-					shell.Exec([]string{"make", "debian-release-force"})
-				} else {
-					shell.Exec([]string{"make", "debian-release"})
-				}
-			}
 			okExit("")
 		}
 	} else {
@@ -151,7 +138,7 @@ func setCurrentRepo(check *gitpb.Repo, s string, note string) bool {
 		me.release.releaseVersionB.SetText("nope")
 		me.release.version.SetText("badver")
 	} else {
-		me.release.repo.SetText(check.GetGoPath())
+		me.release.repo.SetText(check.GetNamespace())
 		me.release.version.SetText(check.GetTargetVersion())
 		me.release.releaseVersionB.SetText("release version " + check.GetTargetVersion())
 		me.release.version.SetText(check.GetTargetVersion())
@@ -159,7 +146,6 @@ func setCurrentRepo(check *gitpb.Repo, s string, note string) bool {
 	me.release.status.SetText(s)
 	me.release.notes.SetText(note)
 	// me.release.openrepo.Enable()
-
 	return true
 }
 
@@ -170,12 +156,12 @@ func testGoDepsCheckOk(godeps *gitpb.GoDeps, verbose bool) error {
 	all := godeps.SortByGoPath()
 	for all.Scan() {
 		depRepo := all.Next()
-		fullpath := filepath.Join(me.forge.GetGoSrc(), depRepo.GetGoPath())
+		fullpath := filepath.Join(me.forge.Config.ReposDir, depRepo.GoPath)
 		found := me.found.FindByFullPath(fullpath)
 		if found == nil {
 			continue
 		}
-		return fmt.Errorf("dep is being upgraded %s", depRepo.GetGoPath())
+		return fmt.Errorf("dep is being upgraded %s", depRepo.GoPath)
 	}
 	return nil
 }

main.go

@@ -8,9 +8,9 @@ import (
 	"path/filepath"
 
 	"go.wit.com/dev/alexflint/arg"
-	"go.wit.com/gui"
 	"go.wit.com/lib/fhelp"
 	"go.wit.com/lib/gadgets"
+	"go.wit.com/lib/gui/prep"
 	"go.wit.com/lib/gui/shell"
 	"go.wit.com/lib/protobuf/forgepb"
 	"go.wit.com/lib/protobuf/gitpb"
@@ -27,28 +27,18 @@ var argv args
 
 func main() {
 	me = new(autoType)
-
-	// parse the command line
-	gui.InitArg()
+	prep.Bash(ARGNAME, argv.DoAutoComplete) // this line should be:  prep.Bash(argv)
+	me.myGui = prep.Gui()                   // prepares the GUI package for go-args
 	me.pp = arg.MustParse(&argv)
 
-	if argv.Bash {
-		argv.doBash()
-		os.Exit(0)
-	}
-	if len(argv.BashAuto) != 0 {
-		argv.doBashAuto()
-		os.Exit(0)
-	}
-
-	// load the ~/.config/forge/ config
 	me.forge = forgepb.Init()
+	me.forge.ScanRepoDir() // looks for new dirs, checks existing repos for changes
 	me.found = new(gitpb.Repos)
 
 	fhelp.CheckGoModCleanExit()
 
 	// me.forge.ConfigPrintTable()
-	os.Setenv("REPO_WORK_PATH", me.forge.GetGoSrc())
+	os.Setenv("REPO_WORK_PATH", me.forge.Config.ReposDir)
 
 	// save the ENV var here
 	me.releaseReasonS = os.Getenv("GUIRELEASE_REASON")
@@ -62,9 +52,7 @@ func main() {
 	// user drops to a shell or xterm, then they shouldn't be set there either
 	os.Unsetenv("GO111MODULE")
 
-	me.myGui = gui.New()
-	me.myGui.InitEmbed(resources)
-	me.myGui.Default()
+	me.myGui.Start() // loads the GUI toolkit
 
 	// our main window
 	me.mainWindow = gadgets.RawBasicWindow("GUI release manager " + VERSION)

prepareRelease.go

@@ -90,8 +90,7 @@ func rillRestore(repo *gitpb.Repo) error {
 }
 
 func rePrepareRelease() {
-	// reload the config
-	// me.forge = forgepb.Init()
+	me.forge.ScanRepoDir() // looks for new dirs, checks existing repos for changes
 	me.found = new(gitpb.Repos)
 	me.reason = make(map[*gitpb.Repo]string) // stores the reason repos need to be versioned & released
 
@@ -222,6 +221,15 @@ func rePrepareRelease() {
 
 	}
 	me.forge.PrintHumanTable(me.found)
+	// todo: verify each found repo is on the master branch
+	for repo := range me.found.IterAll() {
+		if repo.CurrentBranchName != repo.MasterBranchName {
+			log.Info("repo not on master branch", repo.FullPath)
+			if !argv.Force {
+				os.Exit(-1)
+			}
+		}
+	}
 }
 
 func printDone() {

releaseBox.go

@@ -9,9 +9,7 @@ import (
 	"go.wit.com/log"
 
 	"go.wit.com/lib/gadgets"
-	"go.wit.com/lib/gui/repolist"
 	"go.wit.com/lib/gui/shell"
-	"go.wit.com/lib/protobuf/forgepb"
 	"go.wit.com/lib/protobuf/gitpb"
 )
 
@@ -34,7 +32,7 @@ type releaseStruct struct {
 	checkDirtyB  *gui.Node
 	sendVersionB *gui.Node
 	checkSafeB   *gui.Node
-	whitelist    map[string]*repolist.RepoRow
+	// whitelist    map[string]*repolist.RepoRow
 }
 
 func (w *autoType) Disable() {
@@ -53,15 +51,18 @@ func createReleaseBox(box *gui.Node) {
 
 	me.release.releaseVersionB = me.release.grid.NewButton("release version", func() {
 		buttonDisable()
+		fpath := me.current.FullPath
 		if err := doRelease(); err == nil {
 			buttonEnable()
-			log.Info("doRelease() worked")
+			log.Info("doRelease() worked", fpath)
 		} else {
-			log.Info("doRelease() failed", err)
-			log.Info("doRelease() FAILED", err)
-			log.Info("doRelease() FAILED", err)
-			log.Info("doRelease() FAILED", err)
+			log.Info("doRelease() failed", err, fpath)
+			log.Info("doRelease() FAILED", err, fpath)
+			log.Info("doRelease() FAILED", err, fpath)
+			log.Info("doRelease() FAILED", err, fpath)
 		}
+		skipToNext()
+		me.forge.PrintHumanTable(me.found)
 	})
 	me.release.grid.NewButton("Find Next", func() {
 		me.Disable()
@@ -83,14 +84,6 @@ func createReleaseBox(box *gui.Node) {
 	me.release.grid.NextRow()
 
 	me.release.repo = gadgets.NewOneLiner(me.release.grid, "repo")
-	/*
-		me.release.openrepo = me.release.grid.NewButton("Configure", func() {
-			if repov := me.repos.View.FindByPath(me.current.GetGoPath()); repov != nil {
-				repov.Status.Toggle()
-			}
-		})
-		me.release.openrepo.Disable()
-	*/
 	me.release.grid.NextRow()
 	me.release.status = gadgets.NewOneLiner(me.release.grid, "status")
 	me.release.grid.NextRow()
@@ -112,16 +105,11 @@ func createReleaseBox(box *gui.Node) {
 	me.release.grid.NextRow()
 
 	// me.userHomePwd.SetText(homeDir)
-	me.goSrcPwd.SetText(me.forge.GetGoSrc())
+	me.goSrcPwd.SetText(me.forge.Config.ReposDir)
 
 	group := me.release.box.NewGroup("Run on Current Repo")
 	grid := group.NewGrid("buildOptions", 0, 0)
 
-	/*
-		grid.NewButton("whitelist", func() {
-		})
-	*/
-
 	grid.NextRow()
 
 	group = me.release.box.NewGroup("Publish until done")
@@ -156,12 +144,12 @@ func doReleaseAll() {
 
 func skipToNext() error {
 	shell.RunVerbose([]string{"forge", "dirty"})
-	log.Info("Sleeping for 10 seconds. Forge file should have been rewritten")
-	time.Sleep(10)
-	me.forge = forgepb.Init()
+	log.Info("Sleeping for 2 seconds for no reason.")
+	time.Sleep(1)
+	me.forge.ScanRepoDir() // looks for new dirs, checks existing repos for changes
 	me.found = new(gitpb.Repos)
 
-	me.current.Reload()
+	me.current.ReloadCheck()
 	me.forge.SetConfigSave(true)
 	me.forge.ConfigSave()
 	log.Info("sleep 2")

structs.go

@@ -5,6 +5,7 @@ import (
 	"go.wit.com/dev/alexflint/arg"
 	"go.wit.com/gui"
 	"go.wit.com/lib/gadgets"
+	"go.wit.com/lib/gui/prep"
 	"go.wit.com/lib/protobuf/forgepb"
 	"go.wit.com/lib/protobuf/gitpb"
 )
@@ -13,7 +14,7 @@ var me *autoType
 
 type autoType struct {
 	pp             *arg.Parser            // for parsing the command line args.  Yay to alexf lint!
-	myGui          *gui.Node              // the gui handle itself
+	myGui          *prep.GuiPrep          // the gui handle itself
 	releaseReasonS string                 // = "gocui dropdown select"
 	release        releaseStruct          // notsure
 	reposbox       *gui.Node              // notsure