Enable colors from sbt

Author: szeiger

src/main/scala/scala/tools/partest/nest/AbstractRunner.scala

@@ -17,19 +17,20 @@ abstract class AbstractRunner {
 
   val config: RunnerSpec.Config
 
-  val nestUI: NestUI = new NestUI(
+  lazy val nestUI: NestUI = new NestUI(
     verbose = config.optVerbose,
     debug = config.optDebug || propOrFalse("partest.debug"),
     terse = config.optTerse,
     diffOnFail = config.optShowDiff,
     logOnFail = config.optShowLog,
-    colorEnabled = sys.props contains "partest.colors"
+    colorEnabled = colorEnabled
   )
 
   val suiteRunner: SuiteRunner
 
   protected val printSummary         = true
   protected val partestCmd           = "test/partest"
+  protected val colorEnabled         = sys.props contains "partest.colors"
 
   private[this] var totalTests       = 0
   private[this] val passedTests      = mutable.ListBuffer[TestState]()

src/main/scala/scala/tools/partest/sbt/Framework.scala

@@ -1,6 +1,6 @@
 package scala.tools.partest.sbt
 
-import scala.tools.partest.nest.{SBTRunner, RunnerSpec}
+import scala.tools.partest.nest.RunnerSpec
 import _root_.sbt.testing._
 import java.net.URLClassLoader
 import java.io.File

…scala/tools/partest/nest/SBTRunner.scala …/scala/tools/partest/sbt/SBTRunner.scalasrc/main/scala/scala/tools/partest/nest/SBTRunner.scala renamed to src/main/scala/scala/tools/partest/sbt/SBTRunner.scala src/main/scala/scala/tools/partest/nest/SBTRunner.scala renamed to src/main/scala/scala/tools/partest/sbt/SBTRunner.scala

@@ -6,12 +6,15 @@
 **                          |/                                          **
 \*                                                                      */
 
-package scala.tools.partest
-package nest
+package scala.tools.partest.sbt
 
-import _root_.sbt.testing._
 import java.net.URLClassLoader
-import TestState._
+
+import _root_.sbt.testing._
+
+import scala.tools.partest.TestState._
+import scala.tools.partest._
+import scala.tools.partest.nest.{AbstractRunner, FileManager, RunnerSpec, SuiteRunner}
 
 class SBTRunner(val config: RunnerSpec.Config,
                 partestFingerprint: Fingerprint, eventHandler: EventHandler, loggers: Array[Logger],
@@ -27,6 +30,18 @@ class SBTRunner(val config: RunnerSpec.Config,
     args.collect { case Def(k, v) => (k, v) }
   }
 
+  // Enable colors if there's an explicit override or all loggers support them
+  override protected val colorEnabled = {
+    val ptOverride = defs.collect { case ("partest.colors", v) => v.toBoolean }.lastOption
+    ptOverride.getOrElse {
+      val sbtOverride1 = sys.props.get("sbt.log.format").map(_.toBoolean)
+      val sbtOverride2 = sys.props.get("sbt.log.noformat").map(s => !s.toBoolean)
+      sbtOverride1.orElse(sbtOverride2).getOrElse {
+        loggers.forall(_.ansiCodesSupported())
+      }
+    }
+  }
+
   val javaOpts = {
     val l = defs.collect { case ("partest.java_opts", v) => v }
     if(l.isEmpty) PartestDefaults.javaOpts