Moved excludeWhitespace() function to util package

cmd/cmd_pkg.go

@@ -245,14 +245,3 @@ func loadCommandHandler(cmd *cobra.Command, args []string) {
 		exitWithError(err.Error())
 	}
 }
-
-func excludeWhitespaces(arr []string) []string {
-	result := make([]string, 0)
-	for _, h := range arr {
-		if h == "" {
-			continue
-		}
-		result = append(result, h)
-	}
-	return result
-}

cmd/flags_run_local_instance_unix.go

@@ -4,6 +4,8 @@ import (
 	"bufio"
 	"os/exec"
 	"strings"
+
+	"github.com/nanovms/ops/util/slice"
 )
 
 // Checks which process is using given port number
@@ -19,7 +21,7 @@ func checkPortUserPID(portNumber string) (string, error) {
 
 	scanner := bufio.NewScanner(strings.NewReader(string(out)))
 	scanner.Scan() // check header first
-	cols := excludeWhitespaces(strings.Split(scanner.Text(), " "))
+	cols := slice.ExcludeWhitespaces(strings.Split(scanner.Text(), " "))
 	headerIdx := -1
 	for i, v := range cols {
 		if strings.ToLower(v) == "pid" {
@@ -31,7 +33,7 @@ func checkPortUserPID(portNumber string) (string, error) {
 	scanner.Scan()
 	line := strings.Trim(scanner.Text(), " ")
 	if line != "" {
-		cols = excludeWhitespaces(strings.Split(line, " "))
+		cols = slice.ExcludeWhitespaces(strings.Split(line, " "))
 		pid = cols[headerIdx]
 	}
 

util/slice/string.go

@@ -0,0 +1,15 @@
+package slice
+
+import "strings"
+
+// ExcludeWhitespaces removes whitespaces from given slice
+func ExcludeWhitespaces(arr []string) []string {
+	result := make([]string, 0)
+	for _, h := range arr {
+		if strings.Trim(h, " ") == "" {
+			continue
+		}
+		result = append(result, h)
+	}
+	return result
+}

util/slice/string_test.go

@@ -0,0 +1,24 @@
+package slice
+
+import (
+	"strings"
+	"testing"
+)
+
+func TestExcludeWhitespaces(t *testing.T) {
+	arr := []string{
+		"lorem", "ipsum", " ", "dolor", "", "sit", "amet",
+	}
+	trimmed := ExcludeWhitespaces(arr)
+	for _, v := range trimmed {
+		if v == "" {
+			t.Error("found unstripped whice space")
+		}
+	}
+
+	expected := "lorem,ipsum,dolor,sit,amet"
+	str := strings.Join(trimmed, ",")
+	if str != expected {
+		t.Errorf("expected '%s', got '%s'", expected, str)
+	}
+}