Release v2.6.1: Fix spinner timing across all commands

Buffer output before stopping spinner in graph, conflicts, sweep, view.
Content prints immediately after spinner clears with no visible gap.
Updated who spinner message to indicate it may take a moment.

Author: mubbie

VERSION

@@ -1 +1 @@
-2.6.0
+2.6.1

cmd/conflicts.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"bytes"
 	"fmt"
 	"regexp"
 	"strings"
@@ -105,9 +106,10 @@ func runConflicts(cmd *cobra.Command, args []string) error {
 		}
 	}
 
-	sp.Stop()
+	var buf bytes.Buffer
 
 	if len(conflicts) == 0 {
+		sp.Stop()
 		ui.PrintSuccess("No conflicts. Clean merge.")
 		if mb != "" {
 			stat := git.RunUnchecked("diff", "--stat", mb+".."+target)
@@ -121,7 +123,7 @@ func runConflicts(cmd *cobra.Command, args []string) error {
 		return nil
 	}
 
-	fmt.Printf("%s %d conflict%s found\n\n", ui.ErrorStyle.Render("X"), len(conflicts), ui.Plural(len(conflicts)))
+	fmt.Fprintf(&buf, "%s %d conflict%s found\n\n", ui.ErrorStyle.Render("X"), len(conflicts), ui.Plural(len(conflicts)))
 	for _, f := range conflicts {
 		// Try to get authors
 		ourAuthor := git.RunUnchecked("log", "-1", "--format=%an", "--", f)
@@ -130,11 +132,14 @@ func runConflicts(cmd *cobra.Command, args []string) error {
 		if ourAuthor != "" && theirAuthor != "" && ourAuthor != theirAuthor {
 			authors = fmt.Sprintf("     (%s + %s)", ourAuthor, theirAuthor)
 		}
-		fmt.Printf("  %s%s\n", f, authors)
+		fmt.Fprintf(&buf, "  %s%s\n", f, authors)
 	}
 
 	if cleanFiles > 0 {
-		fmt.Printf("\n  %d other file%s merge cleanly\n", cleanFiles, ui.Plural(cleanFiles))
+		fmt.Fprintf(&buf, "\n  %d other file%s merge cleanly\n", cleanFiles, ui.Plural(cleanFiles))
 	}
+
+	sp.Stop()
+	fmt.Print(buf.String())
 	return nil
 }

cmd/graph.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"bytes"
 	"fmt"
 
 	"github.com/mubbie/gx-cli/internal/git"
@@ -25,37 +26,42 @@ func runGraph(cmd *cobra.Command, args []string) error {
 
 	sp := ui.StartSpinner("Building branch tree...")
 	tree := stack.BuildTree()
-	sp.Stop()
+
 	if len(tree.Roots) == 0 && len(tree.Orphans) == 0 {
+		sp.Stop()
 		fmt.Println("No branches found.")
 		return nil
 	}
 
-	fmt.Println()
-	fmt.Println(ui.BoldStyle.Render("Branch Stack:"))
-	fmt.Println()
+	var buf bytes.Buffer
+	fmt.Fprintln(&buf)
+	fmt.Fprintln(&buf, ui.BoldStyle.Render("Branch Stack:"))
+	fmt.Fprintln(&buf)
 
 	for i, root := range tree.Roots {
 		isLast := i == len(tree.Roots)-1 && len(tree.Orphans) == 0
-		renderNode(root, "", isLast)
+		renderNodeTo(&buf, root, "", isLast)
 	}
 
 	if len(tree.Orphans) > 0 {
-		fmt.Println()
-		fmt.Println(ui.WarningStyle.Bold(true).Render("Orphaned Branches:"))
+		fmt.Fprintln(&buf)
+		fmt.Fprintln(&buf, ui.WarningStyle.Bold(true).Render("Orphaned Branches:"))
 		for i, orphan := range tree.Orphans {
-			renderNode(orphan, "", i == len(tree.Orphans)-1)
+			renderNodeTo(&buf, orphan, "", i == len(tree.Orphans)-1)
 		}
 	}
 
-	fmt.Println()
-	fmt.Println(ui.DimStyle.Render("Legend: * current branch  + merged  (+ahead/-behind)  ! orphaned"))
-	fmt.Println(ui.DimStyle.Render("Relationships stored in .git/gx/stack.json"))
-	fmt.Println()
+	fmt.Fprintln(&buf)
+	fmt.Fprintln(&buf, ui.DimStyle.Render("Legend: * current branch  + merged  (+ahead/-behind)  ! orphaned"))
+	fmt.Fprintln(&buf, ui.DimStyle.Render("Relationships stored in .git/gx/stack.json"))
+	fmt.Fprintln(&buf)
+
+	sp.Stop()
+	fmt.Print(buf.String())
 	return nil
 }
 
-func renderNode(node *stack.BranchNode, prefix string, isLast bool) {
+func renderNodeTo(buf *bytes.Buffer, node *stack.BranchNode, prefix string, isLast bool) {
 	connector := ui.DimStyle.Render("|-- ")
 	if isLast {
 		connector = ui.DimStyle.Render("`-- ")
@@ -87,13 +93,13 @@ func renderNode(node *stack.BranchNode, prefix string, isLast bool) {
 		name = ui.BranchStyle.Render(node.Name)
 	}
 
-	fmt.Printf("%s%s%s%s\n", prefix, connector, name, indicators)
+	fmt.Fprintf(buf, "%s%s%s%s\n", prefix, connector, name, indicators)
 
 	childPrefix := prefix + ui.DimStyle.Render("|") + "   "
 	if isLast {
 		childPrefix = prefix + "    "
 	}
 	for i, child := range node.Children {
-		renderNode(child, childPrefix, i == len(node.Children)-1)
+		renderNodeTo(buf, child, childPrefix, i == len(node.Children)-1)
 	}
 }

cmd/sweep.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"bytes"
 	"fmt"
 	"strings"
 
@@ -88,42 +89,47 @@ func runSweep(cmd *cobra.Command, args []string) error {
 		}
 	}
 
-	sp.Stop()
-	fmt.Println()
-
 	if len(merged) == 0 && len(squashMerged) == 0 && len(staleRefs) == 0 {
+		sp.Stop()
+		fmt.Println()
 		ui.PrintSuccess("Nothing to clean up. Repository is tidy!")
 		return nil
 	}
 
+	var buf bytes.Buffer
+	fmt.Fprintln(&buf)
+
 	if len(merged) > 0 {
-		fmt.Println(ui.BoldStyle.Render("Merged branches (safe to delete):"))
+		fmt.Fprintln(&buf, ui.BoldStyle.Render("Merged branches (safe to delete):"))
 		for _, b := range merged {
-			fmt.Printf("  %s\n", ui.BranchStyle.Render(b))
+			fmt.Fprintf(&buf, "  %s\n", ui.BranchStyle.Render(b))
 		}
-		fmt.Println()
+		fmt.Fprintln(&buf)
 	}
 	if len(squashMerged) > 0 {
-		fmt.Println(ui.BoldStyle.Render("Likely squash-merged branches:"))
+		fmt.Fprintln(&buf, ui.BoldStyle.Render("Likely squash-merged branches:"))
 		for _, b := range squashMerged {
-			fmt.Printf("  %s\n", ui.BranchStyle.Render(b))
+			fmt.Fprintf(&buf, "  %s\n", ui.BranchStyle.Render(b))
 		}
-		fmt.Println()
+		fmt.Fprintln(&buf)
 	}
 	if len(staleRefs) > 0 {
-		fmt.Println(ui.BoldStyle.Render("Stale remote tracking refs:"))
+		fmt.Fprintln(&buf, ui.BoldStyle.Render("Stale remote tracking refs:"))
 		for _, r := range staleRefs {
-			fmt.Printf("  %s\n", ui.DimStyle.Render(r))
+			fmt.Fprintf(&buf, "  %s\n", ui.DimStyle.Render(r))
 		}
-		fmt.Println()
+		fmt.Fprintln(&buf)
 	}
 
-	fmt.Printf("%s %s merged, %s likely squash-merged, %s stale refs\n\n",
+	fmt.Fprintf(&buf, "%s %s merged, %s likely squash-merged, %s stale refs\n\n",
 		ui.BoldStyle.Render("Summary:"),
 		ui.BoldStyle.Render(fmt.Sprintf("%d", len(merged))),
 		ui.BoldStyle.Render(fmt.Sprintf("%d", len(squashMerged))),
 		ui.BoldStyle.Render(fmt.Sprintf("%d", len(staleRefs))))
 
+	sp.Stop()
+	fmt.Print(buf.String())
+
 	if dryRun {
 		fmt.Printf("%s would delete %d branches, %d stale refs\n", ui.WarningStyle.Render("DRY RUN"), len(merged)+len(squashMerged), len(staleRefs))
 		return nil

cmd/view.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"bytes"
 	"encoding/json"
 	"fmt"
 	"os/exec"
@@ -81,14 +82,15 @@ func runView(cmd *cobra.Command, args []string) error {
 
 	hasGH := isGHAvailable()
 	var prMap map[string]prInfo
+	var sp *ui.Spinner
 	if hasGH {
-		sp := ui.StartSpinner("Fetching PR status...")
+		sp = ui.StartSpinner("Fetching PR status...")
 		prMap = fetchPRMap()
-		sp.Stop()
 	}
 
-	fmt.Println()
-	fmt.Println(ui.BranchStyle.Render(trunk))
+	var buf bytes.Buffer
+	fmt.Fprintln(&buf)
+	fmt.Fprintln(&buf, ui.BranchStyle.Render(trunk))
 	for _, branch := range allBranches {
 		meta := cfg.Branches[branch]
 		parent := trunk
@@ -114,9 +116,14 @@ func runView(cmd *cobra.Command, args []string) error {
 		if branch == current {
 			parts = append(parts, "  "+ui.HeadMarker.Render("<"))
 		}
-		fmt.Println(strings.Join(parts, ""))
+		fmt.Fprintln(&buf, strings.Join(parts, ""))
 	}
-	fmt.Println()
+	fmt.Fprintln(&buf)
+
+	if sp != nil {
+		sp.Stop()
+	}
+	fmt.Print(buf.String())
 	return nil
 }
 

cmd/who.go

@@ -49,7 +49,7 @@ func runWho(cmd *cobra.Command, args []string) error {
 }
 
 func whoRepo(n int, since string) error {
-	sp := ui.StartSpinner("Analyzing contributors...")
+	sp := ui.StartSpinner("Analyzing contributors (this may take a moment)...")
 
 	// Get commit counts + emails
 	shortlogArgs := []string{"shortlog", "-sne", "--all"}

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "gx-git"
-version = "2.6.0"
+version = "2.6.1"
 description = "Git Productivity Toolkit"
 readme = "README.md"
 license = {text = "MIT"}