Merge pull request #98 from Cognifide/instance-jar-name

Instance JAR file name constraint relaxed

Author: pun-ky

gradle/wrapper/gradle-wrapper.jar

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-all.zip

gradle/wrapper/gradle-wrapper.properties

@@ -46,11 +46,11 @@ abstract class SyncTask : DefaultTask(), AemTask {
     }
 
     protected fun awaitStableInstances() {
-        InstanceActions.awaitStable(project, filterInstances())
+        InstanceActions(project).awaitStable(filterInstances())
     }
 
     protected fun awaitStableLocalInstances() {
-        InstanceActions.awaitStable(project, Instance.locals(project))
+        InstanceActions(project).awaitStable(Instance.locals(project))
     }
 
 }

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

@@ -6,12 +6,13 @@ import com.cognifide.gradle.aem.internal.Formats
 import com.cognifide.gradle.aem.internal.ProgressLogger
 import org.gradle.api.Project
 
-object InstanceActions {
+class InstanceActions(val project: Project) {
 
-    fun awaitStable(project: Project, instances: List<Instance> = Instance.locals(project)) {
-        val config = AemConfig.of(project)
-        val logger = project.logger
+    val config = AemConfig.of(project)
 
+    val logger = project.logger
+
+    fun awaitStable(instances: List<Instance> = Instance.locals(project)) {
         val progressLogger = ProgressLogger(project, "Awaiting stable instance(s)")
 
         progressLogger.started()

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

@@ -3,10 +3,11 @@ package com.cognifide.gradle.aem.instance
 import com.cognifide.gradle.aem.AemConfig
 import com.cognifide.gradle.aem.AemException
 import com.cognifide.gradle.aem.AemInstancePlugin
-import com.cognifide.gradle.aem.internal.file.FileOperations
 import com.cognifide.gradle.aem.internal.Formats
+import com.cognifide.gradle.aem.internal.Patterns
 import com.cognifide.gradle.aem.internal.ProgressLogger
 import com.cognifide.gradle.aem.internal.PropertyParser
+import com.cognifide.gradle.aem.internal.file.FileOperations
 import org.apache.commons.io.FileUtils
 import org.gradle.api.Project
 import org.gradle.api.logging.Logger
@@ -19,6 +20,13 @@ class LocalHandle(val project: Project, val sync: InstanceSync) {
 
     companion object {
         val JAR_STATIC_FILES_PATH = "static/"
+
+        val JAR_NAME_PATTERNS = listOf(
+                "*aem-quickstart*.jar",
+                "*cq-quickstart*.jar",
+                "*quickstart*.jar",
+                "*.jar"
+        )
     }
 
     class Script(val wrapper: File, val bin: File, val command: List<String>) {
@@ -34,9 +42,7 @@ class LocalHandle(val project: Project, val sync: InstanceSync) {
 
     val dir = File("${config.instancesPath}/${instance.name}")
 
-    val jar: File by lazy {
-        FileOperations.find(dir, listOf("cq-quickstart*.jar")) ?: File(dir, "cq-quickstart.jar")
-    }
+    val jar = File(dir, "aem-quickstart.jar")
 
     val lock = File(dir, "local-handle.lock")
 
@@ -58,14 +64,13 @@ class LocalHandle(val project: Project, val sync: InstanceSync) {
         }
     }
 
-    fun create(files: List<File>) {
+    fun create(resolvedFiles: List<File>) {
         cleanDir(true)
 
         logger.info("Creating instance at path '${dir.absolutePath}'")
 
-        logger.info("Copying resolved instance files: ${files.map { it.absolutePath }}")
-        GFileUtils.mkdirs(dir)
-        files.forEach { FileUtils.copyFileToDirectory(it, dir) }
+        logger.info("Copying resolved instance files: $resolvedFiles")
+        copyFiles(resolvedFiles)
 
         logger.info("Validating instance files")
         validateFiles()
@@ -97,13 +102,32 @@ class LocalHandle(val project: Project, val sync: InstanceSync) {
         logger.info("Created instance with success")
     }
 
-    fun validateFiles() {
+    private fun copyFiles(resolvedFiles: List<File>) {
+        GFileUtils.mkdirs(dir)
+        val files = resolvedFiles.map {
+            FileUtils.copyFileToDirectory(it, dir)
+            File(dir, it.name)
+        }
+        findJar(files)?.let { FileUtils.moveFile(it, jar) }
+    }
+
+    private fun findJar(files: List<File>): File? {
+        JAR_NAME_PATTERNS.forEach { pattern ->
+            files.asSequence()
+                    .filter { Patterns.wildcard(it.name, pattern) }
+                    .forEach { return it }
+        }
+
+        return null
+    }
+
+    private fun validateFiles() {
         if (!jar.exists()) {
             throw AemException("Instance JAR file not found at path: ${jar.absolutePath}. Is instance JAR URL configured?")
         }
 
         if (!license.exists()) {
-            throw AemException("License file not found at path: ${license.absolutePath}. Is instance license URL configured?" )
+            throw AemException("License file not found at path: ${license.absolutePath}. Is instance license URL configured?")
         }
     }
 
@@ -117,6 +141,7 @@ class LocalHandle(val project: Project, val sync: InstanceSync) {
         // Ensure that 'logs' directory exists
         GFileUtils.mkdirs(File(staticDir, "logs"))
     }
+
     private fun extractStaticFiles() {
         val progressLogger = ProgressLogger(project, "Extracting static files from JAR  '${jar.absolutePath}' to directory: $staticDir")
         progressLogger.started()

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

@@ -81,6 +81,10 @@ object FileOperations {
         ).map { it(pathOrFileName) }.firstOrNull { it.exists() }
     }
 
+    fun find(dir: File, pattern: String): File? {
+        return find(dir, listOf(pattern))
+    }
+
     fun find(dir: File, patterns: List<String>): File? {
         var result: File? = null
         val files = dir.listFiles({ _, name -> Patterns.wildcard(name, patterns) })