From 9cfac1642a6b2932cd930a0a47921791919c885e Mon Sep 17 00:00:00 2001 From: jaedle Date: Mon, 4 Mar 2019 13:03:13 +0100 Subject: [PATCH] rename method for summary/summaries --- internal/summary/summary.go | 10 +++++----- internal/summary/summary_test.go | 20 ++++++++++---------- task.go | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/internal/summary/summary.go b/internal/summary/summary.go index 05933ebe..3dbfdf22 100644 --- a/internal/summary/summary.go +++ b/internal/summary/summary.go @@ -7,14 +7,14 @@ import ( "github.com/go-task/task/v2/internal/taskfile" ) -func PrintAll(l *logger.Logger, t *taskfile.Taskfile, c []taskfile.Call) { +func PrintTasks(l *logger.Logger, t *taskfile.Taskfile, c []taskfile.Call) { for i, call := range c { - printSpaceBetweenSummaries(i, l) - Print(l, t.Tasks[call.Task]) + printSpaceBetweenSummaries(l, i) + PrintTask(l, t.Tasks[call.Task]) } } -func printSpaceBetweenSummaries(i int, l *logger.Logger) { +func printSpaceBetweenSummaries(l *logger.Logger, i int) { spaceRequired := i > 0 if !spaceRequired { return @@ -24,7 +24,7 @@ func printSpaceBetweenSummaries(i int, l *logger.Logger) { l.Outf("") } -func Print(l *logger.Logger, t *taskfile.Task) { +func PrintTask(l *logger.Logger, t *taskfile.Task) { printTaskName(l, t) if hasSummary(t) { printTaskSummary(l, t) diff --git a/internal/summary/summary_test.go b/internal/summary/summary_test.go index c3122fb3..95029efc 100644 --- a/internal/summary/summary_test.go +++ b/internal/summary/summary_test.go @@ -22,7 +22,7 @@ func TestPrintsDependenciesIfPresent(t *testing.T) { }, } - summary.Print(&l, task) + summary.PrintTask(&l, task) assert.Contains(t, buffer.String(), "\ndependencies:\n - dep1\n - dep2\n - dep3\n") } @@ -43,7 +43,7 @@ func TestDoesNotPrintDependenciesIfMissing(t *testing.T) { Deps: []*taskfile.Dep{}, } - summary.Print(&l, task) + summary.PrintTask(&l, task) assert.NotContains(t, buffer.String(), "dependencies:") } @@ -54,7 +54,7 @@ func TestPrintTaskName(t *testing.T) { Task: "my-task-name", } - summary.Print(&l, task) + summary.PrintTask(&l, task) assert.Contains(t, buffer.String(), "task: my-task-name\n") } @@ -69,7 +69,7 @@ func TestPrintTaskCommandsIfPresent(t *testing.T) { }, } - summary.Print(&l, task) + summary.PrintTask(&l, task) assert.Contains(t, buffer.String(), "\ncommands:\n") assert.Contains(t, buffer.String(), "\n - command-1\n") @@ -83,7 +83,7 @@ func TestDoesNotPrintCommandIfMissing(t *testing.T) { Cmds: []*taskfile.Cmd{}, } - summary.Print(&l, task) + summary.PrintTask(&l, task) assert.NotContains(t, buffer.String(), "commands") } @@ -101,7 +101,7 @@ func TestLayout(t *testing.T) { }, } - summary.Print(&l, task) + summary.PrintTask(&l, task) assert.Equal(t, expectedOutput(), buffer.String()) } @@ -134,17 +134,17 @@ func TestPrintDescriptionAsFallback(t *testing.T) { } taskWithoutSummaryOrDescription := &taskfile.Task{} - summary.Print(&l, taskWithoutSummary) + summary.PrintTask(&l, taskWithoutSummary) assert.Contains(t, buffer.String(), "description") buffer.Reset() - summary.Print(&l, taskWithSummary) + summary.PrintTask(&l, taskWithSummary) assert.NotContains(t, buffer.String(), "description") buffer.Reset() - summary.Print(&l, taskWithoutSummaryOrDescription) + summary.PrintTask(&l, taskWithoutSummaryOrDescription) assert.Contains(t, buffer.String(), "\n(task does not have description or summary)\n") @@ -162,7 +162,7 @@ func TestPrintAllWithSpaces(t *testing.T) { tasks["t2"] = t2 tasks["t3"] = t3 - summary.PrintAll(&l, + summary.PrintTasks(&l, &taskfile.Taskfile{Tasks: tasks}, []taskfile.Call{{Task: "t1"}, {Task: "t2"}, {Task: "t3"}}) diff --git a/task.go b/task.go index d7ba3fd7..f890cb5e 100644 --- a/task.go +++ b/task.go @@ -65,7 +65,7 @@ func (e *Executor) Run(ctx context.Context, calls ...taskfile.Call) error { } if e.Summary { - summary.PrintAll(e.Logger, e.Taskfile, calls) + summary.PrintTasks(e.Logger, e.Taskfile, calls) return nil }