Merge pull request #145 from Cognifide/develop

Release 3.0.9

Author: pun-ky

README.md

@@ -115,7 +115,7 @@ buildscript {
     }
     
     dependencies {
-        classpath 'com.cognifide.gradle:aem-plugin:3.0.8'
+        classpath 'com.cognifide.gradle:aem-plugin:3.0.9'
     }
 }
 

build.gradle

@@ -6,7 +6,7 @@ plugins {
 }
 
 group 'com.cognifide.gradle'
-version '3.0.8'
+version '3.0.9'
 description = 'Gradle AEM Plugin'
 defaultTasks = ['clean', 'build', 'publishToMavenLocal']
 

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

@@ -454,6 +454,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/instance/Instance.kt

@@ -92,10 +92,10 @@ interface Instance : Serializable {
             return instances.filter { instance ->
                 when {
                     config.propParser.flag(AUTHORS_PROP) -> {
-                        Patterns.wildcard(instance.name, "${config.deployEnvironment}-${InstanceType.AUTHOR}")
+                        Patterns.wildcard(instance.name, "${config.deployEnvironment}-${InstanceType.AUTHOR}*")
                     }
                     config.propParser.flag(PUBLISHERS_PROP) -> {
-                        Patterns.wildcard(instance.name, "${config.deployEnvironment}-${InstanceType.PUBLISH}")
+                        Patterns.wildcard(instance.name, "${config.deployEnvironment}-${InstanceType.PUBLISH}*")
                     }
                     else -> Patterns.wildcards(instance.name, instanceFilter)
                 }

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

@@ -12,7 +12,7 @@ enum class InstanceType {
         private val AUTHOR_RULES = listOf("*02")
 
         fun byName(type: String): InstanceType {
-            return values().find { it.name.equals(type, true) }
+            return values().find { it.name.startsWith(type, true) }
                     ?: throw AemException("Invalid instance type: $type")
         }
 

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

@@ -44,7 +44,7 @@ class LocalHandle(val project: Project, val sync: InstanceSync) {
 
     val config = AemConfig.of(project)
 
-    val dir = File("${config.instancesPath}/${instance.name}")
+    val dir = File("${config.instancesPath}/${instance.typeName}")
 
     val jar = File(dir, "aem-quickstart.jar")
 

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

@@ -68,7 +68,7 @@ class LocalInstance(
         get() = ENVIRONMENT
 
     override fun toString(): String {
-        return "LocalInstance(httpUrl='$httpUrl', user='$user', password='$hiddenPassword', type='$typeName', debugPort=$debugPort)"
+        return "LocalInstance(httpUrl='$httpUrl', user='$user', password='$hiddenPassword', typeName='$typeName', debugPort=$debugPort)"
     }
 
     @Transient

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

@@ -38,7 +38,7 @@ class RemoteInstance(
     }
 
     override fun toString(): String {
-        return "RemoteInstance(httpUrl='$httpUrl', user='$user', password='$hiddenPassword', type='$typeName', environment='$environment')"
+        return "RemoteInstance(httpUrl='$httpUrl', user='$user', password='$hiddenPassword', typeName='$typeName', environment='$environment')"
     }
 
     @Transient

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

@@ -64,7 +64,7 @@ open class SatisfyTask : SyncTask() {
     // TODO shouldAwait should be controllable by each PackageGroup.awaitAfter
     private fun satisfyPackagesOnInstances(packageGroups: List<FileGroup>) {
         for (packageGroup in packageGroups) {
-            logger.info("Satisfying group of packages '$group'.")
+            logger.info("Satisfying group of packages '${packageGroup.name}'.")
 
             var shouldAwait = false
 

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() })
         }