expose temp filesystem

mcuadros · mcuadros · commit 8a402b8960fd · 2021-05-02T23:53:51.000+02:00
diff --git a/fixtures.go b/fixtures.go
@@ -15,8 +15,8 @@ import (
 //go:generate esc -o data.go -pkg=fixtures data
 
 var (
-	files = make(map[string]string)
-	fs    = osfs.New(os.TempDir())
+	files      = make(map[string]string)
+	Filesystem = osfs.New(os.TempDir())
 )
 
 var fixtures = Fixtures{{
@@ -207,15 +207,15 @@ func (f *Fixture) Is(tag string) bool {
 
 func (f *Fixture) file(path string) (billy.File, error) {
 	if fpath, ok := files[path]; ok {
-		return fs.Open(fpath)
+		return Filesystem.Open(fpath)
 	}
 
 	bytes, err := FSByte(false, "/data/"+path)
 	if err != nil {
 		return nil, err
 	}
 
-	file, err := fs.TempFile("", "go-git-fixtures")
+	file, err := Filesystem.TempFile("", "go-git-fixtures")
 	if err != nil {
 		return nil, err
 	}
@@ -229,7 +229,7 @@ func (f *Fixture) file(path string) (billy.File, error) {
 	}
 
 	files[path] = file.Name()
-	return fs.Open(file.Name())
+	return Filesystem.Open(file.Name())
 }
 
 func (f *Fixture) Packfile() billy.File {
@@ -263,7 +263,7 @@ func (f *Fixture) DotGit() billy.Filesystem {
 		panic(err)
 	}
 
-	fs, err := tgz.Extract(fs, file.Name())
+	fs, err := tgz.Extract(Filesystem, file.Name())
 	if err != nil {
 		panic(err)
 	}
@@ -303,7 +303,7 @@ func (f *Fixture) Worktree() billy.Filesystem {
 		panic(err)
 	}
 
-	fs, err := tgz.Extract(fs, file.Name())
+	fs, err := tgz.Extract(Filesystem, file.Name())
 	if err != nil {
 		panic(err)
 	}
@@ -359,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 := fs.Remove(f); err != nil {
+		if err := Filesystem.Remove(f); err != nil {
 			return err
 		}
 		delete(files, fname)
diff --git a/fixtures_test.go b/fixtures_test.go
@@ -0,0 +1,14 @@
+package fixtures
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestDotGit(t *testing.T) {
+	fs := Basic().One().DotGit()
+	files, err := fs.ReadDir("/")
+	assert.NoError(t, err)
+	assert.True(t, len(files) > 1)
+}
diff --git a/go.mod b/go.mod
@@ -4,5 +4,6 @@ go 1.14
 
 require (
 	github.com/go-git/go-billy/v5 v5.2.0
+	github.com/stretchr/testify v1.7.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c
 )
diff --git a/go.sum b/go.sum
@@ -1,4 +1,6 @@
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 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=
 github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
@@ -8,8 +10,16 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527 h1:uYVVQ9WP/Ds2ROhcaGPeIdVq0RIXVLwsHlnvJ+cT1So=
 golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,8 @@ import (`
`15`	`15`	`//go:generate esc -o data.go -pkg=fixtures data`
`16`	`16`
`17`	`17`	`var (`
`18`		`- files = make(map[string]string)`
`19`		`- fs = osfs.New(os.TempDir())`
	`18`	`+ files = make(map[string]string)`
	`19`	`+ Filesystem = osfs.New(os.TempDir())`
`20`	`20`	`)`
`21`	`21`
`22`	`22`	`var fixtures = Fixtures{{`
`@@ -207,15 +207,15 @@ func (f *Fixture) Is(tag string) bool {`
`207`	`207`
`208`	`208`	`func (f *Fixture) file(path string) (billy.File, error) {`
`209`	`209`	`if fpath, ok := files[path]; ok {`
`210`		`- return fs.Open(fpath)`
	`210`	`+ return Filesystem.Open(fpath)`
`211`	`211`	`}`
`212`	`212`
`213`	`213`	`bytes, err := FSByte(false, "/data/"+path)`
`214`	`214`	`if err != nil {`
`215`	`215`	`return nil, err`
`216`	`216`	`}`
`217`	`217`
`218`		`- file, err := fs.TempFile("", "go-git-fixtures")`
	`218`	`+ file, err := Filesystem.TempFile("", "go-git-fixtures")`
`219`	`219`	`if err != nil {`
`220`	`220`	`return nil, err`
`221`	`221`	`}`
`@@ -229,7 +229,7 @@ func (f *Fixture) file(path string) (billy.File, error) {`
`229`	`229`	`}`
`230`	`230`
`231`	`231`	`files[path] = file.Name()`
`232`		`- return fs.Open(file.Name())`
	`232`	`+ return Filesystem.Open(file.Name())`
`233`	`233`	`}`
`234`	`234`
`235`	`235`	`func (f *Fixture) Packfile() billy.File {`
`@@ -263,7 +263,7 @@ func (f *Fixture) DotGit() billy.Filesystem {`
`263`	`263`	`panic(err)`
`264`	`264`	`}`
`265`	`265`
`266`		`- fs, err := tgz.Extract(fs, file.Name())`
	`266`	`+ fs, err := tgz.Extract(Filesystem, file.Name())`
`267`	`267`	`if err != nil {`
`268`	`268`	`panic(err)`
`269`	`269`	`}`
`@@ -303,7 +303,7 @@ func (f *Fixture) Worktree() billy.Filesystem {`
`303`	`303`	`panic(err)`
`304`	`304`	`}`
`305`	`305`
`306`		`- fs, err := tgz.Extract(fs, file.Name())`
	`306`	`+ fs, err := tgz.Extract(Filesystem, file.Name())`
`307`	`307`	`if err != nil {`
`308`	`308`	`panic(err)`
`309`	`309`	`}`
`@@ -359,7 +359,7 @@ func (g Fixtures) Exclude(tag string) Fixtures {`
`359`	`359`	`// Clean cleans all the temporal files created`
`360`	`360`	`func Clean() error {`
`361`	`361`	`for fname, f := range files {`
`362`		`- if err := fs.Remove(f); err != nil {`
	`362`	`+ if err := Filesystem.Remove(f); err != nil {`
`363`	`363`	`return err`
`364`	`364`	`}`
`365`	`365`	`delete(files, fname)`
Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,6 @@ go 1.14`
`4`	`4`
`5`	`5`	`require (`
`6`	`6`	`github.com/go-git/go-billy/v5 v5.2.0`
	`7`	`+ github.com/stretchr/testify v1.7.0 // indirect`
`7`	`8`	`gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c`
`8`	`9`	`)`