memfs: support for filemodes

Author: mcuadros

memfs/memory.go

@@ -33,7 +33,7 @@ func New() *Memory {
 
 // Create returns a new file in memory from a given filename.
 func (fs *Memory) Create(filename string) (billy.File, error) {
-	return fs.OpenFile(filename, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0)
+	return fs.OpenFile(filename, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0666)
 }
 
 // Open returns a readonly file from a given name.
@@ -51,15 +51,15 @@ func (fs *Memory) OpenFile(filename string, flag int, perm os.FileMode) (billy.F
 			return nil, os.ErrNotExist
 		}
 
-		fs.s.files[fullpath] = newFile(fs.base, fullpath, flag)
+		fs.s.files[fullpath] = newFile(fs.base, fullpath, perm, flag)
 		return fs.s.files[fullpath], nil
 	}
 
 	if f.isDir {
 		return nil, fmt.Errorf("cannot open directory: %s", filename)
 	}
 
-	n := newFile(fs.base, fullpath, flag)
+	n := newFile(fs.base, fullpath, perm, flag)
 	n.content = f.content
 
 	if isAppend(flag) {
@@ -79,12 +79,12 @@ func (fs *Memory) Stat(filename string) (billy.FileInfo, error) {
 
 	f, ok := fs.s.files[fullpath]
 	if ok && !f.isDir {
-		return newFileInfo(fs.base, fullpath, fs.s.files[fullpath].content.Len()), nil
+		return newFileInfo(fs.base, fullpath, f.mode, fs.s.files[fullpath].content.Len()), nil
 	}
 
 	info, err := fs.ReadDir(fullpath)
 	if err == nil && len(info) != 0 || f != nil && f.isDir {
-		fi := newFileInfo(fs.base, fullpath, len(info))
+		fi := newFileInfo(fs.base, fullpath, 0, len(info))
 		fi.isDir = true
 		return fi, nil
 	}
@@ -110,15 +110,15 @@ func (fs *Memory) ReadDir(base string) (entries []billy.FileInfo, err error) {
 				entries = append(entries, &fileInfo{name: parts[0], isDir: true})
 			}
 
-			entries = append(entries, &fileInfo{name: parts[0], size: f.content.Len()})
+			entries = append(entries, &fileInfo{name: parts[0], mode: f.mode, size: f.content.Len()})
 			continue
 		}
 
 		if _, ok := appendedDirs[parts[0]]; ok {
 			continue
 		}
 
-		entries = append(entries, &fileInfo{name: parts[0], isDir: true})
+		entries = append(entries, &fileInfo{name: parts[0], mode: f.mode, isDir: true})
 		appendedDirs[parts[0]] = true
 	}
 
@@ -232,15 +232,17 @@ type file struct {
 	content  *content
 	position int64
 	flag     int
+	mode     os.FileMode
 	isDir    bool
 }
 
-func newFile(base, fullpath string, flag int) *file {
+func newFile(base, fullpath string, mode os.FileMode, flag int) *file {
 	filename, _ := filepath.Rel(base, fullpath)
 
 	return &file{
 		BaseFile: billy.BaseFile{BaseFilename: filename},
 		content:  &content{},
+		mode:     mode,
 		flag:     flag,
 	}
 }
@@ -318,14 +320,16 @@ func (f *file) Open() error {
 type fileInfo struct {
 	name  string
 	size  int
+	mode  os.FileMode
 	isDir bool
 }
 
-func newFileInfo(base, fullpath string, size int) *fileInfo {
+func newFileInfo(base, fullpath string, mode os.FileMode, size int) *fileInfo {
 	filename, _ := filepath.Rel(base, fullpath)
 
 	return &fileInfo{
 		name: filename,
+		mode: mode,
 		size: size,
 	}
 }
@@ -339,7 +343,7 @@ func (fi *fileInfo) Size() int64 {
 }
 
 func (fi *fileInfo) Mode() os.FileMode {
-	return os.FileMode(0)
+	return fi.mode
 }
 
 func (*fileInfo) ModTime() time.Time {

memfs/memory_test.go

@@ -17,17 +17,17 @@ type MemorySuite struct {
 var _ = Suite(&MemorySuite{})
 
 func (s *MemorySuite) SetUpTest(c *C) {
-	s.FilesystemSuite.Fs = New()
+	s.FilesystemSuite.FS = New()
 }
 
 func (s *MemorySuite) TestTempFileMaxTempFiles(c *C) {
 	for i := 0; i < maxTempFiles; i++ {
-		f, err := s.FilesystemSuite.Fs.TempFile("", "")
+		f, err := s.FilesystemSuite.FS.TempFile("", "")
 		c.Assert(err, IsNil)
 		c.Assert(f, NotNil)
 	}
 
-	f, err := s.FilesystemSuite.Fs.TempFile("", "")
+	f, err := s.FilesystemSuite.FS.TempFile("", "")
 	c.Assert(err, NotNil)
 	c.Assert(f, IsNil)
 }

osfs/os_test.go

@@ -21,15 +21,15 @@ var _ = Suite(&OSSuite{})
 
 func (s *OSSuite) SetUpTest(c *C) {
 	s.path, _ = ioutil.TempDir(os.TempDir(), "go-git-os-fs-test")
-	s.FilesystemSuite.Fs = New(s.path)
+	s.FilesystemSuite.FS = New(s.path)
 }
 func (s *OSSuite) TearDownTest(c *C) {
 	err := os.RemoveAll(s.path)
 	c.Assert(err, IsNil)
 }
 
 func (s *OSSuite) TestOpenDoesNotCreateDir(c *C) {
-	_, err := s.Fs.Open("dir/non-existent")
+	_, err := s.FS.Open("dir/non-existent")
 	c.Assert(err, NotNil)
 	_, err = os.Stat(filepath.Join(s.path, "dir"))
 	c.Assert(os.IsNotExist(err), Equals, true)