Skip to content

Commit 1a21e91

Browse files
AzuyamatAzuyamat
committed
fix: Fix merge conflict
2 parents b3f9121 + ad39bee commit 1a21e91

5 files changed

Lines changed: 47 additions & 21 deletions

File tree

‎internal/command/run.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55

66
gear "github.com/azuyamat/gear/command"
77
"github.com/azuyamat/pace/internal/config"
8+
"github.com/azuyamat/pace/internal/logger"
89
"github.com/azuyamat/pace/internal/runner"
910
)
1011

@@ -27,6 +28,7 @@ func runHandler(ctx *gear.Context, args gear.ValidatedArgs) error {
2728

2829
task, exists := config.GetTaskOrDefault(taskName)
2930
if !exists {
31+
logger.Error("Task '%s' not found", taskName)
3032
return fmt.Errorf("task '%s' not found", taskName)
3133
}
3234

‎internal/command/update.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
"strings"
1010

1111
gear "github.com/azuyamat/gear/command"
12+
"github.com/azuyamat/pace/internal/logger"
1213
)
1314

1415
const (
@@ -24,13 +25,13 @@ func init() {
2425
}
2526

2627
func updateHandler(ctx *gear.Context, args gear.ValidatedArgs) error {
27-
fmt.Println("Checking for updates...")
28+
logger.Info("Checking for updates...")
2829

2930
if cmd := getManagedUpdateCommand(); cmd != nil {
3031
return runManagedUpdate(cmd)
3132
}
3233

33-
fmt.Println("Running installation script to update...")
34+
logger.Info("Running installation script to update...")
3435
return runInstallScript()
3536
}
3637

@@ -70,7 +71,7 @@ func getManagedUpdateCommand() *exec.Cmd {
7071
}
7172

7273
func runManagedUpdate(cmd *exec.Cmd) error {
73-
fmt.Printf("Running: %s\n", strings.Join(cmd.Args, " "))
74+
logger.Task("Running: %s", strings.Join(cmd.Args, " "))
7475

7576
cmd.Stdout = os.Stdout
7677
cmd.Stderr = os.Stderr
@@ -80,7 +81,7 @@ func runManagedUpdate(cmd *exec.Cmd) error {
8081
return fmt.Errorf("update command failed: %w", err)
8182
}
8283

83-
fmt.Println("\nUpdate completed successfully!")
84+
logger.Success("Update completed successfully!")
8485
return nil
8586
}
8687

@@ -106,7 +107,7 @@ func runInstallScript() error {
106107
return fmt.Errorf("installation script failed: %w", err)
107108
}
108109

109-
fmt.Println("\nUpdate completed successfully!")
110+
logger.Success("Update completed successfully!")
110111
return nil
111112
}
112113

‎internal/command/version.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
package command
22

33
import (
4-
"fmt"
5-
64
gear "github.com/azuyamat/gear/command"
5+
"github.com/azuyamat/pace/internal/logger"
76
"github.com/azuyamat/pace/internal/version"
87
)
98

@@ -15,8 +14,8 @@ func init() {
1514
}
1615

1716
func versionHandler(ctx *gear.Context, args gear.ValidatedArgs) error {
18-
fmt.Printf("pace version %s\n", version.Version)
19-
fmt.Printf("commit: %s\n", version.Commit)
20-
fmt.Printf("built at: %s\n", version.Date)
17+
logger.Printf("pace version %s\n", version.Version)
18+
logger.Printf("commit: %s\n", version.Commit)
19+
logger.Printf("built at: %s\n", version.Date)
2120
return nil
2221
}

‎internal/command/watch.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55

66
gear "github.com/azuyamat/gear/command"
77
"github.com/azuyamat/pace/internal/config"
8+
"github.com/azuyamat/pace/internal/logger"
89
"github.com/azuyamat/pace/internal/runner"
910
)
1011

