Fix relative paths in using directives

Author: alexarchambault

modules/build/src/main/scala/scala/build/errors/ForbiddenPathReferenceError.scala

@@ -0,0 +1,11 @@
+package scala.build.errors
+
+import scala.build.Position
+
+final class ForbiddenPathReferenceError(
+  val virtualRoot: String,
+  val positionOpt: Option[Position]
+) extends BuildException(
+      s"Can't reference paths from sources from $virtualRoot",
+      positionOpt.toSeq
+    )

modules/build/src/main/scala/scala/build/preprocessing/directives/Directive.scala

@@ -1,6 +1,8 @@
 package scala.build.preprocessing.directives
 
 import scala.build.Position
+import scala.build.errors.{BuildException, ForbiddenPathReferenceError}
+import scala.build.preprocessing.ScopePath
 
 final case class Directive(
   tpe: Directive.Type,
@@ -14,4 +16,12 @@ object Directive {
   sealed abstract class Type(val name: String) extends Product with Serializable
   case object Using                            extends Type("using")
   case object Require                          extends Type("require")
+
+  def osRoot(cwd: ScopePath, pos: Option[Position]): Either[BuildException, os.Path] =
+    cwd.root match {
+      case Left(virtualRoot) =>
+        Left(new ForbiddenPathReferenceError(virtualRoot, pos))
+      case Right(root) =>
+        Right(root / cwd.path)
+    }
 }

modules/build/src/main/scala/scala/build/preprocessing/directives/UsingCustomJarDirectiveHandler.scala

@@ -1,7 +1,6 @@
 package scala.build.preprocessing.directives
 
 import scala.build.EitherCps.{either, value}
-import scala.build.Os
 import scala.build.Position
 import scala.build.errors.BuildException
 import scala.build.options.{BuildOptions, ClassPathOptions}
@@ -20,13 +19,16 @@ case object UsingCustomJarDirectiveHandler extends UsingDirectiveHandler {
   def handle(directive: Directive, cwd: ScopePath): Option[Either[BuildException, BuildOptions]] =
     directive.values match {
       case Seq("jar" | "jars", paths @ _*) =>
-        val paths0 = paths.map(os.Path(_, Os.pwd))
-        val options = BuildOptions(
-          classPathOptions = ClassPathOptions(
-            extraClassPath = paths0
+        val res = either {
+          val root   = value(Directive.osRoot(cwd, Some(directive.position)))
+          val paths0 = paths.map(os.Path(_, root))
+          BuildOptions(
+            classPathOptions = ClassPathOptions(
+              extraClassPath = paths0
+            )
           )
-        )
-        Some(Right(options))
+        }
+        Some(res)
       case _ =>
         None
     }
@@ -36,20 +38,18 @@ case object UsingCustomJarDirectiveHandler extends UsingDirectiveHandler {
     values: Seq[Any],
     cwd: ScopePath,
     positionOpt: Option[Position]
-  ): Either[BuildException, BuildOptions] = {
+  ): Either[BuildException, BuildOptions] = either {
 
+    val root = value(Directive.osRoot(cwd, positionOpt))
     val extraJars = DirectiveUtil.stringValues(values).map { p =>
-      // FIXME Not the right cwd
       // FIXME Handle malformed paths here
-      os.Path(p, Os.pwd)
+      os.Path(p, root)
     }
 
-    val options = BuildOptions(
+    BuildOptions(
       classPathOptions = ClassPathOptions(
         extraClassPath = extraJars
       )
     )
-
-    Right(options)
   }
 }

modules/build/src/main/scala/scala/build/preprocessing/directives/UsingJavaHomeDirectiveHandler.scala

@@ -1,7 +1,6 @@
 package scala.build.preprocessing.directives
 
 import scala.build.EitherCps.{either, value}
-import scala.build.Os
 import scala.build.Position
 import scala.build.errors.BuildException
 import scala.build.options.{BuildOptions, JavaOptions}
@@ -19,13 +18,16 @@ case object UsingJavaHomeDirectiveHandler extends UsingDirectiveHandler {
   def handle(directive: Directive, cwd: ScopePath): Option[Either[BuildException, BuildOptions]] =
     directive.values match {
       case Seq("java-home" | "javaHome", path) =>
-        val home = os.Path(path, Os.pwd) // FIXME Might throw on invalid path
-        val options = BuildOptions(
-          javaOptions = JavaOptions(
-            javaHomeOpt = Some(home)
+        val res = either {
+          val root = value(Directive.osRoot(cwd, Some(directive.position)))
+          val home = os.Path(path, root)
+          BuildOptions(
+            javaOptions = JavaOptions(
+              javaHomeOpt = Some(home)
+            )
           )
-        )
-        Some(Right(options))
+        }
+        Some(res)
       case _ => None
     }
 
@@ -40,9 +42,9 @@ case object UsingJavaHomeDirectiveHandler extends UsingDirectiveHandler {
         .lastOption
         .toRight("No value passed to javaHome directive")
     }
+    val root = value(Directive.osRoot(cwd, positionOpt))
     // FIXME Might throw
-    // FIXME Wrong cwd
-    val home = os.Path(rawHome, Os.pwd)
+    val home = os.Path(rawHome, root)
     BuildOptions(
       javaOptions = JavaOptions(
         javaHomeOpt = Some(home)

modules/build/src/main/scala/scala/build/preprocessing/directives/UsingResourcesDirectiveHandler.scala

@@ -1,6 +1,6 @@
 package scala.build.preprocessing.directives
 
-import scala.build.Os
+import scala.build.EitherCps.{either, value}
 import scala.build.Position
 import scala.build.errors.BuildException
 import scala.build.options.{BuildOptions, ClassPathOptions}
@@ -19,13 +19,16 @@ case object UsingResourcesDirectiveHandler extends UsingDirectiveHandler {
   def handle(directive: Directive, cwd: ScopePath): Option[Either[BuildException, BuildOptions]] =
     directive.values match {
       case Seq("resource" | "resources", paths @ _*) =>
-        val paths0 = paths.map(os.Path(_, Os.pwd)) // FIXME Wrong cwd, might throw too
-        val options = BuildOptions(
-          classPathOptions = ClassPathOptions(
-            extraClassPath = paths0
+        val res = either {
+          val root   = value(Directive.osRoot(cwd, Some(directive.position)))
+          val paths0 = paths.map(os.Path(_, root))
+          BuildOptions(
+            classPathOptions = ClassPathOptions(
+              extraClassPath = paths0
+            )
           )
-        )
-        Some(Right(options))
+        }
+        Some(res)
       case _ =>
         None
     }
@@ -35,14 +38,14 @@ case object UsingResourcesDirectiveHandler extends UsingDirectiveHandler {
     values: Seq[Any],
     cwd: ScopePath,
     positionOpt: Option[Position]
-  ): Either[BuildException, BuildOptions] = {
+  ): Either[BuildException, BuildOptions] = either {
+    val root   = value(Directive.osRoot(cwd, positionOpt))
     val paths  = DirectiveUtil.stringValues(values)
-    val paths0 = paths.map(os.Path(_, Os.pwd)) // FIXME Wrong cwd, might throw too
-    val options = BuildOptions(
+    val paths0 = paths.map(os.Path(_, root))
+    BuildOptions(
       classPathOptions = ClassPathOptions(
         extraClassPath = paths0
       )
     )
-    Right(options)
   }
 }

modules/integration/src/test/scala/scala/cli/integration/RunTestDefinitions.scala

@@ -1003,8 +1003,8 @@ abstract class RunTestDefinitions(val scalaVersionOpt: Option[String])
     val resourceContent = "Hello from resources"
     TestInputs(
       Seq(
-        os.rel / "resources" / "test" / "data" -> resourceContent,
-        os.rel / "Test.scala" ->
+        os.rel / "src" / "proj" / "resources" / "test" / "data" -> resourceContent,
+        os.rel / "src" / "proj" / "Test.scala" ->
           s"""$directive
              |object Test {
              |  def main(args: Array[String]): Unit = {
@@ -1020,7 +1020,7 @@ abstract class RunTestDefinitions(val scalaVersionOpt: Option[String])
   }
   test("resources") {
     resourcesInputs().fromRoot { root =>
-      os.proc(TestUtil.cli, "run", ".", "--resources", "./resources").call(cwd = root)
+      os.proc(TestUtil.cli, "run", "src", "--resources", "./src/proj/resources").call(cwd = root)
     }
   }
   test("resources via directive") {