Make list output a little more useful/readable

Author: kevinmcconnell

internal/cmd/list.go

@@ -1,9 +1,9 @@
 package cmd
 
 import (
-	"encoding/json"
+	"fmt"
 	"net/rpc"
-	"os"
+	"strings"
 
 	"github.com/spf13/cobra"
 
@@ -36,8 +36,39 @@ func (c *listCommand) run(cmd *cobra.Command, args []string) error {
 			return err
 		}
 
-		json.NewEncoder(os.Stdout).Encode(response)
-
+		c.displayResponse(response)
 		return nil
 	})
 }
+
+func (c *listCommand) displayResponse(reponse server.ListResponse) {
+	fmt.Println(c.format("Service", 30, italic) +
+		c.format("Host", 30, italic) + c.format("Target", 30, italic) +
+		c.format("State", 10, italic) + c.format("TLS", 10, italic))
+
+	for name, service := range reponse.Targets {
+		tls := "no"
+		if service.TLS {
+			tls = "yes"
+		}
+
+		fmt.Println(c.format(name, 30, bold) +
+			c.format(service.Host, 30, plain) + c.format(service.Target, 30, plain) +
+			c.format(service.State, 10, plain) + c.format(tls, 10, plain))
+	}
+}
+
+const (
+	plain  = ""
+	bold   = "1;34"
+	italic = "3;94"
+)
+
+func (c *listCommand) format(text string, width int, style string) string {
+	text = (text + strings.Repeat(" ", width-len(text)))[0:width]
+	if style != "" {
+		text = "\033[" + style + "m" + text + "\033[0m"
+	}
+
+	return text
+}

internal/server/pause_control.go

@@ -13,6 +13,19 @@ const (
 	PauseStateStopped
 )
 
+func (ps PauseState) String() string {
+	switch ps {
+	case PauseStateRunning:
+		return "running"
+	case PauseStatePaused:
+		return "paused"
+	case PauseStateStopped:
+		return "stopped"
+	default:
+		return ""
+	}
+}
+
 type PauseWaitAction int
 
 const (

internal/server/router.go

@@ -29,7 +29,9 @@ type Router struct {
 
 type ServiceDescription struct {
 	Host   string `json:"host"`
+	TLS    bool   `json:"tls"`
 	Target string `json:"target"`
+	State  string `json:"state"`
 }
 
 type ServiceDescriptionMap map[string]ServiceDescription
@@ -167,6 +169,8 @@ func (r *Router) ListActiveServices() ServiceDescriptionMap {
 				result[service.name] = ServiceDescription{
 					Host:   host,
 					Target: service.active.Target(),
+					TLS:    service.options.RequireTLS(),
+					State:  service.pauseControl.State().String(),
 				}
 			}
 		}