Use check ignore in HookExecutor

Author: daddykotex

modules/core/src/main/scala/org/scalasteward/core/edit/hooks/HookExecutor.scala

@@ -96,14 +96,20 @@ final class HookExecutor[F[_]](implicit
         newContent = oldContent.fold(newLines)(_ + "\n" + newLines)
         _ <- fileAlg.writeFile(file, newContent)
         pathAsString = file.pathAsString
-        _ <- gitAlg
+
+        addAndCommit = gitAlg.add(repo, pathAsString).flatMap { _ =>
+          val blameIgnoreCommitMsg =
+            CommitMsg(s"Add '${commitMsg.title}' to $gitBlameIgnoreRevsName")
+          gitAlg.commitAllIfDirty(repo, blameIgnoreCommitMsg)
+        }
+        maybeBlameIgnoreCommit <- gitAlg
           .checkIgnore(repo, pathAsString)
           .ifM(
-            logger.warn(s"Impossible to add '$pathAsString' because it is git ignored."),
-            gitAlg.add(repo, pathAsString)
+            logger
+              .warn(s"Impossible to add '$pathAsString' because it is git ignored.")
+              .as(Option.empty[Commit]),
+            addAndCommit
           )
-        blameIgnoreCommitMsg = CommitMsg(s"Add '${commitMsg.title}' to $gitBlameIgnoreRevsName")
-        maybeBlameIgnoreCommit <- gitAlg.commitAllIfDirty(repo, blameIgnoreCommitMsg)
       } yield maybeBlameIgnoreCommit
     } else F.pure(None)
 }

modules/core/src/test/scala/org/scalasteward/core/buildtool/mill/MillAlgTest.scala

@@ -28,7 +28,8 @@ class MillAlgTest extends FunSuite {
       "show",
       extractDeps
     )
-    val initial = MockState.empty.copy(commandOutputs = Map(millCmd -> List("""{"modules":[]}""")))
+    val initial =
+      MockState.empty.copy(commandOutputs = Map(millCmd -> Right(List("""{"modules":[]}"""))))
     val state = millAlg.getDependencies(buildRoot).runS(initial).unsafeRunSync()
     val expected = initial.copy(
       trace = Vector(

modules/core/src/test/scala/org/scalasteward/core/edit/hooks/HookExecutorTest.scala

@@ -1,5 +1,6 @@
 package org.scalasteward.core.edit.hooks
 
+import cats.data.NonEmptyList
 import cats.syntax.all._
 import munit.CatsEffectSuite
 import org.scalasteward.core.TestInstances.{dummyRepoCache, dummySha1}
@@ -15,6 +16,9 @@ import org.scalasteward.core.repoconfig.{PostUpdateHookConfig, RepoConfig, Scala
 import org.scalasteward.core.scalafmt.ScalafmtAlg.opts
 import org.scalasteward.core.scalafmt.{scalafmtArtifactId, scalafmtBinary, scalafmtGroupId}
 import org.scalasteward.core.util.Nel
+import org.scalasteward.core.io.process.ProcessFailedException
+import org.scalasteward.core.io.process
+import scala.collection.mutable.ListBuffer
 
 class HookExecutorTest extends CatsEffectSuite {
   private val repo = Repo("scala-steward-org", "scala-steward")
@@ -28,17 +32,19 @@ class HookExecutorTest extends CatsEffectSuite {
   }
 
   test("scalafmt: enabled by config") {
+    val gitBlameIgnoreRevs = repoDir / gitBlameIgnoreRevsName
     val update = (scalafmtGroupId % scalafmtArtifactId % "2.7.4" %> "2.7.5").single
     val initial = MockState.empty.copy(commandOutputs =
       Map(
         FileGitAlg.gitCmd.toList ++
           List("status", "--porcelain", "--untracked-files=no", "--ignore-submodules") ->
-          List("build.sbt"),
+          Right(List("build.sbt")),
         FileGitAlg.gitCmd.toList ++ List("rev-parse", "--verify", "HEAD") ->
-          List(dummySha1.value.value)
+          Right(List(dummySha1.value.value)),
+        FileGitAlg.gitCmd.toList ++ List("check-ignore", gitBlameIgnoreRevs.pathAsString) ->
+          Left(dummyProcessError)
       )
     )
-    val gitBlameIgnoreRevs = repoDir / gitBlameIgnoreRevsName
     val state = FileAlgTest.ioFileAlg.deleteForce(gitBlameIgnoreRevs) >>
       hookExecutor.execPostUpdateHooks(data, update).runS(initial)
 
@@ -70,6 +76,7 @@ class HookExecutorTest extends CatsEffectSuite {
         Cmd(gitCmd(repoDir), "rev-parse", "--verify", "HEAD"),
         Cmd("read", gitBlameIgnoreRevs.pathAsString),
         Cmd("write", gitBlameIgnoreRevs.pathAsString),
+        Cmd(gitCmd(repoDir), "check-ignore", gitBlameIgnoreRevs.pathAsString),
         Cmd(gitCmd(repoDir), "add", gitBlameIgnoreRevs.pathAsString),
         Cmd(
           gitCmd(repoDir),
@@ -166,4 +173,7 @@ class HookExecutorTest extends CatsEffectSuite {
 
     state.map(assertEquals(_, expected))
   }
+
+  private val dummyProcessError =
+    new ProcessFailedException(process.Args(NonEmptyList.of("cmd")), ListBuffer.empty, 1)
 }

modules/core/src/test/scala/org/scalasteward/core/io/MockProcessAlg.scala

@@ -1,19 +1,26 @@
 package org.scalasteward.core.io
 
 import cats.data.Kleisli
+import cats.effect.IO
 import org.scalasteward.core.application.Config.ProcessCfg
 import org.scalasteward.core.mock.MockEff
 
 object MockProcessAlg {
   def create(config: ProcessCfg): ProcessAlg[MockEff] =
     new ProcessAlg(config)({ args =>
-      Kleisli {
-        _.modify { s =>
-          val cmd = args.workingDirectory.map(_.toString).toList ++ args.command.toList
-          val s1 = s.exec(cmd, args.extraEnv: _*)
-          val a = s.commandOutputs.getOrElse(args.command.toList, List.empty)
-          (s1, a)
-        }
+      Kleisli { x =>
+        for {
+          state <- x.get
+          cmd = args.workingDirectory.map(_.toString).toList ++ args.command.toList
+          newState = state.exec(cmd, args.extraEnv: _*)
+          res <- x
+            .set(newState)
+            .flatMap { _ =>
+              state.commandOutputs
+                .getOrElse(args.command.toList, Right(List.empty))
+                .fold(err => IO.raiseError(err), a => IO.pure(a))
+            }
+        } yield res
       }
     })
 }

modules/core/src/test/scala/org/scalasteward/core/mock/MockState.scala

@@ -10,7 +10,7 @@ import org.scalasteward.core.mock.MockState.TraceEntry.{Cmd, Log}
 
 final case class MockState(
     trace: Vector[TraceEntry],
-    commandOutputs: Map[List[String], List[String]],
+    commandOutputs: Map[List[String], Either[Throwable, List[String]]],
     files: Map[File, String],
     uris: Map[Uri, String],
     clientResponses: HttpApp[MockEff]