Merge pull request #34 from Cognifide/deploy-rule-task

Deploy rule task

Author: pun-ky

build.gradle

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

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

@@ -203,10 +203,9 @@ data class AemConfig(
      * Initialize defaults that depends on concrete type of project.
      */
     fun configure(task: DefaultTask) {
-        // Default values
         val project = task.project
 
-        if (project.path == project.rootProject.path) {
+        if (project == project.rootProject) {
             bundlePath = "/apps/${project.name}/install"
         } else {
             bundlePath = "/apps/${project.rootProject.name}/${project.name}/install"

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

@@ -7,6 +7,7 @@ import com.cognifide.gradle.aem.vlt.CheckoutTask
 import com.cognifide.gradle.aem.vlt.CleanTask
 import com.cognifide.gradle.aem.vlt.SyncTask
 import com.cognifide.gradle.aem.vlt.VltTask
+import com.google.common.base.CaseFormat
 import org.gradle.api.DefaultTask
 import org.gradle.api.Plugin
 import org.gradle.api.Project
@@ -36,6 +37,10 @@ class AemPlugin : Plugin<Project> {
         val VLT_PATH = "META-INF/vault"
 
         val JCR_ROOT = "jcr_root"
+
+        val DEPLOY_TASK_ROOT = "aemRootDeploy"
+
+        val DEPLOY_TASK_RULE = "Pattern: aem<ProjectPath>Deploy: Build CRX package and deploy it to AEM instance(s). Use preemptive '$DEPLOY_TASK_ROOT' for root project."
     }
 
     override fun apply(project: Project) {
@@ -77,9 +82,11 @@ class AemPlugin : Plugin<Project> {
 
         val assemble = project.tasks.getByName(LifecycleBasePlugin.ASSEMBLE_TASK_NAME)
         val check = project.tasks.getByName(LifecycleBasePlugin.CHECK_TASK_NAME)
+        val build = project.tasks.getByName(LifecycleBasePlugin.BUILD_TASK_NAME)
 
         assemble.mustRunAfter(clean)
         check.mustRunAfter(clean)
+        build.dependsOn(compose)
 
         compose.dependsOn(assemble, check)
         compose.mustRunAfter(clean)
@@ -102,6 +109,25 @@ class AemPlugin : Plugin<Project> {
         vltRaw.mustRunAfter(clean)
         vltCheckout.mustRunAfter(clean)
         vltSync.mustRunAfter(clean)
+
+        project.tasks.addRule(DEPLOY_TASK_RULE, { taskName ->
+            val desiredTaskName = if (project == project.rootProject) {
+                DEPLOY_TASK_ROOT
+            } else {
+                "aem${CaseFormat.LOWER_HYPHEN.to(CaseFormat.UPPER_CAMEL, project.path.replace(":", "-"))}Deploy"
+            }
+
+            if (taskName == desiredTaskName) {
+                if (project.tasks.findByName(taskName) != null) {
+                    project.logger.info("Deploy rule task '$taskName' already exists, so it will be not created.")
+                } else {
+                    project.logger.info("Creating deploy rule task named '$taskName'.")
+
+                    val task = project.tasks.create(taskName)
+                    task.dependsOn(build, deploy)
+                }
+            }
+        })
     }
 
     private fun setupConfigurations(project: Project) {
@@ -118,14 +144,14 @@ class AemPlugin : Plugin<Project> {
     }
 
     private fun setupConfig(project: Project) {
-        project.tasks.forEach {task ->
+        project.tasks.forEach { task ->
             if (task is AemTask && task is DefaultTask) {
                 task.config.configure(task)
             }
         }
 
         project.afterEvaluate({
-            project.tasks.forEach {task ->
+            project.tasks.forEach { task ->
                 if (task is AemTask && task is DefaultTask) {
                     task.config.validate()
                     task.config.attach(task)

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

@@ -0,0 +1,16 @@
+package com.cognifide.gradle.aem.internal
+
+import org.apache.commons.io.FilenameUtils
+import org.apache.commons.io.IOCase
+
+object Patterns {
+
+    fun wildcard(value: String, matcher: String): Boolean {
+        return FilenameUtils.wildcardMatch(value, matcher, IOCase.INSENSITIVE)
+    }
+
+    fun wildcardSensitive(value: String, matcher: String): Boolean {
+        return FilenameUtils.wildcardMatch(value, matcher, IOCase.SENSITIVE)
+    }
+
+}

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

@@ -4,8 +4,6 @@ import com.cognifide.gradle.aem.AemConfig
 import com.cognifide.gradle.aem.AemException
 import com.fasterxml.jackson.databind.util.ISO8601Utils
 import groovy.text.SimpleTemplateEngine
-import org.apache.commons.io.FilenameUtils
-import org.apache.commons.io.IOCase
 import org.apache.commons.lang3.text.StrSubstitutor
 import org.gradle.api.Project
 import java.text.SimpleDateFormat
@@ -19,9 +17,7 @@ class PropertyParser(val project: Project) {
     fun filter(value: String, propName: String, propDefault: String = FILTER_DEFAULT): Boolean {
         val filters = project.properties.getOrElse(propName, { propDefault }) as String
 
-        return filters.split(",").any { group ->
-            FilenameUtils.wildcardMatch(value, group, IOCase.INSENSITIVE)
-        }
+        return filters.split(",").any { group -> Patterns.wildcard(value, group) }
     }
 
     fun expand(source: String, properties: Map<String, Any> = mapOf()): String {

src/main/kotlin/com/cognifide/gradle/aem/pkg/ComposeTask.kt

@@ -3,23 +3,23 @@ package com.cognifide.gradle.aem.pkg
 import com.cognifide.gradle.aem.AemConfig
 import com.cognifide.gradle.aem.AemPlugin
 import com.cognifide.gradle.aem.AemTask
+import com.cognifide.gradle.aem.internal.Patterns
 import com.cognifide.gradle.aem.internal.PropertyParser
-import com.fasterxml.jackson.databind.util.ISO8601Utils
 import org.apache.commons.io.FileUtils
-import org.apache.commons.io.FilenameUtils
-import org.apache.commons.io.IOCase
 import org.apache.commons.io.IOUtils
 import org.gradle.api.Project
 import org.gradle.api.file.DuplicatesStrategy
-import org.gradle.api.tasks.*
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.Internal
+import org.gradle.api.tasks.OutputDirectory
+import org.gradle.api.tasks.TaskAction
 import org.gradle.api.tasks.bundling.Zip
 import org.jsoup.Jsoup
 import org.jsoup.parser.Parser
 import org.reflections.Reflections
 import org.reflections.scanners.ResourcesScanner
 import java.io.File
 import java.io.FileOutputStream
-import java.text.SimpleDateFormat
 
 open class ComposeTask : Zip(), AemTask {
 
@@ -113,7 +113,7 @@ open class ComposeTask : Zip(), AemTask {
     }
 
     private fun expandVaultFiles() {
-        val files = vaultDir.listFiles { _, name -> config.vaultFilesExpanded.any { FilenameUtils.wildcardMatch(name, it, IOCase.INSENSITIVE) } } ?: return
+        val files = vaultDir.listFiles { _, name -> config.vaultFilesExpanded.any { Patterns.wildcard(name, it) } } ?: return
 
         for (file in files) {
             val expandedContent = try {
@@ -171,9 +171,9 @@ open class ComposeTask : Zip(), AemTask {
 
     fun includeProjects(pathFilter: String) {
         project.gradle.afterProject { subproject ->
-            if (subproject.path != project.path
+            if (subproject != project
                     && subproject.plugins.hasPlugin(AemPlugin.ID)
-                    && (pathFilter.isNullOrBlank() || FilenameUtils.wildcardMatch(subproject.path, pathFilter, IOCase.INSENSITIVE))) {
+                    && (pathFilter.isNullOrBlank() || Patterns.wildcard(subproject.path, pathFilter))) {
                 includeProject(subproject)
             }
         }
@@ -230,7 +230,7 @@ open class ComposeTask : Zip(), AemTask {
 
         dependProject(project, config.dependContentTaskNames(project))
 
-        if (this.project.path != project.path && !config.vaultFilterPath.isNullOrBlank()) {
+        if (this.project != project && !config.vaultFilterPath.isNullOrBlank()) {
             vaultFilters.add(File(config.vaultFilterPath))
         }
 

src/main/resources/META-INF/vault/filter.xml

@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <workspaceFilter version="1.0">
-    ${filterRoots}
+
+${filterRoots}
+
 </workspaceFilter>