Merge pull request #262 from achilleas-k/default-server-json

LGTM

Author: mpsonntag

gincmd/serverscmd.go

@@ -9,21 +9,32 @@ import (
 	"github.com/spf13/cobra"
 )
 
+type srvcfgWithDefault struct {
+	config.ServerCfg
+	Default bool
+}
+
 func servers(cmd *cobra.Command, args []string) {
 	flags := cmd.Flags()
 	jsonout, _ := flags.GetBool("json")
 	conf := config.Read()
 	servermap := conf.Servers
 	defserver := conf.DefaultServer
 
+	// augment servermap with Default field
+	serverdefaultmap := make(map[string]srvcfgWithDefault, len(servermap))
+	for alias, srvcfg := range servermap {
+		serverdefaultmap[alias] = srvcfgWithDefault{srvcfg, defserver == alias}
+	}
+
 	if jsonout {
-		serversjson, _ := json.Marshal(conf.Servers)
+		serversjson, _ := json.Marshal(serverdefaultmap)
 		fmt.Print(string(serversjson))
 	} else {
 		fmt.Println(":: Configured servers")
-		for alias, srvcfg := range servermap {
+		for alias, srvcfg := range serverdefaultmap {
 			fmt.Printf("* %s", alias)
-			if alias == defserver {
+			if srvcfg.Default {
 				fmt.Fprintf(color.Output, green(" [default]"))
 			}
 			fmt.Println()