Skip to content

Commit 0c23e0e

Browse files
authored
Merge pull request #32 from nxtcoder17/feat/run-target-prefix-on-stdout
2 parents 9c750e2 + a78bf6d commit 0c23e0e

File tree

9 files changed

+187
-186
lines changed

9 files changed

+187
-186
lines changed

examples/Runfile.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ tasks:
119119
- echo "Hello World"
120120

121121
first-second-and-cmds:all-parallel:
122-
# parallel: true
122+
parallel: true
123123
cmd:
124124
- run: first-and-second
125125
- echo "Hello World"

go.mod

+4
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ module github.com/nxtcoder17/runfile
33
go 1.24
44

55
require (
6+
github.com/alecthomas/chroma/v2 v2.15.0
7+
github.com/charmbracelet/lipgloss v1.0.0
68
github.com/joho/godotenv v1.5.1
79
github.com/muesli/termenv v0.15.2
810
github.com/nxtcoder17/fwatcher v1.2.0
@@ -14,6 +16,8 @@ require (
1416

1517
require (
1618
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
19+
github.com/charmbracelet/x/ansi v0.4.2 // indirect
20+
github.com/dlclark/regexp2 v1.11.4 // indirect
1721
github.com/fsnotify/fsnotify v1.8.0 // indirect
1822
github.com/google/go-cmp v0.6.0 // indirect
1923
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect

go.sum

+14-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,28 @@
1+
github.com/alecthomas/assert/v2 v2.11.0 h1:2Q9r3ki8+JYXvGsDyBXwH3LcJ+WK5D0gc5E8vS6K3D0=
2+
github.com/alecthomas/assert/v2 v2.11.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k=
3+
github.com/alecthomas/chroma/v2 v2.15.0 h1:LxXTQHFoYrstG2nnV9y2X5O94sOBzf0CIUpSTbpxvMc=
4+
github.com/alecthomas/chroma/v2 v2.15.0/go.mod h1:gUhVLrPDXPtp/f+L1jo9xepo9gL4eLwRuGAunSZMkio=
5+
github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc=
6+
github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
17
github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
28
github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8=
9+
github.com/charmbracelet/lipgloss v1.0.0 h1:O7VkGDvqEdGi93X+DeqsQ7PKHDgtQfF8j8/O2qFMQNg=
10+
github.com/charmbracelet/lipgloss v1.0.0/go.mod h1:U5fy9Z+C38obMs+T+tJqst9VGzlOYGj4ri9reL3qUlo=
11+
github.com/charmbracelet/x/ansi v0.4.2 h1:0JM6Aj/g/KC154/gOP4vfxun0ff6itogDYk41kof+qk=
12+
github.com/charmbracelet/x/ansi v0.4.2/go.mod h1:dk73KoMTT5AX5BsX0KrqhsTqAnhZZoCBjs7dGWp4Ktw=
313
github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
414
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
515
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
16+
github.com/dlclark/regexp2 v1.11.4 h1:rPYF9/LECdNymJufQKmri9gV604RvvABwgOA8un7yAo=
17+
github.com/dlclark/regexp2 v1.11.4/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
618
github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M=
719
github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
820
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
921
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
1022
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
1123
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
24+
github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
25+
github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg=
1226
github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
1327
github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
1428
github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
@@ -23,8 +37,6 @@ github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6T
2337
github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
2438
github.com/muesli/termenv v0.15.2 h1:GohcuySI0QmI3wN8Ok9PtKGkgkFIk7y6Vpb5PvrY+Wo=
2539
github.com/muesli/termenv v0.15.2/go.mod h1:Epx+iuz8sNs7mNKhxzH4fWXGNpZwUaJKRS1noLXviQ8=
26-
github.com/nxtcoder17/fwatcher v1.1.0 h1:boRQ1zyN7SDnRYqrEUMJTKpf/j3sQ3YMY0FQKkUIQ0o=
27-
github.com/nxtcoder17/fwatcher v1.1.0/go.mod h1:50dOLE7lHu6bwGtBM7lZ5m6b8wKKMUZDPgBKM2pgdEA=
2840
github.com/nxtcoder17/fwatcher v1.2.0 h1:Nn5NQZrd6tnY0aFIUmpHCysLDbIsUYn4oyHaxEaVj60=
2941
github.com/nxtcoder17/fwatcher v1.2.0/go.mod h1:SMwIdCpyi5fBygrkCX8hIIUeILzgoxJFaDSlhFBOWWQ=
3042
github.com/nxtcoder17/go.pkgs v0.0.0-20250216034729-39e2d2cd48da h1:Y6GILHFlrihVfDqDPQ98y2kdUeI0SQc8tnoXh2NbEIA=

parser/parse-task.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,13 @@ func ParseTask(ctx context.Context, prf *types.ParsedRunfile, task types.Task) (
123123
}
124124

125125
return &types.ParsedTask{
126+
Name: task.Name,
126127
Shell: task.Shell,
127128
WorkingDir: *task.Dir,
128129
Interactive: task.Interactive,
129130
Env: taskEnv,
130131
Commands: commands,
131132
Watch: watch,
132-
Parallel: task.Parallel,
133+
Parallel: task.Parallel,
133134
}, nil
134135
}

parser/parser-runfile.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@ func parseRunfile(runfile *types.Runfile) (*types.ParsedRunfile, error) {
1818
Tasks: make(map[string]types.Task),
1919
}
2020

21-
prf.Tasks = runfile.Tasks
21+
for k, task := range runfile.Tasks {
22+
task.Name = k
23+
prf.Tasks[k] = task
24+
}
2225

2326
m, err := parseIncludes(runfile.Includes)
2427
if err != nil {
@@ -27,6 +30,7 @@ func parseRunfile(runfile *types.Runfile) (*types.ParsedRunfile, error) {
2730

2831
for k, iprf := range m {
2932
for taskName, task := range iprf.Tasks {
33+
task.Name = k
3034
task.Metadata.RunfilePath = &iprf.Metadata.RunfilePath
3135
prf.Tasks[fmt.Sprintf("%s:%s", k, taskName)] = task
3236
}

0 commit comments

Comments
 (0)