Catch and fix some more corner cases

Author: KenjiTakahashi

_testdata/afile

@@ -53,6 +53,9 @@ func (c *ctlCmdStatus) Run(ctl *ctl, params []string) bool {
 		ctl.Status("*", true)
 	} else {
 		for _, dir := range params[1:] {
+			if dir == "" {
+				continue
+			}
 			ctl.Status(dir, true)
 		}
 	}

ctlcmds.go

@@ -242,20 +242,24 @@ func (c *ctl) Services(pattern string, toLog bool) []string {
 			sort.Strings(files)
 		}
 	}
-	return files
+
+	dirs := []string{}
+	for _, file := range files {
+		if fi, err := os.Stat(file); err == nil && fi.IsDir() {
+			dirs = append(dirs, file)
+		}
+	}
+	return dirs
 }
 
 // Status Prints all statuses matching id and optionally their log process statuses.
 func (c *ctl) Status(id string, toLog bool) {
 	// TODO: normally (up|down) and stuff?
-	statuses := []*status{}
-	for _, dir := range c.Services(id, toLog) {
-		if fi, err := os.Stat(dir); err != nil || !fi.IsDir() {
-			continue
-		}
-
+	services := c.Services(id, toLog)
+	statuses := make([]*status, len(services))
+	for i, dir := range services {
 		status := newStatus(dir, c.serviceName(dir))
-		statuses = append(statuses, status)
+		statuses[i] = status
 
 		for i, offset := range status.Offsets {
 			if statuses[0].Offsets[i] < offset {

svctl.go

@@ -53,6 +53,15 @@ func equal(s1, s2 []string) bool {
 	return true
 }
 
+func containsTrimmed(slice []string, str string) bool {
+	for _, elem := range slice {
+		if strings.TrimSpace(elem) == strings.TrimSpace(str) {
+			return true
+		}
+	}
+	return false
+}
+
 type stdout struct {
 	value []string
 }
@@ -120,7 +129,7 @@ func (r *runitRunner) Assert(t *testing.T, cmd *cmdDef) {
 	for _, service := range cmd.services {
 		stdout := r.stdout.ReadString()
 		pieces := strings.Split(stdout, "   ")
-		if !contains(cmd.services, pieces[0]) {
+		if !containsTrimmed(cmd.services, pieces[0]) {
 			t.Errorf(
 				"ERROR IN STATUS: service `%s` != `%s` for %s:%s",
 				pieces[0], service, cmd.cmd, service,
@@ -238,6 +247,8 @@ func TestCmd(t *testing.T) {
 		{"s", []string{"o"}, "STOPPED", 0},
 		{"once", []string{"r1"}, "RUNNING", 0},
 		{"s", []string{"r0", "o"}, "STOPPED", 0},
+		{"s", []string{"r0 ", "o"}, "STOPPED", 0},
+		{"u", []string{"r0 ", "o"}, "RUNNING", 0},
 	}
 	for _, cmd := range cmds {
 		if cmd.cmd == "" {
@@ -248,6 +259,35 @@ func TestCmd(t *testing.T) {
 		runit.Assert(t, &cmd)
 	}
 
+	// Tests for wildcards and defaults.
+	assert := func() {
+		for runit.stdout.Len() != 0 {
+			stdout := runit.stdout.ReadString()
+			pieces := strings.Fields(stdout)
+			pieces[2] = strings.Join(pieces[2:], " ")
+			if pieces[1] == "ERROR" && pieces[2] == "unable to open supervise/ok" {
+				if pieces[0] != "longone" && pieces[0] != "w" {
+					t.Errorf("ERROR IN IMPLICIT *: `%s`", stdout)
+				}
+				continue
+			}
+			if !strings.HasPrefix(pieces[1], "RUNNING") {
+				t.Errorf("ERROR IN IMPLICIT *: `%s` != `RUNNING`", pieces[1])
+			}
+			if pieces[0] != "o" && pieces[0] != "r0" && pieces[0] != "r1" {
+				t.Errorf("ERROR IN IMPLICIT *: Unknown service `%s`", pieces[0])
+			}
+		}
+	}
+	svctl.Ctl("u")
+	assert()
+	svctl.Ctl("s")
+	assert()
+	svctl.Ctl("s r?")
+	runit.Assert(t, &cmdDef{"s", []string{"r0", "r1"}, "RUNNING", 0})
+	svctl.Ctl("s l*ne")
+	runit.Assert(t, &cmdDef{"s", []string{"longone"}, "ERROR", 0})
+
 	// Tests for errors.
 	// Should span to other actions no problem, so just check with `u`.
 	// Incorrect action.