erik/semver-gradle
erik/semver-gradle
1
1
Fork 0
Code Issues Pull requests Releases Activity

Added keysPrefix property.

Browse source
This commit is contained in:
Erik C. Thauvin 2018-06-30 18:10:41 -07:00
parent 884cb69039
commit ce67c4124b
8 changed files with 246 additions and 381 deletions
Download patch file Download diff file Expand all files Collapse all files

43
src/main/kotlin/net/thauvin/erik/gradle/semver/SemverConfig.kt
View file

@ -33,39 +33,34 @@ package net.thauvin.erik.gradle.semver
open class SemverConfig {
companion object {
const val DEFAULT_KEY_PREFIX = "version."
const val DEFAULT_PROPERTIES = "${DEFAULT_KEY_PREFIX}properties"
const val DEFAULT_MAJOR_KEY = "${DEFAULT_KEY_PREFIX}major"
const val DEFAULT_MINOR_KEY = "${DEFAULT_KEY_PREFIX}minor"
const val DEFAULT_PATCH_KEY = "${DEFAULT_KEY_PREFIX}patch"
const val DEFAULT_PRERELEASE_KEY = "${DEFAULT_KEY_PREFIX}prerelease"
const val DEFAULT_PRERELEASE_PREFIX_KEY = "${DEFAULT_KEY_PREFIX}prerelease.prefix"
const val DEFAULT_BUILDMETA_KEY = "${DEFAULT_KEY_PREFIX}buildmeta"
const val DEFAULT_BUILDMETA_PREFIX_KEY = "${DEFAULT_KEY_PREFIX}buildmeta.prefix"
const val DEFAULT_SEPARATOR = "${DEFAULT_KEY_PREFIX}separator"
const val DEFAULT_KEYS_PREFIX = "version."
const val DEFAULT_PROPERTIES = "properties"
const val DEFAULT_MAJOR_KEY = "major"
const val DEFAULT_MINOR_KEY = "minor"
const val DEFAULT_PATCH_KEY = "patch"
const val DEFAULT_PRERELEASE_KEY = "prerelease"
const val DEFAULT_PRERELEASE_PREFIX_KEY = "prerelease.prefix"
const val DEFAULT_BUILDMETA_KEY = "buildmeta"
const val DEFAULT_BUILDMETA_PREFIX_KEY = "buildmeta.prefix"
const val DEFAULT_SEPARATOR = "separator"
}
var properties = DEFAULT_PROPERTIES
var majorKey = DEFAULT_MAJOR_KEY
get() = "$keysPrefix$field"
var minorKey = DEFAULT_MINOR_KEY
get() = "$keysPrefix$field"
var patchKey = DEFAULT_PATCH_KEY
get() = "$keysPrefix$field"
var preReleaseKey = DEFAULT_PRERELEASE_KEY
get() = "$keysPrefix$field"
var preReleasePrefixKey = DEFAULT_PRERELEASE_PREFIX_KEY
get() = "$keysPrefix$field"
var buildMetaKey = DEFAULT_BUILDMETA_KEY
get() = "$keysPrefix$field"
var buildMetaPrefixKey = DEFAULT_BUILDMETA_PREFIX_KEY
get() = "$keysPrefix$field"
var separatorKey = DEFAULT_SEPARATOR
@Suppress("unused")
fun setKeysPrefix(keyPrefix: String) {
if (keyPrefix.isNotBlank()) {
majorKey = keyPrefix + majorKey.removePrefix(DEFAULT_KEY_PREFIX)
minorKey = keyPrefix + minorKey.removePrefix(DEFAULT_KEY_PREFIX)
patchKey = keyPrefix + patchKey.removePrefix(DEFAULT_KEY_PREFIX)
preReleaseKey = keyPrefix + preReleaseKey.removePrefix(DEFAULT_KEY_PREFIX)
preReleasePrefixKey = keyPrefix + preReleasePrefixKey.removePrefix(DEFAULT_KEY_PREFIX)
buildMetaKey = keyPrefix + buildMetaKey.removePrefix(DEFAULT_KEY_PREFIX)
buildMetaPrefixKey = keyPrefix + buildMetaPrefixKey.removePrefix(DEFAULT_KEY_PREFIX)
separatorKey = keyPrefix + separatorKey.removePrefix(DEFAULT_KEY_PREFIX)
}
}
get() = "$keysPrefix$field"
var keysPrefix = DEFAULT_KEYS_PREFIX
}

6
src/main/kotlin/net/thauvin/erik/gradle/semver/Version.kt
View file

@ -59,12 +59,12 @@ class Version {
fun increment(isMajor: Boolean = false, isMinor: Boolean = false, isPatch: Boolean = false) {
if (isMajor) {
major = (major.toInt() + 1).toString()
minor = "0"
patch = "0"
minor = DEFAULT_MINOR
patch = DEFAULT_PATCH
}
if (isMinor) {
minor = (minor.toInt() + 1).toString()
patch = "0"
patch = DEFAULT_PATCH
}
if (isPatch) patch = (patch.toInt() + 1).toString()
}

8
src/test/kotlin/net/thauvin/erik/gradle/semver/SemverConfigSpec.kt
View file

@ -44,7 +44,6 @@ object SemverConfigSpec : Spek({
given("a config") {
val config = SemverConfig()
val vars = listOf(
config.properties,
config.majorKey,
config.minorKey,
config.patchKey,
@ -55,7 +54,6 @@ object SemverConfigSpec : Spek({
config.separatorKey
)
val defaults = listOf(
SemverConfig.DEFAULT_PROPERTIES,
SemverConfig.DEFAULT_MAJOR_KEY,
SemverConfig.DEFAULT_MINOR_KEY,
SemverConfig.DEFAULT_PATCH_KEY,
@ -67,13 +65,13 @@ object SemverConfigSpec : Spek({
)
on("defaults") {
defaults.forEachIndexed { i, d ->
it("should be the same: ${vars[i]}, $d") {
assertTrue(vars[i] == d)
it("should be the same: ${vars[i]}, ${config.keysPrefix}$d") {
assertTrue(vars[i] == "${config.keysPrefix}$d")
}
}
}
on("set keys to test.xxx") {
config.setKeysPrefix("test.")
config.keysPrefix = "test."
val keys = listOf(
config.majorKey,
config.minorKey,