fully based on go-billy

Author: mcuadros

fixtures.go

@@ -3,19 +3,21 @@ package fixtures
 import (
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"strings"
 
-	"github.com/alcortesm/tgz"
 	"github.com/go-git/go-billy/v5"
 	"github.com/go-git/go-billy/v5/osfs"
+	"github.com/go-git/go-git-fixtures/v4/internal/tgz"
 	"gopkg.in/check.v1"
 )
 
 //go:generate esc -o data.go -pkg=fixtures data
 
-var files = make(map[string]string)
+var (
+	files = make(map[string]string)
+	fs    = osfs.New(os.TempDir())
+)
 
 var fixtures = Fixtures{{
 	Tags:         []string{"packfile", "ofs-delta", ".git", "root-reference"},
@@ -203,17 +205,17 @@ func (f *Fixture) Is(tag string) bool {
 	return false
 }
 
-func (f *Fixture) file(path string) (*os.File, error) {
+func (f *Fixture) file(path string) (billy.File, error) {
 	if fpath, ok := files[path]; ok {
-		return os.Open(fpath)
+		return fs.Open(fpath)
 	}
 
 	bytes, err := FSByte(false, "/data/"+path)
 	if err != nil {
 		return nil, err
 	}
 
-	file, err := ioutil.TempFile(os.TempDir(), "go-git-fixtures")
+	file, err := fs.TempFile("", "go-git-fixtures")
 	if err != nil {
 		return nil, err
 	}
@@ -222,32 +224,29 @@ func (f *Fixture) file(path string) (*os.File, error) {
 		return nil, err
 	}
 
-	if err := file.Sync(); err != nil {
-		return nil, err
-	}
-
-	if _, err := file.Seek(0, io.SeekStart); err != nil {
+	if err := file.Close(); err != nil {
 		return nil, err
 	}
 
 	files[path] = file.Name()
-
-	return file, nil
+	return fs.Open(file.Name())
 }
 
-func (f *Fixture) Packfile() *os.File {
+func (f *Fixture) Packfile() billy.File {
 	file, err := f.file(fmt.Sprintf("pack-%s.pack", f.PackfileHash))
 	if err != nil {
 		panic(err)
 	}
+
 	return file
 }
 
-func (f *Fixture) Idx() *os.File {
+func (f *Fixture) Idx() billy.File {
 	file, err := f.file(fmt.Sprintf("pack-%s.idx", f.PackfileHash))
 	if err != nil {
 		panic(err)
 	}
+
 	return file
 }
 
@@ -264,12 +263,12 @@ func (f *Fixture) DotGit() billy.Filesystem {
 		panic(err)
 	}
 
-	path, err := tgz.Extract(file.Name())
+	fs, err := tgz.Extract(fs, file.Name())
 	if err != nil {
 		panic(err)
 	}
 
-	return osfs.New(path)
+	return fs
 }
 
 // EnsureIsBare overrides the config file with one where bare is true.
@@ -304,12 +303,12 @@ func (f *Fixture) Worktree() billy.Filesystem {
 		panic(err)
 	}
 
-	path, err := tgz.Extract(file.Name())
+	fs, err := tgz.Extract(fs, file.Name())
 	if err != nil {
 		panic(err)
 	}
 
-	return osfs.New(path)
+	return fs
 }
 
 type Fixtures []*Fixture
@@ -360,7 +359,7 @@ func (g Fixtures) Exclude(tag string) Fixtures {
 // Clean cleans all the temporal files created
 func Clean() error {
 	for fname, f := range files {
-		if err := os.Remove(f); err != nil {
+		if err := fs.Remove(f); err != nil {
 			return err
 		}
 		delete(files, fname)

go.mod

@@ -3,7 +3,6 @@ module github.com/go-git/go-git-fixtures/v4
 go 1.14
 
 require (
-	github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7
 	github.com/go-git/go-billy/v5 v5.2.0
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c
 )

go.sum

@@ -1,5 +1,3 @@
-github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 h1:uSoVVbwJiQipAclBbw+8quDsfcvFjOpI5iCf4p/cqCs=
-github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/go-git/go-billy/v5 v5.2.0 h1:GcoouCP9J+5slw2uXAocL70z8ml4A8B/H8nEPt6CLPk=
 github.com/go-git/go-billy/v5 v5.2.0/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0=