From d3ebf2689eda78ed9fe63ecf044db7129a1cb994 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Wed, 10 Apr 2019 22:28:18 -0700
Subject: [PATCH] Reworked hasEnv to isNotSystemProperty.

---
 .../kotlin/net/thauvin/erik/gradle/semver/SemverPlugin.kt     | 3 ++-
 src/main/kotlin/net/thauvin/erik/gradle/semver/Utils.kt       | 4 ++--
 src/test/kotlin/net/thauvin/erik/gradle/semver/UtilsSpec.kt   | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/kotlin/net/thauvin/erik/gradle/semver/SemverPlugin.kt b/src/main/kotlin/net/thauvin/erik/gradle/semver/SemverPlugin.kt
index 11f6fa7..774787d 100644
--- a/src/main/kotlin/net/thauvin/erik/gradle/semver/SemverPlugin.kt
+++ b/src/main/kotlin/net/thauvin/erik/gradle/semver/SemverPlugin.kt
@@ -76,7 +76,8 @@ class SemverPlugin : Plugin<Project> {
 
                         val requiredProps = setOf(config.majorKey, config.minorKey, config.patchKey,
                             config.preReleaseKey, config.buildMetaKey)
-                        hasReqProps = stringPropertyNames().containsAll(requiredProps) && !Utils.hasEnv(requiredProps)
+                        hasReqProps = stringPropertyNames().containsAll(requiredProps) &&
+                            Utils.isNotSystemProperty(requiredProps)
 
                         version.major = Utils.loadProperty(this, config.majorKey, Version.DEFAULT_MAJOR)
                         version.minor = Utils.loadProperty(this, config.minorKey, Version.DEFAULT_MINOR)
diff --git a/src/main/kotlin/net/thauvin/erik/gradle/semver/Utils.kt b/src/main/kotlin/net/thauvin/erik/gradle/semver/Utils.kt
index cdbca54..f1497f1 100644
--- a/src/main/kotlin/net/thauvin/erik/gradle/semver/Utils.kt
+++ b/src/main/kotlin/net/thauvin/erik/gradle/semver/Utils.kt
@@ -14,9 +14,9 @@ import java.util.Properties
  * @since 1.0
  */
 object Utils {
-    fun hasEnv(keys: Set<String>): Boolean {
+    fun isNotSystemProperty(keys: Set<String>): Boolean {
         keys.forEach {
-            if (System.getProperties().containsKey(it)) return true
+            if (!System.getProperties().containsKey(it)) return true
         }
         return false
     }
diff --git a/src/test/kotlin/net/thauvin/erik/gradle/semver/UtilsSpec.kt b/src/test/kotlin/net/thauvin/erik/gradle/semver/UtilsSpec.kt
index 71f5ac8..87f5419 100644
--- a/src/test/kotlin/net/thauvin/erik/gradle/semver/UtilsSpec.kt
+++ b/src/test/kotlin/net/thauvin/erik/gradle/semver/UtilsSpec.kt
@@ -87,7 +87,7 @@ object UtilsSpec : Spek({
                 Pair(config.preReleaseKey, "beta"),
                 Pair(config.buildMetaKey, "007"))
             it("should have none of our properties") {
-                assertFalse(Utils.hasEnv(setOf(config.majorKey, config.minorKey, config.patchKey, config.preReleaseKey,
+                assertFalse(Utils.isNotSystemProperty(setOf(config.majorKey, config.minorKey, config.patchKey, config.preReleaseKey,
                     config.buildMetaKey)))
             }
             it("version should match system properties") {