Standardize on a `mill.util.Logger` class

13 files changed, 76 insertions, 54 deletions

diff --git a/core/src/main/scala/mill/Main.scala b/core/src/main/scala/mill/Main.scala
index db7a6c1a..24cd7ed1 100644
--- a/core/src/main/scala/mill/Main.scala
+++ b/core/src/main/scala/mill/Main.scala
@@ -7,7 +7,7 @@ import ammonite.util.{Colors, Res}
 import mill.define.Task
 import mill.discover._
 import mill.eval.{Evaluator, Result}
-import mill.util.OSet
+import mill.util.{Logger, OSet, PrintLogger}
 import ammonite.main.Scripts.pathScoptRead
 import ammonite.repl.Repl
 import mill.define.Task.TaskModule
@@ -151,7 +151,7 @@ object Main {
                            watch: Path => Unit,
                            coloredOutput: Boolean): Int = {
 
-    val log = new Logger(coloredOutput)
+    val log = new PrintLogger(coloredOutput)
 
     val Seq(selectorString, rest @_*) = args
 
@@ -163,7 +163,7 @@ object Main {
         case _ => Nil
       }
       target <- resolve(sel, disc.mirror, obj, rest, crossSelectors, Nil)
-      evaluator = new Evaluator(pwd / 'out, Discovered.mapping(obj)(disc), log.info)
+      evaluator = new Evaluator(pwd / 'out, Discovered.mapping(obj)(disc), log)
       _ <- evaluate(evaluator, target, watch).toLeft(())
     } yield ()
 
@@ -231,17 +231,10 @@ object Main {
   }
 }
 
-class Logger(coloredOutput: Boolean){
-  val colors =
-    if(coloredOutput) Colors.Default
-    else Colors.BlackWhite
 
-  def info(s: String) = System.err.println(colors.info()(s))
-  def error(s: String) = System.err.println(colors.error()(s))
-}
 class Main(config: Main.Config){
   val coloredOutput = config.colored.getOrElse(ammonite.Main.isInteractive())
-  val log = new Logger(coloredOutput)
+  val log = new PrintLogger(coloredOutput)
 
 
   def watchAndWait(watched: Seq[(Path, Long)]) = {
diff --git a/core/src/main/scala/mill/eval/Evaluator.scala b/core/src/main/scala/mill/eval/Evaluator.scala
index b769c025..619b1521 100644
--- a/core/src/main/scala/mill/eval/Evaluator.scala
+++ b/core/src/main/scala/mill/eval/Evaluator.scala
@@ -1,17 +1,20 @@
 package mill.eval
 
+import java.io.PrintStream
+
 import ammonite.ops._
 import ammonite.runtime.SpecialClassLoader
 import mill.define.{Graph, Target, Task}
 import mill.discover.Mirror
 import mill.discover.Mirror.LabelledTarget
 import mill.util
-import mill.util.{Ctx, MultiBiMap, OSet}
+import mill.util._
+
 import scala.collection.mutable
 
 class Evaluator(workspacePath: Path,
                 labeling: Map[Target[_], LabelledTarget[_]],
-                log: String => Unit){
+                log: Logger){
 
   def evaluate(goals: OSet[Task[_]]): Evaluator.Results = {
     mkdir(workspacePath)
@@ -133,8 +136,7 @@ class Evaluator(workspacePath: Path,
   def evaluateGroup(group: OSet[Task[_]],
                     results: collection.Map[Task[_], Result[Any]],
                     targetDestPath: Option[Path],
-                    maybeTargetLabel: Option[String]
-                   ) = {
+                    maybeTargetLabel: Option[String]) = {
 
 
     val newEvaluated = mutable.Buffer.empty[Task[_]]
@@ -150,7 +152,7 @@ class Evaluator(workspacePath: Path,
 
       val logRun = inputResults.forall(_.isInstanceOf[Result.Success[_]])
 
-      if(logRun) { log("Running " + targetLabel) }
+      if(logRun) { log.info("Running " + targetLabel) }
     }
 
     for (target <- nonEvaluatedTargets) {
@@ -166,7 +168,7 @@ class Evaluator(workspacePath: Path,
           val args = new Ctx(
             targetInputValues.toArray[Any],
             targetDestPath.orNull,
-            System.out
+            log
           )
           target.evaluate(args)
         }
diff --git a/core/src/main/scala/mill/modules/Jvm.scala b/core/src/main/scala/mill/modules/Jvm.scala
index a2277e36..a0f586c3 100644
--- a/core/src/main/scala/mill/modules/Jvm.scala
+++ b/core/src/main/scala/mill/modules/Jvm.scala
@@ -130,12 +130,4 @@ object Jvm {
     PathRef(outputPath)
   }
 
-  def jarUp(roots: Task[PathRef]*) = new Task[PathRef]{
-
-    val inputs = roots
-    def evaluate(args: Ctx) = {
-      createJar(args.dest, args.args.map(_.asInstanceOf[PathRef].path))
-      PathRef(args.dest)
-    }
-  }
 }
diff --git a/core/src/main/scala/mill/util/Ctx.scala b/core/src/main/scala/mill/util/Ctx.scala
index f583feaf..7a0a5694 100644
--- a/core/src/main/scala/mill/util/Ctx.scala
+++ b/core/src/main/scala/mill/util/Ctx.scala
@@ -17,7 +17,7 @@ object Ctx{
     def dest: Path
   }
   trait LogCtx{
-    def log: PrintStream
+    def log: Logger
   }
   trait ArgCtx{
     def args: IndexedSeq[_]
@@ -25,7 +25,7 @@ object Ctx{
 }
 class Ctx(val args: IndexedSeq[_],
           val dest: Path,
-          val log: PrintStream) extends DestCtx with LogCtx with ArgCtx{
+          val log: Logger) extends DestCtx with LogCtx with ArgCtx{
   def length = args.length
   def apply[T](index: Int): T = {
     if (index >= 0 && index < args.length) args(index).asInstanceOf[T]
diff --git a/core/src/main/scala/mill/util/Logger.scala b/core/src/main/scala/mill/util/Logger.scala
new file mode 100644
index 00000000..d998a601
--- /dev/null
+++ b/core/src/main/scala/mill/util/Logger.scala
@@ -0,0 +1,29 @@
+package mill.util
+
+import java.io.{OutputStream, PrintStream}
+
+import ammonite.util.Colors
+
+
+trait Logger{
+  val outputStream: PrintStream
+  def info(s: String): Unit
+  def error(s: String): Unit
+}
+
+object DummyLogger extends Logger{
+  val outputStream = new PrintStream(new OutputStream {
+    def write(b: Int) = ()
+  })
+  def info(s: String) = ()
+  def error(s: String) = ()
+}
+class PrintLogger(coloredOutput: Boolean) extends Logger{
+  val outputStream = System.err
+  val colors =
+    if(coloredOutput) Colors.Default
+    else Colors.BlackWhite
+
+  def info(s: String) = System.err.println(colors.info()(s))
+  def error(s: String) = System.err.println(colors.error()(s))
+}
\ No newline at end of file
diff --git a/core/src/test/scala/mill/define/CacherTests.scala b/core/src/test/scala/mill/define/CacherTests.scala
index bb86ae65..bacfa598 100644
--- a/core/src/test/scala/mill/define/CacherTests.scala
+++ b/core/src/test/scala/mill/define/CacherTests.scala
@@ -2,7 +2,7 @@ package mill.define
 
 import mill.discover.Discovered
 import mill.eval.Evaluator
-import mill.util.OSet
+import mill.util.{DummyLogger, OSet}
 import mill.T
 import utest._
 import utest.framework.TestPath
@@ -27,7 +27,7 @@ object CacherTests extends TestSuite{
 
     def eval[T: Discovered, V](base: T, v: Task[V])(implicit tp: TestPath) = {
       val workspace = ammonite.ops.pwd / 'target / 'workspace / tp.value
-      val evaluator = new Evaluator(workspace, Discovered.mapping(base), _ => ())
+      val evaluator = new Evaluator(workspace, Discovered.mapping(base), DummyLogger)
       evaluator.evaluate(OSet(v)).values(0)
     }
 
diff --git a/core/src/test/scala/mill/eval/EvaluationTests.scala b/core/src/test/scala/mill/eval/EvaluationTests.scala
index d3c1861f..3b136ba0 100644
--- a/core/src/test/scala/mill/eval/EvaluationTests.scala
+++ b/core/src/test/scala/mill/eval/EvaluationTests.scala
@@ -5,7 +5,7 @@ import mill.util.TestUtil.{Test, test}
 import mill.define.{Graph, Target, Task}
 import mill.{Module, T}
 import mill.discover.Discovered
-import mill.util.{OSet, TestGraphs, TestUtil}
+import mill.util.{DummyLogger, OSet, TestGraphs, TestUtil}
 import utest._
 import utest.framework.TestPath
 
@@ -14,7 +14,7 @@ object EvaluationTests extends TestSuite{
     val workspace = ammonite.ops.pwd / 'target / 'workspace / tp.value
     ammonite.ops.rm(ammonite.ops.Path(workspace, ammonite.ops.pwd))
     // Make sure data is persisted even if we re-create the evaluator each time
-    def evaluator = new Evaluator(workspace, Discovered.mapping(base), _ => ())
+    def evaluator = new Evaluator(workspace, Discovered.mapping(base), DummyLogger)
 
     def apply(target: Task[_], expValue: Any,
               expEvaled: OSet[Task[_]],
diff --git a/core/src/test/scala/mill/eval/FailureTests.scala b/core/src/test/scala/mill/eval/FailureTests.scala
index 6977334d..2279d931 100644
--- a/core/src/test/scala/mill/eval/FailureTests.scala
+++ b/core/src/test/scala/mill/eval/FailureTests.scala
@@ -2,7 +2,7 @@ package mill.eval
 
 import mill.define.Target
 import mill.discover.Discovered
-import mill.util.OSet
+import mill.util.{DummyLogger, OSet}
 import utest._
 import utest.framework.TestPath
 
@@ -17,7 +17,7 @@ object FailureTests extends TestSuite{
     def check[T: Discovered](base: T)
                             (target: T => Target[_], expectedFailCount: Int, expectedRawValues: Seq[Result[_]])
                             (implicit tp: TestPath) = {
-      val evaluator = new Evaluator(workspace, Discovered.mapping(base), _ => ())
+      val evaluator = new Evaluator(workspace, Discovered.mapping(base), DummyLogger)
       val res = evaluator.evaluate(OSet(target(base)))
       assert(
         res.rawValues == expectedRawValues,
diff --git a/core/src/test/scala/mill/eval/JavaCompileJarTests.scala b/core/src/test/scala/mill/eval/JavaCompileJarTests.scala
index 6c32f9b8..e0a43c6e 100644
--- a/core/src/test/scala/mill/eval/JavaCompileJarTests.scala
+++ b/core/src/test/scala/mill/eval/JavaCompileJarTests.scala
@@ -4,10 +4,10 @@ import ammonite.ops.ImplicitWd._
 import ammonite.ops._
 import mill.define.{Target, Task}
 import mill.discover.Discovered
-import mill.modules.Jvm.jarUp
+import mill.modules.Jvm
 import mill.util.Ctx.DestCtx
 import mill.{Module, T}
-import mill.util.OSet
+import mill.util.{DummyLogger, OSet}
 import utest._
 
 object JavaCompileJarTests extends TestSuite{
@@ -39,7 +39,7 @@ object JavaCompileJarTests extends TestSuite{
         def resourceRoot = T.source{ resourceRootPath }
         def allSources = T{ ls.rec(sourceRoot().path).map(PathRef(_)) }
         def classFiles = T{ compileAll(allSources()) }
-        def jar = T{ jarUp(resourceRoot, classFiles) }
+        def jar = T{ Jvm.createJar(Seq(resourceRoot().path, classFiles().path)) }
 
         def run(mainClsName: String) = T.command{
           %%('java, "-cp", classFiles().path, mainClsName)
@@ -50,7 +50,7 @@ object JavaCompileJarTests extends TestSuite{
       val mapping = Discovered.mapping(Build)
 
       def eval[T](t: Task[T]): Either[Result.Failing, (T, Int)] = {
-        val evaluator = new Evaluator(workspacePath, mapping, _ => ())
+        val evaluator = new Evaluator(workspacePath, mapping, DummyLogger)
         val evaluated = evaluator.evaluate(OSet(t))
 
         if (evaluated.failing.keyCount == 0){
@@ -67,7 +67,7 @@ object JavaCompileJarTests extends TestSuite{
 
       }
       def check(targets: OSet[Task[_]], expected: OSet[Task[_]]) = {
-        val evaluator = new Evaluator(workspacePath, mapping, _ => ())
+        val evaluator = new Evaluator(workspacePath, mapping, DummyLogger)
 
         val evaluated = evaluator.evaluate(targets)
           .evaluated
diff --git a/scalaplugin/src/main/scala/mill/scalaplugin/GenIdea.scala b/scalaplugin/src/main/scala/mill/scalaplugin/GenIdea.scala
index 87a42d04..4ccb71cd 100644
--- a/scalaplugin/src/main/scala/mill/scalaplugin/GenIdea.scala
+++ b/scalaplugin/src/main/scala/mill/scalaplugin/GenIdea.scala
@@ -4,7 +4,7 @@ import ammonite.ops._
 import mill.discover.Mirror.Segment
 import mill.discover.{Discovered, Mirror}
 import mill.eval.{Evaluator, PathRef}
-import mill.util.OSet
+import mill.util.{OSet, PrintLogger}
 
 object GenIdea {
 
@@ -22,7 +22,7 @@ object GenIdea {
     val discovered = implicitly[Discovered[T]]
     val mapping = Discovered.mapping(obj)(discovered)
     val workspacePath = pwd / 'out
-    val evaluator = new Evaluator(workspacePath, mapping, _ => ())
+    val evaluator = new Evaluator(workspacePath, mapping, new PrintLogger(true))
 
     val modules = Mirror
       .traverse(obj, discovered.mirror){ (h, p) =>
diff --git a/scalaplugin/src/main/scala/mill/scalaplugin/ScalaModule.scala b/scalaplugin/src/main/scala/mill/scalaplugin/ScalaModule.scala
index eb9026ba..292c41a6 100644
--- a/scalaplugin/src/main/scala/mill/scalaplugin/ScalaModule.scala
+++ b/scalaplugin/src/main/scala/mill/scalaplugin/ScalaModule.scala
@@ -1,7 +1,7 @@
 package mill
 package scalaplugin
 
-import java.io.File
+import java.io.{File, PrintStream, PrintWriter, Writer}
 import java.net.URLClassLoader
 import java.util.Optional
 import java.util.concurrent.Callable
@@ -86,7 +86,9 @@ object ScalaModule{
 
     val logger = {
 
-      val consoleAppender = MainAppender.defaultScreen(ConsoleOut.printStreamOut(ctx.log))
+      val consoleAppender = MainAppender.defaultScreen(ConsoleOut.printStreamOut(
+        ctx.log.outputStream
+      ))
       val l = LogExchange.logger("Hello")
       LogExchange.unbindLoggerAppenders("Hello")
       LogExchange.bindLoggerAppenders("Hello", (consoleAppender -> sbt.util.Level.Info) :: Nil)
diff --git a/scalaplugin/src/main/scala/mill/scalaplugin/TestRunner.scala b/scalaplugin/src/main/scala/mill/scalaplugin/TestRunner.scala
index 03292b68..43e15974 100644
--- a/scalaplugin/src/main/scala/mill/scalaplugin/TestRunner.scala
+++ b/scalaplugin/src/main/scala/mill/scalaplugin/TestRunner.scala
@@ -6,6 +6,8 @@ import java.net.URLClassLoader
 import java.util.zip.ZipInputStream
 
 import ammonite.ops.{Path, ls, pwd}
+import mill.util.Ctx.LogCtx
+import mill.util.PrintLogger
 import sbt.testing._
 
 import scala.collection.mutable
@@ -43,14 +45,17 @@ object TestRunner {
       entireClasspath = args(1).split(" ").map(Path(_)),
       testClassfilePath = args(2).split(" ").map(Path(_)),
       args = args(3) match{ case "" => Nil case x => x.split(" ").toList }
-    )
+    )(new LogCtx {
+      def log = new PrintLogger(true)
+    })
     val outputPath = args(4)
     ammonite.ops.write(Path(outputPath), upickle.default.write(result))
   }
   def apply(frameworkName: String,
             entireClasspath: Seq[Path],
             testClassfilePath: Seq[Path],
-            args: Seq[String]): Option[String] = {
+            args: Seq[String])
+           (implicit ctx: LogCtx): Option[String] = {
     val outerClassLoader = getClass.getClassLoader
     val cl = new URLClassLoader(
       entireClasspath.map(_.toIO.toURI.toURL).toArray,
@@ -86,17 +91,17 @@ object TestRunner {
         },
         Array(
           new Logger {
-            def debug(msg: String) = println(msg)
+            def debug(msg: String) = ctx.log.info(msg)
 
-            def error(msg: String) = println(msg)
+            def error(msg: String) = ctx.log.error(msg)
 
             def ansiCodesSupported() = true
 
-            def warn(msg: String) = println(msg)
+            def warn(msg: String) = ctx.log.info(msg)
 
-            def trace(t: Throwable) = println(t)
+            def trace(t: Throwable) = t.printStackTrace(ctx.log.outputStream)
 
-            def info(msg: String) = println(msg)
+            def info(msg: String) = ctx.log.info(msg)
         })
       )
     }
@@ -107,7 +112,7 @@ object TestRunner {
         val grouped = events.groupBy(x => x).mapValues(_.length).filter(_._2 != 0).toList.sorted
         grouped.map{case (k, v) => k + ": " + v}.mkString(",")
       }
-    println(msg)
+    ctx.log.info(msg)
     if (events.count(Set(Status.Error, Status.Failure)) == 0) None
     else Some(msg)
   }
diff --git a/scalaplugin/src/test/scala/mill/scalaplugin/TestEvaluator.scala b/scalaplugin/src/test/scala/mill/scalaplugin/TestEvaluator.scala
index e54480c9..49c245e4 100644
--- a/scalaplugin/src/test/scala/mill/scalaplugin/TestEvaluator.scala
+++ b/scalaplugin/src/test/scala/mill/scalaplugin/TestEvaluator.scala
@@ -4,20 +4,19 @@ import ammonite.ops.Path
 import mill.define.{Target, Task}
 import mill.discover.Mirror
 import mill.eval.{Evaluator, Result}
-import mill.util.OSet
+import mill.util.{DummyLogger, OSet}
 
 object TestEvaluator {
 
-  private val noopLogger: String => Unit = _ => ()
 
   def resolveDestPaths(workspacePath: Path)(t: Mirror.LabelledTarget[_]): (Path, Path) = {
-    new Evaluator(workspacePath, Map.empty, noopLogger).resolveDestPaths(t)
+    new Evaluator(workspacePath, Map.empty, DummyLogger).resolveDestPaths(t)
   }
 
   def eval[T](
       mapping: Map[Target[_], Mirror.LabelledTarget[_]],
       workspacePath: Path)(t: Task[T]): Either[Result.Failing, (T, Int)] = {
-    val evaluator = new Evaluator(workspacePath, mapping, noopLogger)
+    val evaluator = new Evaluator(workspacePath, mapping, DummyLogger)
     val evaluated = evaluator.evaluate(OSet(t))
 
     if (evaluated.failing.keyCount == 0) {