go/task
1
0
Fork 0
mirror of https://github.com/go-task/task.git synced 2025-07-15 01:35:00 +02:00
Code Issues Releases Activity

refactor: remove newlines from formatter print functions (#1137)

Browse Source
This commit is contained in:
Pete Davison
2023-04-27 01:20:06 +01:00
committed by GitHub
parent 1e8fc5011b
commit 8cfac5a25a
11 changed files with 58 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/compiler/v2/compiler_v2.go
View File

@ -117,7 +117,7 @@ func (c *CompilerV2) HandleDynamicVar(v taskfile.Var, _ string) (string, error)
result := strings.TrimSuffix(stdout.String(), "\n")
c.dynamicCache[v.Sh] = result
c.Logger.VerboseErrf(logger.Magenta, `task: dynamic variable: '%s' result: '%s'`, v.Sh, result)
c.Logger.VerboseErrf(logger.Magenta, "task: dynamic variable: %q result: %q\n", v.Sh, result)
return result, nil
}

2
internal/compiler/v3/compiler_v3.go
View File

@ -161,7 +161,7 @@ func (c *CompilerV3) HandleDynamicVar(v taskfile.Var, dir string) (string, error
result = strings.TrimSuffix(result, "\n")
c.dynamicCache[v.Sh] = result
c.Logger.VerboseErrf(logger.Magenta, `task: dynamic variable: '%s' result: '%s'`, v.Sh, result)
c.Logger.VerboseErrf(logger.Magenta, "task: dynamic variable: %q result: %q\n", v.Sh, result)
return result, nil
}

4
internal/fingerprint/status.go
View File

@ -27,10 +27,10 @@ func (checker *StatusChecker) IsUpToDate(ctx context.Context, t *taskfile.Task)
Env: env.Get(t),
})
if err != nil {
checker.logger.VerboseOutf(logger.Yellow, "task: status command %s exited non-zero: %s", s, err)
checker.logger.VerboseOutf(logger.Yellow, "task: status command %s exited non-zero: %s\n", s, err)
return false, nil
}
checker.logger.VerboseOutf(logger.Yellow, "task: status command %s exited zero", s)
checker.logger.VerboseOutf(logger.Yellow, "task: status command %s exited zero\n", s)
}
return true, nil
}

4
internal/logger/logger.go
View File

@ -64,7 +64,7 @@ type Logger struct {
// Outf prints stuff to STDOUT.
func (l *Logger) Outf(color Color, s string, args ...any) {
l.FOutf(l.Stdout, color, s+"\n", args...)
l.FOutf(l.Stdout, color, s, args...)
}
// FOutf prints stuff to the given writer.
@ -95,7 +95,7 @@ func (l *Logger) Errf(color Color, s string, args ...any) {
color = Default
}
print := color()
print(l.Stderr, s+"\n", args...)
print(l.Stderr, s, args...)
}
// VerboseErrf prints stuff to STDERR if verbose mode is enabled.

40
internal/summary/summary.go
View File

@ -20,8 +20,8 @@ func PrintSpaceBetweenSummaries(l *logger.Logger, i int) {
return
}
l.Outf(logger.Default, "")
l.Outf(logger.Default, "")
l.Outf(logger.Default, "\n")
l.Outf(logger.Default, "\n")
}
func PrintTask(l *logger.Logger, t *taskfile.Task) {
@ -51,26 +51,26 @@ func printTaskSummary(l *logger.Logger, t *taskfile.Task) {
for i, line := range lines {
notLastLine := i+1 < len(lines)
if notLastLine || line != "" {
l.Outf(logger.Default, line)
l.Outf(logger.Default, "%s\n", line)
}
}
}
func printTaskName(l *logger.Logger, t *taskfile.Task) {
l.FOutf(l.Stdout, logger.Default, "task: ")
l.FOutf(l.Stdout, logger.Green, "%s\n", t.Name())
l.Outf(logger.Default, "")
l.Outf(logger.Default, "task: ")
l.Outf(logger.Green, "%s\n", t.Name())
l.Outf(logger.Default, "\n")
}
func printTaskAliases(l *logger.Logger, t *taskfile.Task) {
if len(t.Aliases) == 0 {
return
}
l.Outf(logger.Default, "")
l.Outf(logger.Default, "aliases:")
l.Outf(logger.Default, "\n")
l.Outf(logger.Default, "aliases:\n")
for _, alias := range t.Aliases {
l.FOutf(l.Stdout, logger.Default, " - ")
l.Outf(logger.Cyan, alias)
l.Outf(logger.Default, " - ")
l.Outf(logger.Cyan, "%s\n", alias)
}
}
@ -79,11 +79,11 @@ func hasDescription(t *taskfile.Task) bool {
}
func printTaskDescription(l *logger.Logger, t *taskfile.Task) {
l.Outf(logger.Default, t.Desc)
l.Outf(logger.Default, "%s\n", t.Desc)
}
func printNoDescriptionOrSummary(l *logger.Logger) {
l.Outf(logger.Default, "(task does not have description or summary)")
l.Outf(logger.Default, "(task does not have description or summary)\n")
}
func printTaskDependencies(l *logger.Logger, t *taskfile.Task) {
@ -91,11 +91,11 @@ func printTaskDependencies(l *logger.Logger, t *taskfile.Task) {
return
}
l.Outf(logger.Default, "")
l.Outf(logger.Default, "dependencies:")
l.Outf(logger.Default, "\n")
l.Outf(logger.Default, "dependencies:\n")
for _, d := range t.Deps {
l.Outf(logger.Default, " - %s", d.Task)
l.Outf(logger.Default, " - %s\n", d.Task)
}
}
@ -104,15 +104,15 @@ func printTaskCommands(l *logger.Logger, t *taskfile.Task) {
return
}
l.Outf(logger.Default, "")
l.Outf(logger.Default, "commands:")
l.Outf(logger.Default, "\n")
l.Outf(logger.Default, "commands:\n")
for _, c := range t.Cmds {
isCommand := c.Cmd != ""
l.FOutf(l.Stdout, logger.Default, " - ")
l.Outf(logger.Default, " - ")
if isCommand {
l.FOutf(l.Stdout, logger.Yellow, "%s\n", c.Cmd)
l.Outf(logger.Yellow, "%s\n", c.Cmd)
} else {
l.FOutf(l.Stdout, logger.Green, "Task: %s\n", c.Task)
l.Outf(logger.Green, "Task: %s\n", c.Task)
}
}
}