Merge PR #4433: Adopt YAML as human-readable text output

server/tm_cmds.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
+	"gopkg.in/yaml.v2"
 
 	tcmd "github.com/tendermint/tendermint/cmd/tendermint/commands"
 	"github.com/tendermint/tendermint/libs/cli"
@@ -18,14 +19,6 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
-const (
-	versionString = `Tendermint: %s
-ABCI: %s
-BlockProtocol: %d
-P2PProtocol: %d
-`
-)
-
 // ShowNodeIDCmd - ported from Tendermint, dump node ID to stdout
 func ShowNodeIDCmd(ctx *Context) *cobra.Command {
 	return &cobra.Command{
@@ -110,9 +103,22 @@ against which this app has been compiled.
 `,
 		RunE: func(cmd *cobra.Command, args []string) error {
 
-			fmt.Printf(versionString, tversion.Version, tversion.ABCIVersion,
-				tversion.BlockProtocol.Uint64(), tversion.P2PProtocol.Uint64())
+			bs, err := yaml.Marshal(&struct {
+				Tendermint    string
+				ABCI          string
+				BlockProtocol uint64
+				P2PProtocol   uint64
+			}{
+				Tendermint:    tversion.Version,
+				ABCI:          tversion.ABCIVersion,
+				BlockProtocol: tversion.BlockProtocol.Uint64(),
+				P2PProtocol:   tversion.P2PProtocol.Uint64(),
+			})
+			if err != nil {
+				return err
+			}
 
+			fmt.Println(string(bs))
 			return nil
 		},
 	}