Merge pull request #144 from Cognifide/satisfy-minor-impr

Minor satisfy improvements (better logging)

Author: pun-ky

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

@@ -452,6 +452,10 @@ class AemConfig(
         instance(RemoteInstance.create(httpUrl, environment))
     }
 
+    fun remoteInstance(httpUrl: String, user: String, password: String) {
+        instance(RemoteInstance.create(httpUrl, user, password, deployEnvironment))
+    }
+
     fun remoteInstance(httpUrl: String, user: String, password: String, environment: String) {
         instance(RemoteInstance.create(httpUrl, user, password, environment))
     }

src/main/kotlin/com/cognifide/gradle/aem/pkg/deploy/DeployTask.kt

@@ -1,6 +1,7 @@
 package com.cognifide.gradle.aem.pkg.deploy
 
 import com.cognifide.gradle.aem.api.AemTask
+import com.cognifide.gradle.aem.instance.Instance
 import org.gradle.api.tasks.TaskAction
 
 open class DeployTask : SyncTask() {
@@ -17,7 +18,7 @@ open class DeployTask : SyncTask() {
     @TaskAction
     fun deploy() {
         if (config.deployDistributed) {
-            synchronizeInstances({ it.distributePackage() }, filterInstances(config.deployInstanceAuthorName))
+            synchronizeInstances({ it.distributePackage() }, Instance.filter(project, config.deployInstanceAuthorName))
         } else {
             synchronizeInstances({ it.deployPackage() })
         }

src/main/kotlin/com/cognifide/gradle/aem/pkg/deploy/SyncTask.kt

@@ -11,15 +11,24 @@ abstract class SyncTask : AemDefaultTask() {
     protected val propertyParser = PropertyParser(project)
 
     protected fun synchronizeInstances(synchronizer: (InstanceSync) -> Unit) {
-        synchronizeInstances(synchronizer, filterInstances())
+        synchronizeInstances(synchronizer, Instance.filter(project))
     }
 
     protected fun <T : Instance> synchronizeInstances(synchronizer: (InstanceSync) -> Unit, instances: List<T>) {
-        val callback = { instance: T -> synchronizeInstance(synchronizer, instance) }
-        if (config.deployParallel) {
-            instances.parallelStream().forEach(callback)
+        synchronizeInstances(instances, { instance: T -> synchronizeInstance(synchronizer, instance) })
+    }
+
+    protected fun <T : Instance> synchronizeInstances(instances: List<T>, callback: (T) -> Unit) {
+        if (instances.isEmpty()) {
+            logger.warn("No instances to synchronize. Verify deploy instance name filter '${config.deployInstanceName}' and defined instances name (environment-type).")
         } else {
-            instances.onEach(callback)
+            if (config.deployParallel) {
+                logger.info("Synchronizing ${instances.size} instance(s) in parallel mode")
+                instances.parallelStream().forEach(callback)
+            } else {
+                logger.info("Synchronizing ${instances.size} instance(s) in sequential mode")
+                instances.onEach(callback)
+            }
         }
     }
 
@@ -30,7 +39,7 @@ abstract class SyncTask : AemDefaultTask() {
     }
 
     protected fun synchronizeLocalInstances(handler: (LocalHandle) -> Unit) {
-        Instance.locals(project).forEach { instance -> synchronizeLocalInstance(handler, instance) }
+        synchronizeInstances(Instance.locals(project), { instance -> synchronizeLocalInstance(handler, instance) })
     }
 
     protected fun synchronizeLocalInstance(handler: (LocalHandle) -> Unit, instance: LocalInstance) {
@@ -39,16 +48,8 @@ abstract class SyncTask : AemDefaultTask() {
         handler(LocalHandle(project, InstanceSync(project, instance)))
     }
 
-    protected fun filterInstances(): List<Instance> {
-        return Instance.filter(project)
-    }
-
-    protected fun filterInstances(instanceGroup: String): List<Instance> {
-        return Instance.filter(project, instanceGroup)
-    }
-
     protected fun awaitStableInstances() {
-        InstanceActions(project).awaitStable(filterInstances())
+        InstanceActions(project).awaitStable(Instance.filter(project))
     }
 
     protected fun awaitStableLocalInstances() {