rayan/go-task
1
0
Fork 0
mirror of https://github.com/go-task/task.git synced 2026-07-02 08:58:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: for

Browse Source
This commit is contained in:
Pete Davison
2023-06-15 15:04:03 +00:00
committed by Andrey Nering
parent 7ece04e996
commit 7ff1b1795e
12 changed files with 387 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/fingerprint/glob.go
View File

@@ -10,7 +10,7 @@ import (
"github.com/go-task/task/v3/internal/filepathext"
)
func globs(dir string, globs []string) ([]string, error) {
func Globs(dir string, globs []string) ([]string, error) {
files := make([]string, 0)
for _, g := range globs {
f, err := Glob(dir, g)

2
internal/fingerprint/sources_checksum.go
View File

@@ -84,7 +84,7 @@ func (*ChecksumChecker) Kind() string {
}
func (c *ChecksumChecker) checksum(t *taskfile.Task) (string, error) {
sources, err := globs(t.Dir, t.Sources)
sources, err := Globs(t.Dir, t.Sources)
if err != nil {
return "", err
}

6
internal/fingerprint/sources_timestamp.go
View File

@@ -28,11 +28,11 @@ func (checker *TimestampChecker) IsUpToDate(t *taskfile.Task) (bool, error) {
return false, nil
}
sources, err := globs(t.Dir, t.Sources)
sources, err := Globs(t.Dir, t.Sources)
if err != nil {
return false, nil
}
generates, err := globs(t.Dir, t.Generates)
generates, err := Globs(t.Dir, t.Generates)
if err != nil {
return false, nil
}
@@ -90,7 +90,7 @@ func (checker *TimestampChecker) Kind() string {
// Value implements the Checker Interface
func (checker *TimestampChecker) Value(t *taskfile.Task) (any, error) {
sources, err := globs(t.Dir, t.Sources)
sources, err := Globs(t.Dir, t.Sources)
if err != nil {
return time.Now(), err
}

32
internal/templater/templater.go
View File

@@ -5,6 +5,8 @@ import (
"strings"
"text/template"
"golang.org/x/exp/maps"
"github.com/go-task/task/v3/taskfile"
)
@@ -25,6 +27,14 @@ func (r *Templater) ResetCache() {
}
func (r *Templater) Replace(str string) string {
return r.replace(str, nil)
}
func (r *Templater) ReplaceWithExtra(str string, extra map[string]any) string {
return r.replace(str, extra)
}
func (r *Templater) replace(str string, extra map[string]any) string {
if r.err != nil || str == "" {
return ""
}
@@ -40,7 +50,15 @@ func (r *Templater) Replace(str string) string {
}
var b bytes.Buffer
if err = templ.Execute(&b, r.cacheMap); err != nil {
if extra == nil {
err = templ.Execute(&b, r.cacheMap)
} else {
// Copy the map to avoid modifying the cached map
m := maps.Clone(r.cacheMap)
maps.Copy(m, extra)
err = templ.Execute(&b, m)
}
if err != nil {
r.err = err
return ""
}
@@ -63,6 +81,14 @@ func (r *Templater) ReplaceSlice(strs []string) []string {
}
func (r *Templater) ReplaceVars(vars *taskfile.Vars) *taskfile.Vars {
return r.replaceVars(vars, nil)
}
func (r *Templater) ReplaceVarsWithExtra(vars *taskfile.Vars, extra map[string]any) *taskfile.Vars {
return r.replaceVars(vars, extra)
}
func (r *Templater) replaceVars(vars *taskfile.Vars, extra map[string]any) *taskfile.Vars {
if r.err != nil || vars.Len() == 0 {
return nil
}
@@ -70,9 +96,9 @@ func (r *Templater) ReplaceVars(vars *taskfile.Vars) *taskfile.Vars {
var new taskfile.Vars
_ = vars.Range(func(k string, v taskfile.Var) error {
new.Set(k, taskfile.Var{
Static: r.Replace(v.Static),
Static: r.ReplaceWithExtra(v.Static, extra),
Live: v.Live,
Sh: r.Replace(v.Sh),
Sh: r.ReplaceWithExtra(v.Sh, extra),
})
return nil
})