testing task

Author: efraespada

src/main/kotlin/StringCare.kt

@@ -52,18 +52,21 @@ open class StringCare : Plugin<Project> {
                         moduleMap[module.name!!] = Configuration(module.name).apply {
                             stringFiles.addAll(module.stringFiles)
                             srcFolders.addAll(module.srcFolders)
+                            debug = extension.debug
                         }
                     }
                     module.srcFolders.isNotEmpty() -> {
                         moduleMap[module.name!!] = Configuration(module.name).apply {
                             stringFiles.addAll(defaultConfig().stringFiles)
                             srcFolders.addAll(module.srcFolders)
+                            debug = extension.debug
                         }
                     }
                     module.stringFiles.isNotEmpty() -> {
                         moduleMap[module.name!!] = Configuration(module.name).apply {
                             stringFiles.addAll(module.stringFiles)
                             srcFolders.addAll(defaultConfig().srcFolders)
+                            debug = extension.debug
                         }
                     }
                 }
@@ -77,7 +80,8 @@ open class StringCare : Plugin<Project> {
             debug = extension.debug,
             dataFound = { _, _ ->
                 // nothing to do here
-            }, mergeResourcesStart = { module, variant ->
+            },
+            mergeResourcesStart = { module, variant ->
                 fingerPrint(module, variant, extension.debug) { key ->
                     if ("none" == key) {
                         return@fingerPrint
@@ -113,7 +117,8 @@ open class StringCare : Plugin<Project> {
                     }
                 }
 
-            }, mergeResourcesFinish = { module, _ ->
+            },
+            mergeResourcesFinish = { module, _ ->
                 restoreFiles(absoluteProjectPath, module)
             }
         ))
@@ -133,6 +138,7 @@ open class StringCare : Plugin<Project> {
     open class Configuration(var name: String?) {
         var stringFiles = mutableListOf<String>()
         var srcFolders = mutableListOf<String>()
+        var debug = false
     }
 
 }

src/main/kotlin/components/Extensions.kt

@@ -57,6 +57,7 @@ fun String.uncapitalize(): String {
         else -> char + original.substring(1, original.length)
     }
 }
+
 fun String.escape(): String = Regex.escape(this)
 fun String.unescape(): String = StringEscapeUtils.unescapeJava(this)
 fun String.removeNewLines(): String = this.replace("\n", "")
@@ -73,7 +74,7 @@ fun String.androidTreatment(): String {
 
 fun File.validForConfiguration(configuration: Configuration): Boolean {
     var valid = this.absolutePath.contains("${File.separator}${configuration.name}${File.separator}")
-
+            && excluded().not()
     if (valid) {
         valid = false
         configuration.srcFolders.forEach { folder ->
@@ -102,9 +103,28 @@ fun File.validForConfiguration(configuration: Configuration): Boolean {
             }
         }
     }
+    if (configuration.debug && excluded().not()) {
+        println("${if (valid) "✔ " else "❌ not"} valid file ${this.absolutePath}")
+    }
     return valid
 }
 
+fun File.excluded(): Boolean {
+    val exclude = listOf(
+        "/build/",
+        "/.git/",
+        "/.gradle/",
+        "/gradle/"
+    )
+    var valid = true
+    exclude.forEach { value ->
+        when {
+            this.absolutePath.contains(value.normalizePath()) -> valid = false
+        }
+    }
+    return (valid && this.isDirectory.not() && this.absolutePath.contains(".xml")).not()
+}
+
 fun File.resourceFile(configuration: Configuration): ResourceFile? {
     var sourceFolder = ""
     var validFile: File? = null
@@ -155,9 +175,11 @@ fun Project.createExtension(): Extension {
 fun Project.registerTask() {
     this.tasks.addRule("Pattern: $gradleTaskNameObfuscate<variant>") { taskName ->
         if (taskName.startsWith(gradleTaskNameObfuscate)) {
+            println("taskname $taskName")
             task(taskName) {
                 it.doLast {
                     val variant = taskName.replace(gradleTaskNameObfuscate, "").uncapitalize()
+                    println("variant $variant")
                     val task = this.tasks.getByName(gradleTaskNameObfuscate) as SCTestObfuscation
                     task.variant = variant
                     task.module = StringCare.mainModule

src/main/kotlin/components/Tasks.kt

@@ -39,14 +39,14 @@ internal fun buildTask(directory: String): String {
 
 internal fun basicGradleTask(directory: String): String {
     return """
-        ${buildTask(directory)} &&
+        cd $directory &&
         ${gradleWrapper()} $gradleTaskNameDoctor
         """.trimIndent()
 }
 
 internal fun obfuscationTestGradleTask(directory: String): String {
     return """
-        ${buildTask(directory)} &&
+        cd $directory &&
         ${gradleWrapper()} ${gradleTaskNameObfuscate}Debug
         """.trimIndent()
 }
@@ -60,13 +60,6 @@ internal fun signingReportTask(directory: String): String {
         """.trimIndent()
 }
 
-internal fun resetCommand(directory: String): String {
-    return when(getOs()) {
-        Os.OSX -> "rm -rf $directory && "
-        Os.WINDOWS -> "rmdir /q/s $directory & "
-    }
-}
-
 internal fun copyCommand(): String = when (getOs()) {
     Os.WINDOWS -> copyCommandWindows
     Os.OSX -> copyCommandOsX

src/main/kotlin/task/SCTestObfuscation.kt

@@ -20,7 +20,7 @@ open class SCTestObfuscation : DefaultTask() {
 
     @TaskAction
     fun greet() {
-        println("== OBFUSCATION ======================================")
+        println("== TEST OBFUSCATION ======================================")
         println("Modules (${moduleMap.size})")
 
         moduleMap.forEach { entry ->
@@ -34,6 +34,7 @@ open class SCTestObfuscation : DefaultTask() {
             filesToObfuscate.forEach { file ->
                 val originalEntities = parseXML(file.file)
                 println("============================")
+                println("path: ${file.file.absolutePath}")
                 originalEntities.forEach { entity ->
                     entity.attributes.forEach { attribute ->
                         println("\"${attribute.name}\": \"${attribute.value}\"")

src/test/kotlin/SCTest.kt

@@ -275,7 +275,6 @@ class SCTest {
         prepareTask(temp).runCommand { _, _ ->
             modifyForTest(temp, testProjectName)
             basicGradleTask("$temp${File.separator}$testProjectName").runCommand { _, androidReport ->
-                assert(androidReport.contains("BUILD SUCCESSFUL"))
                 assert(androidReport.contains("END REPORT"))
                 println(androidReport)
             }
@@ -292,7 +291,6 @@ class SCTest {
         prepareTask(temp).runCommand { _, _ ->
             modifyForTest(temp, testProjectName)
             obfuscationTestGradleTask("$temp${File.separator}$testProjectName").runCommand { _, androidReport ->
-                assert(androidReport.contains("BUILD SUCCESSFUL"))
                 assert(androidReport.contains("END OBFUSCATION"))
                 println(androidReport)
             }

src/test/kotlin/utils/Helper.kt

@@ -13,7 +13,7 @@ fun modifyForTest(directory: String, projectPath: String) {
     val content = file.getContent().replace(
         "classpath \"com.stringcare:plugin:\$stringcare_version\"",
         when (getOs()) {
-            Os.WINDOWS -> "\nclasspath files(\"${current.absolutePath.replace("\\", "\\\\")}${File.separator}${File.separator}build${File.separator}${File.separator}libs${File.separator}${File.separator}plugin-2.2.jar\")\n"
+            Os.WINDOWS -> "\nclasspath files(\"${current.absolutePath.replace("\\", "\\\\")}${File.separator}${File.separator}build${File.separator}${File.separator}libs${File.separator}${File.separator}plugin-$version.jar\")\n"
             Os.OSX -> "\nclasspath files(\"${current.absolutePath}${File.separator}build${File.separator}libs${File.separator}plugin-$version.jar\")\n"
         }
     )