Merge pull request #1638 from scala-steward-org/topic/no-sync-in-nurturealg

Do not require Sync for NurtureAlg

Author: fthomas

modules/core/src/main/scala/org/scalasteward/core/application/StewardAlg.scala

@@ -17,7 +17,6 @@
 package org.scalasteward.core.application
 
 import better.files.File
-import cats.Monad
 import cats.effect.ExitCode
 import cats.syntax.all._
 import fs2.Stream
@@ -29,8 +28,8 @@ import org.scalasteward.core.nurture.NurtureAlg
 import org.scalasteward.core.repocache.RepoCacheAlg
 import org.scalasteward.core.update.PruningAlg
 import org.scalasteward.core.util
-import org.scalasteward.core.util.DateTimeAlg
 import org.scalasteward.core.util.logger.LoggerOps
+import org.scalasteward.core.util.{BracketThrowable, DateTimeAlg}
 import org.scalasteward.core.vcs.data.Repo
 
 final class StewardAlg[F[_]](implicit
@@ -46,7 +45,7 @@ final class StewardAlg[F[_]](implicit
     selfCheckAlg: SelfCheckAlg[F],
     streamCompiler: Stream.Compiler[F, F],
     workspaceAlg: WorkspaceAlg[F],
-    F: Monad[F]
+    F: BracketThrowable[F]
 ) {
   private def printBanner: F[Unit] = {
     val banner =
@@ -60,27 +59,31 @@ final class StewardAlg[F[_]](implicit
     logger.info(msg)
   }
 
-  private def readRepos(reposFile: File): F[List[Repo]] =
-    fileAlg.readFile(reposFile).map { maybeContent =>
-      val regex = """-\s+(.+)/([^/]+)""".r
-      val content = maybeContent.getOrElse("")
-      content.linesIterator.collect { case regex(owner, repo) =>
-        Repo(owner.trim, repo.trim)
-      }.toList
+  private def readRepos(reposFile: File): Stream[F, Repo] =
+    Stream.evals {
+      fileAlg.readFile(reposFile).map { maybeContent =>
+        val regex = """-\s+(.+)/([^/]+)""".r
+        val content = maybeContent.getOrElse("")
+        content.linesIterator.collect { case regex(owner, repo) =>
+          Repo(owner.trim, repo.trim)
+        }.toList
+      }
     }
 
   private def steward(repo: Repo): F[Either[Throwable, Unit]] = {
     val label = s"Steward ${repo.show}"
     logger.infoTotalTime(label) {
-      for {
-        _ <- logger.info(util.string.lineLeftRight(label))
-        _ <- repoCacheAlg.checkCache(repo)
-        (attentionNeeded, updates) <- pruningAlg.needsAttention(repo)
-        result <- {
-          if (attentionNeeded) nurtureAlg.nurture(repo, updates)
-          else gitAlg.removeClone(repo).as(().asRight[Throwable])
-        }
-      } yield result
+      F.guarantee {
+        for {
+          _ <- logger.info(util.string.lineLeftRight(label))
+          _ <- repoCacheAlg.checkCache(repo)
+          (attentionNeeded, updates) <- pruningAlg.needsAttention(repo)
+          result <- {
+            if (attentionNeeded) nurtureAlg.nurture(repo, updates)
+            else F.pure(().asRight[Throwable])
+          }
+        } yield result
+      }(gitAlg.removeClone(repo))
     }
   }
 
@@ -89,12 +92,13 @@ final class StewardAlg[F[_]](implicit
       for {
         _ <- printBanner
         _ <- selfCheckAlg.checkAll
+        _ <- workspaceAlg.cleanWorkspace
         exitCode <- sbtAlg.addGlobalPlugins {
-          for {
-            _ <- workspaceAlg.cleanWorkspace
-            repos <- readRepos(config.reposFile)
-            result <- Stream.emits(repos).evalMap(steward).compile.foldMonoid
-          } yield result.fold(_ => ExitCode.Error, _ => ExitCode.Success)
+          readRepos(config.reposFile)
+            .evalMap(steward)
+            .compile
+            .foldMonoid
+            .map(_.fold(_ => ExitCode.Error, _ => ExitCode.Success))
         }
       } yield exitCode
     }

modules/core/src/main/scala/org/scalasteward/core/nurture/NurtureAlg.scala

@@ -16,9 +16,10 @@
 
 package org.scalasteward.core.nurture
 
-import cats.effect.Sync
+import cats.Applicative
 import cats.implicits._
 import eu.timepit.refined.types.numeric.PosInt
+import fs2.Stream
 import io.chrisdavenport.log4cats.Logger
 import org.scalasteward.core.application.Config
 import org.scalasteward.core.coursier.CoursierAlg
@@ -30,7 +31,7 @@ import org.scalasteward.core.repocache.RepoCacheRepository
 import org.scalasteward.core.repoconfig.{PullRequestUpdateStrategy, RepoConfigAlg}
 import org.scalasteward.core.scalafix.MigrationAlg
 import org.scalasteward.core.util.logger.LoggerOps
-import org.scalasteward.core.util.{DateTimeAlg, HttpExistenceClient}
+import org.scalasteward.core.util.{BracketThrowable, DateTimeAlg, HttpExistenceClient}
 import org.scalasteward.core.vcs.data.{NewPullRequestData, Repo}
 import org.scalasteward.core.vcs.{VCSApiAlg, VCSExtraAlg, VCSRepoAlg}
 import org.scalasteward.core.{git, util, vcs}
@@ -50,15 +51,16 @@ final class NurtureAlg[F[_]](implicit
     migrationAlg: MigrationAlg,
     pullRequestRepository: PullRequestRepository[F],
     repoCacheRepository: RepoCacheRepository[F],
-    F: Sync[F]
+    streamCompiler: Stream.Compiler[F, F],
+    F: BracketThrowable[F]
 ) {
   def nurture(repo: Repo, updates: List[Update.Single]): F[Either[Throwable, Unit]] = {
     val label = s"Nurture ${repo.show}"
     logger.infoTotalTime(label) {
       logger.attemptLog(util.string.lineLeftRight(label)) {
-        F.bracket(cloneAndSync(repo)) { case (fork, baseBranch) =>
+        cloneAndSync(repo).flatMap { case (fork, baseBranch) =>
           updateDependencies(repo, fork, baseBranch, updates)
-        }(_ => gitAlg.removeClone(repo))
+        }
       }
     }
   }
@@ -232,15 +234,15 @@ final class NurtureAlg[F[_]](implicit
 }
 
 object NurtureAlg {
-  def processUpdates[F[_]: Sync](
+  def processUpdates[F[_]](
       updates: List[Update],
       updateF: Update => F[ProcessResult],
       updatesLimit: Option[PosInt]
-  ): F[Unit] =
+  )(implicit streamCompiler: Stream.Compiler[F, F], F: Applicative[F]): F[Unit] =
     updatesLimit match {
       case None => updates.traverse_(updateF)
       case Some(limit) =>
-        fs2.Stream
+        Stream
           .emits(updates)
           .evalMap(updateF)
           .through(util.takeUntil(limit.value) {