mirror of
https://github.com/go-task/task.git
synced 2025-04-13 11:50:50 +02:00
Compile tasks before printing help or summary (Closes #276)
This commit is contained in:
parent
de98a53b43
commit
7453e688fd
4
help.go
4
help.go
@ -29,6 +29,10 @@ func (e *Executor) tasksWithDesc() (tasks []*taskfile.Task) {
|
|||||||
tasks = make([]*taskfile.Task, 0, len(e.Taskfile.Tasks))
|
tasks = make([]*taskfile.Task, 0, len(e.Taskfile.Tasks))
|
||||||
for _, task := range e.Taskfile.Tasks {
|
for _, task := range e.Taskfile.Tasks {
|
||||||
if task.Desc != "" {
|
if task.Desc != "" {
|
||||||
|
compiledTask, err := e.CompiledTask(taskfile.Call{Task: task.Task})
|
||||||
|
if err == nil {
|
||||||
|
task = compiledTask
|
||||||
|
}
|
||||||
tasks = append(tasks, task)
|
tasks = append(tasks, task)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -9,12 +9,12 @@ import (
|
|||||||
|
|
||||||
func PrintTasks(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 {
|
for i, call := range c {
|
||||||
printSpaceBetweenSummaries(l, i)
|
PrintSpaceBetweenSummaries(l, i)
|
||||||
PrintTask(l, t.Tasks[call.Task])
|
PrintTask(l, t.Tasks[call.Task])
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func printSpaceBetweenSummaries(l *logger.Logger, i int) {
|
func PrintSpaceBetweenSummaries(l *logger.Logger, i int) {
|
||||||
spaceRequired := i > 0
|
spaceRequired := i > 0
|
||||||
if !spaceRequired {
|
if !spaceRequired {
|
||||||
return
|
return
|
||||||
|
9
task.go
9
task.go
@ -70,7 +70,14 @@ func (e *Executor) Run(ctx context.Context, calls ...taskfile.Call) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if e.Summary {
|
if e.Summary {
|
||||||
summary.PrintTasks(e.Logger, e.Taskfile, calls)
|
for i, c := range calls {
|
||||||
|
compiledTask, err := e.CompiledTask(c)
|
||||||
|
if err != nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
summary.PrintSpaceBetweenSummaries(e.Logger, i)
|
||||||
|
summary.PrintTask(e.Logger, compiledTask)
|
||||||
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -25,6 +25,7 @@ func (e *Executor) CompiledTask(call taskfile.Call) (*taskfile.Task, error) {
|
|||||||
new := taskfile.Task{
|
new := taskfile.Task{
|
||||||
Task: origTask.Task,
|
Task: origTask.Task,
|
||||||
Desc: r.Replace(origTask.Desc),
|
Desc: r.Replace(origTask.Desc),
|
||||||
|
Summary: r.Replace(origTask.Summary),
|
||||||
Sources: r.ReplaceSlice(origTask.Sources),
|
Sources: r.ReplaceSlice(origTask.Sources),
|
||||||
Generates: r.ReplaceSlice(origTask.Generates),
|
Generates: r.ReplaceSlice(origTask.Generates),
|
||||||
Status: r.ReplaceSlice(origTask.Status),
|
Status: r.ReplaceSlice(origTask.Status),
|
||||||
|
Loading…
x
Reference in New Issue
Block a user