Add support for multiple input directories

baseline.xml

@@ -3,8 +3,10 @@
  <ManuallySuppressedIssues></ManuallySuppressedIssues>
  <CurrentIssues>
  <ID>InvalidPackageDeclaration:ValidFile.kt$package `code-samples`.`valid`</ID>
+ <ID>InvalidPackageDeclaration:ValidFile2.kt$package `code-samples`.valid2</ID>
  <ID>InvalidPackageDeclaration:WildcardImportViolated.kt$package `code-samples`.`invalid-package-naming`</ID>
  <ID>PackageNaming:ValidFile.kt$package `code-samples`.`valid`</ID>
+ <ID>PackageNaming:ValidFile2.kt$package `code-samples`.valid2</ID>
  <ID>PackageNaming:WildcardImportViolated.kt$package `code-samples`.`invalid-package-naming`</ID>
  </CurrentIssues>
 </SmellBaseline>

src/main/java/com/github/ozsie/CheckMojo.kt

@@ -20,11 +20,13 @@ class CheckMojo : DetektMojo() {
  log.debug("Applying $it")
  }
  val cliArgs = parseArguments(getCliSting().log().toTypedArray())
- val foundInputDir = Files.isDirectory(Paths.get(input))
- if (!skip && foundInputDir)
+ val invalidInputDirs = input.split(",").mapNotNull {
+ if (!Files.isDirectory(Paths.get(it))) it else null
+ }
+ if (!skip && invalidInputDirs.isEmpty())
  failBuildIfNeeded { Runner(cliArgs, System.out, System.err).execute() }
  else
- inputSkipLog(skip)
+ inputSkipLog(skip, invalidInputDirs)
  }
 
  private fun failBuildIfNeeded(block: () -> Unit) {
@@ -38,7 +40,11 @@ class CheckMojo : DetektMojo() {
  }
  }
 
- private fun inputSkipLog(skip: Boolean) {
- if (skip) log.info("Skipping execution") else log.info("Input directory '$input' not found, skipping module")
+ private fun inputSkipLog(skip: Boolean, invalidInputDirs: List<String>) {
+ if (skip) {
+ log.info("Skipping execution")
+ } else {
+ log.info("Failed to resolve input directories '${invalidInputDirs.joinToString()}', skipping module")
+ }
  }
 }

src/test/java/com/github/ozsie/CheckMojoSpec.kt

@@ -8,10 +8,8 @@ import kotlin.test.assertFailsWith
 import kotlin.test.expect
 
 class CheckMojoSpec : Spek({
- val invalidPackageNamingDirectoryPath by lazy {
- CheckMojoSpec::class.java.classLoader.getResource("code-samples/invalid-package-naming")!!
- .file
- }
+ val codeSamplesDirectory = CheckMojoSpec::class.java.classLoader.getResource("code-samples")!!.file
+ val invalidPackageNamingDirectoryPath = "$codeSamplesDirectory/invalid-package-naming"
 
  given("a CheckMojo and 'skip' is true") {
  val checkMojo = CheckMojo()
@@ -64,4 +62,32 @@ class CheckMojoSpec : Spek({
  }
  }
  }
+
+ given("multiple valid comma separated input directories are supplied") {
+ val checkMojo = CheckMojo().apply {
+ input = "$codeSamplesDirectory/valid,$codeSamplesDirectory/valid2"
+ failBuildOnMaxIssuesReached = true
+ }
+ on("checkMojo.execute()") {
+ test("detekt analyses the specified directories") {
+ assertFailsWith(MaxIssuesReached::class, "Build failed with 2 weighted issues.") {
+ checkMojo.execute()
+ }
+ }
+ }
+ }
+
+ given("a mix of valid and invalid comma separated input directories are supplied") {
+ val checkMojo = CheckMojo().apply {
+ input = "$codeSamplesDirectory/valid,invalidDirectory"
+ failBuildOnMaxIssuesReached = false
+ }
+ on("checkMojo.execute()") {
+ test("detekt analysis is aborted") {
+ expect(Unit) {
+ checkMojo.execute()
+ }
+ }
+ }
+ }
 })

src/test/resources/code-samples/valid2/ValidFile2.kt

@@ -0,0 +1 @@
+package `code-samples`.valid2