From bfd4ce96bbe9d3428479440a0399c619e10cd300 Mon Sep 17 00:00:00 2001
From: Rigel Rozanski <rigelrozanski@Rigels-MacBook-Air.local>
Date: Wed, 30 Aug 2017 19:25:35 -0400
Subject: [PATCH] added init option flag and tests

---
 server/commands/init.go  | 28 ++++++++++++++++++++++++----
 tests/cli/init-server.sh | 23 +++++++++++++++++++++++
 2 files changed, 47 insertions(+), 4 deletions(-)
 create mode 100644 tests/cli/init-server.sh

diff --git a/server/commands/init.go b/server/commands/init.go
index bb8617d08..e4a584440 100644
--- a/server/commands/init.go
+++ b/server/commands/init.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
+	"strings"
 
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
@@ -25,10 +26,12 @@ var InitCmd = &cobra.Command{
 //nolint - flags
 var (
 	FlagChainID = "chain-id" //TODO group with other flags or remove? is this already a flag here?
+	FlagOption  = "option"
 )
 
 func init() {
 	InitCmd.Flags().String(FlagChainID, "test_chain_id", "Chain ID")
+	InitCmd.Flags().StringSlice(FlagOption, []string{}, "Genesis option in the format <app>/<option>/<value>")
 }
 
 // returns 1 iff it set a file, otherwise 0 (so we can add them)
@@ -64,7 +67,24 @@ func initCmd(cmd *cobra.Command, args []string) error {
 		return errors.New("Address must be 20-bytes in hex")
 	}
 
-	genesis := GetGenesisJSON(viper.GetString(FlagChainID), userAddr)
+	var options []string
+	var optionsStr string
+	sep := ",\n      "
+	optionsRaw := viper.GetStringSlice(FlagOption)
+	if len(optionsRaw) > 0 {
+		optionsStr = sep
+		for i := 0; i < len(optionsRaw); i++ {
+			s := strings.SplitN(optionsRaw[i], "/", 3)
+			if len(s) != 3 {
+				return errors.New("Genesis option must be in the format <app>/<option>/<value>")
+			}
+			option := `"` + s[0] + `/` + s[1] + `", "` + s[2] + `"`
+			options = append(options, option)
+		}
+	}
+	optionsStr += strings.Join(options[:], ",\n      ")
+
+	genesis := GetGenesisJSON(viper.GetString(FlagChainID), userAddr, optionsStr)
 	return CreateGenesisValidatorFiles(cfg, genesis, cmd.Root().Name())
 }
 
@@ -114,7 +134,7 @@ var PrivValJSON = `{
 // GetGenesisJSON returns a new tendermint genesis with Basecoin app_options
 // that grant a large amount of "mycoin" to a single address
 // TODO: A better UX for generating genesis files
-func GetGenesisJSON(chainID, addr string) string {
+func GetGenesisJSON(chainID, addr string, options string) string {
 	return fmt.Sprintf(`{
   "app_hash": "",
   "chain_id": "%s",
@@ -140,8 +160,8 @@ func GetGenesisJSON(chainID, addr string) string {
       ]
     }],
     "plugin_options": [
-      "coin/issuer", {"app": "sigs", "addr": "%s"}
+      "coin/issuer", {"app": "sigs", "addr": "%s"}%s
     ]
   }
-}`, chainID, addr, addr)
+}`, chainID, addr, addr, options)
 }
diff --git a/tests/cli/init-server.sh b/tests/cli/init-server.sh
new file mode 100644
index 000000000..7d2cce7d4
--- /dev/null
+++ b/tests/cli/init-server.sh
@@ -0,0 +1,23 @@
+" Press ? for help
+
+.. (up a dir)
+/
+▸ Applications/
+▸ bin/
+▸ cores/
+▸ dev/
+▸ etc/ -> /private/etc/
+▸ home/
+▸ Library/
+▸ net/
+▸ Network/
+▸ opt/
+▸ private/
+▸ sbin/
+▸ System/
+▸ tmp/ -> /private/tmp/
+▸ Users/
+▸ usr/
+▸ var/ -> /private/var/
+▸ Volumes/
+  installer.failurerequests [RO]