Merge pull request #14 from essentialkaos/develop

Version 1.4.2

.travis/script.sh

@@ -52,6 +52,12 @@ testWithCover() {
     # fsutil currently is hard to test
     # we test this package by hands
     if [[ "$pkg" == "fsutil" ]] ; then
+      go test $dir/$pkg
+
+      if [[ $? -ne 0 ]] ; then
+        has_errors=true
+      fi
+
       continue
     fi
 

changelog.md

@@ -1,5 +1,9 @@
 ## Changelog
 
+#### v1.4.2
+
+* `[fsutil]` Added method `ProperPath` which return first proper path from given slice
+
 #### v1.4.1
 
 * `[fsutil]` Added partial FreeBSD support

fsutil/fs.go

@@ -128,6 +128,17 @@ func CheckPerms(props, path string) bool {
 	return true
 }
 
+// ProperPath return first proper path from given slice
+func ProperPath(props string, paths []string) string {
+	for _, path := range paths {
+		if CheckPerms(props, path) {
+			return path
+		}
+	}
+
+	return ""
+}
+
 // IsExist check if target is exist in fs or not
 func IsExist(path string) bool {
 	if path == "" {

fsutil/fs_test.go

@@ -132,3 +132,19 @@ func (fs *FSSuite) TestList(c *check.C) {
 		[]string{"dir2/file4.wav", "file2.jpg"},
 	)
 }
+
+func (fs *FSSuite) TestProperPath(c *check.C) {
+	tmpFile := fs.TempDir + "/test.txt"
+
+	os.OpenFile(tmpFile, os.O_CREATE, 0644)
+
+	paths := []string{"/etc/sudoers", "/etc/passwd", tmpFile}
+
+	c.Assert(ProperPath("DR", paths), check.Equals, "")
+	c.Assert(ProperPath("FR", paths), check.Equals, "/etc/passwd")
+	c.Assert(ProperPath("FRW", paths), check.Equals, tmpFile)
+	c.Assert(ProperPath("FRWS", paths), check.Equals, "")
+	c.Assert(ProperPath("F", paths), check.Equals, "/etc/sudoers")
+
+	os.Remove(tmpFile)
+}