diff --git a/src/main/kotlin/net/thauvin/erik/kobalt/plugin/versioneye/Utils.kt b/src/main/kotlin/net/thauvin/erik/kobalt/plugin/versioneye/Utils.kt index 42d4063..b5b15f1 100644 --- a/src/main/kotlin/net/thauvin/erik/kobalt/plugin/versioneye/Utils.kt +++ b/src/main/kotlin/net/thauvin/erik/kobalt/plugin/versioneye/Utils.kt @@ -36,6 +36,15 @@ import com.beust.kobalt.misc.log open class Utils { companion object { + // Non-colors failure + fun alt(failed: Boolean): String { + if (failed) { + return " [FAILED]" + } + + return "" + } + // Match failure option in set fun isFail(failOn: Set, match: Fail): Boolean { return failOn.contains(match) diff --git a/src/main/kotlin/net/thauvin/erik/kobalt/plugin/versioneye/VersionEyePlugin.kt b/src/main/kotlin/net/thauvin/erik/kobalt/plugin/versioneye/VersionEyePlugin.kt index 3eabadb..d309fae 100644 --- a/src/main/kotlin/net/thauvin/erik/kobalt/plugin/versioneye/VersionEyePlugin.kt +++ b/src/main/kotlin/net/thauvin/erik/kobalt/plugin/versioneye/VersionEyePlugin.kt @@ -231,10 +231,10 @@ class VersionEyePlugin @Inject constructor(val configActor: ConfigActor 0 + val isFailLicense = Utils.isFail(config.failSet, Fail.licensesCheck) && licenses_red > 0 + val isFailUnknown = Utils.isFail(config.failSet, Fail.licensesUnknownCheck) && licenses_unknown > 0 + val isFailSecurity = Utils.isFail(config.failSet, Fail.securityCheck) && sv_count > 0 // Unknown dependencies var unknownDeps = 0 @@ -258,14 +258,14 @@ class VersionEyePlugin @Inject constructor(val configActor: ConfigActor UNKNOWN", unknownDeps, false, config.colors)) + depsInfo.append(Utils.redLight(" - $depName -> UNKNOWN", unknownDeps, false, config.colors)) } else if (dep.get("outdated").asBoolean) { if (depsInfo.isNotEmpty()) { depsInfo.append(lf) } depsInfo.append(Utils.redLight(" - $depName -> " - + curVer.asString, out_number, isFailDeps, config.colors)) + + curVer.asString, out_number, isFailDeps, config.colors) + + Utils.alt(isFailDeps && !config.colors)) } // Parse licenses @@ -297,7 +297,8 @@ class VersionEyePlugin @Inject constructor(val configActor: ConfigActor 1 || config.verbose) - val alt = " [FAILED]" // Log dependencies check results log(1, " Dependencies: " + Utils.redLight(out_number, isFailDeps, config.colors) + " outdated. " + Utils.redLight(unknownDeps, false, config.colors) + " unknown. $dep_number total." - + if (isFailDeps && !config.colors) alt else "") + + Utils.alt(isFailDeps && !config.colors)) Utils.log(depsInfo, verbose) // Log licenses check results log(1, " Licenses: " - + Utils.redLight(licenses_red, isFailLicense, config.colors) - + " whitelist. " + + Utils.redLight(licenses_red, isFailLicense, config.colors) + " whitelist. " + Utils.redLight(licenses_unknown, isFailUnknown, config.colors) + Utils.plural(" unknown", licenses_unknown, "s.", ".") - + if ((isFailLicense || isFailUnknown) && !config.colors) alt else "") + + Utils.alt((isFailLicense || isFailUnknown) && !config.colors)) Utils.log(licensesInfo, verbose) // Log security check results @@ -347,7 +348,7 @@ class VersionEyePlugin @Inject constructor(val configActor: ConfigActor 0 && isFailDeps - || licenses_red > 0 && isFailLicense - || licenses_unknown > 0 && isFailUnknown - || sv_count > 0 && isFailSecurity) { + if (isFailDeps || isFailLicense || isFailUnknown || isFailSecurity) { return TaskResult(false) } }