Merge pull request #230 from olafurpg/moped-no-color

Tweak ANSI color output

Author: olafurpg

build.sbt

@@ -11,7 +11,7 @@ lazy val V =
     val coursier = "2.0.8"
     val bloop = "1.4.7"
     val bsp = "2.0.0-M13"
-    val moped = "0.1.9"
+    val moped = "0.1.10"
     def scala213 = "2.13.4"
     def scala212 = "2.12.12"
     def scalameta = "4.4.8"

lsif-java/src/main/scala/com/sourcegraph/lsif_java/buildtools/GradleBuildTool.scala

@@ -75,7 +75,7 @@ class GradleBuildTool(index: IndexCommand) extends BuildTool("Gradle", index) {
     buildCommand ++= index.finalBuildCommand(List("clean", "compileTestJava"))
     buildCommand += lsifJavaDependencies
 
-    val result = index.process(buildCommand)
+    val result = index.process(buildCommand, env = Map("TERM" -> "dumb"))
     printDebugLogs(toolchains.tmp)
     Embedded
       .reportUnexpectedJavacErrors(index.app.reporter, toolchains.tmp)

lsif-java/src/main/scala/com/sourcegraph/lsif_java/buildtools/MavenBuildTool.scala

@@ -45,6 +45,7 @@ class MavenBuildTool(index: IndexCommand) extends BuildTool("Maven", index) {
       buildCommand ++=
         index.finalBuildCommand(
           List(
+            s"--batch-mode",
             s"clean",
             // Default to the "verify" command, as recommended by the official docs
             // https://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html#usual-command-line-calls

lsif-java/src/main/scala/com/sourcegraph/lsif_java/commands/IndexCommand.scala

@@ -6,13 +6,14 @@ import java.nio.file.Paths
 
 import com.sourcegraph.io.AbsolutePath
 import com.sourcegraph.lsif_java.buildtools.BuildTool
+import fansi.Color
 import moped.annotations._
 import moped.cli.Application
 import moped.cli.Command
 import moped.cli.CommandParser
 import moped.internal.reporters.Levenshtein
 import os.CommandResult
-import os.Inherit
+import os.ProcessOutput
 import os.Shellable
 
 @Description(
@@ -65,13 +66,13 @@ case class IndexCommand(
       shellable: Shellable,
       env: Map[String, String] = Map.empty
   ): CommandResult = {
-    app.info(shellable.value.mkString(" "))
+    app.out.println(Color.DarkGray(shellable.value.mkString("$ ", " ", "")))
     app
       .process(shellable)
       .call(
         check = false,
-        stdout = Inherit,
-        stderr = Inherit,
+        stdout = ProcessOutput.Readlines(line => app.out.println(line)),
+        stderr = ProcessOutput.Readlines(line => app.err.println(line)),
         cwd = workingDirectory,
         env = env
       )

tests/buildTools/src/test/scala/tests/BaseBuildToolSuite.scala

@@ -37,7 +37,7 @@ abstract class BaseBuildToolSuite extends MopedSuite(LsifJava.app) {
       original: String,
       expectedSemanticdbFiles: Int = 0,
       extraArguments: List[String] = Nil,
-      expectedError: String = "",
+      expectedError: Option[String => Unit] = None,
       expectedPackages: String = "",
       initCommand: => List[String] = Nil
   ): Unit = {
@@ -59,11 +59,12 @@ abstract class BaseBuildToolSuite extends MopedSuite(LsifJava.app) {
       if (extraArguments.contains("--verbose")) {
         println(app.capturedOutput)
       }
-      if (expectedError.nonEmpty) {
-        assert(clue(exit) != 0, clues(app.capturedOutput))
-        assertNoDiff(app.capturedOutput, expectedError)
-      } else {
-        assertEquals(exit, 0, clues(app.capturedOutput))
+      expectedError match {
+        case Some(fn) =>
+          assert(clue(exit) != 0, clues(app.capturedOutput))
+          fn(app.capturedOutput)
+        case None =>
+          assertEquals(exit, 0, clues(app.capturedOutput))
       }
       val semanticdbFiles =
         if (!Files.isDirectory(targetroot))

tests/buildTools/src/test/scala/tests/GradleBuildToolSuite.scala

@@ -103,10 +103,13 @@ class GradleBuildToolSuite extends BaseBuildToolSuite {
        |/src/main/java/Example.java
        |public class Example {}
        |""".stripMargin,
-    expectedError =
-      """|info: /workingDirectory/gradlew --init-script /cache/java-toolchains.gradle lsifDetectJavaToolchains
-         |error: lsif-java does not support Gradle 6.7 when used together with Java toolchains. To fix this problem, upgrade to Gradle version 6.8 or newer and try again.
-         |""".stripMargin,
+    expectedError = Some { error =>
+      assert(
+        clue(error).contains(
+          """error: lsif-java does not support Gradle 6.7 when used together with Java toolchains. To fix this problem, upgrade to Gradle version 6.8 or newer and try again."""
+        )
+      )
+    },
     initCommand = gradleVersion("6.7")
   )