From fa1e2d76baf0d5c62639f66176badddc63d44e27 Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Thu, 15 Oct 2015 20:59:58 -0700 Subject: [PATCH] Ascii art. --- src/main/kotlin/com/beust/kobalt/AsciiArt.kt | 53 +++++++++++++++++++ src/main/kotlin/com/beust/kobalt/Banner.kt | 25 --------- src/main/kotlin/com/beust/kobalt/Main.kt | 2 +- .../com/beust/kobalt/internal/TaskManager.kt | 29 +--------- 4 files changed, 56 insertions(+), 53 deletions(-) create mode 100644 src/main/kotlin/com/beust/kobalt/AsciiArt.kt delete mode 100644 src/main/kotlin/com/beust/kobalt/Banner.kt diff --git a/src/main/kotlin/com/beust/kobalt/AsciiArt.kt b/src/main/kotlin/com/beust/kobalt/AsciiArt.kt new file mode 100644 index 00000000..7c6ac39c --- /dev/null +++ b/src/main/kotlin/com/beust/kobalt/AsciiArt.kt @@ -0,0 +1,53 @@ +package com.beust.kobalt + +import com.beust.kobalt.misc.log +import java.util.* + + +class AsciiArt { + companion object { + private val BANNERS = arrayOf( + " __ __ __ __ __ \n" + + " / //_/ ____ / /_ ____ _ / / / /_\n" + + " / ,< / __ \\ / __ \\ / __ `/ / / / __/\n" + + " / /| | / /_/ / / /_/ // /_/ / / / / /_ \n" + + " /_/ |_| \\____/ /_.___/ \\__,_/ /_/ \\__/ ", + + " _ __ _ _ _ \n" + + " | |/ / ___ | |__ __ _ | | | |_ \n" + + " | ' / / _ \\ | '_ \\ / _` | | | | __|\n" + + " | . \\ | (_) | | |_) | | (_| | | | | |_ \n" + + " |_|\\_\\ \\___/ |_.__/ \\__,_| |_| \\__| " + ) + + val banner : String get() = BANNERS.get(Random().nextInt(BANNERS.size())) + + fun box(s: String) : List { + val ul = "\u2554" + val ur = "\u2557" + val h = "\u2550" + val v = "\u2551" + val bl = "\u255a" + val br = "\u255d" + + fun r(n: Int, w: String) : String { + with(StringBuffer()) { + repeat(n, { append(w) }) + return toString() + } + } + + return arrayListOf( + ul + r(s.length() + 2, h) + ur, + "$v $s $v", + bl + r(s.length() + 2, h) + br) + } + + fun logBox(s: String) { + box(s).forEach { + log(1, " $it") + } + } + } +} + diff --git a/src/main/kotlin/com/beust/kobalt/Banner.kt b/src/main/kotlin/com/beust/kobalt/Banner.kt deleted file mode 100644 index 4884034c..00000000 --- a/src/main/kotlin/com/beust/kobalt/Banner.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.beust.kobalt - -import java.util.* - - -class Banner { - companion object { - val BANNERS = arrayOf( - " __ __ __ __ __ \n" + - " / //_/ ____ / /_ ____ _ / / / /_\n" + - " / ,< / __ \\ / __ \\ / __ `/ / / / __/\n" + - " / /| | / /_/ / / /_/ // /_/ / / / / /_ \n" + - " /_/ |_| \\____/ /_.___/ \\__,_/ /_/ \\__/ ", - - " _ __ _ _ _ \n" + - " | |/ / ___ | |__ __ _ | | | |_ \n" + - " | ' / / _ \\ | '_ \\ / _` | | | | __|\n" + - " | . \\ | (_) | | |_) | | (_| | | | | |_ \n" + - " |_|\\_\\ \\___/ |_.__/ \\__,_| |_| \\__| " - ) - - fun get() = BANNERS.get(Random().nextInt(BANNERS.size())) - } -} - diff --git a/src/main/kotlin/com/beust/kobalt/Main.kt b/src/main/kotlin/com/beust/kobalt/Main.kt index 52e6b1d8..cfe9ac4b 100644 --- a/src/main/kotlin/com/beust/kobalt/Main.kt +++ b/src/main/kotlin/com/beust/kobalt/Main.kt @@ -55,7 +55,7 @@ private class Main @Inject constructor( var result = 0 val latestVersionFuture = github.latestKobaltVersion benchmark("Build", { - println(Banner.get() + Kobalt.version + "\n") + println(AsciiArt.banner + Kobalt.version + "\n") // runTest() result = runWithArgs(jc, args) executors.shutdown() diff --git a/src/main/kotlin/com/beust/kobalt/internal/TaskManager.kt b/src/main/kotlin/com/beust/kobalt/internal/TaskManager.kt index 24b536ce..78832af2 100644 --- a/src/main/kotlin/com/beust/kobalt/internal/TaskManager.kt +++ b/src/main/kotlin/com/beust/kobalt/internal/TaskManager.kt @@ -1,6 +1,7 @@ package com.beust.kobalt.internal import com.beust.kobalt.Args +import com.beust.kobalt.AsciiArt import com.beust.kobalt.Plugins import com.beust.kobalt.api.PluginTask import com.beust.kobalt.api.Project @@ -43,32 +44,6 @@ public class TaskManager @Inject constructor(val plugins: Plugins, val args: Arg fun matches(projectName: String) = project == null || project == projectName } - fun box(s: String) : List { - val ul = "\u2554" - val ur = "\u2557" - val h = "\u2550" - val v = "\u2551" - val bl = "\u255a" - val br = "\u255d" - - fun r(n: Int, w: String) : String { - with(StringBuffer()) { - repeat(n, { append(w) }) - return toString() - } - } - - return arrayListOf( - ul + r(s.length() + 2, h) + ur, - "$v $s $v", - bl + r(s.length() + 2, h) + br) - } - - fun logBox(s: String) { - box(s).forEach { - log(1, " $it") - } - } public fun runTargets(targets: List, projects: List) : Int { var result = 0 projects.forEach { project -> @@ -80,7 +55,7 @@ public class TaskManager @Inject constructor(val plugins: Plugins, val args: Arg tasksByNames.put(it.name, it) } - logBox("Building project ${project.name}") + AsciiArt.logBox("Building project ${project.name}") val graph = DynamicGraph() targets.forEach { target ->