Merge pull request #34 from tindzk/bug/version-ordering

MavenCentral: Fix parsing of library artefacts

src/main/scala/seed/artefact/MavenCentral.scala

@@ -54,15 +54,12 @@ object MavenCentral {
       .map(_.takeWhile(_ != '/'))
   }
 
-  /** @param stable Only consider stable artefacts (as opposed to pre-releases)
-    * @return Found versions in ascending order
-    */
-  def fetchLibraryArtefacts(artefact: Artefact, stable: Boolean, log: Log): List[
+  def parseLibraryArtefacts(artefacts: List[String], artefactName: String, stable: Boolean, log: Log): List[
     (Platform, PlatformVersion, CompilerVersion)
   ] =
-    fetchOrganisationArtefacts(artefact.organisation, log)
-      .filter(_.startsWith(artefact.name))
-      .map(_.drop(artefact.name.length + 1))
+    artefacts
+      .filter(_.startsWith(artefactName + "_"))
+      .map(_.drop(artefactName.length + 1))
       .filter(a =>
         a.headOption.exists(_.isDigit) ||
         a.startsWith("sjs") ||
@@ -72,6 +69,18 @@ object MavenCentral {
                     isArtefactEligible(stable, log)(a._3))
        .sortBy(_._2)(new SemanticVersioning(log).versionOrdering)
 
+  /** @param stable Only consider stable artefacts (as opposed to pre-releases)
+    * @return Found versions in ascending order
+    */
+  def fetchLibraryArtefacts(artefact: Artefact, stable: Boolean, log: Log): List[
+    (Platform, PlatformVersion, CompilerVersion)
+  ] =
+    parseLibraryArtefacts(
+      fetchOrganisationArtefacts(artefact.organisation, log),
+      artefact.name,
+      stable,
+      log)
+
   type PlatformVersion = String
   type CompilerVersion = String
   /** Derive from artefact name, supported platforms and compilers */

src/test/scala/seed/artefact/MavenCentralSpec.scala

@@ -0,0 +1,38 @@
+package seed.artefact
+
+import minitest.SimpleTestSuite
+import seed.model.Platform.JVM
+import seed.Log
+
+object MavenCentralSpec extends SimpleTestSuite {
+  test("Parse library artefact versions") {
+    val artefacts = List(
+      "scribe-slf4j18_2.11",
+      "scribe-slf4j18_2.12",
+      "scribe-slf4j18_2.13",
+
+      // Only these should match
+      "scribe-slf4j_2.11",
+      "scribe-slf4j_2.12",
+      "scribe-slf4j_2.13",
+      "scribe-slf4j_2.13.0-RC2")
+
+    def parse(stable: Boolean) =
+      MavenCentral.parseLibraryArtefacts(
+        artefacts,
+        "scribe-slf4j",
+        stable,
+        Log.urgent)
+
+    assertEquals(parse(stable = false), List(
+      (JVM, "2.11", "2.11"),
+      (JVM, "2.12", "2.12"),
+      (JVM, "2.13.0-RC2", "2.13.0-RC2"),
+      (JVM, "2.13", "2.13")))
+
+    assertEquals(parse(stable = true), List(
+      (JVM, "2.11", "2.11"),
+      (JVM, "2.12", "2.12"),
+      (JVM, "2.13", "2.13")))
+  }
+}