fix: correct Node.FilenameAndLastDir return order across implementations

Author: iwittkau

Diff for: taskfile/node.go

@@ -22,7 +22,7 @@ type Node interface {
 	Remote() bool
 	ResolveEntrypoint(entrypoint string) (string, error)
 	ResolveDir(dir string) (string, error)
-	FilenameAndLastDir() (string, string)
+	FilenameAndLastDir() (lastDir string, file string) // TODO the return order is implemented opposite to the naming
 }
 
 func NewRootNode(

Diff for: taskfile/node_git.go

@@ -121,5 +121,5 @@ func (node *GitNode) ResolveDir(dir string) (string, error) {
 }
 
 func (node *GitNode) FilenameAndLastDir() (string, string) {
-	return filepath.Base(node.path), filepath.Base(filepath.Dir(node.path))
+	return filepath.Base(filepath.Dir(node.filepath)), filepath.Base(node.filepath)
 }

Diff for: taskfile/node_git_test.go

@@ -67,19 +67,19 @@ func TestGitNode_FilenameAndDir(t *testing.T) {
 
 	node, err := NewGitNode("https://github.com/foo/bar.git//directory/Taskfile.yml?ref=main", "", false)
 	assert.NoError(t, err)
-	filename, dir := node.FilenameAndLastDir()
+	dir, filename := node.FilenameAndLastDir()
 	assert.Equal(t, "Taskfile.yml", filename)
 	assert.Equal(t, "directory", dir)
 
 	node, err = NewGitNode("https://github.com/foo/bar.git//Taskfile.yml?ref=main", "", false)
 	assert.NoError(t, err)
-	filename, dir = node.FilenameAndLastDir()
+	dir, filename = node.FilenameAndLastDir()
 	assert.Equal(t, "Taskfile.yml", filename)
 	assert.Equal(t, ".", dir)
 
 	node, err = NewGitNode("https://github.com/foo/bar.git//multiple/directory/Taskfile.yml?ref=main", "", false)
 	assert.NoError(t, err)
-	filename, dir = node.FilenameAndLastDir()
+	dir, filename = node.FilenameAndLastDir()
 	assert.Equal(t, "Taskfile.yml", filename)
 	assert.Equal(t, "directory", dir)
 }

Diff for: taskfile/node_http.go

@@ -6,6 +6,7 @@ import (
 	"net/http"
 	"net/url"
 	"path/filepath"
+	"strings"
 	"time"
 
 	"github.com/go-task/task/v3/errors"
@@ -119,6 +120,7 @@ func (node *HTTPNode) ResolveDir(dir string) (string, error) {
 }
 
 func (node *HTTPNode) FilenameAndLastDir() (string, string) {
-	dir, filename := filepath.Split(node.entrypoint)
+	path := strings.TrimPrefix(node.url.Path, "/")
+	dir, filename := filepath.Split(path)
 	return filepath.Base(dir), filename
 }

Diff for: taskfile/node_http_test.go

@@ -42,3 +42,40 @@ func TestHTTPNode_redaction(t *testing.T) {
 		assert.Equal(t, "https://user:[email protected]/common.yaml", location)
 	})
 }
+
+func TestHTTPNode_FilenameAndDir(t *testing.T) {
+	t.Parallel()
+
+	l := logger.NewTestLogger(t)
+	tests := map[string]struct {
+		entrypoint string
+		filename   string
+		dir        string
+	}{
+		"file at root": {
+			entrypoint: "https://example.com/Taskfile.yaml",
+			filename:   "Taskfile.yaml",
+			dir:        ".",
+		},
+		"file in folder": {
+			entrypoint: "https://example.com/taskfiles/Taskfile.yaml",
+			filename:   "Taskfile.yaml",
+			dir:        "taskfiles",
+		},
+		"nested structure": {
+			entrypoint: "https://raw.githubusercontent.com/my-org/my-repo/main/Taskfile.yaml",
+			filename:   "Taskfile.yaml",
+			dir:        "main",
+		},
+	}
+	for name, tt := range tests {
+		t.Run(name, func(t *testing.T) {
+			t.Parallel()
+			node, err := NewHTTPNode(l, tt.entrypoint, "", false, time.Second)
+			require.NoError(t, err)
+			dir, filename := node.FilenameAndLastDir()
+			assert.Equal(t, tt.filename, filename)
+			assert.Equal(t, tt.dir, dir)
+		})
+	}
+}