Improve rule source logging

nebula-plugins · May 18, 2016 · 661fb37 · 661fb37
1 parent 4873cfe
commit 661fb37
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/functionalTest/groovy/nebula/plugin/resolutionrules/ResolutionRulesPluginSpec.groovy b/src/functionalTest/groovy/nebula/plugin/resolutionrules/ResolutionRulesPluginSpec.groovy
@@ -188,9 +188,9 @@ class ResolutionRulesPluginSpec extends IntegrationSpec {
         def result = runTasksSuccessfully('dependencies')
 
         then:
-        [rulesJsonFile, rulesZipFile, rulesJarFile].each {
-            assert result.standardOutput.contains("Using ${it.absolutePath} as a dependency rules source")
-        }
+        result.standardOutput.contains 'Using all-rules-sources (all-rules-sources.json) a dependency rules source'
+        result.standardOutput.contains "Using all-rules-sources ($projectDir/rules.jar) a dependency rules source"
+        result.standardOutput.contains "Using all-rules-sources ($projectDir/rules.zip) a dependency rules source"
     }
 
     def 'replace module'() {

diff --git a/src/main/groovy/nebula/plugin/resolutionrules/ResolutionRulesPlugin.groovy b/src/main/groovy/nebula/plugin/resolutionrules/ResolutionRulesPlugin.groovy
@@ -89,10 +89,8 @@ class ResolutionRulesPlugin implements Plugin<Project> {
         for (file in files) {
             if (isIncludedRuleFile(file.name, extension)) {
                 ResolutionJsonValidator.validateJsonFile(file)
-                LOGGER.info("Using $file as a dependency rules source")
                 rules.add(parseJsonFile(file))
             } else if (file.name.endsWith(JAR_EXT) || file.name.endsWith(ZIP_EXT)) {
-                LOGGER.info("Using $file as a dependency rules source")
                 ZipFile zip = new ZipFile(file)
                 try {
                     Enumeration<? extends ZipEntry> entries = zip.entries()
@@ -128,18 +126,20 @@ class ResolutionRulesPlugin implements Plugin<Project> {
         return false
     }
 
-    private static String ruleSet(String filename) {
+    static String ruleSet(String filename) {
         return filename.substring(0, filename.lastIndexOf(JSON_EXT))
     }
 
     static Rules parseJsonFile(File file) {
         def ruleSet = ruleSet(file.name)
+        LOGGER.info("Using $ruleSet (${file.name}) a dependency rules source")
         rulesFromJson(ruleSet, new JsonSlurper().parse(file) as Map)
     }
 
     static Rules parseJsonStream(ZipFile zip, ZipEntry entry) {
         def stream = zip.getInputStream(entry)
         def ruleSet = ruleSet(new File(entry.name).name)
+        LOGGER.info("Using $ruleSet (${zip.name}) a dependency rules source")
         rulesFromJson(ruleSet, new JsonSlurper().parse(stream) as Map)
     }