Merge pull request #3 from alexarchambault/missing-dir

Handle globs on missing directories
coursier · May 5, 2023 · 2f27bd9 · 2f27bd9
2 parents a52a6bf + 4b020ca
commit 2f27bd9
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 7 deletions.
diff --git a/coursier/cputil/ClassPathUtil.scala b/coursier/cputil/ClassPathUtil.scala
@@ -14,7 +14,7 @@ object ClassPathUtil {
   private implicit class CustomStringOps(private val str: String) extends AnyVal {
     def endsWithIgnoreCase(suffix: String): Boolean =
       str.length >= suffix.length &&
-        suffix.compareToIgnoreCase(str.substring(str.length - suffix.length)) == 0
+      suffix.compareToIgnoreCase(str.substring(str.length - suffix.length)) == 0
   }
 
   private val propertyRegex = Pattern.compile(
@@ -44,12 +44,15 @@ object ClassPathUtil {
         value
       }
       def allJarsOf(dir: Path): Seq[Path] =
-        Files.list(dir)
-          .iterator
-          .asScala
-          .filter(_.toString.endsWithIgnoreCase(".jar"))
-          .toVector
-          .sortBy(_.getFileName)
+        if (Files.isDirectory(dir))
+          Files.list(dir)
+            .iterator
+            .asScala
+            .filter(_.toString.endsWithIgnoreCase(".jar"))
+            .toVector
+            .sortBy(_.getFileName)
+        else
+          Nil
       val allJarsSuffixes = Seq("/", File.separator)
         .distinct
         .flatMap(sep => Seq("*", "*.jar").map(sep + _))

diff --git a/test/coursier/cputil/tests/ClassPathUtilTests.scala b/test/coursier/cputil/tests/ClassPathUtilTests.scala
@@ -66,6 +66,18 @@ class ClassPathUtilTests extends munit.FunSuite {
     }
   }
 
+  test("star missing dir") {
+    val tmpDir = os.temp.dir(prefix = "class-path-util-tests")
+
+    val sep = File.separator
+
+    for (glob <- testGlobs) {
+      val res =
+        ClassPathUtil.classPath(s"${tmpDir / "foo"}$sep$glob", _ => None).map(os.Path(_, os.pwd))
+      expect(res.isEmpty)
+    }
+  }
+
   test("property") {
     val initialCp = os.proc("cs", "fetch", "org.scala-lang:scala3-compiler_3:3.1.3")
       .call()