Support whitespace around maven repo credentials (fixes #228)

Author: holgerbrandl

src/main/kotlin/kscript/app/Script.kt

@@ -188,17 +188,23 @@ data class MavenRepo(val id: String, val url: String, val user: String = "", val
  * Collect custom artifact repos declared with @file:MavenRepository
  */
 fun Script.collectRepos(): List<MavenRepo> {
-    val dependsOnMavenPrefix = "^@file:MavenRepository[(]".toRegex()
+    val mvnRepoAnnotPrefix = "^@file:MavenRepository[(]".toRegex()
     // only supported annotation format for now
 
     // @file:MavenRepository("imagej", "http://maven.imagej.net/content/repositories/releases/")
     // @file:MavenRepository("imagej", "http://maven.imagej.net/content/repositories/releases/", user="user", password="pass")
     return lines
-        .filter { it.contains(dependsOnMavenPrefix) }
-        .map { it.replaceFirst(dependsOnMavenPrefix, "").substringBeforeLast(")") }
-        .map {
-            it.split(",").map { it.trim(' ', '"', '(') }.let { annotationParams ->
-                val namedArgs = annotationParams.filter { it.contains("=") }.map { item: String -> item.let { item.substringBefore("=") to item.substringAfter("=\"") } }.toMap()
+        .filter { it.contains(mvnRepoAnnotPrefix) }
+        .map { it.replaceFirst(mvnRepoAnnotPrefix, "").substringBeforeLast(")") }
+        .map { repoLine ->
+            repoLine.split(",").map { it.trim(' ', '"', '(') }.let { annotationParams ->
+                val keyValSep = "[ ]*=[ ]*\"".toRegex()
+
+                val namedArgs = annotationParams
+                        .filter { it.contains(keyValSep) }
+                        .map { keyVal -> keyVal.split(keyValSep).map { it.trim(' ', '\"') }.let{ it.first() to it.last()}}
+                        .toMap()
+
                 MavenRepo(annotationParams[0], annotationParams[1], namedArgs.getOrDefault("user", ""), namedArgs.getOrDefault("password", ""))
             }
         }

src/test/kotlin/Tests.kt

@@ -93,7 +93,14 @@ class Tests {
     fun customRepoWithCreds() {
         val lines = listOf(
                 """@file:MavenRepository("imagej-releases", "http://maven.imagej.net/content/repositories/releases", user="user", password="pass") """,
+                // Same but name arg comes last
                 """@file:MavenRepository("imagej-snapshots", "http://maven.imagej.net/content/repositories/snapshots", password="pass", user="user") """,
+                // Whitespaces around credentials see #228
+                """@file:MavenRepository("spaceAroundCredentials", "http://maven.imagej.net/content/repositories/snapshots", password= "pass" , user= "user" ) """,
+                // Different whitespaces around credentials see #228
+                """@file:MavenRepository("spaceAroundCredentials2", "http://maven.imagej.net/content/repositories/snapshots", password= "pass", user="user" ) """,
+
+                // some other script bits unrelated to the repo definition
                 """@file:DependsOnMaven("net.clearvolume:cleargl:2.0.1")""",
                 """@file:DependsOn("log4j:log4j:1.2.14")""",
                 """println("foo")"""
@@ -103,7 +110,9 @@ class Tests {
 
             collectRepos() shouldBe listOf(
                     MavenRepo("imagej-releases", "http://maven.imagej.net/content/repositories/releases", "user", "pass"),
-                    MavenRepo("imagej-snapshots", "http://maven.imagej.net/content/repositories/snapshots", "user", "pass") //Provided with name in non-typical order
+                    MavenRepo("imagej-snapshots", "http://maven.imagej.net/content/repositories/snapshots", "user", "pass"),
+                    MavenRepo("spaceAroundCredentials", "http://maven.imagej.net/content/repositories/snapshots", "user", "pass"),
+                    MavenRepo("spaceAroundCredentials2", "http://maven.imagej.net/content/repositories/snapshots", "user", "pass")
             )
 
             collectDependencies() shouldBe listOf(
@@ -116,7 +125,6 @@ class Tests {
     }
 
 
-
     // combine kotlin opts spread over multiple lines
     @Test
     fun optsCollect() {