Include artifact differences in long report

Author: stringbean

src/main/resources/messages.properties

@@ -42,4 +42,10 @@ lock.status.full.dependencies.removed.multiple=\ \ {0} dependencies removed:\n{1
 
 lock.status.full.dependencies.changed.none=
 lock.status.full.dependencies.changed.singular=\ \ 1 dependency changed:\n{1}
-lock.status.full.dependencies.changed.multiple=\ \ {0} dependencies changed:\n{1}
+lock.status.full.dependencies.changed.multiple=\ \ {0} dependencies changed:\n{1}
+
+# lockfile full status - artifacts ============================================
+
+lock.status.full.artifacts.changed.none=
+lock.status.full.artifacts.changed.singular=\ \ 1 dependency artifacts changed:\n{1}
+lock.status.full.artifacts.changed.multiple=\ \ {0} dependency artifacts changed:\n{1}

src/main/scala/software/purpledragon/sbt/lock/model/LockFileStatus.scala

@@ -135,8 +135,7 @@ final case class LockFileDiffers(
     }
 
     def dumpChanges(changes: Seq[ChangedDependency]): String = {
-      val table =
-        new TableFormatter(None, prefix = "    ", stripTrailingNewline = true)
+      val table = new TableFormatter(None, prefix = "    ", stripTrailingNewline = true)
 
       changes foreach { change =>
         table.addRow(
@@ -153,11 +152,55 @@ final case class LockFileDiffers(
       table.toString()
     }
 
-    if (changedDependencies.nonEmpty) {
+    val (depChanged, artChanged) =
+      changedDependencies.partition(change => change.configurationsChanged || change.versionChanged)
+
+    if (depChanged.nonEmpty) {
       errors += MessageUtil.formatPlural(
         "lock.status.full.dependencies.changed",
-        changedDependencies.size,
-        dumpChanges(changedDependencies))
+        depChanged.size,
+        dumpChanges(depChanged))
+    }
+
+    def dumpArtifactChanges(changes: Seq[ChangedDependency]): String = {
+      val changesBuilder = new mutable.StringBuilder()
+
+      changes foreach { change =>
+        changesBuilder ++= "    "
+        changesBuilder ++= change.org
+        changesBuilder ++= ":"
+        changesBuilder ++= change.name
+        changesBuilder ++= "  ("
+        change.oldConfigurations.addString(changesBuilder, ",")
+        changesBuilder ++= ")  "
+        changesBuilder ++= change.oldVersion
+        changesBuilder ++= ":\n"
+
+        val table = new TableFormatter(None, prefix = "      ", stripTrailingNewline = false)
+
+        change.addedArtifacts foreach { added =>
+          table.addRow("(added)", added.name, added.hash)
+        }
+
+        change.removedArtifacts foreach { removed =>
+          table.addRow("(removed)", removed.name, removed.hash)
+        }
+
+        change.changedArtifacts foreach { changed =>
+          table.addRow("(changed)", changed.name, changed.oldHash, s"-> ${changed.newHash}")
+        }
+
+        changesBuilder ++= table.toString()
+      }
+
+      changesBuilder.toString()
+    }
+
+    if (artChanged.nonEmpty) {
+      errors += MessageUtil.formatPlural(
+        "lock.status.full.artifacts.changed",
+        artChanged.size,
+        dumpArtifactChanges(artChanged))
     }
 
     MessageUtil.formatMessage("lock.status.failed.long", errors.mkString("\n"))

src/main/scala/software/purpledragon/sbt/lock/model/ResolvedArtifact.scala

@@ -35,7 +35,11 @@ object ResolvedArtifact {
     val (artifact, file) = art
     val hash = checksumCache.getOrElseUpdate(file, hashFile(file))
 
-    val classifier = artifact.classifier.map(c => s"-$c").getOrElse("")
+    val classifier = artifact.classifier match {
+      case None | Some("") => ""
+      case Some(c) => s"-$c"
+    }
+
     val qualifier = artifact.`type` match {
       case "jar" | "bundle" => ""
       case q => s"-$q"

src/test/scala/software/purpledragon/sbt/lock/model/LockFileStatusSpec.scala

@@ -180,6 +180,42 @@ class LockFileStatusSpec extends AnyFlatSpec with Matchers {
       .toLongReport shouldBe expected
   }
 
+  it should "render 2 dependency artifacts changed" in {
+    val expected =
+      """Dependency lock check failed:
+        |  2 dependency artifacts changed:
+        |    com.example:dependency-1  (compile)  1.1:
+        |      (added)    artifact-2.jar  sha1:07c10d545325e3a6e72e06381afe469fd40eb701
+        |      (removed)  artifact-1.jar  sha1:2b8b815229aa8a61e483fb4ba0588b8b6c491890
+        |    com.example:dependency-2  (compile)  1.1.2:
+        |      (changed)  artifact-a.jar  sha1:07c10d545325e3a6e72e06381afe469fd40eb701  -> sha1:cfa4f316351a91bfd95cb0644c6a2c95f52db1fc
+        |""".stripMargin
+
+    LockFileMatches
+      .withDependencyChanges(
+        Nil,
+        Nil,
+        Seq(
+          testChangedDependencyArtifacts(
+            "dependency-1",
+            "1.1",
+            added = Seq(ResolvedArtifact("artifact-2.jar", "sha1:07c10d545325e3a6e72e06381afe469fd40eb701")),
+            removed = Seq(ResolvedArtifact("artifact-1.jar", "sha1:2b8b815229aa8a61e483fb4ba0588b8b6c491890"))
+          ),
+          testChangedDependencyArtifacts(
+            "dependency-2",
+            "1.1.2",
+            changed = Seq(
+              ChangedArtifact(
+                "artifact-a.jar",
+                "sha1:07c10d545325e3a6e72e06381afe469fd40eb701",
+                "sha1:cfa4f316351a91bfd95cb0644c6a2c95f52db1fc"))
+          )
+        )
+      )
+      .toLongReport shouldBe expected
+  }
+
   it should "render lots of changes" in {
     val expected =
       """Dependency lock check failed:
@@ -247,4 +283,25 @@ class LockFileStatusSpec extends AnyFlatSpec with Matchers {
       SortedSet.empty,
       SortedSet.empty)
   }
+
+  private def testChangedDependencyArtifacts(
+      name: String,
+      version: String,
+      org: String = "com.example",
+      added: Seq[ResolvedArtifact] = Nil,
+      removed: Seq[ResolvedArtifact] = Nil,
+      changed: Seq[ChangedArtifact] = Nil): ChangedDependency = {
+
+    ChangedDependency(
+      org,
+      name,
+      version,
+      version,
+      SortedSet("compile"),
+      SortedSet("compile"),
+      added.to[SortedSet],
+      removed.to[SortedSet],
+      changed.to[SortedSet]
+    )
+  }
 }