Merge pull request #1826 from scala-steward-org/topic/log-clone-sync

More accurately log when we're cloning and syncing

Author: fthomas

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

@@ -63,7 +63,6 @@ final class NurtureAlg[F[_]](config: Config)(implicit
 
   def cloneAndSync(repo: Repo, fork: RepoOut): F[Branch] =
     for {
-      _ <- logger.info(s"Clone and synchronize ${repo.show}")
       _ <- gitAlg.cloneExists(repo).ifM(F.unit, vcsRepoAlg.cloneAndSync(repo, fork))
       baseBranch <- vcsApiAlg.parentOrRepo(fork, config.doNotFork).map(_.default_branch)
     } yield baseBranch

modules/core/src/main/scala/org/scalasteward/core/vcs/VCSRepoAlg.scala

@@ -32,9 +32,11 @@ final class VCSRepoAlg[F[_]](config: Config)(implicit
     logger: Logger[F],
     F: MonadThrow[F]
 ) {
-
   def cloneAndSync(repo: Repo, repoOut: RepoOut): F[Unit] =
     for {
+      _ <-
+        if (config.doNotFork) logger.info(s"Clone ${repo.show}")
+        else logger.info(s"Clone and synchronize ${repo.show}")
       _ <- clone(repo, repoOut)
       _ <- syncFork(repo, repoOut)
       _ <- logger.attemptLogError("Initializing and cloning submodules failed") {

modules/core/src/test/scala/org/scalasteward/core/vcs/VCSRepoAlgTest.scala

@@ -43,7 +43,8 @@ class VCSRepoAlgTest extends FunSuite {
         envVars ++ List(repoDir, "git", "merge", "upstream/master"),
         envVars ++ List(repoDir, "git", "push", "--force", "--set-upstream", "origin", "master"),
         envVars ++ List(repoDir, "git", "submodule", "update", "--init", "--recursive")
-      )
+      ),
+      logs = Vector((None, "Clone and synchronize fthomas/datapackage"))
     )
     assertEquals(state, expected)
   }