Merge pull request #58 from Cognifide/await-improvement

Await delay with progress visible and force redeploy(resatisfy) snapshot packages

Author: pun-ky

src/main/kotlin/com/cognifide/gradle/aem/AemConfig.kt

@@ -84,6 +84,13 @@ open class AemConfig(project: Project) : Serializable {
     @Input
     var deployParallel: Boolean = false
 
+    /**
+     * CRX package name conventions indicating that package can change over time while having
+     * same version specified.
+     */
+    @Input
+    var deploySnapshots: List<String> = mutableListOf("**/*-SNAPSHOT.zip")
+
     /**
      * Force upload CRX package regardless if it was previously uploaded.
      */
@@ -256,7 +263,7 @@ open class AemConfig(project: Project) : Serializable {
      * actual operation being performed on AEM like starting JCR package installation or even creating launchpad.
      */
     @Input
-    var awaitDelay: Int = 3000
+    var awaitDelay: Int = 5000
 
     /**
      * Time in milliseconds used as interval between next instance stability checks being performed.

src/main/kotlin/com/cognifide/gradle/aem/AemPackagePlugin.kt

@@ -114,7 +114,10 @@ class AemPackagePlugin : Plugin<Project> {
             val desiredTaskName = if (project == project.rootProject) {
                 BuildTask.NAME
             } else {
-                "aem${CaseFormat.LOWER_HYPHEN.to(CaseFormat.UPPER_CAMEL, project.path.replace(":", "-"))}Build"
+                val projectPath = project.path
+                        .replace(":", "-")
+                        .replace(".", "-")
+                "aem${CaseFormat.LOWER_HYPHEN.to(CaseFormat.UPPER_CAMEL, projectPath)}Build"
             }
 
             if (taskName == desiredTaskName) {

src/main/kotlin/com/cognifide/gradle/aem/instance/InstanceActions.kt

@@ -12,22 +12,12 @@ object InstanceActions {
         val config = AemConfig.of(project)
         val logger = project.logger
 
-        if (config.awaitDelay > 0) {
-            logger.info("Delaying instance stability checking")
-            Behaviors.waitFor(config.awaitDelay)
-        }
-
         val progressLogger = ProgressLogger(project, "Awaiting stable instance(s)")
 
         progressLogger.started()
 
         var lastInstanceStates = -1
         Behaviors.waitUntil(config.awaitInterval, { timer ->
-            if (config.awaitTimes > 0 && timer.ticks > config.awaitTimes) {
-                logger.warn("Instance(s) are not stable. Timeout reached after ${Formats.duration(timer.elapsed)}")
-                return@waitUntil false
-            }
-
             val instanceStates = instances.map { InstanceState(project, it) }
             if (instanceStates.hashCode() != lastInstanceStates) {
                 lastInstanceStates = instanceStates.hashCode()
@@ -37,6 +27,15 @@ object InstanceActions {
             val instanceProgress = instanceStates.joinToString(" | ") { progressFor(it, timer.ticks, config.awaitTimes) }
             progressLogger.progress(instanceProgress)
 
+            if (config.awaitDelay > 0 && timer.elapsed < config.awaitDelay) {
+                return@waitUntil true
+            }
+
+            if (config.awaitTimes > 0 && timer.ticks > config.awaitTimes) {
+                logger.warn("Instance(s) are not stable. Timeout reached after ${Formats.duration(timer.elapsed)}")
+                return@waitUntil false
+            }
+
             if (instanceStates.all { it.stable }) {
                 logger.info("Instance(s) are stable after ${Formats.duration(timer.elapsed)}")
                 return@waitUntil false

src/main/kotlin/com/cognifide/gradle/aem/instance/InstanceSync.kt

@@ -3,6 +3,7 @@ package com.cognifide.gradle.aem.instance
 import com.cognifide.gradle.aem.AemConfig
 import com.cognifide.gradle.aem.AemPackagePlugin
 import com.cognifide.gradle.aem.deploy.*
+import com.cognifide.gradle.aem.internal.Patterns
 import org.apache.commons.httpclient.HttpClient
 import org.apache.commons.httpclient.HttpMethod
 import org.apache.commons.httpclient.HttpStatus
@@ -173,15 +174,15 @@ class InstanceSync(val project: Project, val instance: Instance) {
         try {
             val json = sync.post(url, mapOf(
                     "package" to file,
-                    "force" to config.uploadForce
+                    "force" to (config.uploadForce || isSnapshot(file))
             ))
             val response = UploadResponse.fromJson(json)
 
             if (response.isSuccess) {
                 logger.info(response.msg)
             } else {
                 logger.error(response.msg)
-                throw DeployException(response.msg.orEmpty())
+                throw DeployException(response.msg)
             }
 
             return response
@@ -237,15 +238,19 @@ class InstanceSync(val project: Project, val instance: Instance) {
             deployPackage(file)
             true
         } else {
-            if (pkg.installed) {
-                false
-            } else {
+            if (!pkg.installed || isSnapshot(file)) {
                 deployPackage(file)
                 true
+            } else {
+               false
             }
         }
     }
 
+    fun isSnapshot(file: File): Boolean {
+        return Patterns.wildcard(file, config.deploySnapshots)
+    }
+
     fun deployPackage(file: File = determineLocalPackage()): InstallResponse {
         return installPackage(uploadPackage(file).path)
     }

src/main/kotlin/com/cognifide/gradle/aem/instance/RemoteInstance.kt

@@ -16,7 +16,7 @@ class RemoteInstance(
             httpUrl,
             Instance.USER_DEFAULT,
             Instance.PASSWORD_DEFAULT,
-            InstanceType.byUrl(httpUrl).name,
+            InstanceType.byUrl(httpUrl).name.toLowerCase(),
             environment
     )
 

src/main/kotlin/com/cognifide/gradle/aem/internal/PropertyParser.kt

@@ -1,11 +1,11 @@
 package com.cognifide.gradle.aem.internal
 
-import com.mitchellbosecke.pebble.PebbleEngine
-import com.mitchellbosecke.pebble.lexer.Syntax
-import com.mitchellbosecke.pebble.loader.StringLoader
 import com.cognifide.gradle.aem.AemConfig
 import com.cognifide.gradle.aem.AemException
 import com.cognifide.gradle.aem.vlt.SyncTask
+import com.mitchellbosecke.pebble.PebbleEngine
+import com.mitchellbosecke.pebble.lexer.Syntax
+import com.mitchellbosecke.pebble.loader.StringLoader
 import org.apache.commons.lang3.BooleanUtils
 import org.apache.commons.lang3.ClassUtils
 import org.apache.commons.lang3.text.StrSubstitutor
@@ -53,6 +53,10 @@ class PropertyParser(val project: Project) {
         return value
     }
 
+    fun flag(name: String) : Boolean {
+        return project.properties.containsKey(name) && BooleanUtils.toBoolean(project.properties[name] as String?)
+    }
+
     fun prop(name: String, defaultValue: () -> String): String {
         return prop(name) ?: defaultValue()
     }
@@ -136,8 +140,12 @@ class PropertyParser(val project: Project) {
 
     private fun isUniqueProjectName() = project == project.rootProject || project.name == project.rootProject.name
 
+    fun isForce(): Boolean {
+        return flag(FORCE_PROP)
+    }
+
     fun checkForce(message: String = FORCE_MESSAGE) {
-        if (!project.properties.containsKey(FORCE_PROP) || !BooleanUtils.toBoolean(project.properties[FORCE_PROP] as String?)) {
+        if (!isForce()) {
             throw AemException("Warning! This task execution must be confirmed by specifying explicitly parameter '-P$FORCE_PROP=true'. $message")
         }
     }