Support coverage.exclude: for excluding files from coverage reports

k1LoW · Feb 8, 2024 · d5e6e7d · d5e6e7d
1 parent 618e3f0
commit d5e6e7d
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 10 deletions.
diff --git a/cmd/badge.go b/cmd/badge.go
@@ -29,9 +29,9 @@ import (
 	"strings"
 	"time"
 
+	"github.com/k1LoW/octocov/badge"
 	"github.com/k1LoW/octocov/config"
 	"github.com/k1LoW/octocov/internal"
-	"github.com/k1LoW/octocov/badge"
 	"github.com/k1LoW/octocov/report"
 	"github.com/spf13/cobra"
 )
@@ -85,7 +85,7 @@ var badgeCmd = &cobra.Command{
 			if err := c.CoverageConfigReady(); err != nil {
 				return err
 			}
-			if err := r.MeasureCoverage(c.Coverage.Paths); err != nil {
+			if err := r.MeasureCoverage(c.Coverage.Paths, c.Coverage.Exclude); err != nil {
 				return err
 			}
 			cp := r.CoveragePercent()

diff --git a/cmd/dump.go b/cmd/dump.go
@@ -59,7 +59,7 @@ var dumpCmd = &cobra.Command{
 		if err := c.CoverageConfigReady(); err != nil {
 			cmd.PrintErrf("Skip measuring code coverage: %v\n", err)
 		} else {
-			if err := r.MeasureCoverage(c.Coverage.Paths); err != nil {
+			if err := r.MeasureCoverage(c.Coverage.Paths, c.Coverage.Exclude); err != nil {
 				cmd.PrintErrf("Skip measuring code coverage: %v\n", err)
 			}
 		}

diff --git a/cmd/lsFiles.go b/cmd/lsFiles.go
@@ -61,7 +61,7 @@ var lsFilesCmd = &cobra.Command{
 		if err != nil {
 			return err
 		}
-		if err := r.MeasureCoverage(c.Coverage.Paths); err != nil {
+		if err := r.MeasureCoverage(c.Coverage.Paths, c.Coverage.Exclude); err != nil {
 			return err
 		}
 		t := 0

diff --git a/cmd/root.go b/cmd/root.go
@@ -169,7 +169,7 @@ var rootCmd = &cobra.Command{
 		if err := c.CoverageConfigReady(); err != nil {
 			cmd.PrintErrf("Skip measuring code coverage: %v\n", err)
 		} else {
-			if err := r.MeasureCoverage(c.Coverage.Paths); err != nil {
+			if err := r.MeasureCoverage(c.Coverage.Paths, c.Coverage.Exclude); err != nil {
 				cmd.PrintErrf("Skip measuring code coverage: %v\n", err)
 			}
 		}
@@ -358,7 +358,7 @@ var rootCmd = &cobra.Command{
 				if err != nil {
 					return err
 				}
-				if err := rt.MeasureCoverage([]string{c.Diff.Path}); err == nil {
+				if err := rt.MeasureCoverage([]string{c.Diff.Path}, c.Coverage.Exclude); err == nil {
 					if rPrev == nil || rPrev.Timestamp.UnixNano() < rt.Timestamp.UnixNano() {
 						rPrev = rt
 					}
@@ -508,7 +508,7 @@ func printMetrics(cmd *cobra.Command) error {
 	}
 
 	if err := c.CoverageConfigReady(); err == nil {
-		if err := r.MeasureCoverage(c.Coverage.Paths); err != nil {
+		if err := r.MeasureCoverage(c.Coverage.Paths, c.Coverage.Exclude); err != nil {
 			cmd.PrintErrf("Skip measuring code coverage: %v\n", err)
 		}
 	}

diff --git a/cmd/view.go b/cmd/view.go
@@ -57,7 +57,7 @@ var viewCmd = &cobra.Command{
 		if err != nil {
 			return err
 		}
-		if err := r.MeasureCoverage(c.Coverage.Paths); err != nil {
+		if err := r.MeasureCoverage(c.Coverage.Paths, c.Coverage.Exclude); err != nil {
 			return err
 		}
 		for _, f := range args {

diff --git a/config/config.go b/config/config.go
@@ -60,6 +60,7 @@ type Config struct {
 type Coverage struct {
 	Path       string        `yaml:"path,omitempty"`
 	Paths      []string      `yaml:"paths,omitempty"`
+	Exclude    []string      `yaml:"exclude,omitempty"`
 	Badge      CoverageBadge `yaml:"badge,omitempty"`
 	Acceptable string        `yaml:"acceptable,omitempty"`
 	If         string        `yaml:"if,omitempty"`

diff --git a/report/report.go b/report/report.go
@@ -297,7 +297,7 @@ func (r *Report) Load(path string) error {
 	return nil
 }
 
-func (r *Report) MeasureCoverage(paths []string) error {
+func (r *Report) MeasureCoverage(paths, exclude []string) error {
 	if len(paths) == 0 {
 		return fmt.Errorf("coverage report not found: %s", paths)
 	}
@@ -333,6 +333,11 @@ func (r *Report) MeasureCoverage(paths []string) error {
 		return cerr
 	}
 
+	if err := r.Coverage.Exclude(exclude); err != nil {
+		cerr = multierror.Append(cerr, err)
+		return cerr
+	}
+
 	return nil
 }
 

diff --git a/report/report_test.go b/report/report_test.go
@@ -109,7 +109,7 @@ func TestMeasureCoverage(t *testing.T) {
 	}
 	for _, tt := range tests {
 		r := &Report{}
-		if err := r.MeasureCoverage(tt.paths); err != nil {
+		if err := r.MeasureCoverage(tt.paths, nil); err != nil {
 			if !tt.wantErr {
 				t.Error(err)
 			}