Plugin release 2.0.6

Author: krystian.panek

README.md

@@ -60,7 +60,7 @@ buildscript {
     }
     
     dependencies {
-        classpath 'com.cognifide.gradle:aem-plugin:2.0.5'
+        classpath 'com.cognifide.gradle:aem-plugin:2.0.6'
     }
 }
 

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

@@ -360,6 +360,14 @@ open class AemConfig(project: Project) : Serializable {
             return paths.filter { !it.isBlank() }.map { File(it) }
         }
 
+    /**
+     * CRX package Vault files path.
+     */
+    @get:Internal
+    @get:JsonIgnore
+    val vaultPath: String
+        get() = "$contentPath/${AemPackagePlugin.VLT_PATH}"
+
     /**
      * CRX package Vault filter path.
      * Also used by VLT tool as default filter for files being checked out from running AEM instance.
@@ -369,12 +377,12 @@ open class AemConfig(project: Project) : Serializable {
     @get:Internal
     @get:JsonIgnore
     val vaultFilterPath: String
-        get() = "$contentPath/${AemPackagePlugin.VLT_PATH}/filter.xml"
+        get() = "$vaultPath/filter.xml"
 
     /**
      * Fallback for older form of configuration. Inner closure 'config' could be skipped.
      *
-     * @Deprecated
+     * @deprecated
      * @since 2.0.2
      */
     fun config(closure: Closure<*>) {

src/main/kotlin/com/cognifide/gradle/aem/internal/file/FileOperations.kt

@@ -5,6 +5,7 @@ import com.cognifide.gradle.aem.internal.Patterns
 import org.apache.commons.io.FileUtils
 import org.apache.commons.io.IOUtils
 import org.apache.commons.io.filefilter.TrueFileFilter
+import org.gradle.api.Project
 import org.gradle.util.GFileUtils
 import org.reflections.Reflections
 import org.reflections.scanners.ResourcesScanner
@@ -67,6 +68,13 @@ object FileOperations {
         file.printWriter().use { it.print(source) }
     }
 
+    fun find(project: Project, dirIfFileName: String, pathOrFileName: String): File? {
+        return mutableListOf<(String) -> File>(
+                { project.file(pathOrFileName) },
+                { File(File(dirIfFileName), pathOrFileName) }
+        ).map { it(pathOrFileName) }.firstOrNull { it.exists() }
+    }
+
     fun find(dir: File, patterns: List<String>): File? {
         var result: File? = null
         val files = dir.listFiles({ _, name -> Patterns.wildcard(name, patterns) })

src/main/kotlin/com/cognifide/gradle/aem/vlt/VltCommand.kt

@@ -3,6 +3,7 @@ package com.cognifide.gradle.aem.vlt
 import com.cognifide.gradle.aem.AemConfig
 import com.cognifide.gradle.aem.instance.Instance
 import com.cognifide.gradle.aem.internal.PropertyParser
+import com.cognifide.gradle.aem.internal.file.FileOperations
 import org.gradle.api.Project
 import org.gradle.api.logging.Logger
 import java.io.File
@@ -54,10 +55,8 @@ class VltCommand(val project: Project) {
         val cmdFilterPath = project.properties["aem.vlt.filter"] as String?
 
         if (!cmdFilterPath.isNullOrBlank()) {
-            val cmdFilter = project.file(cmdFilterPath)
-            if (!cmdFilter.exists()) {
-                throw VltException("Vault check out filter file does not exist at path: ${cmdFilter.absolutePath}")
-            }
+            val cmdFilter = FileOperations.find(project, config.vaultPath, cmdFilterPath!!)
+                    ?: throw VltException("Vault check out filter file does not exist at path: $cmdFilterPath")
 
             filter = cmdFilter
         }

src/test/resources/com/cognifide/gradle/aem/test/compose/assembly/gradle/buildscript.gradle

@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    classpath 'com.cognifide.gradle:aem-plugin:2.0.4'
+    classpath 'com.cognifide.gradle:aem-plugin:2.0.6'
     classpath "org.dm.gradle:gradle-bundle-plugin:0.10.0"
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.4"
 }

src/test/resources/com/cognifide/gradle/aem/test/compose/bundle-and-content/build.gradle

@@ -7,7 +7,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.cognifide.gradle:aem-plugin:2.0.4'
+        classpath 'com.cognifide.gradle:aem-plugin:2.0.6'
         classpath 'org.dm.gradle:gradle-bundle-plugin:0.10.0'
     }
 }

src/test/resources/com/cognifide/gradle/aem/test/debug/build.gradle

@@ -7,7 +7,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.cognifide.gradle:aem-plugin:2.0.4'
+        classpath 'com.cognifide.gradle:aem-plugin:2.0.6'
     }
 }