#37 allow to disable SimpleCov parser

Author: terma

src/main/java/com/github/terma/jenkins/githubprcoveragestatus/CompareCoverageAction.java

@@ -88,6 +88,8 @@ public void perform(
 
         buildLog.println(BUILD_LOG_PREFIX + "start");
 
+        final SettingsRepository settingsRepository = ServiceRegistry.getSettingsRepository();
+
         final int prId = PrIdAndUrlUtils.getPrId(scmVars, build, listener);
         final String gitUrl = PrIdAndUrlUtils.getGitUrl(scmVars, build, listener);
 
@@ -98,18 +100,17 @@ public void perform(
         buildLog.println(BUILD_LOG_PREFIX + "master coverage: " + masterCoverage);
 
         buildLog.println(BUILD_LOG_PREFIX + "collecting coverage...");
-        final float coverage = ServiceRegistry.getCoverageRepository().get(workspace);
+        final float coverage = ServiceRegistry.getCoverageRepository(settingsRepository.isDisableSimpleCov()).get(workspace);
         buildLog.println(BUILD_LOG_PREFIX + "build coverage: " + coverage);
 
         final Message message = new Message(coverage, masterCoverage);
         buildLog.println(BUILD_LOG_PREFIX + message.forConsole());
 
         final String buildUrl = Utils.getBuildUrl(build, listener);
 
-        String jenkinsUrl = ServiceRegistry.getSettingsRepository().getJenkinsUrl();
+        String jenkinsUrl = settingsRepository.getJenkinsUrl();
         if (jenkinsUrl == null) jenkinsUrl = Utils.getJenkinsUrlFromBuildUrl(buildUrl);
 
-        final SettingsRepository settingsRepository = ServiceRegistry.getSettingsRepository();
 
         try {
             final String comment = message.forComment(

src/main/java/com/github/terma/jenkins/githubprcoveragestatus/Configuration.java

@@ -94,6 +94,7 @@ public static final class ConfigurationDescriptor extends Descriptor<Configurati
 
         private final Map<String, Float> coverageByRepo = new ConcurrentHashMap<String, Float>();
 
+        private boolean disableSimpleCov;
         private String gitHubApiUrl;
         private String personalAccessToken;
         private String jenkinsUrl;
@@ -156,6 +157,11 @@ public boolean isUseSonarForMasterCoverage() {
             return useSonarForMasterCoverage;
         }
 
+        @Override
+        public boolean isDisableSimpleCov() {
+            return disableSimpleCov;
+        }
+
         @Override
         public String getSonarUrl() {
             return sonarUrl;
@@ -188,6 +194,7 @@ public boolean configure(StaplerRequest req, JSONObject formData) throws FormExc
             jenkinsUrl = StringUtils.trimToNull(formData.getString("jenkinsUrl"));
             privateJenkinsPublicGitHub = BooleanUtils.toBoolean(formData.getString("privateJenkinsPublicGitHub"));
             useSonarForMasterCoverage = BooleanUtils.toBoolean(formData.getString("useSonarForMasterCoverage"));
+            disableSimpleCov = BooleanUtils.toBoolean(formData.getString("disableSimpleCov"));
             sonarUrl = StringUtils.trimToNull(formData.getString("sonarUrl"));
             sonarToken = StringUtils.trimToNull(formData.getString("sonarToken"));
             sonarLogin = StringUtils.trimToNull(formData.getString("sonarLogin"));

src/main/java/com/github/terma/jenkins/githubprcoveragestatus/GetCoverageCallable.java

@@ -32,6 +32,12 @@
 @SuppressWarnings("WeakerAccess")
 final class GetCoverageCallable extends MasterToSlaveFileCallable<Float> implements CoverageRepository {
 
+    private final boolean disableSimpleCov;
+
+    GetCoverageCallable(final boolean disableSimpleCov) {
+        this.disableSimpleCov = disableSimpleCov;
+    }
+
     private static List<Float> getFloats(File ws, String path, CoverageReportParser parser) {
         FileSet fs = Util.createFileSet(ws, path);
         DirectoryScanner ds = fs.getDirectoryScanner();
@@ -44,7 +50,7 @@ private static List<Float> getFloats(File ws, String path, CoverageReportParser
     @Override
     public float get(final FilePath workspace) throws IOException, InterruptedException {
         if (workspace == null) throw new IllegalArgumentException("Workspace should not be null!");
-        return workspace.act(new GetCoverageCallable());
+        return workspace.act(new GetCoverageCallable(disableSimpleCov));
     }
 
     @Override
@@ -55,7 +61,7 @@ public Float invoke(final File ws, final VirtualChannel channel) throws IOExcept
         cov.addAll(getFloats(ws, "**/jacoco.xml", new JacocoParser()));
         cov.addAll(getFloats(ws, "**/jacocoTestReport.xml", new JacocoParser())); //default for gradle
         cov.addAll(getFloats(ws, "**/clover.xml", new CloverParser()));
-        cov.addAll(getFloats(ws, "**/coverage.json", new SimpleCovParser()));
+        if (!disableSimpleCov) cov.addAll(getFloats(ws, "**/coverage.json", new SimpleCovParser()));
 
         float s = 0;
         for (float v : cov) s += v;

src/main/java/com/github/terma/jenkins/githubprcoveragestatus/MasterCoverageAction.java

@@ -70,7 +70,8 @@ public void perform(final Run build, final FilePath workspace, final Launcher la
         final PrintStream buildLog = listener.getLogger();
         final String gitUrl = PrIdAndUrlUtils.getGitUrl(scmVars, build, listener);
 
-        final float masterCoverage = ServiceRegistry.getCoverageRepository().get(workspace);
+        final boolean disableSimpleCov = ServiceRegistry.getSettingsRepository().isDisableSimpleCov();
+        final float masterCoverage = ServiceRegistry.getCoverageRepository(disableSimpleCov).get(workspace);
         buildLog.println("Master coverage " + Percent.toWholeString(masterCoverage));
         Configuration.setMasterCoverage(gitUrl, masterCoverage);
     }

src/main/java/com/github/terma/jenkins/githubprcoveragestatus/ServiceRegistry.java

@@ -51,8 +51,8 @@ public static void setMasterCoverageRepository(MasterCoverageRepository masterCo
         ServiceRegistry.masterCoverageRepository = masterCoverageRepository;
     }
 
-    public static CoverageRepository getCoverageRepository() {
-        return coverageRepository != null ? coverageRepository : new GetCoverageCallable();
+    public static CoverageRepository getCoverageRepository(final boolean disableSimpleCov) {
+        return coverageRepository != null ? coverageRepository : new GetCoverageCallable(disableSimpleCov);
     }
 
     public static void setCoverageRepository(CoverageRepository coverageRepository) {

src/main/java/com/github/terma/jenkins/githubprcoveragestatus/SettingsRepository.java

@@ -16,6 +16,8 @@ interface SettingsRepository {
 
     boolean isUseSonarForMasterCoverage();
 
+    boolean isDisableSimpleCov();
+
     String getSonarUrl();
 
     String getSonarToken();

src/main/resources/com/github/terma/jenkins/githubprcoveragestatus/Configuration/global.groovy

@@ -48,4 +48,8 @@ f.section(title: descriptor.displayName) {
         f.password()
     }
 
+    f.entry(field: "disableSimpleCov", title: _("Disable SimpleCov coverage parser")) {
+        f.checkbox()
+    }
+
 }

src/main/resources/com/github/terma/jenkins/githubprcoveragestatus/Configuration/help-disableSimpleCov.html

@@ -0,0 +1,5 @@
+<div>
+    SimpleCov coverage generate has pretty wide search criteria for coverage file <code>**/coverage.json</code>
+    Often it can fails because some of files from JS/Node JS projects have similar name but definitely not a
+    SimpleCov format so parser will fail entire build.
+</div>