include playbook root dir into dependencies search

meomap · Sep 1, 2018 · 1255158 · 1255158
1 parent 29c5a14
commit 1255158
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,4 @@
 *.out
 vendor
 zeno
+dist
diff --git a/parser/playbook.go b/parser/playbook.go
@@ -42,7 +42,7 @@ func ParsePlaybook(filePath string, repoDir string, ds loader.DataSource) ([]str
 		return nil, errors.Wrapf(err, "yaml.Unmarshal file_path=%s", filePath)
 	}
 	playbookRoot := filepath.Dir(path.Join(repoDir, filePath))
-	deps := []string{}
+	deps := []string{playbookRoot}
 	for _, play := range playbook {
 		for _, role := range play.Roles {
 			roleDeps, rErr := parseRole(role.Name, playbookRoot, ds)

diff --git a/parser/playbook_test.go b/parser/playbook_test.go
@@ -28,7 +28,7 @@ func TestParsePlaybook(t *testing.T) {
   hosts: all`))
 			},
 
-			want: []string{},
+			want: []string{"."},
 		},
 		{
 			caseName: "playbook_with_single_role_explicit_path",
@@ -42,7 +42,7 @@ func TestParsePlaybook(t *testing.T) {
 `))
 				ds.SetFile("roles/r1", []byte(""))
 			},
-			want: []string{"roles/r1"},
+			want: []string{".", "roles/r1"},
 		},
 		{
 			caseName: "playbook_with_single_role_implicit_path",
@@ -56,7 +56,7 @@ func TestParsePlaybook(t *testing.T) {
 `))
 				ds.SetFile("roles/r2", []byte(""))
 			},
-			want: []string{"roles/r2"},
+			want: []string{".", "roles/r2"},
 		},
 		{
 			caseName: "playbook_with_multiple_roles",
@@ -72,7 +72,7 @@ func TestParsePlaybook(t *testing.T) {
 				ds.SetFile("roles/r1", []byte(""))
 				ds.SetFile("roles/r2", []byte(""))
 			},
-			want: []string{"roles/r1", "roles/r2"},
+			want: []string{".", "roles/r1", "roles/r2"},
 		},
 		{
 			caseName: "playbook_not_exist",
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,3 +12,4 @@ @@
     *.out
     vendor
     zeno
+    dist