go/task
go/task
1
0
Fork 0
mirror of https://github.com/go-task/task.git synced 2025-01-06 03:53:54 +02:00
Code Issues Releases Activity

refactor: rename node resolver methods

Browse Source
This commit is contained in:
Pete Davison 2024-02-13 19:29:28 +00:00
parent 68191205c7
commit 9a5fb38f48
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
taskfile/node.go
View File

@ -18,8 +18,8 @@ type Node interface {
Dir() string
Optional() bool
Remote() bool
ResolveIncludeEntrypoint(entrypoint string) (string, error)
ResolveIncludeDir(dir string) (string, error)
ResolveEntrypoint(entrypoint string) (string, error)
ResolveDir(dir string) (string, error)
}
func NewRootNode(

4
taskfile/node_file.go
View File

@ -77,7 +77,7 @@ func resolveFileNodeEntrypointAndDir(l *logger.Logger, entrypoint, dir string) (
return entrypoint, dir, nil
}
func (node *FileNode) ResolveIncludeEntrypoint(entrypoint string) (string, error) {
func (node *FileNode) ResolveEntrypoint(entrypoint string) (string, error) {
// If the file is remote, we don't need to resolve the path
if strings.Contains(entrypoint, "://") {
return entrypoint, nil
@ -98,7 +98,7 @@ func (node *FileNode) ResolveIncludeEntrypoint(entrypoint string) (string, error
return filepathext.SmartJoin(entrypointDir, path), nil
}
func (node *FileNode) ResolveIncludeDir(dir string) (string, error) {
func (node *FileNode) ResolveDir(dir string) (string, error) {
path, err := execext.Expand(dir)
if err != nil {
return "", err

4
taskfile/node_http.go
View File

@ -75,7 +75,7 @@ func (node *HTTPNode) Read(ctx context.Context) ([]byte, error) {
return b, nil
}
func (node *HTTPNode) ResolveIncludeEntrypoint(entrypoint string) (string, error) {
func (node *HTTPNode) ResolveEntrypoint(entrypoint string) (string, error) {
ref, err := url.Parse(entrypoint)
if err != nil {
return "", err
@ -83,7 +83,7 @@ func (node *HTTPNode) ResolveIncludeEntrypoint(entrypoint string) (string, error
return node.URL.ResolveReference(ref).String(), nil
}
func (node *HTTPNode) ResolveIncludeDir(dir string) (string, error) {
func (node *HTTPNode) ResolveDir(dir string) (string, error) {
path, err := execext.Expand(dir)
if err != nil {
return "", err

4
taskfile/node_stdin.go
View File

@ -44,7 +44,7 @@ func (node *StdinNode) Read(ctx context.Context) ([]byte, error) {
return stdin, nil
}
func (node *StdinNode) ResolveIncludeEntrypoint(entrypoint string) (string, error) {
func (node *StdinNode) ResolveEntrypoint(entrypoint string) (string, error) {
// If the file is remote, we don't need to resolve the path
if strings.Contains(entrypoint, "://") {
return entrypoint, nil
@ -62,7 +62,7 @@ func (node *StdinNode) ResolveIncludeEntrypoint(entrypoint string) (string, erro
return filepathext.SmartJoin(node.Dir(), path), nil
}
func (node *StdinNode) ResolveIncludeDir(dir string) (string, error) {
func (node *StdinNode) ResolveDir(dir string) (string, error) {
path, err := execext.Expand(dir)
if err != nil {
return "", err

4
taskfile/reader.go
View File

@ -64,12 +64,12 @@ func Read(
return err
}
entrypoint, err := node.ResolveIncludeEntrypoint(include.Taskfile)
entrypoint, err := node.ResolveEntrypoint(include.Taskfile)
if err != nil {
return err
}
dir, err := node.ResolveIncludeDir(include.Dir)
dir, err := node.ResolveDir(include.Dir)
if err != nil {
return err
}