Resolve Local Dependencies From Bundle Path

Fixes #22
ponylang · Aug 9, 2018 · 08bcc47 · 08bcc47
1 parent fdc38b9
commit 08bcc47
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/stable/dep.pony b/stable/dep.pony
@@ -123,7 +123,7 @@ class DepLocal
       end
 
   fun root_path(): String =>
-    local_path
+    Path.join(bundle.path.path, local_path)
 
   fun packages_path(): String =>
     root_path()

diff --git a/stable/test/integration/test_env.pony b/stable/test/integration/test_env.pony
@@ -108,7 +108,7 @@ class TestEnvBundleInSameDir is UnitTest
 
     let expected =
       try
-        "../local/a" + ":" +
+        Path.join(tmp.path, "../local/a") + ":" +
         tmp.join(".deps/-local-git-b16798852821555717647")?.path + ":" +
         tmp.join(".deps/github/c")?.path + ":" +
         tmp.join(".deps/gitlab/d")?.path
@@ -193,7 +193,7 @@ class TestEnvBundleInParentDir is UnitTest
       ]}\n"), "prepare bundle.json")
 
     let notifier: ProcessNotify iso = _ExpectClient(h,
-      ["PONYPATH=../local/a"],
+      ["PONYPATH=" + Path.join(tmp.path, "../local/a")],
       None,
       0)
     _Exec(h, "stable env", nested.path, consume notifier)

diff --git a/stable/test/test_dep.pony b/stable/test/test_dep.pony
@@ -72,8 +72,9 @@ class TestDep is UnitTest
 
     info = JsonObject.from_map(local)
     dep = Dep(bundle, info)?
-    h.assert_eq[String]("../foo/bar", dep.root_path())
-    h.assert_eq[String]("../foo/bar", dep.packages_path())
+
+    h.assert_eq[String](Path.join(bundle.path.path, "../foo/bar"), dep.root_path())
+    h.assert_eq[String](Path.join(bundle.path.path, "../foo/bar"), dep.packages_path())
 
     let incomplete_local = Map[String, JsonType]
     incomplete_local("type") = "local"