@@ -28,6 +29,7 @@ func watchHandler(ctx *gear.Context, args gear.ValidatedArgs) error {
2829

2930
func Watch(cfg *config.Config, args []string) error {
3031
if len(args) < 1 {
32+
logger.Error("No task name provided for watch command")
3133
return fmt.Errorf("no task name provided for watch command")
3234
}
3335

@@ -39,10 +41,12 @@ func Watch(cfg *config.Config, args []string) error {
3941

4042
task, exists := cfg.Tasks[taskName]
4143
if !exists {
44+
logger.Error("Task %q not found in configuration", taskName)
4245
return fmt.Errorf("task %q not found in configuration", taskName)
4346
}
4447

4548
if len(task.Inputs) == 0 {
49+
logger.Warning("Task %q has no inputs defined for watching", taskName)
4650
return fmt.Errorf("task %q has no inputs defined for watching", taskName)
4751
}
4852

‎internal/logger/logger.go‎

Lines changed: 31 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,59 +32,79 @@ func (l *Logger) SetEnabled(enabled bool) {
3232
}
3333

3434
func (l *Logger) timestamp() string {
35-
background := ColorBlue.Dark().Background()
36-
return background.Wrap(" " + time.Now().Format("15:04:05") + " ")
35+
timeStr := time.Now().Format("15:04:05")
36+
return ColorGray.Wrap("[" + timeStr + "]")
37+
}
38+
39+
func (l *Logger) badge(text string, color Color) string {
40+
bg := color.Dark().Background()
41+
return bg.Wrap(" " + text + " ")
3742
}
3843

3944
func (l *Logger) Info(format string, args ...interface{}) {
4045
if !l.enabled || l.level > LevelInfo {
4146
return
4247
}
4348
msg := fmt.Sprintf(format, args...)
44-
foregroundColor := ColorWhite
45-
icon := ColorBlue.Dim().Wrap("[INFO]")
46-
coloredMessage := foregroundColor.Wrap(msg)
47-
fmt.Printf("%s %s %s\n", l.timestamp(), icon, coloredMessage)
49+
badge := l.badge("INFO", ColorBlue)
50+
icon := ColorCyan.Wrap("◆")
51+
coloredMsg := ColorWhite.Wrap(msg)
52+
fmt.Printf("%s %s %s %s\n", l.timestamp(), badge, icon, coloredMsg)
4853
}
4954

5055
func (l *Logger) Success(format string, args ...interface{}) {
5156
if !l.enabled || l.level > LevelInfo {
5257
return
5358
}
5459
msg := fmt.Sprintf(format, args...)
55-
fmt.Printf("%s %s✓%s %s\n", l.timestamp(), ColorGreen, ColorReset, msg)
60+
badge := l.badge("DONE", ColorGreen)
61+
icon := ColorGreen.Bright().Wrap("✓")
62+
coloredMsg := ColorWhite.Wrap(msg)
63+
fmt.Printf("%s %s %s %s\n", l.timestamp(), badge, icon, coloredMsg)
5664
}
5765

5866
func (l *Logger) Error(format string, args ...interface{}) {
5967
if !l.enabled || l.level > LevelError {
6068
return
6169
}
6270
msg := fmt.Sprintf(format, args...)
63-
fmt.Printf("%s %s✗%s %s\n", l.timestamp(), ColorRed, ColorReset, msg)
71+
badge := l.badge("ERROR", ColorRed)
72+
icon := ColorRed.Bright().Wrap("✗")
73+
coloredMsg := ColorWhite.Wrap(msg)
74+
fmt.Printf("%s %s %s %s\n", l.timestamp(), badge, icon, coloredMsg)
6475
}
6576

6677
func (l *Logger) Warning(format string, args ...interface{}) {
6778
if !l.enabled || l.level > LevelWarning {
6879
return
6980
}
7081
msg := fmt.Sprintf(format, args...)
71-
fmt.Printf("%s %s⚠%s %s\n", l.timestamp(), ColorYellow, ColorReset, msg)
82+
badge := l.badge("WARN", ColorYellow)
83+
icon := ColorYellow.Bright().Wrap("⚠")
84+
coloredMsg := ColorWhite.Wrap(msg)
85+
fmt.Printf("%s %s %s %s\n", l.timestamp(), badge, icon, coloredMsg)
7286
}
7387

7488
func (l *Logger) Task(format string, args ...interface{}) {
7589
if !l.enabled || l.level > LevelInfo {
7690
return
7791
}
7892
msg := fmt.Sprintf(format, args...)
79-
fmt.Printf("%s %s▶%s %s\n", l.timestamp(), ColorBlue, ColorReset, msg)
93+
badge := l.badge("TASK", ColorPurple)
94+
icon := ColorPurple.Bright().Wrap("▶")
95+
coloredMsg := ColorWhite.Wrap(msg)
96+
fmt.Printf("%s %s %s %s\n", l.timestamp(), badge, icon, coloredMsg)
8097
}
8198

8299
func (l *Logger) Debug(format string, args ...interface{}) {
83100
if !l.enabled || l.level != LevelDebug {
84101
return
85102
}
86103
msg := fmt.Sprintf(format, args...)
87-
fmt.Printf("%s %s[DEBUG]%s %s\n", l.timestamp(), ColorGray, ColorReset, msg)
104+
badge := l.badge("DEBUG", ColorGray)
105+
icon := ColorGray.Wrap("●")
106+
coloredMsg := ColorGray.Wrap(msg)
107+
fmt.Printf("%s %s %s %s\n", l.timestamp(), badge, icon, coloredMsg)
88108
}
89109

90110
func (l *Logger) Print(format string, args ...interface{}) {

0 commit comments

Comments
 (0)