Merge pull request #3005 from scala-steward-org/topic/exec-commands-in-mockeff

Allow to execute commands in MockEff

Author: fthomas

modules/core/src/main/scala/org/scalasteward/core/io/ProcessAlg.scala

@@ -24,7 +24,9 @@ import org.scalasteward.core.io.process.{Args, SlurpOption, SlurpOptions}
 import org.scalasteward.core.util.Nel
 import org.typelevel.log4cats.Logger
 
-final class ProcessAlg[F[_]](config: ProcessCfg)(execImpl: Args => F[List[String]]) {
+final class ProcessAlg[F[_]](config: ProcessCfg)(
+    private[io] val execImpl: Args => F[List[String]]
+) {
   def exec(
       command: Nel[String],
       workingDirectory: File,

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

@@ -8,18 +8,16 @@ import org.scalasteward.core.mock.MockEff
 object MockProcessAlg {
   def create(config: ProcessCfg): ProcessAlg[MockEff] =
     new ProcessAlg(config)({ args =>
-      Kleisli { x =>
+      Kleisli { ctx =>
         for {
-          state <- x.get
+          state <- ctx.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))
-            }
+          _ <- ctx.set(state.exec(cmd, args.extraEnv: _*))
+          res <- state.commandOutputs.get(args.command.toList) match {
+            case Some(output)               => IO.fromEither(output)
+            case None if state.execCommands => ProcessAlgTest.ioProcessAlg.execImpl(args)
+            case None                       => IO.pure(List.empty)
+          }
         } yield res
       }
     })

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

@@ -11,6 +11,7 @@ import org.scalasteward.core.mock.MockState.TraceEntry.{Cmd, Log}
 final case class MockState(
     trace: Vector[TraceEntry],
     commandOutputs: Map[List[String], Either[Throwable, List[String]]],
+    execCommands: Boolean,
     files: Map[File, String],
     uris: Map[Uri, String],
     clientResponses: HttpApp[MockEff]
@@ -41,6 +42,7 @@ object MockState {
     MockState(
       trace = Vector.empty,
       commandOutputs = Map.empty,
+      execCommands = false,
       files = Map.empty,
       uris = Map.empty,
       clientResponses = HttpApp.notFound