Merge pull request #107 from pjbgf/iofs

Bump module to v6

Author: pjbgf

README.md

@@ -1,4 +1,4 @@
-# go-billy [![GoDoc](https://godoc.org/gopkg.in/go-git/go-billy.v5?status.svg)](https://pkg.go.dev/github.com/go-git/go-billy/v5) [![Test](https://github.com/go-git/go-billy/workflows/Test/badge.svg)](https://github.com/go-git/go-billy/actions?query=workflow%3ATest)
+# go-billy [![GoDoc](https://godoc.org/gopkg.in/go-git/go-billy.v6?status.svg)](https://pkg.go.dev/github.com/go-git/go-billy/v6) [![Test](https://github.com/go-git/go-billy/workflows/Test/badge.svg)](https://github.com/go-git/go-billy/actions?query=workflow%3ATest)
 
 The missing interface filesystem abstraction for Go.
 Billy implements an interface based on the `os` standard library, allowing to develop applications without dependency on the underlying storage. Makes it virtually free to implement mocks and testing over filesystem operations.
@@ -8,14 +8,14 @@ Billy was born as part of [go-git/go-git](https://github.com/go-git/go-git) proj
 ## Installation
 
 ```go
-import "github.com/go-git/go-billy/v5" // with go modules enabled (GO111MODULE=on or outside GOPATH)
+import "github.com/go-git/go-billy/v6" // with go modules enabled (GO111MODULE=on or outside GOPATH)
 import "github.com/go-git/go-billy" // with go modules disabled
 ```
 
 ## Usage
 
 Billy exposes filesystems using the
-[`Filesystem` interface](https://pkg.go.dev/github.com/go-git/go-billy/v5?tab=doc#Filesystem).
+[`Filesystem` interface](https://pkg.go.dev/github.com/go-git/go-billy/v6?tab=doc#Filesystem).
 Each filesystem implementation gives you a `New` method, whose arguments depend on
 the implementation itself, that returns a new `Filesystem`.
 

fs.go

@@ -3,7 +3,7 @@ package billy
 import (
 	"errors"
 	"io"
-	"os"
+	"io/fs"
 	"time"
 )
 
@@ -72,9 +72,9 @@ type Basic interface {
 	// instead. It opens the named file with specified flag (O_RDONLY etc.) and
 	// perm, (0666 etc.) if applicable. If successful, methods on the returned
 	// File can be used for I/O.
-	OpenFile(filename string, flag int, perm os.FileMode) (File, error)
+	OpenFile(filename string, flag int, perm fs.FileMode) (File, error)
 	// Stat returns a FileInfo describing the named file.
-	Stat(filename string) (os.FileInfo, error)
+	Stat(filename string) (fs.FileInfo, error)
 	// Rename renames (moves) oldpath to newpath. If newpath already exists and
 	// is not a directory, Rename replaces it. OS-specific restrictions may
 	// apply when oldpath and newpath are in different directories.
@@ -105,12 +105,12 @@ type TempFile interface {
 type Dir interface {
 	// ReadDir reads the directory named by dirname and returns a list of
 	// directory entries sorted by filename.
-	ReadDir(path string) ([]os.FileInfo, error)
+	ReadDir(path string) ([]fs.FileInfo, error)
 	// MkdirAll creates a directory named path, along with any necessary
 	// parents, and returns nil, or else returns an error. The permission bits
 	// perm are used for all directories that MkdirAll creates. If path is/
 	// already a directory, MkdirAll does nothing and returns nil.
-	MkdirAll(filename string, perm os.FileMode) error
+	MkdirAll(filename string, perm fs.FileMode) error
 }
 
 // Symlink abstract the symlink related operations in a storage-agnostic
@@ -119,7 +119,7 @@ type Symlink interface {
 	// Lstat returns a FileInfo describing the named file. If the file is a
 	// symbolic link, the returned FileInfo describes the symbolic link. Lstat
 	// makes no attempt to follow the link.
-	Lstat(filename string) (os.FileInfo, error)
+	Lstat(filename string) (fs.FileInfo, error)
 	// Symlink creates a symbolic-link from link to target. target may be an
 	// absolute or relative path, and need not refer to an existing node.
 	// Parent directories of link are created as necessary.
@@ -133,7 +133,7 @@ type Symlink interface {
 type Change interface {
 	// Chmod changes the mode of the named file to mode. If the file is a
 	// symbolic link, it changes the mode of the link's target.
-	Chmod(name string, mode os.FileMode) error
+	Chmod(name string, mode fs.FileMode) error
 	// Lchown changes the numeric uid and gid of the named file. If the file is
 	// a symbolic link, it changes the uid and gid of the link itself.
 	Lchown(name string, uid, gid int) error
@@ -161,15 +161,14 @@ type Chroot interface {
 
 // File represent a file, being a subset of the os.File
 type File interface {
+	fs.File
+
 	// Name returns the name of the file as presented to Open.
 	Name() string
 	io.Writer
-	// TODO: Add io.WriterAt for v6  
-	// io.WriterAt
-	io.Reader
+	io.WriterAt
 	io.ReaderAt
 	io.Seeker
-	io.Closer
 	// Lock locks the file like e.g. flock. It protects against access from
 	// other processes.
 	Lock() error

fs_test.go

@@ -3,8 +3,8 @@ package billy_test
 import (
 	"testing"
 
-	. "github.com/go-git/go-billy/v5"
-	"github.com/go-git/go-billy/v5/internal/test"
+	. "github.com/go-git/go-billy/v6"
+	"github.com/go-git/go-billy/v6/internal/test"
 	"github.com/stretchr/testify/assert"
 )
 

go.mod

@@ -1,4 +1,4 @@
-module github.com/go-git/go-billy/v5
+module github.com/go-git/go-billy/v6
 
 // go-git supports the last 3 stable Go versions.
 go 1.21

helper/chroot/chroot.go

@@ -1,12 +1,13 @@
 package chroot
 
 import (
+	"io/fs"
 	"os"
 	"path/filepath"
 	"strings"
 
-	"github.com/go-git/go-billy/v5"
-	"github.com/go-git/go-billy/v5/helper/polyfill"
+	"github.com/go-git/go-billy/v6"
+	"github.com/go-git/go-billy/v6/helper/polyfill"
 )
 
 // ChrootHelper is a helper to implement billy.Chroot.
@@ -68,7 +69,7 @@ func (fs *ChrootHelper) Open(filename string) (billy.File, error) {
 	return newFile(fs, f, filename), nil
 }
 
-func (fs *ChrootHelper) OpenFile(filename string, flag int, mode os.FileMode) (billy.File, error) {
+func (fs *ChrootHelper) OpenFile(filename string, flag int, mode fs.FileMode) (billy.File, error) {
 	fullpath, err := fs.underlyingPath(filename)
 	if err != nil {
 		return nil, err
@@ -142,7 +143,7 @@ func (fs *ChrootHelper) ReadDir(path string) ([]os.FileInfo, error) {
 	return fs.underlying.(billy.Dir).ReadDir(fullpath)
 }
 
-func (fs *ChrootHelper) MkdirAll(filename string, perm os.FileMode) error {
+func (fs *ChrootHelper) MkdirAll(filename string, perm fs.FileMode) error {
 	fullpath, err := fs.underlyingPath(filename)
 	if err != nil {
 		return err

helper/chroot/chroot_test.go

@@ -5,8 +5,8 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/go-git/go-billy/v5"
-	"github.com/go-git/go-billy/v5/internal/test"
+	"github.com/go-git/go-billy/v6"
+	"github.com/go-git/go-billy/v6/internal/test"
 	"github.com/stretchr/testify/assert"
 )
 

helper/iofs/iofs.go

@@ -7,8 +7,8 @@ import (
 	"io/fs"
 	"path/filepath"
 
-	billyfs "github.com/go-git/go-billy/v5"
-	"github.com/go-git/go-billy/v5/helper/polyfill"
+	billyfs "github.com/go-git/go-billy/v6"
+	"github.com/go-git/go-billy/v6/helper/polyfill"
 )
 
 // Wrap adapts a billy.Filesystem to a io.fs.FS.

helper/iofs/iofs_test.go

@@ -9,8 +9,8 @@ import (
 	"testing"
 	"testing/fstest"
 
-	billyfs "github.com/go-git/go-billy/v5"
-	"github.com/go-git/go-billy/v5/memfs"
+	billyfs "github.com/go-git/go-billy/v6"
+	"github.com/go-git/go-billy/v6/memfs"
 )
 
 type errorList interface {

helper/mount/mount.go

@@ -2,14 +2,15 @@ package mount
 
 import (
 	"io"
+	"io/fs"
 	"os"
 	"path/filepath"
 	"strings"
 
 	"fmt"
 
-	"github.com/go-git/go-billy/v5"
-	"github.com/go-git/go-billy/v5/helper/polyfill"
+	"github.com/go-git/go-billy/v6"
+	"github.com/go-git/go-billy/v6/helper/polyfill"
 )
 
 var separator = string(filepath.Separator)
@@ -53,7 +54,7 @@ func (h *Mount) Open(path string) (billy.File, error) {
 	return wrapFile(f, path), err
 }
 
-func (h *Mount) OpenFile(path string, flag int, mode os.FileMode) (billy.File, error) {
+func (h *Mount) OpenFile(path string, flag int, mode fs.FileMode) (billy.File, error) {
 	fs, fullpath := h.getBasicAndPath(path)
 	if fullpath == "." {
 		return nil, os.ErrInvalid
@@ -118,7 +119,7 @@ func (h *Mount) ReadDir(path string) ([]os.FileInfo, error) {
 	return fs.ReadDir(fullpath)
 }
 
-func (h *Mount) MkdirAll(filename string, perm os.FileMode) error {
+func (h *Mount) MkdirAll(filename string, perm fs.FileMode) error {
 	fs, fullpath, err := h.getDirAndPath(filename)
 	if err != nil {
 		return err

helper/mount/mount_test.go

@@ -5,10 +5,10 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/go-git/go-billy/v5"
-	"github.com/go-git/go-billy/v5/internal/test"
-	"github.com/go-git/go-billy/v5/memfs"
-	"github.com/go-git/go-billy/v5/util"
+	"github.com/go-git/go-billy/v6"
+	"github.com/go-git/go-billy/v6/internal/test"
+	"github.com/go-git/go-billy/v6/memfs"
+	"github.com/go-git/go-billy/v6/util"
 	"github.com/stretchr/testify/assert"
 )