erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-26 08:27:12 -07:00
Code Releases Activity

Merge pull request #280 from ethauvin/master

Browse source 
Fix for --log -2 undocumented "quiet" feature.
This commit is contained in:
Cedric Beust 2016-07-13 17:42:39 -07:00 • committed by GitHub
commit c6072710fe
3 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Args.kt
View file

@ -42,8 +42,9 @@ class Args {
@Parameter(names = arrayOf("--listTemplates"), description = "List the available templates") @Parameter(names = arrayOf("--listTemplates"), description = "List the available templates")
var listTemplates: Boolean = false var listTemplates: Boolean = false
@Parameter(names = arrayOf("--log"), description = "Define the log level (1-3)") @Parameter(names = arrayOf("--log"), description = "Define the log level " +
var log: Int = 1 "(${Constants.LOG_DEFAULT_LEVEL}-${Constants.LOG_MAX_LEVEL})")
var log: Int = Constants.LOG_DEFAULT_LEVEL
@Parameter(names = arrayOf("--forceIncremental"), @Parameter(names = arrayOf("--forceIncremental"),
description = "Force the build to be incremental even if the build file was modified") description = "Force the build to be incremental even if the build file was modified")

4
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Constants.kt
View file

@ -3,12 +3,14 @@ package com.beust.kobalt
import com.beust.kobalt.misc.KFiles import com.beust.kobalt.misc.KFiles
object Constants { object Constants {
const val LOG_DEFAULT_LEVEL = 1
const val LOG_MAX_LEVEL = 3
val BUILD_FILE_NAME = "Build.kt" val BUILD_FILE_NAME = "Build.kt"
val BUILD_FILE_DIRECTORY = "kobalt/src" val BUILD_FILE_DIRECTORY = "kobalt/src"
val BUILD_FILE_PATH = KFiles.joinDir(BUILD_FILE_DIRECTORY, BUILD_FILE_NAME) val BUILD_FILE_PATH = KFiles.joinDir(BUILD_FILE_DIRECTORY, BUILD_FILE_NAME)
internal val DEFAULT_REPOS = listOf<String>( internal val DEFAULT_REPOS = listOf<String>(
// "https://maven-central.storage.googleapis.com/", // "https://maven-central.storage.googleapis.com/",
"http://repo1.maven.org/maven2/", "http://repo1.maven.org/maven2/",
"https://jcenter.bintray.com/", "https://jcenter.bintray.com/",
"http://repository.jetbrains.com/all/" "http://repository.jetbrains.com/all/"

18
src/main/kotlin/com/beust/kobalt/Main.kt
View file

@ -33,7 +33,11 @@ private fun parseArgs(argv: Array<String>): Main.RunInfo {
val args = Args() val args = Args()
val result = JCommander(args) val result = JCommander(args)
result.parse(*argv) result.parse(*argv)
KobaltLogger.LOG_LEVEL = args.log KobaltLogger.LOG_LEVEL = if (args.log < 0) {
Constants.LOG_DEFAULT_LEVEL
} else if (args.log > Constants.LOG_MAX_LEVEL) {
Constants.LOG_MAX_LEVEL
} else args.log
return Main.RunInfo(result, args) return Main.RunInfo(result, args)
} }
@ -68,7 +72,7 @@ private class Main @Inject constructor(
data class RunInfo(val jc: JCommander, val args: Args) data class RunInfo(val jc: JCommander, val args: Args)
private fun installCommandLinePlugins(args: Args) : ClassLoader { private fun installCommandLinePlugins(args: Args): ClassLoader {
var pluginClassLoader = javaClass.classLoader var pluginClassLoader = javaClass.classLoader
val dependencies = arrayListOf<IClasspathDependency>() val dependencies = arrayListOf<IClasspathDependency>()
args.pluginIds?.let { args.pluginIds?.let {
@ -117,7 +121,7 @@ private class Main @Inject constructor(
} }
} }
if (! args.update) { if (!args.update) {
log(1, if (result != 0) "BUILD FAILED: $result" else "BUILD SUCCESSFUL ($seconds seconds)") log(1, if (result != 0) "BUILD FAILED: $result" else "BUILD SUCCESSFUL ($seconds seconds)")
updateKobalt.checkForNewVersion(latestVersionFuture) updateKobalt.checkForNewVersion(latestVersionFuture)
@ -156,9 +160,9 @@ private class Main @Inject constructor(
} else if (args.serverMode) { } else if (args.serverMode) {
// --server // --server
val port = serverFactory.create(args.force, args.port, val port = serverFactory.create(args.force, args.port,
{ buildFile -> projectFinder.initForBuildFile(BuildFile(Paths.get(buildFile), buildFile), args)}, { buildFile -> projectFinder.initForBuildFile(BuildFile(Paths.get(buildFile), buildFile), args) },
{ cleanUp() }) { cleanUp() })
.call() .call()
} else { } else {
// Options that don't need Build.kt to be parsed first // Options that don't need Build.kt to be parsed first
if (args.gc) { if (args.gc) {
@ -183,7 +187,7 @@ private class Main @Inject constructor(
if (args.projectInfo) { if (args.projectInfo) {
// --projectInfo // --projectInfo
allProjects.forEach { allProjects.forEach {
resolveDependency.run(it.compileDependencies.map {it.id}) resolveDependency.run(it.compileDependencies.map { it.id })
} }
} else if (args.dependencies != null) { } else if (args.dependencies != null) {
// --resolve // --resolve
@ -217,7 +221,7 @@ private class Main @Inject constructor(
return result return result
} }
private fun findBuildFile() : File { private fun findBuildFile(): File {
val deprecatedLocation = File(Constants.BUILD_FILE_NAME) val deprecatedLocation = File(Constants.BUILD_FILE_NAME)
val result: File = val result: File =
if (deprecatedLocation.exists()) { if (deprecatedLocation.exists()) {