Merge pull request #46 from tendermint/updates

Updates

cmd/tmsp-cli/tmsp-cli.go

@@ -15,10 +15,38 @@ import (
 	"github.com/urfave/cli"
 )
 
+//structure for data passed to print response
+// variables must be exposed for JSON to read
+type response struct {
+	Res       types.Result
+	Data      string
+	PrintCode bool
+	Code      string
+}
+
+func newResponse(res types.Result, data string, printCode bool) *response {
+	rsp := &response{
+		Res:       res,
+		Data:      data,
+		PrintCode: printCode,
+		Code:      "",
+	}
+
+	if printCode {
+		rsp.Code = res.Code.String()
+	}
+
+	return rsp
+}
+
 // client is a global variable so it can be reused by the console
 var client tmspcli.Client
 
 func main() {
+
+	//workaround for the cli library (https://github.com/urfave/cli/issues/565)
+	cli.OsExiter = func(_ int) {}
+
 	app := cli.NewApp()
 	app.Name = "tmsp-cli"
 	app.Usage = "tmsp-cli [command] [args...]"
@@ -131,6 +159,20 @@ func badCmd(c *cli.Context, cmd string) {
 	cli.DefaultAppComplete(c)
 }
 
+//Generates new Args array based off of previous call args to maintain flag persistence
+func persistentArgs(line []byte) []string {
+
+	//generate the arguments to run from orginal os.Args
+	// to maintain flag arguments
+	args := os.Args
+	args = args[:len(args)-1] // remove the previous command argument
+
+	if len(line) > 0 { //prevents introduction of extra space leading to argument parse errors
+		args = append(args, strings.Split(string(line), " ")...)
+	}
+	return args
+}
+
 //--------------------------------------------------------------------------------
 
 func cmdBatch(app *cli.App, c *cli.Context) error {
@@ -146,12 +188,9 @@ func cmdBatch(app *cli.App, c *cli.Context) error {
 		} else if err != nil {
 			return err
 		}
-		args := []string{"tmsp-cli"}
-		if c.GlobalBool("verbose") {
-			args = append(args, "--verbose")
-		}
-		args = append(args, strings.Split(string(line), " ")...)
-		app.Run(args)
+
+		args := persistentArgs(line)
+		app.Run(args) //cli prints error within its func call
 	}
 	return nil
 }
@@ -159,6 +198,7 @@ func cmdBatch(app *cli.App, c *cli.Context) error {
 func cmdConsole(app *cli.App, c *cli.Context) error {
 	// don't hard exit on mistyped commands (eg. check vs check_tx)
 	app.CommandNotFound = badCmd
+
 	for {
 		fmt.Printf("\n> ")
 		bufReader := bufio.NewReader(os.Stdin)
@@ -169,12 +209,8 @@ func cmdConsole(app *cli.App, c *cli.Context) error {
 			return err
 		}
 
-		args := []string{"tmsp-cli"}
-		args = append(args, strings.Split(string(line), " ")...)
-		if err := app.Run(args); err != nil {
-			// if the command doesn't succeed, inform the user without exiting
-			fmt.Println("Error:", err.Error())
-		}
+		args := persistentArgs(line)
+		app.Run(args) //cli prints error within its func call
 	}
 }
 
@@ -185,14 +221,16 @@ func cmdEcho(c *cli.Context) error {
 		return errors.New("Command echo takes 1 argument")
 	}
 	res := client.EchoSync(args[0])
-	printResponse(c, res, string(res.Data), false)
+	rsp := newResponse(res, string(res.Data), false)
+	printResponse(c, rsp)
 	return nil
 }
 
 // Get some info from the application
 func cmdInfo(c *cli.Context) error {
 	res, _, _, _ := client.InfoSync()
-	printResponse(c, res, string(res.Data), false)
+	rsp := newResponse(res, string(res.Data), false)
+	printResponse(c, rsp)
 	return nil
 }
 
@@ -203,7 +241,8 @@ func cmdSetOption(c *cli.Context) error {
 		return errors.New("Command set_option takes 2 arguments (key, value)")
 	}
 	res := client.SetOptionSync(args[0], args[1])
-	printResponse(c, res, Fmt("%s=%s", args[0], args[1]), false)
+	rsp := newResponse(res, Fmt("%s=%s", args[0], args[1]), false)
+	printResponse(c, rsp)
 	return nil
 }
 
@@ -218,7 +257,8 @@ func cmdAppendTx(c *cli.Context) error {
 		return err
 	}
 	res := client.AppendTxSync(txBytes)
-	printResponse(c, res, string(res.Data), true)
+	rsp := newResponse(res, string(res.Data), true)
+	printResponse(c, rsp)
 	return nil
 }
 
