- Added capability to perform modular analysis

- Added capability to specify a reports directory.

Author: iwang-atlassian

sonar-swift-plugin/src/main/java/org/sonar/plugins/swift/coverage/CoberturaReportParser.java

@@ -84,6 +84,13 @@ private void collectPackageMeasures(SMInputCursor pack) throws XMLStreamExceptio
             collectFileMeasures(pack.descendantElementCursor("class"), builderByFilename);
             for (Map.Entry<String, CoverageMeasuresBuilder> entry : builderByFilename.entrySet()) {
                 String filePath = entry.getKey();
+                if (project.isModule()) {
+                    if (!filePath.startsWith(project.path())) {
+                        continue;
+                    }
+                    // fileSystem.baseDir() will include the module path, so we need to get rid of it here
+                    filePath = filePath.substring(project.path().length());
+                }
                 File file = new File(fileSystem.baseDir(), filePath);
                 InputFile inputFile = fileSystem.inputFile(fileSystem.predicates().hasAbsolutePath(file.getAbsolutePath()));
 
@@ -98,6 +105,7 @@ private void collectPackageMeasures(SMInputCursor pack) throws XMLStreamExceptio
                         context.saveMeasure(resource, measure);
                     }
                 }
+                LOGGER.info("Successfully collected measures for file " + file.getPath());
             }
         }
     }

sonar-swift-plugin/src/main/java/org/sonar/plugins/swift/coverage/ReportFilesFinder.java

@@ -18,57 +18,90 @@
 package org.sonar.plugins.swift.coverage;
 
 import org.apache.tools.ant.DirectoryScanner;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.sonar.api.config.Settings;
 
 import java.io.File;
+import java.util.Arrays;
 import java.util.ArrayList;
 import java.util.List;
 
 final class ReportFilesFinder {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(ReportFilesFinder.class);
+
     private final Settings conf;
-    private final String settingsKey;
-    private final String settingsDefault;
+    private final String settingsReportKey;
+    private final String settingsReportDefault;
+    private final String settingsDirectoryKey;
 
-    public ReportFilesFinder(final Settings settings, final String key, final String defaultValue) {
+    public ReportFilesFinder(final Settings settings, final String settingsReportKey, final String settingsReportDefault, final String settingsDirectoryKey) {
 
         conf = settings;
-        settingsKey = key;
-        settingsDefault = defaultValue;
+        this.settingsReportKey = settingsReportKey;
+        this.settingsReportDefault = settingsReportDefault;
+        this.settingsDirectoryKey = settingsDirectoryKey;
     }
 
-    public List<File> reportsIn(final String baseDirPath) {
+    public List<File> reportsIn(final String module, final String rootDirectory, final String baseDirectory) {
 
-        final String[] relPaths = filesMathingPattern(baseDirPath, reportPattern());
+        final String reportDirectory = getReportDirectory(module, rootDirectory, baseDirectory);
+        final String reportPattern = getReportPattern(module);
+        final String[] relPaths = filesMatchingPattern(reportDirectory, reportPattern);
 
         final List<File> reports = new ArrayList<File>();
 
         for (final String relPath : relPaths) {
-            reports.add(new File(baseDirPath, relPath));
+            reports.add(new File(reportDirectory, relPath));
         }
 
         return reports;
     }
 
-    private String[] filesMathingPattern(final String baseDirPath, final String reportPath) {
+    private String[] filesMatchingPattern(final String reportDirectory, final String reportPath) {
 
         final DirectoryScanner scanner = new DirectoryScanner();
         scanner.setIncludes(new String[] { reportPath });
-        scanner.setBasedir(new File(baseDirPath));
+        scanner.setBasedir(new File(reportDirectory));
         scanner.scan();
+        
+        LOGGER.info("Files found in directory '" + reportDirectory + "' including '" + reportPath + "': " + Arrays.toString(scanner.getIncludedFiles()));
 
         return scanner.getIncludedFiles();
     }
 
-    private String reportPattern() {
+    private String getReportPattern(final String module) {
+
+        String reportPath = conf.getString(module + "." + settingsReportKey);
 
-        String reportPath = conf.getString(settingsKey);
+        if (reportPath == null) {
+            reportPath = conf.getString(settingsReportKey);
+        }
 
         if (reportPath == null) {
-            reportPath = settingsDefault;
+            reportPath = settingsReportDefault;
         }
 
         return reportPath;
     }
 
+    private String getReportDirectory(final String module, final String rootDirectory, final String defaultDirectory) {
+
+        String reportDirectory = conf.getString(module + "." + settingsDirectoryKey);
+
+        if (reportDirectory == null) {
+            reportDirectory = conf.getString(settingsDirectoryKey);
+        }
+
+        if (reportDirectory != null) {
+            reportDirectory = rootDirectory + reportDirectory;
+        }
+        else {
+            reportDirectory = defaultDirectory;
+        }
+
+        return reportDirectory;
+    }
+
 }

sonar-swift-plugin/src/main/java/org/sonar/plugins/swift/coverage/SwiftCoberturaSensor.java

@@ -37,38 +37,48 @@ public final class SwiftCoberturaSensor implements Sensor {
 
     public static final String REPORT_PATTERN_KEY = SwiftPlugin.PROPERTY_PREFIX + ".coverage.reportPattern";
     public static final String DEFAULT_REPORT_PATTERN = "sonar-reports/coverage-swift*.xml";
+    public static final String REPORT_DIRECTORY_KEY = SwiftPlugin.PROPERTY_PREFIX + ".coverage.reportDirectory";
 
     private final ReportFilesFinder reportFilesFinder;
 
     private final Settings settings;
     private final FileSystem fileSystem;
     private final PathResolver pathResolver;
-    private Project project;
 
     public SwiftCoberturaSensor(final FileSystem fileSystem, final PathResolver pathResolver, final Settings settings) {
-
+        
         this.settings = settings;
         this.fileSystem = fileSystem;
-        this.pathResolver = pathResolver;
+        this.pathResolver = pathResolver;   
 
-        reportFilesFinder = new ReportFilesFinder(settings, REPORT_PATTERN_KEY, DEFAULT_REPORT_PATTERN);
-    }
+        reportFilesFinder = new ReportFilesFinder(settings, REPORT_PATTERN_KEY, DEFAULT_REPORT_PATTERN, REPORT_DIRECTORY_KEY);
+    }   
 
     public boolean shouldExecuteOnProject(final Project project) {
-
-        this.project = project;
-
-        return project.isRoot() && fileSystem.languages().contains(Swift.KEY);
+        return fileSystem.languages().contains(Swift.KEY);
     }
 
     public void analyse(final Project project, final SensorContext context) {
 
-
         final String projectBaseDir = fileSystem.baseDir().getPath();
+        LOGGER.info("Analyzing directory: " + projectBaseDir);
 
-        for (final File report : reportFilesFinder.reportsIn(projectBaseDir)) {
+        final String module = project.getName();
+        final String rootDir = getRootDirectory(project);
+
+        for (final File report : reportFilesFinder.reportsIn(module, rootDir, projectBaseDir)) {
             LOGGER.info("Processing coverage report {}", report);
             CoberturaReportParser.parseReport(report, fileSystem, project, context);
         }
     }
+
+    private String getRootDirectory(Project project) {
+        final String projectBaseDir = fileSystem.baseDir().getPath();
+        if (project.isRoot()) {
+            return projectBaseDir;
+        } else {
+            final String modulePath = project.path();
+            return projectBaseDir.substring(0, projectBaseDir.length() - modulePath.length());
+        }
+    }
 }