Merge pull request #1 from Cognifide/ux-improvements

UX improvements

Author: Krystian Panek

src/main/kotlin/com/cognifide/gradle/environment/docker/Docker.kt

@@ -47,7 +47,9 @@ class Docker(val environment: EnvironmentExtension) {
 
     val configPath get() = runtime.determinePath(environment.sourceDir.get().asFile)
 
-    val rootPath get() = runtime.determinePath(environment.rootDir.get().asFile)
+    val workPath get() = runtime.determinePath(environment.rootDir.get().asFile)
+
+    val rootPath get() = runtime.determinePath(environment.project.rootProject.projectDir)
 
     fun init() {
         syncComposeFile()

src/main/kotlin/com/cognifide/gradle/environment/docker/container/DevOptions.kt

@@ -13,4 +13,8 @@ class DevOptions(val container: Container) {
     fun watchConfigDir(vararg paths: String) = paths.forEach {
         watchDir(container.host.configDir.dir(it))
     }
+
+    fun watchRootDir(vararg paths: String) = paths.forEach {
+        watchDir(container.environment.project.rootProject.layout.projectDirectory.dir(it))
+    }
 }

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

@@ -50,7 +50,7 @@ class HealthChecker(val environment: EnvironmentExtension) {
                     reset()
 
                     step = when {
-                        no > 1 -> "Health rechecking (attempt $no/${retry.times}, ${failed.size} ${if (failed.size == 1) "check" else "checks"} failed)"
+                        no > 1 -> "Health rechecking (attempt ${no - 1}/${retry.times}, ${failed.size} ${if (failed.size == 1) "check" else "checks"} failed)"
                         else -> "Health checking"
                     }
 
@@ -74,7 +74,8 @@ class HealthChecker(val environment: EnvironmentExtension) {
                     logger.info(message)
                 }
             } catch (e: EnvironmentException) {
-                val message = "Environment health check(s) failed. Success ratio: $count:\n${all.joinToString("\n")}"
+                val message = "Environment health check(s) failed. Success ratio: $count:\n" +
+                        all.sortedWith(compareBy({ it.passed }, { it.check.name })).joinToString("\n")
                 if (!verbose) {
                     logger.error(message)
                 } else {