From 07a60ffe3cefab8345c3750cdb8449886cf05342 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Wed, 14 Feb 2024 00:19:36 -0600 Subject: code reorg Signed-off-by: Jeff Carr --- branchesBox.go | 26 ++++++-------- commandsBox.go | 97 -------------------------------------------------- modifyBox.go | 110 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 120 insertions(+), 113 deletions(-) delete mode 100644 commandsBox.go create mode 100644 modifyBox.go diff --git a/branchesBox.go b/branchesBox.go index 38c1d26..f692d2e 100644 --- a/branchesBox.go +++ b/branchesBox.go @@ -7,22 +7,29 @@ import ( func (rs *RepoStatus) makeBranchesBox() { rs.gitBranchesGroup = rs.window.Box().NewGroup("branches") - newgrid := rs.gitBranchesGroup.NewGrid("gridnuts", 2, 2) + newgrid := rs.gitBranchesGroup.NewGrid("gridnuts", 0, 0) rs.lasttag = gadgets.NewOneLiner(newgrid, "last tag") + newgrid.NextRow() rs.masterBranchVersion = gadgets.NewOneLiner(newgrid, "master") + newgrid.NextRow() rs.develBranchVersion = gadgets.NewOneLiner(newgrid, "devel") + newgrid.NextRow() rs.userBranchVersion = gadgets.NewOneLiner(newgrid, "user") + newgrid.NextRow() rs.currentBranch = gadgets.NewOneLiner(newgrid, "current branch") + newgrid.NextRow() rs.currentVersion = gadgets.NewOneLiner(newgrid, "current version") + newgrid.NextRow() rs.showBranchesButton = newgrid.NewButton("getBranches()", func() { all := rs.getBranches() i := len(all) log.Log(WARN, "branch count =", i) }) + newgrid.NextRow() rs.checkBranchesButton = newgrid.NewButton("CheckBranches()", func() { if rs.CheckBranches() { @@ -31,6 +38,7 @@ func (rs *RepoStatus) makeBranchesBox() { log.Log(WARN, "Branches are not perfect") } }) + newgrid.NextRow() newgrid.NewButton("show .git/config", func() { if rs.gitConfig == nil { @@ -47,6 +55,7 @@ func (rs *RepoStatus) makeBranchesBox() { log.Log(WARN, " ", name, "remote:", branch.remote, "merge", branch.merge) } }) + newgrid.NextRow() newgrid.NewButton("CheckDirty()", func() { if rs.CheckDirty() { @@ -55,19 +64,4 @@ func (rs *RepoStatus) makeBranchesBox() { log.Log(WARN, "is not dirty") } }) - - // rs.TagsW = rs.TagWindow() - - newgrid.NewButton("Show tags", func() { - if rs.TagsW == nil { - log.Warn("error: found rs.TagsW == nil") - rs.TagsW = rs.TagWindow() - return - } - if rs.TagsW.Hidden() { - rs.TagsW.Show() - } else { - rs.TagsW.Show() - } - }) } diff --git a/commandsBox.go b/commandsBox.go deleted file mode 100644 index 865e4b0..0000000 --- a/commandsBox.go +++ /dev/null @@ -1,97 +0,0 @@ -package repostatus - -import ( - "go.wit.com/lib/gadgets" - "go.wit.com/log" -) - -func (rs *RepoStatus) drawGitCommands() { - rs.gitCommandsGroup = rs.window.Box().NewGroup("git commands") - newgrid := rs.gitCommandsGroup.NewGrid("gridnuts", 0, 0) - - newgrid.NewButton("update", func() { - rs.Update() - }) - newgrid.NextRow() - - newgrid.NewButton("git pull", func() { - var cmd []string - cmd = append(cmd, "git", "pull") - err, b, output := RunCmd(rs.realPath.String(), cmd) - log.Warn("Did git pull here", err, b, output) - }) - newgrid.NextRow() - - label := "merge " + rs.userWorkingName.String() + " to " + rs.develWorkingName.String() - rs.develMergeB = newgrid.NewButton(label, func() { - rs.Disable() - if rs.RunDevelMergeB() { - log.Warn("THINGS SEEM OK fullAutomation() returned true.") - } else { - log.Warn("THINGS FAILED fullAutomation() returned false") - } - rs.Enable() - }) - - label = "merge " + rs.develWorkingName.String() + " to " + rs.mainWorkingName.String() - rs.mainMergeB = newgrid.NewButton(label, func() { - rs.Disable() - if rs.RunDevelMergeB() { - log.Warn("THINGS SEEM OK fullAutomation() returned true.") - } else { - log.Warn("THINGS FAILED fullAutomation() returned false") - } - rs.Enable() - }) - newgrid.NextRow() - - rs.major = gadgets.NewBasicCombobox(newgrid, "major") - rs.major.Custom = func() { - rs.setTag() - rs.generateCmd() - } - rs.major.Hide() - newgrid.NextRow() - - rs.minor = gadgets.NewBasicCombobox(newgrid, "minor") - rs.minor.Custom = func() { - rs.setTag() - rs.generateCmd() - } - rs.minor.Hide() - newgrid.NextRow() - - rs.revision = gadgets.NewBasicCombobox(newgrid, "revision") - rs.revision.Custom = func() { - rs.setTag() - rs.generateCmd() - } - rs.revision.Hide() - newgrid.NextRow() - - // newgrid.NewLabel("new tag version") - rs.newversion = newgrid.NewLabel("0.0.1") - rs.newversion.Hide() - newgrid.NextRow() - - rs.versionMessage = gadgets.NewBasicEntry(newgrid, "tag message") - rs.versionMessage.Custom = func() { - rs.generateCmd() - } - rs.versionMessage.Hide() - newgrid.NextRow() - - rs.versionCmdOutput = gadgets.NewOneLiner(newgrid, "tag cmd") - rs.versionCmdOutput.Hide() - newgrid.NextRow() - - rs.releaseVersion = newgrid.NewButton("tag and release new version", func() { - rs.Disable() - rs.runReleaseVersionB() - }) - rs.releaseVersion.Hide() - newgrid.NextRow() - - newgrid.Margin() - newgrid.Pad() -} diff --git a/modifyBox.go b/modifyBox.go new file mode 100644 index 0000000..098dbe0 --- /dev/null +++ b/modifyBox.go @@ -0,0 +1,110 @@ +package repostatus + +import ( + "go.wit.com/lib/gadgets" + "go.wit.com/log" +) + +func (rs *RepoStatus) drawGitCommands() { + rs.gitCommandsGroup = rs.window.Box().NewGroup("modify") + newgrid := rs.gitCommandsGroup.NewGrid("gridnuts", 0, 0) + + newgrid.NewButton("update", func() { + rs.Update() + }) + + newgrid.NewButton("Show tags", func() { + if rs.TagsW == nil { + log.Warn("error: found rs.TagsW == nil") + rs.TagsW = rs.TagWindow() + return + } + if rs.TagsW.Hidden() { + rs.TagsW.Show() + } else { + rs.TagsW.Show() + } + }) + newgrid.NextRow() + + newgrid.NewButton("git pull", func() { + var cmd []string + cmd = append(cmd, "git", "pull") + err, b, output := RunCmd(rs.realPath.String(), cmd) + log.Warn("Did git pull here", err, b, output) + }) + newgrid.NextRow() + + label := "merge " + rs.userWorkingName.String() + " to " + rs.develWorkingName.String() + rs.develMergeB = newgrid.NewButton(label, func() { + rs.Disable() + if rs.RunDevelMergeB() { + log.Warn("THINGS SEEM OK fullAutomation() returned true.") + } else { + log.Warn("THINGS FAILED fullAutomation() returned false") + } + rs.Enable() + }) + + label = "merge " + rs.develWorkingName.String() + " to " + rs.mainWorkingName.String() + rs.mainMergeB = newgrid.NewButton(label, func() { + rs.Disable() + if rs.RunDevelMergeB() { + log.Warn("THINGS SEEM OK fullAutomation() returned true.") + } else { + log.Warn("THINGS FAILED fullAutomation() returned false") + } + rs.Enable() + }) + newgrid.NextRow() + + rs.major = gadgets.NewBasicCombobox(newgrid, "major") + rs.major.Custom = func() { + rs.setTag() + rs.generateCmd() + } + rs.major.Hide() + newgrid.NextRow() + + rs.minor = gadgets.NewBasicCombobox(newgrid, "minor") + rs.minor.Custom = func() { + rs.setTag() + rs.generateCmd() + } + rs.minor.Hide() + newgrid.NextRow() + + rs.revision = gadgets.NewBasicCombobox(newgrid, "revision") + rs.revision.Custom = func() { + rs.setTag() + rs.generateCmd() + } + rs.revision.Hide() + newgrid.NextRow() + + // newgrid.NewLabel("new tag version") + rs.newversion = newgrid.NewLabel("0.0.1") + rs.newversion.Hide() + newgrid.NextRow() + + rs.versionMessage = gadgets.NewBasicEntry(newgrid, "tag message") + rs.versionMessage.Custom = func() { + rs.generateCmd() + } + rs.versionMessage.Hide() + newgrid.NextRow() + + rs.versionCmdOutput = gadgets.NewOneLiner(newgrid, "tag cmd") + rs.versionCmdOutput.Hide() + newgrid.NextRow() + + rs.releaseVersion = newgrid.NewButton("tag and release new version", func() { + rs.Disable() + rs.runReleaseVersionB() + }) + rs.releaseVersion.Hide() + newgrid.NextRow() + + newgrid.Margin() + newgrid.Pad() +} -- cgit v1.2.3