Allow to add resource dirs via using directives

Author: alexarchambault

modules/build/src/main/scala/scala/build/preprocessing/ScalaPreprocessor.scala

@@ -29,7 +29,8 @@ case object ScalaPreprocessor extends Preprocessor {
     UsingJavaOptionsDirectiveHandler,
     UsingJavaHomeDirectiveHandler,
     UsingTestFrameworkDirectiveHandler,
-    UsingCustomJarDirectiveHandler
+    UsingCustomJarDirectiveHandler,
+    UsingResourcesDirectiveHandler
   )
 
   val requireDirectiveHandlers = Seq[RequireDirectiveHandler](

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

@@ -0,0 +1,29 @@
+package scala.build.preprocessing.directives
+
+import scala.build.Os
+import scala.build.options.{BuildOptions, ClassPathOptions}
+
+case object UsingResourcesDirectiveHandler extends UsingDirectiveHandler {
+  def name        = "Resources"
+  def description = "Manually adds a resource directory to the class path"
+  def usage       = "using resource _path_ | using resources _path1_ _path2_ …"
+  override def usageMd =
+    "`using resource `_path_ | `using resources `_path1_ _path2_ …"
+  override def examples = Seq(
+    "using resource \"./resources\""
+  )
+
+  def handle(directive: Directive): Option[Either[String, BuildOptions]] =
+    directive.values match {
+      case Seq("resource" | "resources", paths @ _*) =>
+        val paths0 = paths.map(os.Path(_, Os.pwd))
+        val options = BuildOptions(
+          classPathOptions = ClassPathOptions(
+            extraClassPath = paths0
+          )
+        )
+        Some(Right(options))
+      case _ =>
+        None
+    }
+}

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

@@ -980,13 +980,14 @@ abstract class RunTestDefinitions(val scalaVersionOpt: Option[String])
       forbiddenDirTest()
     }
 
-  private val resourcesInputs = {
+  private def resourcesInputs(directive: String = "") = {
     val resourceContent = "Hello from resources"
     TestInputs(
       Seq(
         os.rel / "resources" / "test" / "data" -> resourceContent,
         os.rel / "Test.scala" ->
-          s"""object Test {
+          s"""$directive
+             |object Test {
              |  def main(args: Array[String]): Unit = {
              |    val cl = Thread.currentThread().getContextClassLoader
              |    val is = cl.getResourceAsStream("test/data")
@@ -999,9 +1000,14 @@ abstract class RunTestDefinitions(val scalaVersionOpt: Option[String])
     )
   }
   test("resources") {
-    resourcesInputs.fromRoot { root =>
+    resourcesInputs().fromRoot { root =>
       os.proc(TestUtil.cli, "run", ".", "--resources", "./resources").call(cwd = root)
     }
   }
+  test("resources via directive") {
+    resourcesInputs("using resources ./resources").fromRoot { root =>
+      os.proc(TestUtil.cli, "run", ".").call(cwd = root)
+    }
+  }
 
 }

website/docs/reference/directives.md

@@ -80,6 +80,15 @@ Adds a repository for dependency resolution
 
 `using repository https://maven-central.storage-download.googleapis.com/maven2`
 
+### Resources
+
+Manually adds a resource directory to the class path
+
+`using resource `_path_ | `using resources `_path1_ _path2_ …
+
+#### Examples
+`using resource "./resources"`
+
 ### Scala version
 
 Sets the default Scala version