Include artifact differences in short report

Author: stringbean

src/main/resources/messages.properties

@@ -20,6 +20,11 @@ lock.status.dependencies.none=no dependencies
 lock.status.dependencies.singular=1 dependency
 lock.status.dependencies.multiple={0} dependencies
 
+# lockfile short status - artifacts ============================================
+lock.status.artifacts.changed.none=
+lock.status.artifacts.changed.singular=\ \ 1 dependency artifacts changed
+lock.status.artifacts.changed.multiple=\ \ {0} dependency artifacts changed
+
 # lockfile full status - configurations =======================================
 
 lock.status.full.configs.added.none=
@@ -45,7 +50,6 @@ lock.status.full.dependencies.changed.singular=\ \ 1 dependency 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

@@ -80,7 +80,9 @@ final case class LockFileDiffers(
       )
     }
 
-    if (addedDependencies.nonEmpty || removedDependencies.nonEmpty || changedDependencies.nonEmpty) {
+    val (otherChanged, artifactChanged) = separateArtifactChanges(changedDependencies)
+
+    if (addedDependencies.nonEmpty || removedDependencies.nonEmpty || otherChanged.nonEmpty) {
       errors += MessageUtil.formatMessage(
         "lock.status.dependencies.info",
         MessageUtil.formatPlural("lock.status.dependencies", addedDependencies.size),
@@ -89,6 +91,10 @@ final case class LockFileDiffers(
       )
     }
 
+    if (artifactChanged.nonEmpty) {
+      errors += MessageUtil.formatPlural("lock.status.artifacts.changed", artifactChanged.size)
+    }
+
     MessageUtil.formatMessage("lock.status.failed.short", errors.mkString("\n"))
   }
 
@@ -152,14 +158,13 @@ final case class LockFileDiffers(
       table.toString()
     }
 
-    val (depChanged, artChanged) =
-      changedDependencies.partition(change => change.configurationsChanged || change.versionChanged)
+    val (otherChanged, artifactChanged) = separateArtifactChanges(changedDependencies)
 
-    if (depChanged.nonEmpty) {
+    if (otherChanged.nonEmpty) {
       errors += MessageUtil.formatPlural(
         "lock.status.full.dependencies.changed",
-        depChanged.size,
-        dumpChanges(depChanged))
+        otherChanged.size,
+        dumpChanges(otherChanged))
     }
 
     def dumpArtifactChanges(changes: Seq[ChangedDependency]): String = {
@@ -196,13 +201,18 @@ final case class LockFileDiffers(
       changesBuilder.toString()
     }
 
-    if (artChanged.nonEmpty) {
+    if (artifactChanged.nonEmpty) {
       errors += MessageUtil.formatPlural(
         "lock.status.full.artifacts.changed",
-        artChanged.size,
-        dumpArtifactChanges(artChanged))
+        artifactChanged.size,
+        dumpArtifactChanges(artifactChanged))
     }
 
     MessageUtil.formatMessage("lock.status.failed.long", errors.mkString("\n"))
   }
+
+  private def separateArtifactChanges(
+      changedDependencies: Seq[ChangedDependency]): (Seq[ChangedDependency], Seq[ChangedDependency]) = {
+    changedDependencies.partition(change => change.configurationsChanged || change.versionChanged)
+  }
 }

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

@@ -88,6 +88,36 @@ class LockFileStatusSpec extends AnyFlatSpec with Matchers {
     LockFileMatches.withDependencyChanges(Nil, Nil, Seq(testChangedDependency())).toShortReport shouldBe expected
   }
 
+  it should "render 2 dependency artifacts changed" in {
+    val expected =
+      """Dependency lock check failed:
+        |  2 dependency artifacts changed""".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"))
+          )
+        )
+      )
+      .toShortReport shouldBe expected
+  }
+
   it should "render configs and dependencies changed" in {
     val expected =
       """Dependency lock check failed: