Skip to content

Commit

Permalink
Merge pull request #176 from motemen/iss173
Browse files Browse the repository at this point in the history
Ignore files which seems to system hidden file in walking
  • Loading branch information
Songmu authored May 16, 2019
2 parents 41ef114 + 06faa95 commit cf5b3a8
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 5 deletions.
26 changes: 21 additions & 5 deletions list_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -174,10 +174,8 @@ func TestDoList_unique(t *testing.T) {

func TestDoList_unknownRoot(t *testing.T) {
defer func(orig []string) { _localRepositoryRoots = orig }(_localRepositoryRoots)
defer func(orig string) { os.Setenv("GHQ_ROOT", orig) }(os.Getenv("GHQ_ROOT"))

defer tmpEnv("GHQ_ROOT", "/path/to/unknown-ghq")()
_localRepositoryRoots = nil
os.Setenv("GHQ_ROOT", "/path/to/unknown-ghq")

err := newApp().Run([]string{"ghq", "list"})
if err != nil {
Expand All @@ -187,19 +185,37 @@ func TestDoList_unknownRoot(t *testing.T) {

func TestDoList_notPermittedRoot(t *testing.T) {
defer func(orig []string) { _localRepositoryRoots = orig }(_localRepositoryRoots)
defer func(orig string) { os.Setenv("GHQ_ROOT", orig) }(os.Getenv("GHQ_ROOT"))
tmpdir := newTempDir(t)
defer func(dir string) {
os.Chmod(dir, 0755)
os.RemoveAll(dir)
}(tmpdir)
defer tmpEnv("GHQ_ROOT", tmpdir)()

_localRepositoryRoots = nil
os.Setenv("GHQ_ROOT", tmpdir)
os.Chmod(tmpdir, 0000)

err := newApp().Run([]string{"ghq", "list"})
if !os.IsPermission(xerrors.Unwrap(err)) {
t.Errorf("error should be ErrNotExist, but: %s", err)
}
}

func TestDoList_withSystemHiddenDir(t *testing.T) {
defer func(orig []string) { _localRepositoryRoots = orig }(_localRepositoryRoots)
tmpdir := newTempDir(t)
systemHidden := filepath.Join(tmpdir, ".system")
os.MkdirAll(systemHidden, 0000)
defer func(dir string) {
os.Chmod(systemHidden, 0755)
os.RemoveAll(dir)
}(tmpdir)
defer tmpEnv("GHQ_ROOT", tmpdir)()

_localRepositoryRoots = nil

err := newApp().Run([]string{"ghq", "list"})
if err != nil {
t.Errorf("error should be nil, but: %s", err)
}
}
3 changes: 3 additions & 0 deletions local_repository.go
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,9 @@ func walkLocalRepositories(callback func(*LocalRepository)) error {
if err == nil || os.IsNotExist(err) {
return nil
}
if os.IsPermission(err) && filepath.Base(fpath)[0] == '.' {
return nil
}
return err
}
if fi.Mode()&os.ModeSymlink == os.ModeSymlink {
Expand Down

0 comments on commit cf5b3a8

Please sign in to comment.