diff options
| author | Paul Buetow <paul@buetow.org> | 2026-03-27 11:15:10 +0200 |
|---|---|---|
| committer | Paul Buetow <paul@buetow.org> | 2026-03-27 11:15:10 +0200 |
| commit | 4732a59111d161232f466e9122c01fe5fc6cf80e (patch) | |
| tree | 51f9593261e17f418935093e8ceee73be38db1d8 /internal | |
| parent | aac01f41e7247c05170ad4b4cb935da171a5ac97 (diff) | |
664b9fe4: extract renderTaskList helper
Diffstat (limited to 'internal')
| -rw-r--r-- | internal/askcli/command_list.go | 19 | ||||
| -rw-r--r-- | internal/askcli/command_urgency.go | 19 | ||||
| -rw-r--r-- | internal/askcli/render_task_list.go | 30 | ||||
| -rw-r--r-- | internal/askcli/render_task_list_test.go | 90 |
4 files changed, 122 insertions, 36 deletions
diff --git a/internal/askcli/command_list.go b/internal/askcli/command_list.go index 76b5302..99ffcc8 100644 --- a/internal/askcli/command_list.go +++ b/internal/askcli/command_list.go @@ -3,7 +3,6 @@ package askcli import ( "bytes" "context" - "encoding/json" "fmt" "io" "sort" @@ -52,23 +51,7 @@ func (d *Dispatcher) handleListWithFilters(ctx context.Context, initialFilters, } return tasks[i].Urgency > tasks[j].Urgency }) - if d.jsonOutput { - data, err := json.Marshal(tasks) - if err != nil { - fmt.Fprintf(stderr, "error: failed to marshal JSON: %v\n", err) - return 1, nil - } - stdout.Write(data) - io.WriteString(stdout, "\n") - } else { - aliases, err := ensureTaskAliases(tasks) - if err != nil { - fmt.Fprintf(stderr, "error: failed to load task aliases: %v\n", err) - return 1, nil - } - io.WriteString(stdout, FormatTaskListForWidth(tasks, aliases, detectTaskListTerminalWidth(stdout))) - } - return 0, nil + return renderTaskList(tasks, stdout, stderr, d.jsonOutput) } func priorityOrder(p string) int { diff --git a/internal/askcli/command_urgency.go b/internal/askcli/command_urgency.go index a6f545c..9911f42 100644 --- a/internal/askcli/command_urgency.go +++ b/internal/askcli/command_urgency.go @@ -3,7 +3,6 @@ package askcli import ( "bytes" "context" - "encoding/json" "fmt" "io" "sort" @@ -23,21 +22,5 @@ func (d *Dispatcher) handleUrgency(ctx context.Context, stdout, stderr io.Writer sort.Slice(tasks, func(i, j int) bool { return tasks[i].Urgency > tasks[j].Urgency }) - if d.jsonOutput { - data, err := json.Marshal(tasks) - if err != nil { - fmt.Fprintf(stderr, "error: failed to marshal JSON: %v\n", err) - return 1, nil - } - stdout.Write(data) - io.WriteString(stdout, "\n") - } else { - aliases, err := ensureTaskAliases(tasks) - if err != nil { - fmt.Fprintf(stderr, "error: failed to load task aliases: %v\n", err) - return 1, nil - } - io.WriteString(stdout, FormatTaskListForWidth(tasks, aliases, detectTaskListTerminalWidth(stdout))) - } - return 0, nil + return renderTaskList(tasks, stdout, stderr, d.jsonOutput) } diff --git a/internal/askcli/render_task_list.go b/internal/askcli/render_task_list.go new file mode 100644 index 0000000..1c0da8c --- /dev/null +++ b/internal/askcli/render_task_list.go @@ -0,0 +1,30 @@ +package askcli + +import ( + "encoding/json" + "fmt" + "io" +) + +var taskListAliasLoader = ensureTaskAliases + +func renderTaskList(tasks []TaskExport, stdout, stderr io.Writer, jsonOutput bool) (int, error) { + if jsonOutput { + data, err := json.Marshal(tasks) + if err != nil { + fmt.Fprintf(stderr, "error: failed to marshal JSON: %v\n", err) + return 1, nil + } + stdout.Write(data) + io.WriteString(stdout, "\n") + return 0, nil + } + + aliases, err := taskListAliasLoader(tasks) + if err != nil { + fmt.Fprintf(stderr, "error: failed to load task aliases: %v\n", err) + return 1, nil + } + io.WriteString(stdout, FormatTaskListForWidth(tasks, aliases, detectTaskListTerminalWidth(stdout))) + return 0, nil +} diff --git a/internal/askcli/render_task_list_test.go b/internal/askcli/render_task_list_test.go new file mode 100644 index 0000000..623055e --- /dev/null +++ b/internal/askcli/render_task_list_test.go @@ -0,0 +1,90 @@ +package askcli + +import ( + "bytes" + "encoding/json" + "fmt" + "reflect" + "strings" + "testing" +) + +func TestRenderTaskList_JSONOutput(t *testing.T) { + tasks := []TaskExport{{ + UUID: "uuid-json", + Description: "JSON task", + Status: "pending", + Priority: "H", + Tags: []string{"cli"}, + Urgency: 12.5, + }} + var stdout, stderr bytes.Buffer + code, err := renderTaskList(tasks, &stdout, &stderr, true) + if err != nil { + t.Fatalf("renderTaskList returned error: %v", err) + } + if code != 0 { + t.Fatalf("renderTaskList code = %d, want 0", code) + } + var parsed []TaskExport + if err := json.Unmarshal(bytes.TrimSpace(stdout.Bytes()), &parsed); err != nil { + t.Fatalf("failed to parse JSON output: %v", err) + } + if !reflect.DeepEqual(parsed, tasks) { + t.Fatalf("rendered tasks = %#v, want %#v", parsed, tasks) + } + if stderr.Len() != 0 { + t.Fatalf("unexpected stderr = %q", stderr.String()) + } +} + +func TestRenderTaskList_TextOutputUsesAliasLoader(t *testing.T) { + oldLoader := taskListAliasLoader + defer func() { taskListAliasLoader = oldLoader }() + + taskListAliasLoader = func(tasks []TaskExport) (map[string]string, error) { + if len(tasks) != 1 || tasks[0].UUID != "uuid-text" { + t.Fatalf("unexpected tasks passed to loader: %#v", tasks) + } + return map[string]string{"uuid-text": "2"}, nil + } + + var stdout, stderr bytes.Buffer + code, err := renderTaskList([]TaskExport{{UUID: "uuid-text", Description: "Text task", Priority: "L"}}, &stdout, &stderr, false) + if err != nil { + t.Fatalf("renderTaskList returned error: %v", err) + } + if code != 0 { + t.Fatalf("renderTaskList code = %d, want 0", code) + } + output := stdout.String() + if !strings.Contains(output, "2") || strings.Contains(output, "uuid-text") { + t.Fatalf("expected alias in output, got %q", output) + } + if stderr.Len() != 0 { + t.Fatalf("unexpected stderr = %q", stderr.String()) + } +} + +func TestRenderTaskList_AliasLoaderError(t *testing.T) { + oldLoader := taskListAliasLoader + defer func() { taskListAliasLoader = oldLoader }() + + taskListAliasLoader = func([]TaskExport) (map[string]string, error) { + return nil, fmt.Errorf("boom") + } + var stdout, stderr bytes.Buffer + code, err := renderTaskList([]TaskExport{{UUID: "uuid-error"}}, &stdout, &stderr, false) + if err != nil { + t.Fatalf("renderTaskList returned error: %v", err) + } + if code != 1 { + t.Fatalf("renderTaskList code = %d, want 1 on alias error", code) + } + if stdout.Len() != 0 { + t.Fatalf("expected no stdout on alias error, got %q", stdout.String()) + } + if !strings.Contains(stderr.String(), "failed to load task aliases") { + t.Fatalf("unexpected stderr message: %q", stderr.String()) + } +} |
