Merge pull request #2995 from mkurz/check_3-level-plugins

Check up to 5 nested project folders

Author: fthomas

modules/core/src/main/scala/org/scalasteward/core/buildtool/sbt/SbtAlg.scala

@@ -51,12 +51,24 @@ final class SbtAlg[F[_]](config: Config)(implicit
       version = maybeProperties.flatMap(parser.parseBuildProperties)
     } yield version
 
+  private def metaBuildsCount(buildRootDir: File): F[Int] =
+    fs2.Stream
+      .iterate(buildRootDir / project)(_ / project)
+      .take(5L) // Use an upper bound for the meta-builds count to prevent DoS attacks.
+      .evalMap(fileAlg.isDirectory)
+      .takeWhile(identity)
+      .compile
+      .count
+      .map(_.toInt)
+
   override def getDependencies(buildRoot: BuildRoot): F[List[Scope.Dependencies]] =
     for {
       buildRootDir <- workspaceAlg.buildRootDir(buildRoot)
       maybeSbtVersion <- getSbtVersion(buildRootDir)
-      lines <- addStewardPluginTemporarily(buildRootDir, maybeSbtVersion).surround {
-        val commands = Nel.of(crossStewardDependencies, reloadPlugins, stewardDependencies)
+      metaBuilds <- metaBuildsCount(buildRootDir)
+      lines <- addStewardPluginTemporarily(buildRootDir, maybeSbtVersion, metaBuilds).surround {
+        val commands = Nel.of(crossStewardDependencies) ++
+          List.fill(metaBuilds)(List(reloadPlugins, stewardDependencies)).flatten
         sbt(commands, buildRootDir)
       }
       dependencies = parser.parseDependencies(lines)
@@ -65,7 +77,8 @@ final class SbtAlg[F[_]](config: Config)(implicit
 
   private def addStewardPluginTemporarily(
       buildRootDir: File,
-      maybeSbtVersion: Option[Version]
+      maybeSbtVersion: Option[Version],
+      metaBuilds: Int
   ): Resource[F, Unit] =
     for {
       _ <- Resource.unit[F]
@@ -74,8 +87,9 @@ final class SbtAlg[F[_]](config: Config)(implicit
         case _                                => "1_3_11"
       }
       plugin <- Resource.eval(stewardPlugin(pluginVersion))
-      _ <- fileAlg.createTemporarily(buildRootDir / project, plugin)
-      _ <- fileAlg.createTemporarily(buildRootDir / project / project, plugin)
+      _ <- List
+        .iterate(buildRootDir / project, metaBuilds + 1)(_ / project)
+        .collectFold(fileAlg.createTemporarily(_, plugin))
     } yield ()
 
   private def stewardPlugin(version: String): F[FileData] = {

modules/core/src/test/scala/org/scalasteward/core/buildtool/BuildToolDispatcherTest.scala

@@ -55,6 +55,8 @@ class BuildToolDispatcherTest extends FunSuite {
         ),
         Log("Get dependencies in . from sbt"),
         Cmd("read", s"$repoDir/project/build.properties"),
+        Cmd("test", "-d", s"$repoDir/project"),
+        Cmd("test", "-d", s"$repoDir/project/project"),
         Cmd("read", "classpath:StewardPlugin_1_0_0.scala"),
         Cmd("write", s"$repoDir/project/scala-steward-StewardPlugin_1_0_0.scala"),
         Cmd("write", s"$repoDir/project/project/scala-steward-StewardPlugin_1_0_0.scala"),

modules/core/src/test/scala/org/scalasteward/core/buildtool/sbt/SbtAlgTest.scala

@@ -15,15 +15,18 @@ class SbtAlgTest extends FunSuite {
   private val workspace = workspaceAlg.rootDir.unsafeRunSync()
 
   test("getDependencies") {
-    val repo = Repo("typelevel", "cats")
+    val repo = Repo("sbt-alg", "test-1")
     val buildRoot = BuildRoot(repo, ".")
     val repoDir = workspaceAlg.repoDir(repo).unsafeRunSync()
-    val files = Map(repoDir / "project" / "build.properties" -> "sbt.version=1.3.6")
-    val initial = MockState.empty.copy(files = files)
+    val initial = MockState.empty
+      .addFiles(repoDir / "project" / "build.properties" -> "sbt.version=1.3.11")
+      .unsafeRunSync()
     val state = sbtAlg.getDependencies(buildRoot).runS(initial).unsafeRunSync()
     val expected = initial.copy(
       trace = Vector(
         Cmd("read", s"$repoDir/project/build.properties"),
+        Cmd("test", "-d", s"$repoDir/project"),
+        Cmd("test", "-d", s"$repoDir/project/project"),
         Cmd("read", "classpath:StewardPlugin_1_3_11.scala"),
         Cmd("write", s"$repoDir/project/scala-steward-StewardPlugin_1_3_11.scala"),
         Cmd("write", s"$repoDir/project/project/scala-steward-StewardPlugin_1_3_11.scala"),

modules/core/src/test/scala/org/scalasteward/core/buildtool/scalacli/ScalaCliAlgTest.scala

@@ -49,9 +49,9 @@ class ScalaCliAlgTest extends CatsEffectSuite {
           repoDir.toString
         ),
         Cmd("read", s"$sbtBuildDir/project/build.properties"),
+        Cmd("test", "-d", s"$sbtBuildDir/project"),
         Cmd("read", "classpath:StewardPlugin_1_3_11.scala"),
         Cmd("write", s"$sbtBuildDir/project/scala-steward-StewardPlugin_1_3_11.scala"),
-        Cmd("write", s"$sbtBuildDir/project/project/scala-steward-StewardPlugin_1_3_11.scala"),
         Cmd(
           sbtBuildDir.toString,
           "firejail",
@@ -63,9 +63,8 @@ class ScalaCliAlgTest extends CatsEffectSuite {
           "-Dsbt.color=false",
           "-Dsbt.log.noformat=true",
           "-Dsbt.supershell=false",
-          s";$crossStewardDependencies;$reloadPlugins;$stewardDependencies"
+          s";$crossStewardDependencies"
         ),
-        Cmd("rm", "-rf", s"$sbtBuildDir/project/project/scala-steward-StewardPlugin_1_3_11.scala"),
         Cmd("rm", "-rf", s"$sbtBuildDir/project/scala-steward-StewardPlugin_1_3_11.scala"),
         Cmd("rm", "-rf", s"$sbtBuildDir")
       )