Remove InvalidVersions from Update.newerVersions

closes #371
scala-steward-org · May 16, 2019 · 3f9eedf · 3f9eedf
1 parent 2ea66e7
commit 3f9eedf
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/modules/core/src/main/scala/org/scalasteward/core/sbt/parser.scala b/modules/core/src/main/scala/org/scalasteward/core/sbt/parser.scala
@@ -33,8 +33,8 @@ object parser {
  artifactId <- Either.fromOption(moduleId.lift(1), msg("artifactId"))
  configurations = moduleId.lift(2)
  currentVersion <- Either.fromOption(versions.headOption, msg("currentVersion"))
- maybeNewerVersions = Nel.fromList(versions.drop(1).toList)
- newerVersions <- Either.fromOption(maybeNewerVersions, msg("newerVersions"))
+ newerVersionsList = versions.drop(1).toList.filterNot(_.startsWith("InvalidVersion"))
+ newerVersions <- Either.fromOption(Nel.fromList(newerVersionsList), msg("newerVersions"))
  } yield Update.Single(groupId, artifactId, currentVersion, newerVersions, configurations)
 
  case _ => Left(s"'$str' must contain ' : ' exactly once")

diff --git a/modules/core/src/test/scala/org/scalasteward/core/sbt/parserTest.scala b/modules/core/src/test/scala/org/scalasteward/core/sbt/parserTest.scala
@@ -58,6 +58,20 @@ class parserTest extends FunSuite with Matchers {
  parseSingleUpdate(str).isLeft
  }
 
+ test("parseSingleUpdate: all new versions are invalid") {
+ val str =
+ "bigdataoss:gcs-connector : hadoop2-1.9.16 -> InvalidVersion(hadoop3-2.0.0-SNAPSHOT)"
+ parseSingleUpdate(str).isLeft
+ }
+
+ test("parseSingleUpdate: one new version is invalid") {
+ val str =
+ "bigdataoss:gcs-connector : hadoop2-1.9.16 -> InvalidVersion(hadoop3-2.0.0-SNAPSHOT) -> 1.9.4-hadoop3"
+ parseSingleUpdate(str) shouldBe Right(
+ Update.Single("bigdataoss", "gcs-connector", "hadoop2-1.9.16", Nel.of("1.9.4-hadoop3"))
+ )
+ }
+
  test("parseSingleUpdates 1") {
  val str =
  """[info] Found 3 dependency updates for datapackage