Escape paths

cmd/pathctl/main.go

@@ -7,8 +7,8 @@ import (
 	"os"
 	"strings"
 
+	"al.essio.dev/pkg/tools/dirlist"
 	"al.essio.dev/pkg/tools/internal/version"
-	"al.essio.dev/pkg/tools/pathlist"
 )
 
 const (
@@ -27,7 +27,7 @@ var (
 	envVar string
 )
 
-var cmdHandlers map[string]func(d pathlist.List)
+var cmdHandlers map[string]func(d dirlist.List)
 
 func init() {
 	flag.BoolVar(&helpMode, "help", false, "display this help and exit.")
@@ -39,22 +39,22 @@ func init() {
 	flag.Usage = usage
 	flag.CommandLine.SetOutput(os.Stderr)
 
-	cmdHandlers = func() map[string]func(pathlist.List) {
-		hAppend := func(d pathlist.List) {
+	cmdHandlers = func() map[string]func(dirlist.List) {
+		hAppend := func(d dirlist.List) {
 			if dropMode {
 				d.Drop(flag.Arg(1))
 			}
 			d.Append(flag.Arg(1))
 		}
-		hDrop := func(d pathlist.List) { d.Drop(flag.Arg(1)) }
-		hPrepend := func(d pathlist.List) {
+		hDrop := func(d dirlist.List) { d.Drop(flag.Arg(1)) }
+		hPrepend := func(d dirlist.List) {
 			if dropMode {
 				d.Drop(flag.Arg(1))
 			}
 			d.Prepend(flag.Arg(1))
 		}
 
-		return map[string]func(pathlist.List){
+		return map[string]func(dirlist.List){
 			"append":  hAppend,
 			"drop":    hDrop,
 			"prepend": hPrepend,
@@ -75,7 +75,7 @@ func main() {
 
 	handleHelpAndVersionModes()
 
-	dirs := pathlist.New()
+	dirs := dirlist.New()
 	dirs.LoadEnv(envVar)
 
 	if flag.NArg() < 1 {
@@ -91,7 +91,7 @@ func main() {
 	}
 }
 
-func printPathList(d pathlist.List) {
+func printPathList(d dirlist.List) {
 	var sb = strings.Builder{}
 	sb.Reset()
 

dirlist/dirlist.go

@@ -0,0 +1,43 @@
+package dirlist
+
+var (
+	dList List
+)
+
+func init() {
+	dList = New()
+}
+
+func Reset() { dList.Reset() }
+
+func Contains(p string) bool {
+	return dList.Contains(quoteAndClean(p))
+}
+
+func Load(s string) {
+	dList.Load(s)
+}
+
+func LoadEnv(s string) {
+	dList.LoadEnv(s)
+}
+
+func Prepend(p string) {
+	dList.Prepend(p)
+}
+
+func Append(p string) {
+	dList.Append(p)
+}
+
+func Drop(p string) {
+	dList.Drop(p)
+}
+
+func Slice() []string {
+	return dList.Slice()
+}
+
+func String() string {
+	return dList.String()
+}

dirlist/dirlist_test.go

@@ -0,0 +1,97 @@
+package dirlist
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestAppend(t *testing.T) {
+	Reset()
+	require.Equal(t, "", String())
+	for _, p := range []string{"/var", "/var", "/bin", "/bin/", "/bin///"} {
+		Append(p)
+	}
+
+	require.Equal(t, "/var:/bin", String())
+	Prepend("/bin///")
+	require.Equal(t, "/var:/bin", String())
+}
+
+func TestContains(t *testing.T) {
+	Reset()
+	Load("/opt/local/bin:/usr/local/bin:/sbin:/bin:/var:/bin")
+	require.False(t, Contains("/ur/local/sbin"))
+	require.False(t, Contains("/ur/local////sbin/"))
+	require.True(t, Contains("/sbin"))
+	require.True(t, Contains("///sbin//"))
+
+}
+
+func TestDrop(t *testing.T) {
+	Reset()
+	Load("/opt/local/bin:/usr/local/bin:/sbin:/bin:/var:/bin")
+	require.Equal(t, Slice(), []string{"/opt/local/bin", "/usr/local/bin", "/sbin", "/bin", "/var"})
+	Drop("/opt/local/bin")
+	Drop("/opt/local/bin")
+	Drop("/opt/local/bin")
+	Drop("/usr/local/bin")
+	Drop("/var")
+	require.NotEqual(t, "", String())
+	Drop("/sbin")
+	Drop("/bin")
+	require.False(t, Contains("/bin"))
+	require.Equal(t, "", String())
+
+	Reset()
+	require.NotPanics(t, func() { Drop("") })
+}
+
+func TestLoadEnv(t *testing.T) {
+	tests := []struct {
+		name string
+		val  string
+		want string
+	}{
+		{"empty", "", ""},
+	}
+	for i, tt := range tests {
+		tt2 := tt
+		t.Run(tt2.name, func(t *testing.T) {
+			envvar := fmt.Sprintf("%s_%d_VAR", t.Name(), i)
+			Reset()
+			t.Setenv(envvar, tt.val)
+			LoadEnv(envvar)
+			require.Equal(t, tt2.want, String())
+		})
+	}
+}
+
+func TestPrepend(t *testing.T) {
+	Reset()
+	require.Equal(t, "", String())
+	for _, p := range []string{"/var", "/var", "/bin", "/bin/", "/bin///"} {
+		Append(p)
+	}
+
+	require.Equal(t, "/var:/bin", String())
+	Prepend("/bin///")
+	require.Equal(t, "/var:/bin", String())
+}
+
+func TestSlice(t *testing.T) {
+	Reset()
+	require.Equal(t, 0, len(Slice()))
+	Prepend("/usr/bin")
+	Append("/bin")
+	require.Equal(t, []string{"/usr/bin", "/bin"}, Slice())
+}
+
+func TestString(t *testing.T) {
+	Reset()
+	require.Equal(t, "", String())
+	Prepend("/usr/bin")
+	Append("/bin")
+	require.Equal(t, "/usr/bin:/bin", String())
+}