DSL impr

Author: Krystian Panek

src/main/kotlin/com/cognifide/gradle/environment/EnvironmentPlugin.kt

@@ -24,13 +24,14 @@ class EnvironmentPlugin : CommonDefaultPlugin() {
 
     private fun Project.setupTasks() = tasks {
         val resolve = register<EnvironmentResolve>(EnvironmentResolve.NAME)
+        val hosts = register<EnvironmentHosts>(EnvironmentHosts.NAME)
 
         val down = register<EnvironmentDown>(EnvironmentDown.NAME)
         val destroy = register<EnvironmentDestroy>(EnvironmentDestroy.NAME) {
             dependsOn(down)
         }
         val up = register<EnvironmentUp>(EnvironmentUp.NAME) {
-            mustRunAfter(resolve, down, destroy)
+            mustRunAfter(hosts, resolve, down, destroy)
         }
         val restart = register<EnvironmentRestart>(EnvironmentRestart.NAME) {
             dependsOn(down, up)
@@ -48,7 +49,6 @@ class EnvironmentPlugin : CommonDefaultPlugin() {
         register<EnvironmentReload>(EnvironmentReload.NAME) {
             mustRunAfter(up)
         }
-        register<EnvironmentHosts>(EnvironmentHosts.NAME)
 
         // Runtime lifecycle
 

src/main/kotlin/com/cognifide/gradle/environment/health/HealthChecker.kt

@@ -88,6 +88,10 @@ class HealthChecker(val environment: EnvironmentExtension) {
     /**
      * Check URL using specified criteria (HTTP options and e.g text & status code assertions).
      */
+    fun http(checkName: String, url: String, statusCode: Int = HttpStatus.SC_OK) {
+        http(checkName, url) { respondsWith(statusCode) }
+    }
+
     fun http(checkName: String, url: String, containedText: String, statusCode: Int = HttpStatus.SC_OK) {
         http(checkName, url) { containsText(containedText, statusCode) }
     }

src/main/kotlin/com/cognifide/gradle/environment/health/HttpCheck.kt

@@ -22,6 +22,14 @@ class HttpCheck(val url: String) {
 
     // Shorthand methods for checking responses
 
+    fun respondsWith(statusCode: Int) {
+        check { response ->
+            checkStatus(response, statusCode)
+        }
+    }
+
+    fun respondsOk() = respondsWith(HttpStatus.SC_OK)
+
     fun containsText(text: String, statusCode: Int = HttpStatus.SC_OK) {
         check { response ->
             checkStatus(response, statusCode)