@@ -233,14 +273,16 @@ func cmdCheckTx(c *cli.Context) error {
 		return err
 	}
 	res := client.CheckTxSync(txBytes)
-	printResponse(c, res, string(res.Data), true)
+	rsp := newResponse(res, string(res.Data), true)
+	printResponse(c, rsp)
 	return nil
 }
 
 // Get application Merkle root hash
 func cmdCommit(c *cli.Context) error {
 	res := client.CommitSync()
-	printResponse(c, res, Fmt("0x%X", res.Data), false)
+	rsp := newResponse(res, Fmt("0x%X", res.Data), false)
+	printResponse(c, rsp)
 	return nil
 }
 
@@ -255,31 +297,37 @@ func cmdQuery(c *cli.Context) error {
 		return err
 	}
 	res := client.QuerySync(queryBytes)
-	printResponse(c, res, string(res.Data), true)
+	rsp := newResponse(res, string(res.Data), true)
+	printResponse(c, rsp)
 	return nil
 }
 
 //--------------------------------------------------------------------------------
 
-func printResponse(c *cli.Context, res types.Result, s string, printCode bool) {
-	if c.GlobalBool("verbose") {
+func printResponse(c *cli.Context, rsp *response) {
+
+	verbose := c.GlobalBool("verbose")
+
+	if verbose {
 		fmt.Println(">", c.Command.Name, strings.Join(c.Args(), " "))
 	}
 
-	if printCode {
-		fmt.Printf("-> code: %s\n", res.Code.String())
-	}
-	/*if res.Error != "" {
-		fmt.Printf("-> error: %s\n", res.Error)
-	}*/
-	if s != "" {
-		fmt.Printf("-> data: %s\n", s)
-	}
-	if res.Log != "" {
-		fmt.Printf("-> log: %s\n", res.Log)
+	if rsp.PrintCode {
+		fmt.Printf("-> code: %s\n", rsp.Code)
 	}
 
-	if c.GlobalBool("verbose") {
+	//if pr.res.Error != "" {
+	//	fmt.Printf("-> error: %s\n", pr.res.Error)
+	//}
+
+	if rsp.Data != "" {
+		fmt.Printf("-> data: %s\n", rsp.Data)
+	}
+	if rsp.Res.Log != "" {
+		fmt.Printf("-> log: %s\n", rsp.Res.Log)
+	}
+
+	if verbose {
 		fmt.Println("")
 	}
 

example/counter/counter.go

@@ -72,5 +72,14 @@ func (app *CounterApplication) Commit() types.Result {
 }
 
 func (app *CounterApplication) Query(query []byte) types.Result {
-	return types.NewResultOK(nil, Fmt("Query is not supported"))
+	queryStr := string(query)
+
+	switch queryStr {
+	case "hash":
+		return types.NewResultOK(nil, Fmt("%v", app.hashCount))
+	case "tx":
+		return types.NewResultOK(nil, Fmt("%v", app.txCount))
+	}
+
+	return types.ErrUnknownRequest.SetLog(Fmt("Invalid nonce. Expected hash or tx, got %v", queryStr))
 }

glide.lock

@@ -1,5 +1,5 @@
 hash: 0644029071e51c40b7b4f9b3b3c14fce59e6dadd42897ea20d7eaf049104969e
-updated: 2016-12-06T03:21:00.488564175-08:00
+updated: 2017-01-12T01:05:04.505700434-05:00
 imports:
 - name: github.com/btcsuite/btcd
   version: afec1bd1245a4a19e6dfe1306974b733e7cbb9b8
@@ -46,15 +46,15 @@ imports:
 - name: github.com/tendermint/go-crypto
   version: 4b11d62bdb324027ea01554e5767b71174680ba0
 - name: github.com/tendermint/go-db
-  version: 5e2a1d3e300743380a329499804dde6bfb0af7d5
+  version: 2645626c33d8702739e52a61a55d705c2dfe4530
 - name: github.com/tendermint/go-logger
   version: cefb3a45c0bf3c493a04e9bcd9b1540528be59f2
 - name: github.com/tendermint/go-merkle
-  version: 8bbe6968f21c1c8a3dcdd2f1ca2a87009a9ec912
+  version: c7a7ae88ca72bf030a7fb7d0d52ce8d1e62b4e16
 - name: github.com/tendermint/go-process
   version: 7f507d69fa4c13b34e7a17ff5c87d1eaaa759145
 - name: github.com/tendermint/go-wire
-  version: 287d8caeae91d21686340f5f87170560531681e6
+  version: 37d5dd6530857a1abc1db50a48ba22c3459826a1
 - name: github.com/tendermint/log15
   version: ae0f3d6450da9eac7074b439c8e1c3cabf0d5ce6
   subpackages: