Merge commit 'f3c3b3cb653349397e61c27de4f0fb79ec33ec59' into develop

* commit 'f3c3b3cb653349397e61c27de4f0fb79ec33ec59':
  merged pull request code from main

Author: Timothy G. Rundle

docs/sonarqube-fastlane.md

@@ -9,7 +9,7 @@ Then add the following lane.
 lane :metrics do
     scan(scheme: "[SCHEME]", code_coverage: true, derived_data_path: "./DerivedData", output_directory: "./reports")
     slather(cobertura_xml: true, jenkins: true, scheme: "[SCHEME]", build_directory: "./DerivedData", output_directory: "./reports", proj: "./[PROJECT].xcodeproj")
-    lizard(source_folder: "[SOURCE_FOLDER]", language: "swift", export_type: "xml", report_file: "report/lizard-report.xml")
+    lizard(source_folder: "[SOURCE_FOLDER]", language: "swift", export_type: "xml", report_file: "reports/lizard-report.xml")
     swiftlint(output_file: "./reports/swiftlint.txt", ignore_exit_status: true)
     sonar
 end

objclang/src/main/java/com/backelite/sonarqube/objectivec/issues/oclint/OCLintParser.java

@@ -88,6 +88,7 @@ private void collectFileViolations(String filePath, NodeList nodeList) {
         FilePredicate fp = context.fileSystem().predicates().hasAbsolutePath(file.getAbsolutePath());
         if(!context.fileSystem().hasFiles(fp)){
             LOGGER.warn("file not included in sonar {}", filePath);
+            return;
         }
         InputFile inputFile = context.fileSystem().inputFile(fp);
         for (int i = 0; i < nodeList.getLength(); i++) {

objclang/src/main/resources/org/sonar/plugins/oclint/profile-oclint.xml

@@ -27,6 +27,18 @@
             <repositoryKey>OCLint</repositoryKey>
             <key>collapsible if statements</key>
         </rule>
+        <rule>
+            <repositoryKey>OCLint</repositoryKey>
+            <key>compiler error</key>
+        </rule>
+        <rule>
+            <repositoryKey>OCLint</repositoryKey>
+            <key>compiler warning</key>
+        </rule>
+        <rule>
+            <repositoryKey>OCLint</repositoryKey>
+            <key>clang static analyzer</key>
+        </rule>
         <rule>
             <repositoryKey>OCLint</repositoryKey>
             <key>constant conditional operator</key>

objclang/src/main/resources/org/sonar/plugins/oclint/rules.txt

@@ -54,6 +54,30 @@ Category: OCLint
 constant conditional operator
 ----------
 
+Summary: Name: compiler error
+
+Severity: 2
+Category: OCLint
+
+compiler error
+----------
+
+Summary: Name: compiler warning
+
+Severity: 3
+Category: OCLint
+
+compiler warning
+----------
+
+Summary: Name: clang static analyzer
+
+Severity: 3
+Category: OCLint
+
+clang static analyzer
+----------
+
 Summary: Name: constant conditional operator
 
 Severity: 3
@@ -70,7 +94,7 @@ Category: OCLint
 high cyclomatic complexity
 ----------
 
-Summary: 
+Summary:
 
 Severity: 2
 Category: OCLint
@@ -158,15 +182,15 @@ Category: OCLint
 empty while statement
 ----------
 
-Summary: 
+Summary:
 
 Severity: 3
 Category: OCLint
 
 feature envy
 ----------
 
-Summary: 
+Summary:
 
 Severity: 3
 Category: OCLint
@@ -182,7 +206,7 @@ Category: OCLint
 goto statement
 ----------
 
-Summary: 
+Summary:
 
 Severity: 3
 Category: OCLint
@@ -246,7 +270,7 @@ Category: OCLint
 misplaced nil check
 ----------
 
-Summary: 
+Summary:
 
 Severity: 4
 Category: OCLint
@@ -270,7 +294,7 @@ Category: OCLint
 must override hash with isEqual
 ----------
 
-Summary: 
+Summary:
 
 Severity: 1
 Category: OCLint
@@ -302,7 +326,7 @@ Category: OCLint
 high npath complexity
 ----------
 
-Summary: 
+Summary:
 
 Severity: 2
 Category: OCLint
@@ -358,31 +382,31 @@ Category: OCLint
 short variable name
 ----------
 
-Summary: 
+Summary:
 
 Severity: 2
 Category: OCLint
 
 switch statements don't need default when fully covered
 ----------
 
-Summary: 
+Summary:
 
 Severity: 3
 Category: OCLint
 
 throw exception from finally block
 ----------
 
-Summary: 
+Summary:
 
 Severity: 3
 Category: OCLint
 
 too few branches in switch statement
 ----------
 
-Summary: 
+Summary:
 
 Severity: 2
 Category: OCLint
@@ -406,7 +430,7 @@ Category: OCLint
 too many parameters
 ----------
 
-Summary: 
+Summary:
 
 Severity: 3
 Category: OCLint
@@ -430,15 +454,15 @@ Category: OCLint
 unused method parameter
 ----------
 
-Summary: 
+Summary:
 
 Severity: 0
 Category: OCLint
 
 useless parentheses
 ----------
 
-Summary: 
+Summary:
 
 Severity: 1
 Category: OCLint
@@ -526,7 +550,7 @@ Category: OCLint
 use object subscripting
 ----------
 
-Summary: 
+Summary:
 
 Severity: 1
 Category: OCLint
@@ -561,5 +585,4 @@ missing abstract method implementation
 Summary: Name: missing abstract method implementation
 
 Severity: 1
-Category: OCLint
-
+Category: OCLint

sonar-swift-plugin/src/main/java/com/backelite/sonarqube/swift/complexity/LizardReportParser.java

@@ -178,7 +178,7 @@ private static class SwiftFunction implements InputModule {
 
         public SwiftFunction(String name) {
             String[] vals = name.split(" at ");
-            if (vals.length == 2) {
+            if (vals.length >= 2) {
                 this.name = vals[0].replaceAll("\\W","");
 
                 if (vals[1].contains(":")) {

sonar-swift-plugin/src/main/java/com/backelite/sonarqube/swift/complexity/LizardSensor.java

@@ -56,10 +56,14 @@ public void describe(SensorDescriptor descriptor) {
 
     @Override
     public void execute(SensorContext context) {
-        String reportFileName = context.fileSystem().baseDir().getPath() + File.separator + reportPath();
-        LOGGER.info("Processing complexity report: {}",reportFileName);
+        File reportFile = new File(context.fileSystem().baseDir(), reportPath());
+        if (!reportFile.isFile()) {
+            LOGGER.warn("Lizard report file not found at {}", reportFile.getAbsolutePath());
+            return;
+        }
 
+        LOGGER.info("Processing complexity report: {}", reportFile.getAbsolutePath());
         LizardReportParser parser = new LizardReportParser(context);
-        parser.parseReport(new File(reportFileName));
+        parser.parseReport(reportFile);
     }
 }

sonar-swift-plugin/src/main/java/com/backelite/sonarqube/swift/coverage/CoberturaReportParser.java

@@ -95,8 +95,8 @@ private void collectClassMeasures(NodeList nodeList) {
 
     private void collectFileData(String filePath, NodeList nodeList) {
         InputFile resource = getFile(filePath);
-        LOGGER.info("Collect file data: {}",resource.toString());
         if (resource != null) {
+            LOGGER.info("Collect file data: {}",resource.toString());
             boolean lineAdded = false;
             NewCoverage coverage = context.newCoverage();
             coverage.onFile(resource);