Drop formatters dependency to env package

formatters/clover/clover.go

@@ -5,7 +5,6 @@ import (
 	"os"
 	"strings"
 
-	"github.com/codeclimate/test-reporter/env"
 	"github.com/codeclimate/test-reporter/formatters"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
@@ -47,8 +46,6 @@ func (r Formatter) Format() (formatters.Report, error) {
 		return rep, errors.WithStack(err)
 	}
 
-	gitHead, _ := env.GetHead()
-
 	files := c.Files
 	for _, pp := range c.Packages {
 		files = append(files, pp.Files...)
@@ -62,7 +59,7 @@ func (r Formatter) Format() (formatters.Report, error) {
 			path = pf.Name
 		}
 
-		sf, err := formatters.NewSourceFile(path, gitHead)
+		sf, err := formatters.NewSourceFile(path, nil)
 		if err != nil {
 			return rep, errors.WithStack(err)
 		}

formatters/clover/clover_test.go

@@ -3,19 +3,10 @@ package clover
 import (
 	"testing"
 
-	"gopkg.in/src-d/go-git.v4/plumbing/object"
-
-	"github.com/codeclimate/test-reporter/env"
 	"github.com/stretchr/testify/require"
 )
 
 func Test_Parse(t *testing.T) {
-	gb := env.GitBlob
-	defer func() { env.GitBlob = gb }()
-	env.GitBlob = func(s string, c *object.Commit) (string, error) {
-		return s, nil
-	}
-
 	r := require.New(t)
 
 	f := &Formatter{Path: "./example.xml"}
@@ -33,12 +24,6 @@ func Test_Parse(t *testing.T) {
 }
 
 func Test_Parse_Without_Package(t *testing.T) {
-	gb := env.GitBlob
-	defer func() { env.GitBlob = gb }()
-	env.GitBlob = func(s string, c *object.Commit) (string, error) {
-		return s, nil
-	}
-
 	r := require.New(t)
 
 	f := &Formatter{Path: "./example_without_package.xml"}

formatters/cobertura/cobertura.go

@@ -6,7 +6,6 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/codeclimate/test-reporter/env"
 	"github.com/codeclimate/test-reporter/formatters"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
@@ -49,7 +48,6 @@ func (r Formatter) Format() (formatters.Report, error) {
 		return rep, errors.WithStack(err)
 	}
 
-	gitHead, _ := env.GetHead()
 	for _, pp := range coberturaFile.Packages {
 		mergedClasses := make(map[string]*xmlClass)
 		// merge Classes by filename
@@ -68,7 +66,7 @@ func (r Formatter) Format() (formatters.Report, error) {
 			num := 1
 			fileName := coberturaFile.getFullFilePath(pf.FileName)
 			logrus.Debugf("creating test file report for %s", fileName)
-			sf, err := formatters.NewSourceFile(fileName, gitHead)
+			sf, err := formatters.NewSourceFile(fileName, nil)
 			if err != nil {
 				return rep, errors.WithStack(err)
 			}

formatters/cobertura/cobertura_test.go

@@ -3,18 +3,10 @@ package cobertura
 import (
 	"testing"
 
-	"gopkg.in/src-d/go-git.v4/plumbing/object"
-
-	"github.com/codeclimate/test-reporter/env"
 	"github.com/stretchr/testify/require"
 )
 
 func Test_Parse(t *testing.T) {
-	gb := env.GitBlob
-	defer func() { env.GitBlob = gb }()
-	env.GitBlob = func(s string, c *object.Commit) (string, error) {
-		return s, nil
-	}
 
 	r := require.New(t)
 

formatters/coveragepy/coveragepy.go

@@ -5,7 +5,6 @@ import (
 	"os"
 	"strings"
 
-	"github.com/codeclimate/test-reporter/env"
 	"github.com/codeclimate/test-reporter/formatters"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
@@ -47,12 +46,11 @@ func (r *Formatter) Format() (formatters.Report, error) {
 		return rep, errors.WithStack(err)
 	}
 
-	gitHead, _ := env.GetHead()
 	for _, xmlPackage := range coverageFile.Packages {
 		for _, xmlClass := range xmlPackage.Classes {
 			fileName := coverageFile.getFullFilePath(xmlClass.FileName)
 			logrus.Debugf("creating test file report for %s", fileName)
-			sourceFile, err := formatters.NewSourceFile(fileName, gitHead)
+			sourceFile, err := formatters.NewSourceFile(fileName, nil)
 			if err != nil {
 				return rep, errors.WithStack(err)
 			}

formatters/coveragepy/coveragepy_test.go

@@ -3,18 +3,10 @@ package coveragepy
 import (
 	"testing"
 
-	"gopkg.in/src-d/go-git.v4/plumbing/object"
-
-	"github.com/codeclimate/test-reporter/env"
 	"github.com/stretchr/testify/require"
 )
 
 func Test_Parse(t *testing.T) {
-	gb := env.GitBlob
-	defer func() { env.GitBlob = gb }()
-	env.GitBlob = func(s string, c *object.Commit) (string, error) {
-		return s, nil
-	}
 
 	r := require.New(t)
 

formatters/dotcover/dotcover.go

@@ -5,7 +5,6 @@ import (
 	"os"
 	"strings"
 
-	"github.com/codeclimate/test-reporter/env"
 	"github.com/codeclimate/test-reporter/formatters"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
@@ -44,10 +43,8 @@ func (f Formatter) Format() (formatters.Report, error) {
 		return rep, err
 	}
 
-	gitHead, _ := env.GetHead()
-
 	for _, file := range c.Files {
-		sf, err := formatters.NewSourceFile(file.Path, gitHead)
+		sf, err := formatters.NewSourceFile(file.Path, nil)
 		if err != nil {
 			err = errors.WithStack(err)
 			break

formatters/dotcover/dotcover_test.go

@@ -3,21 +3,10 @@ package dotcover
 import (
 	"testing"
 
-	"gopkg.in/src-d/go-git.v4/plumbing/object"
-
-	"github.com/codeclimate/test-reporter/env"
 	"github.com/stretchr/testify/require"
 )
 
 func Test_Parse(t *testing.T) {
-	ogb := env.GitBlob
-	defer func() {
-		env.GitBlob = ogb
-	}()
-	env.GitBlob = func(s string, c *object.Commit) (string, error) {
-		return s, nil
-	}
-
 	assert := require.New(t)
 
 	formatter := Formatter{

formatters/excoveralls/excoveralls.go

@@ -5,7 +5,6 @@ import (
 	"os"
 	"strings"
 
-	"github.com/codeclimate/test-reporter/env"
 	"github.com/codeclimate/test-reporter/formatters"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
@@ -47,9 +46,8 @@ func (r Formatter) Format() (formatters.Report, error) {
 		return report, errors.WithStack(err)
 	}
 
-	gitHead, _ := env.GetHead()
 	for _, file := range coverageInput.Files {
-		sourceFile, err := formatters.NewSourceFile(file.Name, gitHead)
+		sourceFile, err := formatters.NewSourceFile(file.Name, nil)
 		if err != nil {
 			return report, errors.WithStack(err)
 		}

formatters/excoveralls/excoveralls_test.go

@@ -3,18 +3,10 @@ package excoveralls
 import (
 	"testing"
 
-	"gopkg.in/src-d/go-git.v4/plumbing/object"
-
-	"github.com/codeclimate/test-reporter/env"
 	"github.com/stretchr/testify/require"
 )
 
 func Test_Format(t *testing.T) {
-	gb := env.GitBlob
-	defer func() { env.GitBlob = gb }()
-	env.GitBlob = func(s string, c *object.Commit) (string, error) {
-		return s, nil
-	}
 
 	r := require.New(t)
 
@@ -40,11 +32,6 @@ func Test_Format(t *testing.T) {
 }
 
 func Test_Format_MissingFile(t *testing.T) {
-	gb := env.GitBlob
-	defer func() { env.GitBlob = gb }()
-	env.GitBlob = func(s string, c *object.Commit) (string, error) {
-		return s, nil
-	}
 
 	r := require.New(t)
 

formatters/gcov/gcov.go

@@ -9,7 +9,6 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/codeclimate/test-reporter/env"
 	"github.com/codeclimate/test-reporter/formatters"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
@@ -56,9 +55,8 @@ func (f *Formatter) Format() (formatters.Report, error) {
 		return rep, err
 	}
 
-	gitHead, _ := env.GetHead()
 	for _, file := range f.FileNames {
-		sf, err := parseSourceFile(file, gitHead)
+		sf, err := parseSourceFile(file, nil)
 		if err != nil {
 			return rep, errors.WithStack(err)
 		}

formatters/gocov/gocov.go

@@ -7,26 +7,16 @@ import (
 
 	"golang.org/x/tools/cover"
 
-	"github.com/codeclimate/test-reporter/env"
 	"github.com/codeclimate/test-reporter/formatters"
-	"github.com/gobuffalo/envy"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )
 
-var basePackage string
-
-func init() {
-	basePackage, _ = os.Getwd()
-	for _, gp := range envy.GoPaths() {
-		basePackage = strings.TrimPrefix(basePackage, filepath.Join(gp, "src")+string(os.PathSeparator))
-	}
-}
-
 var searchPaths = []string{"c.out"}
 
 type Formatter struct {
-	Path string
+	Path         string
+	GoModuleName string
 }
 
 func (f *Formatter) Search(paths ...string) (string, error) {
@@ -53,10 +43,9 @@ func (r Formatter) Format() (formatters.Report, error) {
 		return rep, errors.WithStack(err)
 	}
 
-	gitHead, _ := env.GetHead()
 	for _, p := range profiles {
-		n := strings.TrimPrefix(filepath.FromSlash(p.FileName), basePackage+string(os.PathSeparator))
-		sf, err := formatters.NewSourceFile(n, gitHead)
+		n := strings.TrimPrefix(filepath.FromSlash(p.FileName), r.GoModuleName+string(os.PathSeparator))
+		sf, err := formatters.NewSourceFile(n, nil)
 		if err != nil {
 			return rep, errors.WithStack(err)
 		}

formatters/gocov/gocov_test.go

@@ -5,19 +5,11 @@ import (
 
 	"path/filepath"
 
-	"gopkg.in/src-d/go-git.v4/plumbing/object"
-
-	"github.com/codeclimate/test-reporter/env"
 	"github.com/stretchr/testify/require"
 )
 
 func Test_Parse(t *testing.T) {
 	t.Run("should parse report from single package", func(t *testing.T) {
-		gb := env.GitBlob
-		defer func() { env.GitBlob = gb }()
-		env.GitBlob = func(s string, c *object.Commit) (string, error) {
-			return s, nil
-		}
 
 		r := require.New(t)
 
@@ -27,7 +19,8 @@ func Test_Parse(t *testing.T) {
 
 		r.Len(rep.SourceFiles, 4)
 
-		sf := rep.SourceFiles[filepath.FromSlash("github.com/codeclimate/test-reporter/formatters/source_file.go")]
+		sf, fok := rep.SourceFiles[filepath.FromSlash("github.com/codeclimate/test-reporter/formatters/source_file.go")]
+		r.True(fok)
 
 		r.InDelta(75.8, sf.CoveredPercent, 1)
 		r.Len(sf.Coverage, 115)
@@ -46,22 +39,19 @@ func Test_Parse(t *testing.T) {
 	// ./...
 	//
 	t.Run("should parse coverage report from multiple packages", func(t *testing.T) {
-		gb := env.GitBlob
-		defer func() { env.GitBlob = gb }()
-		env.GitBlob = func(s string, c *object.Commit) (string, error) {
-			return s, nil
-		}
 
 		r := require.New(t)
 
-		f := &Formatter{Path: filepath.Join("example", "foobar_test.out")}
+		f := &Formatter{Path: filepath.Join("example", "foobar_test.out"), GoModuleName: "github.com/codeclimate/test-reporter"}
 		rep, err := f.Format()
 		r.NoError(err)
 
 		r.Len(rep.SourceFiles, 2)
 
-		sfFoo := rep.SourceFiles[filepath.Join("example","foo","foo.go")]
-		sfBar := rep.SourceFiles[filepath.Join("example","bar","bar.go")]
+		sfFoo, okFoo := rep.SourceFiles[filepath.Join("formatters", "gocov", "example", "foo", "foo.go")]
+		r.True(okFoo)
+		sfBar, okBar := rep.SourceFiles[filepath.Join("formatters", "gocov", "example", "bar", "bar.go")]
+		r.True(okBar)
 
 		r.EqualValues(85, rep.CoveredPercent)
 		r.EqualValues(100, sfFoo.CoveredPercent)

formatters/jacoco/jacoco.go

@@ -7,7 +7,6 @@ import (
 	"path"
 	"strings"
 
-	"github.com/codeclimate/test-reporter/env"
 	"github.com/codeclimate/test-reporter/formatters"
 	"github.com/gobuffalo/envy"
 	"github.com/pkg/errors"
@@ -56,7 +55,6 @@ func (r Formatter) Format() (formatters.Report, error) {
 		return rep, errors.WithStack(err)
 	}
 
-	gitHead, _ := env.GetHead()
 	for _, xmlPackage := range xmlJacoco.Packages {
 		for _, xmlSF := range xmlPackage.SourceFile {
 			num := 1
@@ -68,7 +66,7 @@ func (r Formatter) Format() (formatters.Report, error) {
 					break
 				}
 			}
-			sf, err := formatters.NewSourceFile(absolutePath, gitHead)
+			sf, err := formatters.NewSourceFile(absolutePath, nil)
 			if err != nil {
 				logrus.Warnf("Couldn't find file for path \"%s\" from %s coverage data. Ignore if the path doesn't correspond to an existent file in your repo.", absolutePath, r.Path)
 				continue