583b480f3a · krz/gitbay

internal/control/control.go +10

	@@ -360,6 +360,16 @@ type emptyReader struct{}
360		360
361	func (emptyReader) Read([]byte) (int, error) { return 0, io.EOF }	361	func (emptyReader) Read([]byte) (int, error) { return 0, io.EOF }
362		362
		363	// emitView is emit for a command with a terminal screen: --json and
		364	// piped output are emit's, and at a terminal build's screen is drawn
		365	// in place of plain.
		366	func (c *Ctx) emitView(data any, plain func(w io.Writer), build func() screen) int {
		367	if c.Term.Cols == 0 \|\| c.JSON {
		368	return c.emit(data, plain)
		369	}
		370	return c.emit(data, func(w io.Writer) { c.render(w, build()) })
		371	}
		372
363	// emit writes data as the command result: a JSON envelope under --json,	373	// emit writes data as the command result: a JSON envelope under --json,
364	// otherwise via the plain formatter.	374	// otherwise via the plain formatter.
365	func (c *Ctx) emit(data any, plain func(w io.Writer)) int {	375	func (c *Ctx) emit(data any, plain func(w io.Writer)) int {

internal/control/cursor.go +24 −14

 	"io"
 	"reflect"
 	"regexp"
+	"slices"
 	"strconv"
 	"strings"
 			fmt.Fprintf(w, "next\t%s\n", next)
 			return
 		}
-		var again []string
+		fmt.Fprintln(c.Stderr, c.Term.paint(sgrBold, "Next page")+"  "+c.Term.paint(sgrBlue, c.cmdline(c.nextArgv(next))))
-		for i := 0; i < len(c.Argv); i++ {
-			if c.Argv[i] == "--cursor" {
-				i++
-				continue
-			}
-			again = append(again, c.Argv[i])
-		}
-		cmd := []string{"gitbay", joinPath(c.Cmd.Path)}
-		for _, a := range again {
-			cmd = append(cmd, shellWord(a))
-		}
-		cmd = append(cmd, "--cursor", next)
-		fmt.Fprintf(c.Stderr, "more: %s\n", strings.Join(cmd, " "))
 	})
 }
+// emitPageView is emitPage for a list with a terminal screen.
+func (c *Ctx) emitPageView(p page, items any, next string, plain func(w io.Writer), build func() screen) int {
+	if c.Term.Cols == 0 || c.JSON {
+		return c.emitPage(p, items, next, plain)
+	}
+	return c.emitPage(p, items, next, func(w io.Writer) { c.render(w, build()) })
+}
+// nextArgv is the command that fetches the page after this one: this
+// command's argv with its cursor replaced.
+func (c *Ctx) nextArgv(next string) []string {
+	argv := slices.Clone(c.Cmd.Path)
+	for i := 0; i < len(c.Argv); i++ {
+		if c.Argv[i] == "--cursor" {
+			i++
+			continue
+		}
+		argv = append(argv, c.Argv[i])
+	}
+	return append(argv, "--cursor", next)
+}

internal/control/cursor_test.go +10 −6

 		t.Errorf("cursor row on stdout at a terminal")
 	}
 	stderr := errOut.String()
-	want := "more: gitbay build list " + repo.Path() + " --limit 2 --cursor "
+	cmd, ok := strings.CutPrefix(stderr, "Next page  ")
-	if !strings.Contains(stderr, want) {
+	if !ok {
-		t.Errorf("stderr = %q, want %q…", stderr, want)
+		t.Fatalf("stderr = %q, want a Next page line", stderr)
 	}
-	// Ensure no double space in the output.
+	want := "gitbay build list " + repo.Path() + " --limit 2 --cursor "
-	if strings.Contains(stderr, "  ") {
+	if !strings.HasPrefix(cmd, want) {
-		t.Errorf("stderr contains double space: %q", stderr)
+		t.Errorf("command = %q, want %q…", cmd, want)
+	}
+	// No empty word in the command.
+	if strings.Contains(cmd, "  ") {
+		t.Errorf("command contains double space: %q", cmd)
 	}
 }

internal/control/screen_test.go +29

	@@ -1,7 +1,9 @@
1	package control	1	package control
2		2
3	import (	3	import (
		4	"bytes"
4	"fmt"	5	"fmt"
		6	"io"
5	"strings"	7	"strings"
6	"testing"	8	"testing"
7	)	9	)
	@@ -177,3 +179,30 @@ func TestLegendColour(t *testing.T) {
177	t.Error("colour legend differs beyond SGR")	179	t.Error("colour legend differs beyond SGR")
178	}	180	}
179	}	181	}
		182
		183	func TestEmitViewRoutes(t *testing.T) {
		184	built := false
		185	build := func() screen { built = true; return screen{fields: []field{{"Repo", []cell{cText("a/b")}}}} }
		186	plain := func(w io.Writer) { io.WriteString(w, "plain\n") }
		187
		188	var out bytes.Buffer
		189	c := &Ctx{Stdout: &out, Stderr: io.Discard}
		190	c.emitView(map[string]string{"k": "v"}, plain, build)
		191	if out.String() != "plain\n" \|\| built {
		192	t.Errorf("piped: %q built=%v", out.String(), built)
		193	}
		194
		195	out.Reset()
		196	c = &Ctx{Stdout: &out, Stderr: io.Discard, JSON: true, Term: Term{Cols: 80}}
		197	c.emitView(map[string]string{"k": "v"}, plain, build)
		198	if !strings.Contains(out.String(), `"k":"v"`) \|\| built {
		199	t.Errorf("json: %q built=%v", out.String(), built)
		200	}
		201
		202	out.Reset()
		203	c = &Ctx{Stdout: &out, Stderr: io.Discard, Term: Term{Cols: 80}}
		204	c.emitView(map[string]string{"k": "v"}, plain, build)
		205	if out.String() != "Repo: a/b\n" \|\| !built {
		206	t.Errorf("terminal: %q built=%v", out.String(), built)
		207	}
		208	}

Commit 583b480f3a