create root report dir before creating any outputs

#16
form-com · Aug 4, 2021 · 00b2fed · 00b2fed
1 parent 1bcb38d
commit 00b2fed
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 20 deletions.
diff --git a/build.gradle b/build.gradle
@@ -28,7 +28,7 @@ subprojects {
     apply plugin: 'maven-publish'
     apply plugin: 'jacoco'
 
-    version '0.7.3-SNAPSHOT'
+    version '0.7.3'
 
     repositories {
         mavenCentral()

diff --git a/diff-coverage/src/main/kotlin/com/form/coverage/tasks/DiffCoverageTask.kt b/diff-coverage/src/main/kotlin/com/form/coverage/tasks/DiffCoverageTask.kt
@@ -46,7 +46,10 @@ open class DiffCoverageTask : DefaultTask() {
 
     @OutputDirectory
     fun getOutputDir(): File {
-        return project.getReportOutputDir().toFile()
+        return project.getReportOutputDir().toFile().apply {
+            log.debug("Diff Coverage output dir: $absolutePath, " +
+                    "exists=${exists()}, isDir=$isDirectory, canRead=${canRead()}, canWrite=${canWrite()}")
+        }
     }
 
     init {
@@ -57,10 +60,7 @@ open class DiffCoverageTask : DefaultTask() {
     @TaskAction
     fun executeAction() {
         log.info("DiffCoverage configuration: $diffCoverageReport")
-        val fileNameToModifiedLineNumbers = obtainUpdatesInfo(
-            project.rootProject.projectDir,
-            diffCoverageReport
-        )
+        val fileNameToModifiedLineNumbers = obtainUpdatesInfo(diffCoverageReport)
         fileNameToModifiedLineNumbers.forEach { (file, rows) ->
             log.info("File $file has ${rows.size} modified lines")
             log.debug("File $file has modified lines $rows")
@@ -99,13 +99,14 @@ open class DiffCoverageTask : DefaultTask() {
         return project.tasks.findByName("jacocoTestReport") as? JacocoReport
     }
 
-    private fun obtainUpdatesInfo(
-        projectRoot: File,
-        configuration: ChangesetCoverageConfiguration
-    ): Map<String, Set<Int>> {
-        val diffSource = getDiffSource(projectRoot, configuration.diffSource).apply {
+    private fun obtainUpdatesInfo(configuration: ChangesetCoverageConfiguration): Map<String, Set<Int>> {
+        val reportDir: File = getOutputDir().apply {
+            val isCreated = mkdirs()
+            log.debug("Creating of report dir '$absolutePath' is successful: $isCreated")
+        }
+        val diffSource = getDiffSource(project.rootProject.projectDir, configuration.diffSource).apply {
             log.debug("Starting to retrieve modified lines from $sourceDescription'")
-            saveDiffTo(projectRoot.resolve(configuration.reportConfiguration.baseReportDir)).apply {
+            saveDiffTo(reportDir).apply {
                 log.info("diff content saved to '$absolutePath'")
             }
         }

diff --git a/diff-coverage/src/main/kotlin/com/form/coverage/tasks/git/DiffSource.kt b/diff-coverage/src/main/kotlin/com/form/coverage/tasks/git/DiffSource.kt
@@ -14,7 +14,7 @@ interface DiffSource {
 }
 
 internal class FileDiffSource(
-        private val filePath: String
+    private val filePath: String
 ) : DiffSource {
 
     override val sourceDescription = "File: $filePath"
@@ -34,7 +34,7 @@ internal class FileDiffSource(
 }
 
 internal class UrlDiffSource(
-        private val url: String
+    private val url: String
 ) : DiffSource {
     override val sourceDescription = "URL: $url"
 
@@ -50,8 +50,8 @@ internal class UrlDiffSource(
 }
 
 internal class GitDiffSource(
-        private val projectRoot: File,
-        private val compareWith: String
+    private val projectRoot: File,
+    private val compareWith: String
 ) : DiffSource {
 
     private val diffContent: String by lazy {
@@ -70,13 +70,13 @@ internal class GitDiffSource(
 }
 
 fun getDiffSource(
-        projectRoot: File,
-        diffConfig: DiffSourceConfiguration
+    projectRoot: File,
+    diffConfig: DiffSourceConfiguration
 ): DiffSource = when {
 
     diffConfig.file.isNotBlank() && diffConfig.url.isNotBlank() -> throw IllegalStateException(
-            "Expected only Git configuration or file or URL diff source more than one: " +
-                    "git.diffBase=${diffConfig.git.diffBase} file=${diffConfig.file}, url=${diffConfig.url}"
+        "Expected only Git configuration or file or URL diff source more than one: " +
+                "git.diffBase=${diffConfig.git.diffBase} file=${diffConfig.file}, url=${diffConfig.url}"
     )
 
     diffConfig.file.isNotBlank() -> FileDiffSource(diffConfig.file)