From 014802e2726403c1e91ac755b629b4c32c5c4c4b Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Tue, 28 Mar 2017 17:16:11 -0700 Subject: [PATCH] Implemented --log 0 --- .../src/main/kotlin/com/beust/kobalt/Args.kt | 2 +- .../main/kotlin/com/beust/kobalt/Constants.kt | 1 + .../com/beust/kobalt/ResolveDependency.kt | 19 ++++---- .../com/beust/kobalt/internal/DynamicGraph.kt | 19 +++----- .../beust/kobalt/internal/ParallelLogger.kt | 8 ++-- .../com/beust/kobalt/internal/TestNgRunner.kt | 44 +++++++++---------- .../kobalt/internal/build/BuildSources.kt | 3 +- .../kotlin/com/beust/kobalt/maven/Pom2.kt | 7 ++- .../main/kotlin/com/beust/kobalt/misc/Io.kt | 10 ++--- .../com/beust/kobalt/misc/KobaltLogger.kt | 12 ++--- .../main/kotlin/com/beust/kobalt/misc/Node.kt | 2 +- .../java/com/beust/kobalt/wrapper/Main.java | 3 +- src/main/kotlin/com/beust/kobalt/Main.kt | 6 +-- src/main/kotlin/com/beust/kobalt/Options.kt | 12 ++--- .../kobalt/app/remote/RemoteDependencyData.kt | 12 ++--- .../plugin/application/ApplicationPlugin.kt | 10 ++--- .../kotlin/com/beust/kobalt/TestModule.kt | 7 ++- .../beust/kobalt/internal/DynamicGraphTest.kt | 2 +- 18 files changed, 76 insertions(+), 103 deletions(-) diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Args.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Args.kt index fe4cf2a3..69dca61e 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Args.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Args.kt @@ -43,7 +43,7 @@ class Args { var listTemplates: Boolean = false @Parameter(names = arrayOf("--log"), description = "Define the log level " + - "(${Constants.LOG_DEFAULT_LEVEL}-${Constants.LOG_MAX_LEVEL})") + "(${Constants.LOG_QUIET_LEVEL}-${Constants.LOG_MAX_LEVEL})") var log: Int = Constants.LOG_DEFAULT_LEVEL @Parameter(names = arrayOf("--logTags"), diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Constants.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Constants.kt index 6305f1b1..a3a03c33 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Constants.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Constants.kt @@ -3,6 +3,7 @@ package com.beust.kobalt import com.beust.kobalt.misc.KFiles object Constants { + const val LOG_QUIET_LEVEL = 0 const val LOG_DEFAULT_LEVEL = 1 const val LOG_MAX_LEVEL = 3 val BUILD_FILE_NAME = "Build.kt" diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/ResolveDependency.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/ResolveDependency.kt index a14f993c..0d1223e9 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/ResolveDependency.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/ResolveDependency.kt @@ -3,13 +3,8 @@ package com.beust.kobalt import com.beust.kobalt.api.IClasspathDependency import com.beust.kobalt.maven.LocalRepo import com.beust.kobalt.maven.MavenId -import com.beust.kobalt.maven.aether.AetherDependency -import com.beust.kobalt.maven.aether.Filters -import com.beust.kobalt.maven.aether.KobaltMavenResolver -import com.beust.kobalt.misc.KobaltExecutors -import com.beust.kobalt.misc.Node -import com.beust.kobalt.misc.kobaltLog -import com.beust.kobalt.misc.warn +import com.beust.kobalt.maven.aether.* +import com.beust.kobalt.misc.* import com.google.inject.Inject import org.eclipse.aether.artifact.DefaultArtifact import org.eclipse.aether.graph.DependencyNode @@ -74,7 +69,7 @@ class ResolveDependency @Inject constructor( kobaltLog(1, AsciiArt.logBox(listOf(dep.id, url, dep.jarFile.get()).map { " $it" })) display(root.children) - println("") + kobaltLog(1, "") } private fun display(nodes: List>) { @@ -86,10 +81,12 @@ class ResolveDependency @Inject constructor( else leftMiddle val indent = level * increment for(i in 0..indent - 2) { - if (i == 0 || ((i + 1) % increment == 0)) print(vertical) - else print(" ") + if (!KobaltLogger.isQuiet) { + if (i == 0 || ((i + 1) % increment == 0)) print(vertical) + else print(" ") + } } - println(left + " " + dep.id + (if (dep.optional) " (optional)" else "")) + kobaltLog(1, left + " " + dep.id + (if (dep.optional) " (optional)" else "")) display(node.children) } } diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/DynamicGraph.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/DynamicGraph.kt index 2b1f3c2f..1ea14a1a 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/DynamicGraph.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/DynamicGraph.kt @@ -1,12 +1,7 @@ package com.beust.kobalt.internal -import com.beust.kobalt.AsciiTable -import com.beust.kobalt.KobaltException -import com.beust.kobalt.TaskResult -import com.beust.kobalt.misc.NamedThreadFactory -import com.beust.kobalt.misc.error -import com.beust.kobalt.misc.kobaltLog -import com.beust.kobalt.misc.warn +import com.beust.kobalt.* +import com.beust.kobalt.misc.* import com.google.common.collect.HashMultimap import java.lang.reflect.InvocationTargetException import java.util.* @@ -303,14 +298,14 @@ class DynamicGraphExecutor(val graph : DynamicGraph, val factory: IThreadW duration = " (" + ((hl.timestamp - start) / 1000) .toInt().toString() + ")" } else { - println("DONOTCOMMIT") + kobaltLog(1, "DONOTCOMMIT") } } return hl.name + duration } historyLog.forEach { hl -> - println("CURRENT LOG: " + currentLog + " HISTORY LINE: " + hl) + kobaltLog(1, "CURRENT LOG: " + currentLog + " HISTORY LINE: " + hl) if (hl.start) { projectStart[hl.name] = hl.timestamp } @@ -318,10 +313,10 @@ class DynamicGraphExecutor(val graph : DynamicGraph, val factory: IThreadW currentLog = CompressedLog(hl.timestamp, hashMapOf(hl.threadId to hl.name)) } else currentLog?.let { cl -> if (! hl.start || hl.timestamp - cl.timestamp < 1000) { - println(" CURRENT LOG IS WITHING ONE SECOND: $hl") + kobaltLog(1, " CURRENT LOG IS WITHING ONE SECOND: $hl") cl.threadMap[hl.threadId] = toName(hl) } else { - println(" ADDING COMPRESSED LINE $cl") + kobaltLog(1, " ADDING COMPRESSED LINE $cl") compressed.add(cl) currentLog = CompressedLog(hl.timestamp, hashMapOf(hl.threadId to toName(hl))) } @@ -378,7 +373,7 @@ class DynamicGraphExecutor(val graph : DynamicGraph, val factory: IThreadW return table } - println(displayRegularLog(table).build()) + kobaltLog(1, displayRegularLog(table).build()) } } diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/ParallelLogger.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/ParallelLogger.kt index 7fda0eac..519a94c9 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/ParallelLogger.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/ParallelLogger.kt @@ -2,9 +2,7 @@ package com.beust.kobalt.internal import com.beust.kobalt.Args import com.beust.kobalt.KobaltException -import com.beust.kobalt.misc.kobaltError -import com.beust.kobalt.misc.kobaltLog -import com.beust.kobalt.misc.kobaltWarn +import com.beust.kobalt.misc.* import com.google.inject.Inject import com.google.inject.Singleton import java.util.* @@ -69,7 +67,7 @@ class ParallelLogger @Inject constructor(val args: Args) : ILogger { private fun debug(s: CharSequence) { if (args.log >= 3) { val time = System.currentTimeMillis() - startTime!! - println(" ### [$time] $s") + kobaltLog(1, " ### [$time] $s") } } @@ -127,6 +125,6 @@ class ParallelLogger @Inject constructor(val args: Args) : ILogger { runningProjects.forEach { emptyProjectLog(it) } - println("") + kobaltLog(1, "") } } diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/TestNgRunner.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/TestNgRunner.kt index 83c67671..5f1d430c 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/TestNgRunner.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/TestNgRunner.kt @@ -2,19 +2,11 @@ package com.beust.kobalt.internal import com.beust.kobalt.AsciiArt import com.beust.kobalt.TestConfig -import com.beust.kobalt.api.IClasspathDependency -import com.beust.kobalt.api.KobaltContext -import com.beust.kobalt.api.Project +import com.beust.kobalt.api.* import com.beust.kobalt.maven.aether.AetherDependency -import com.beust.kobalt.misc.KFiles -import com.beust.kobalt.misc.StringVersion -import com.beust.kobalt.misc.runCommand -import com.beust.kobalt.misc.warn +import com.beust.kobalt.misc.* import org.testng.remote.RemoteArgs -import org.testng.remote.strprotocol.JsonMessageSender -import org.testng.remote.strprotocol.MessageHelper -import org.testng.remote.strprotocol.MessageHub -import org.testng.remote.strprotocol.TestResultMessage +import org.testng.remote.strprotocol.* import java.io.File import java.io.IOException @@ -124,8 +116,8 @@ class TestNgRunner : GenericTestRunner() { try { var message = mh.receiveMessage() - println("") - println(green("PASSED") + " | " + red("FAILED") + " | " + yellow("SKIPPED")) + kobaltLog(1, "") + kobaltLog(1, green("PASSED") + " | " + red("FAILED") + " | " + yellow("SKIPPED")) while (message != null) { message = mh.receiveMessage() if (message is TestResultMessage) { @@ -136,17 +128,19 @@ class TestNgRunner : GenericTestRunner() { MessageHelper.SKIPPED_TEST -> skipped.add(message.name) } } - print("\r " + d(passed.size, AsciiArt.GREEN) - + " | " + d(failed.size, AsciiArt.RED) - + " | " + d(skipped.size, AsciiArt.YELLOW)) + if (!KobaltLogger.isQuiet) { + print("\r " + d(passed.size, AsciiArt.GREEN) + + " | " + d(failed.size, AsciiArt.RED) + + " | " + d(skipped.size, AsciiArt.YELLOW)) + } } } catch(ex: IOException) { - println("Exception: ${ex.message}") + kobaltLog(1, "Exception: ${ex.message}") } - println("\nPassed: " + passed.size + ", Failed: " + failed.size + ", Skipped: " + skipped.size) + kobaltLog(1, "\nPassed: " + passed.size + ", Failed: " + failed.size + ", Skipped: " + skipped.size) failed.forEach { val top = it.stackTrace.substring(0, it.stackTrace.indexOf("\n")) - println(" " + it.cls + "." + it.method + "\n " + top) + kobaltLog(1, " " + it.cls + "." + it.method + "\n " + top) } return failed.isEmpty() && skipped.isEmpty() } @@ -201,10 +195,12 @@ fun main(args: Array) { fun d(n: Int, color: String) = AsciiArt.wrap(String.format("%4d", n), color) - println("PASSED | FAILED | SKIPPED") - repeat(20) { i -> - print("\r " + d(i, AsciiArt.GREEN) + " | " + d(i * 2, AsciiArt.RED) + " | " + d(i, AsciiArt.YELLOW)) - Thread.sleep(500) + if (!KobaltLogger.isQuiet) { + println("PASSED | FAILED | SKIPPED") + repeat(20) { i -> + print("\r " + d(i, AsciiArt.GREEN) + " | " + d(i * 2, AsciiArt.RED) + " | " + d(i, AsciiArt.YELLOW)) + Thread.sleep(500) + } + println("") } - println("") } diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/build/BuildSources.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/build/BuildSources.kt index 63a8d5be..9815ebf7 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/build/BuildSources.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/build/BuildSources.kt @@ -1,6 +1,7 @@ package com.beust.kobalt.internal.build import com.beust.kobalt.homeDir +import com.beust.kobalt.misc.kobaltLog import java.io.File import java.nio.file.* import java.nio.file.attribute.BasicFileAttributes @@ -37,7 +38,7 @@ class BuildSources(val file: File) : IBuildSources { override fun preVisitDirectory(dir: Path?, attrs: BasicFileAttributes?): FileVisitResult { if (dir != null) { val path = dir.toFile() - println(path.name) + kobaltLog(1, path.name) if (path.name == "src" && path.parentFile.name == "kobalt") { val sources = path.listFiles().filter { it.name.endsWith(".kt")} result.addAll(sources) diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/Pom2.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/Pom2.kt index d7457529..879f6d51 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/Pom2.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/Pom2.kt @@ -1,13 +1,12 @@ package com.beust.kobalt.maven +import com.beust.kobalt.misc.kobaltLog import org.w3c.dom.Element import org.xml.sax.InputSource import java.io.File import java.io.FileReader import javax.xml.bind.JAXBContext -import javax.xml.bind.annotation.XmlAnyElement -import javax.xml.bind.annotation.XmlElement -import javax.xml.bind.annotation.XmlRootElement +import javax.xml.bind.annotation.* import javax.xml.parsers.SAXParserFactory import javax.xml.transform.sax.SAXSource @@ -147,7 +146,7 @@ class Dependency { private fun expandVariable(s: String, pom: Pom2) : String { val variable = extractVariable(s) if (variable != null) { - println("Expanding variable $variable") + kobaltLog(2, "Expanding variable $variable") val value = pom.pomProject.propertyValue(variable) return s } else { diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/Io.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/Io.kt index df5fa340..8d2b0580 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/Io.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/Io.kt @@ -1,9 +1,7 @@ package com.beust.kobalt.misc import java.io.File -import java.nio.file.Files -import java.nio.file.Paths -import java.nio.file.StandardCopyOption +import java.nio.file.* class Io(val dryRun: Boolean = false) { fun mkdirs(dir: String) { @@ -47,8 +45,8 @@ class Io(val dryRun: Boolean = false) { if (! dryRun) { KFiles.copyRecursively(from, toDir) require(from.exists(), { -> "$from should exist" }) - require(from.isDirectory, { -> println("$from should be a directory")}) - require(toDir.isDirectory, { -> println("$toDir should be a file")}) + require(from.isDirectory, { -> kobaltLog(1, "$from should be a directory")}) + require(toDir.isDirectory, { -> kobaltLog(1, "$toDir should be a file")}) } } @@ -58,7 +56,7 @@ class Io(val dryRun: Boolean = false) { private fun rmDir(dir: File, keep: (File) -> Boolean, indent : String) { kobaltLog("rm -rf $dir") - require(dir.isDirectory, { -> println("$dir should be a directory")}) + require(dir.isDirectory, { -> kobaltLog(1, "$dir should be a directory")}) dir.listFiles({ p0 -> ! keep(p0!!) }).forEach { if (it.isDirectory) { diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/KobaltLogger.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/KobaltLogger.kt index a361b0d5..1d235a44 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/KobaltLogger.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/KobaltLogger.kt @@ -1,8 +1,6 @@ package com.beust.kobalt.misc -import com.beust.kobalt.Args -import com.beust.kobalt.AsciiArt -import com.beust.kobalt.KobaltException +import com.beust.kobalt.* import com.beust.kobalt.api.Kobalt import com.beust.kobalt.maven.aether.Exceptions import java.lang.Exception @@ -10,7 +8,7 @@ import java.time.LocalDateTime import java.time.format.DateTimeFormatter fun Any.log(level: Int, text: CharSequence, newLine : Boolean = true) { - if (level <= KobaltLogger.LOG_LEVEL) { + if (level <= KobaltLogger.LOG_LEVEL && !KobaltLogger.isQuiet) { KobaltLogger.logger.log(javaClass.simpleName, text, newLine) } } @@ -25,11 +23,11 @@ fun Any.kobaltLog(tag: String, text: CharSequence, newLine : Boolean = true) { } fun Any.logWrap(level: Int, text1: CharSequence, text2: CharSequence, function: () -> Unit) { - if (level <= KobaltLogger.LOG_LEVEL) { + if (level <= KobaltLogger.LOG_LEVEL && !KobaltLogger.isQuiet) { KobaltLogger.logger.log(javaClass.simpleName, text1, newLine = false) } function() - if (level <= KobaltLogger.LOG_LEVEL) { + if (level <= KobaltLogger.LOG_LEVEL && !KobaltLogger.isQuiet) { KobaltLogger.logger.log(javaClass.simpleName, text2, newLine = true) } } @@ -50,6 +48,8 @@ fun Any.error(text: CharSequence, e: Throwable? = null) { object KobaltLogger { var LOG_LEVEL: Int = 1 + + val isQuiet: Boolean get() = (LOG_LEVEL == Constants.LOG_QUIET_LEVEL) val logger: Logger get() = if (Kobalt.context != null) { diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/Node.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/Node.kt index 3479ae2f..26707f03 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/Node.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/Node.kt @@ -12,7 +12,7 @@ data class Node(val value: T) { } private fun p(s: String) { - println(s) + kobaltLog(1, s) } fun dump(r: T, children: List>, indent: Int) { diff --git a/modules/wrapper/src/main/java/com/beust/kobalt/wrapper/Main.java b/modules/wrapper/src/main/java/com/beust/kobalt/wrapper/Main.java index a9a30385..f91bf3c1 100644 --- a/modules/wrapper/src/main/java/com/beust/kobalt/wrapper/Main.java +++ b/modules/wrapper/src/main/java/com/beust/kobalt/wrapper/Main.java @@ -36,6 +36,7 @@ public class Main { private final Properties wrapperProperties = new Properties(); + private static int logQuietLevel = 0; private static int logLevel = 1; private boolean noOverwrite = false; @@ -487,7 +488,7 @@ public class Main { } private static void p(int level, String s, boolean newLine) { - if (level <= logLevel) { + if (level != logQuietLevel && level <= logLevel) { if (newLine) System.out.println(s); else System.out.print(s); } diff --git a/src/main/kotlin/com/beust/kobalt/Main.kt b/src/main/kotlin/com/beust/kobalt/Main.kt index 75f27bda..2d55cac6 100644 --- a/src/main/kotlin/com/beust/kobalt/Main.kt +++ b/src/main/kotlin/com/beust/kobalt/Main.kt @@ -27,7 +27,7 @@ private fun parseArgs(argv: Array): Main.RunInfo { val args = Args() val result = JCommander(args) result.parse(*argv) - KobaltLogger.LOG_LEVEL = if (args.log < 0) { + KobaltLogger.LOG_LEVEL = if (args.log < Constants.LOG_QUIET_LEVEL) { Constants.LOG_DEFAULT_LEVEL } else if (args.log > Constants.LOG_MAX_LEVEL) { Constants.LOG_MAX_LEVEL @@ -110,9 +110,9 @@ private class Main @Inject constructor( private fun runWithArgs(jc: JCommander, args: Args, argv: Array): Int { val p = if (args.buildFile != null) File(args.buildFile) else File(".") args.buildFile = p.absolutePath - + if (!args.update) { - println(AsciiArt.banner + Kobalt.version + "\n") + kobaltLog(1, AsciiArt.banner + Kobalt.version + "\n") } return options.run(jc, args, argv) diff --git a/src/main/kotlin/com/beust/kobalt/Options.kt b/src/main/kotlin/com/beust/kobalt/Options.kt index 9b29a831..2936dd59 100644 --- a/src/main/kotlin/com/beust/kobalt/Options.kt +++ b/src/main/kotlin/com/beust/kobalt/Options.kt @@ -1,18 +1,14 @@ package com.beust.kobalt import com.beust.jcommander.JCommander -import com.beust.kobalt.api.Kobalt -import com.beust.kobalt.api.PluginTask -import com.beust.kobalt.api.Project -import com.beust.kobalt.app.ProjectFinder -import com.beust.kobalt.app.ProjectGenerator -import com.beust.kobalt.app.Templates -import com.beust.kobalt.app.UpdateKobalt +import com.beust.kobalt.api.* +import com.beust.kobalt.app.* import com.beust.kobalt.app.remote.KobaltServer import com.beust.kobalt.internal.PluginInfo import com.beust.kobalt.internal.TaskManager import com.beust.kobalt.internal.build.BuildSources import com.beust.kobalt.misc.CheckVersions +import com.beust.kobalt.misc.kobaltLog import com.beust.kobalt.wrapper.Main import com.google.common.collect.HashMultimap import com.google.inject.Inject @@ -165,6 +161,6 @@ class Options @Inject constructor( } } - println(sb.toString()) + kobaltLog(1, sb.toString()) } } \ No newline at end of file diff --git a/src/main/kotlin/com/beust/kobalt/app/remote/RemoteDependencyData.kt b/src/main/kotlin/com/beust/kobalt/app/remote/RemoteDependencyData.kt index ab1c1175..b03be293 100644 --- a/src/main/kotlin/com/beust/kobalt/app/remote/RemoteDependencyData.kt +++ b/src/main/kotlin/com/beust/kobalt/app/remote/RemoteDependencyData.kt @@ -4,16 +4,10 @@ import com.beust.kobalt.Args import com.beust.kobalt.api.IClasspathDependency import com.beust.kobalt.api.Project import com.beust.kobalt.app.BuildFileCompiler -import com.beust.kobalt.internal.DynamicGraph -import com.beust.kobalt.internal.GraphUtil -import com.beust.kobalt.internal.PluginInfo -import com.beust.kobalt.internal.TaskManager +import com.beust.kobalt.internal.* import com.beust.kobalt.internal.build.BuildSources import com.beust.kobalt.maven.DependencyManager -import com.beust.kobalt.misc.KFiles -import com.beust.kobalt.misc.KobaltExecutors -import com.beust.kobalt.misc.StringVersion -import com.beust.kobalt.misc.log +import com.beust.kobalt.misc.* import com.google.inject.Inject import java.io.File @@ -170,7 +164,7 @@ class RemoteDependencyData @Inject constructor(val executors: KobaltExecutors, v GraphUtil.displayGraph(it.compileDependencies, {dd: DependencyData -> dd.children }, {dd: DependencyData, indent: String -> - println(" " + indent + dd.id + " " + (if (! dd.isLatest) "(old)" else "")) + log(1, " " + indent + dd.id + " " + (if (! dd.isLatest) "(old)" else "")) }) } diff --git a/src/main/kotlin/com/beust/kobalt/plugin/application/ApplicationPlugin.kt b/src/main/kotlin/com/beust/kobalt/plugin/application/ApplicationPlugin.kt index 17e7aacf..9903e9f4 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/application/ApplicationPlugin.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/application/ApplicationPlugin.kt @@ -8,9 +8,7 @@ import com.beust.kobalt.archive.Archives import com.beust.kobalt.internal.ActorUtils import com.beust.kobalt.maven.DependencyManager import com.beust.kobalt.maven.aether.Scope -import com.beust.kobalt.misc.KFiles -import com.beust.kobalt.misc.KobaltExecutors -import com.beust.kobalt.misc.RunCommand +import com.beust.kobalt.misc.* import com.beust.kobalt.plugin.packaging.PackageConfig import com.beust.kobalt.plugin.packaging.PackagingPlugin import com.google.inject.Inject @@ -128,11 +126,11 @@ class ApplicationPlugin @Inject constructor(val configActor: ConfigActor -> - println(output.joinToString("\n")) + kobaltLog(1, output.joinToString("\n")) }, errorCallback = { output: List -> - println("ERROR") - println(output.joinToString("\n")) + kobaltLog(1, "ERROR") + kobaltLog(1, output.joinToString("\n")) } ) return TaskResult(exitCode == 0) diff --git a/src/test/kotlin/com/beust/kobalt/TestModule.kt b/src/test/kotlin/com/beust/kobalt/TestModule.kt index d132ee1f..c8fa2ce8 100644 --- a/src/test/kotlin/com/beust/kobalt/TestModule.kt +++ b/src/test/kotlin/com/beust/kobalt/TestModule.kt @@ -2,11 +2,10 @@ package com.beust.kobalt import com.beust.kobalt.api.KobaltContext import com.beust.kobalt.app.MainModule -import com.beust.kobalt.internal.ILogger -import com.beust.kobalt.internal.KobaltSettings -import com.beust.kobalt.internal.KobaltSettingsXml +import com.beust.kobalt.internal.* import com.beust.kobalt.maven.LocalRepo import com.beust.kobalt.maven.aether.KobaltMavenResolver +import com.beust.kobalt.misc.kobaltLog import com.google.common.eventbus.EventBus import com.google.inject.Provider import com.google.inject.Scopes @@ -32,7 +31,7 @@ class TestModule : MainModule(Args(), TEST_KOBALT_SETTINGS) { resolver = testResolver logger = object: ILogger { override fun log(tag: CharSequence, level: Int, message: CharSequence, newLine: Boolean) { - println("TestLog: [$tag $level] " + message) + kobaltLog(1, "TestLog: [$tag $level] " + message) } } } diff --git a/src/test/kotlin/com/beust/kobalt/internal/DynamicGraphTest.kt b/src/test/kotlin/com/beust/kobalt/internal/DynamicGraphTest.kt index 11fdb80c..64dbd5bd 100644 --- a/src/test/kotlin/com/beust/kobalt/internal/DynamicGraphTest.kt +++ b/src/test/kotlin/com/beust/kobalt/internal/DynamicGraphTest.kt @@ -61,7 +61,7 @@ class DynamicGraphTest { assertThat(transitiveClosure(3)).isEqualTo(listOf(3)) assertThat(transitiveClosure(6)).isEqualTo(listOf(6, 7)) assertThat(transitiveClosure(7)).isEqualTo(listOf(7)) - println("done") + kobaltLog(1, "done") } }