Merge pull request #2 from jfontan/readdir

Add ReadDir and fix test directory deletion

.travis.yml

@@ -19,6 +19,8 @@ before_script:
   - make container
 
 script:
+  - cp Gopkg.testing Gopkg.toml
+  - make godep
   - make dependencies
   - make test-coverage
   - make codecov

Gopkg.testing

@@ -0,0 +1,4 @@
+[[constraint]]
+  name = "gopkg.in/src-d/go-billy.v4"
+  source = "github.com/src-d/go-billy"
+  revision = "40f7491e8a4a5cf7ab1d17f7679d94938ca4a714"

README.md

@@ -10,6 +10,7 @@ So far, following actions are implemented:
 * `Stat`
 * `Rename`
 * `Remove`
+* `Readdir`
 * `MkdirAll`
 
 For more information head to the [documentation](https://godoc.org/gopkg.in/src-d/go-billy-gluster.v0)

filesystem.go

@@ -1,9 +1,9 @@
 package gluster
 
 import (
-	"fmt"
 	"os"
 	"path/filepath"
+	"syscall"
 
 	"github.com/gluster/gogfapi/gfapi"
 	"gopkg.in/src-d/go-billy.v4"
@@ -127,18 +127,51 @@ func (g *FS) Rename(oldpath string, newpath string) error {
 
 // Remove implements billy.Basic interface.
 func (g *FS) Remove(filename string) error {
-	return g.v.Unlink(filename)
+	err := g.v.Unlink(filename)
+	if err == nil {
+		return nil
+	}
+
+	if e, ok := err.(*os.PathError); ok {
+		if e.Err == syscall.EISDIR {
+			return g.v.Rmdir(filename)
+		}
+	}
+
+	return err
 }
 
 // Join implements billy.Basic interface.
 func (g *FS) Join(elem ...string) string {
 	return filepath.Join(elem...)
 }
 
-// ReadDir is not implemented by the underlying library. Added so billy.Dir
-// is implemented as it is needed by tests.
+// ReadDir implements billy.Dir interface.
 func (g *FS) ReadDir(path string) ([]os.FileInfo, error) {
-	return nil, fmt.Errorf("ReadDir not implemented")
+	d, err := g.v.Open(path)
+	if err != nil {
+		return nil, err
+	}
+
+	defer d.Close()
+
+	files, err := d.Readdir(0)
+	if err != nil {
+		return nil, err
+	}
+
+	// gluster Readdir returns also "." and ".."
+	n := len(files)
+	for i := 0; i < n; i++ {
+		if files[i].Name() == "." || files[i].Name() == ".." {
+			// swap with the last element
+			files[i], files[n-1] = files[n-1], files[i]
+			n--
+			i--
+		}
+	}
+
+	return files[:n], nil
 }
 
 // MkdirAll implements billy.Dir interface.

filesystem_test.go

@@ -1,7 +1,6 @@
 package gluster
 
 import (
-	"os"
 	"testing"
 
 	. "gopkg.in/check.v1"
@@ -16,6 +15,7 @@ var _ = Suite(&FilesystemSuite{})
 
 type FilesystemSuite struct {
 	test.BasicSuite
+	test.DirSuite
 
 	FS  *FS
 	tmp string
@@ -24,20 +24,32 @@ type FilesystemSuite struct {
 func (s *FilesystemSuite) SetUpTest(c *C) {
 	fs, err := New("localhost", "billy")
 	c.Assert(err, IsNil)
+	s.FS = fs
 
 	s.tmp, err = util.TempDir(fs, "", "billy")
 	c.Assert(err, IsNil)
 
 	tmp := chroot.New(fs, s.tmp)
 	s.BasicSuite.FS = tmp
+	s.DirSuite.FS = tmp
 }
 
 func (s *FilesystemSuite) TearDownTest(c *C) {
 	if s.FS != nil {
-		err := os.RemoveAll(s.tmp)
+		err := util.RemoveAll(s.FS, s.tmp)
 		c.Assert(err, IsNil)
 
 		err = s.FS.Close()
 		c.Assert(err, IsNil)
 	}
 }
+
+func (s *FilesystemSuite) TestReaddirEmpty(c *C) {
+	fs := s.DirSuite.FS
+	err := fs.MkdirAll("test", 0777)
+	c.Assert(err, IsNil)
+
+	files, err := fs.ReadDir("test")
+	c.Assert(err, IsNil)
+	c.Assert(len(files), Equals, 0)
+}