Merge pull request #275 from vdice/sort-labels

feat(cmd/labels.go): sort labels when listing

Author: Vaughn Dice

cmd/apps_test.go

@@ -211,7 +211,7 @@ lorem-ipsum-cmd-1911796442-48b58 up (v2)
 lorem-ipsum
 
 === lorem-ipsum Label
-team:            frontend
+team:      frontend
 
 `, "output")
 }

cmd/labels.go

@@ -2,9 +2,12 @@ package cmd
 
 import (
 	"fmt"
+	"strings"
+
+	"github.com/deis/pkg/prettyprint"
+
 	"github.com/deis/controller-sdk-go/api"
 	"github.com/deis/controller-sdk-go/appsettings"
-	"strings"
 )
 
 // LabelsList list app's labels
@@ -20,12 +23,21 @@ func (d *DeisCmd) LabelsList(appID string) error {
 		return err
 	}
 
+	sortedLabels := sortKeys(appSettings.Label)
+
 	d.Printf("=== %s Label\n", appID)
 
-	if appSettings.Label == nil || len(appSettings.Label) == 0 {
+	if len(sortedLabels) == 0 {
 		d.Println("No labels found.")
 	} else {
-		d.Println(appSettings.Label)
+		labels := make(map[string]string)
+
+		// appSettings.Label is type interface, so it needs to be converted to a string
+		for _, label := range sortedLabels {
+			labels[label+":"] = fmt.Sprintf("%v", appSettings.Label[label])
+		}
+
+		d.Print(prettyprint.PrettyTabs(labels, 6))
 	}
 
 	return nil

cmd/labels_test.go

@@ -27,7 +27,7 @@ func TestLabelsList(t *testing.T) {
 		fmt.Fprintf(w, `{
 			"owner": "jim",
 			"app": "rivendell",
-		    "label": {"git_repo": "https://github.com/deis/controller-sdk-go", "team" : "deis"},
+		    "label": {"team" : "deis", "git_repo": "https://github.com/deis/controller-sdk-go"},
 			"created": "2014-01-01T00:00:00UTC",
 			"updated": "2014-01-01T00:00:00UTC",
 			"uuid": "de1bf5b5-4a72-4f94-a10c-d2a3741cdf75"
@@ -37,8 +37,8 @@ func TestLabelsList(t *testing.T) {
 	err = cmdr.LabelsList("rivendell")
 	assert.NoErr(t, err)
 	assert.Equal(t, strings.TrimSpace(b.String()), `=== rivendell Label
-git_repo:        https://github.com/deis/controller-sdk-go
-team:            deis`, "output")
+git_repo:      https://github.com/deis/controller-sdk-go
+team:          deis`, "output")
 
 	server.Mux.HandleFunc("/v2/apps/mordor/settings/", func(w http.ResponseWriter, r *http.Request) {
 		testutil.SetHeaders(w)

glide.lock

@@ -16,4 +16,4 @@ import:
 - package: github.com/olekukonko/tablewriter
 - package: github.com/arschles/assert
 - package: github.com/deis/controller-sdk-go
-  version: 685c7f75bc1c4b57899a7cde55d945aa16129513
+  version: e4abe62d2accc3168b82ff54cb7e8aff2764d03b