Merge pull request #114 from mnottale/inspect-sort

inspect: Sort settings output.

Author: mnottale

e2e/binary_test.go

@@ -168,6 +168,17 @@ targets:
 	assert.Assert(t, fs.Equal(dirName, manifest))
 }
 
+func TestInspectBinary(t *testing.T) {
+	dockerApp, _ := getBinary(t)
+	cmd := exec.Command(dockerApp, "inspect", "render/envvariables")
+	output, err := cmd.CombinedOutput()
+	if err != nil {
+		fmt.Println(string(output))
+	}
+	assert.NilError(t, err)
+	golden.Assert(t, string(output), "envvariables-inspect.golden")
+}
+
 func TestPackBinary(t *testing.T) {
 	dockerApp, hasExperimental := getBinary(t)
 	if !hasExperimental {

e2e/testdata/envvariables-inspect.golden

@@ -0,0 +1,8 @@
+myapp 0.1.0
+Maintained by: bearclaw <[email protected]>
+
+Setting              Default
+-------              -------
+myapp.alpine_version latest
+myapp.command1       cat
+myapp.command2       foo

renderer/inspect.go

@@ -5,6 +5,7 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
+	"sort"
 	"strings"
 	"text/tabwriter"
 
@@ -40,6 +41,12 @@ func Inspect(appname string) error {
 	if err != nil {
 		return err
 	}
+	// sort the keys to get consistent output
+	var settingsKeys []string
+	for k := range settings {
+		settingsKeys = append(settingsKeys, k)
+	}
+	sort.Slice(settingsKeys, func(i, j int) bool { return settingsKeys[i] < settingsKeys[j] })
 	// build maintainers string
 	maintainers := ""
 	for _, m := range meta.Maintainers {
@@ -58,8 +65,8 @@ func Inspect(appname string) error {
 	w := tabwriter.NewWriter(os.Stdout, 0, 0, 1, ' ', 0)
 	fmt.Fprintln(w, "Setting\tDefault")
 	fmt.Fprintln(w, "-------\t-------")
-	for k, v := range settings {
-		fmt.Fprintf(w, "%s\t%s\n", k, v)
+	for _, k := range settingsKeys {
+		fmt.Fprintf(w, "%s\t%s\n", k, settings[k])
 	}
 	w.Flush()
 	return nil