Output rework to comply with redis-cli, --raw support

Gopkg.toml

@@ -28,3 +28,7 @@
 [prune]
  go-tests = true
  unused-packages = true
+
+[[constraint]]
+ name = "github.com/mattn/go-isatty"
+ version = "0.0.3"

README.md

@@ -8,11 +8,7 @@ Redli is a Go-based alternative to the official Redis-cli application. It's majo
 
 ```text
  redli [<flags>] [<commands>...]
- ```
-
-### Flags
-
-```text
+ 
  --help Show context-sensitive help (also try --help-long and --help-man).
  --debug Enable debug mode.
  --long Enable long prompt with host/port
@@ -24,6 +20,10 @@ Redli is a Go-based alternative to the official Redis-cli application. It's majo
  --tls Enable TLS/SSL
  --certfile=CERTFILE Self-signed certificate file for validation
  --certb64=CERTB64 Self-signed certificate string as base64 for validation
+ --raw Produce raw output
+
+Args:
+ [<commands>] Redis commands and values
 ```
 
 * `URI` URI to connect To. It follow the format of [the provisional IANA spec for Redis URLs](https://www.iana.org/assignments/uri-schemes/prov/redis), but with the option to denote a TLS secured connection with the protocol rediss:.

redli.go

@@ -14,6 +14,7 @@ import (
  "strings"
 
  "github.com/gomodule/redigo/redis"
+ "github.com/mattn/go-isatty"
  "github.com/mattn/go-shellwords"
  "github.com/peterh/liner"
  "gopkg.in/alecthomas/kingpin.v2"
@@ -30,17 +31,27 @@ var (
  redistls = kingpin.Flag("tls", "Enable TLS/SSL").Default("false").Bool()
  rediscertfile = kingpin.Flag("certfile", "Self-signed certificate file for validation").Envar("REDIS_CERTFILE").File()
  rediscertb64 = kingpin.Flag("certb64", "Self-signed certificate string as base64 for validation").Envar("REDIS_CERTB64").String()
+ forceraw = kingpin.Flag("raw", "Produce raw output").Bool()
  commandargs = kingpin.Arg("commands", "Redis commands and values").Strings()
 )
 
 var (
  rawrediscommands = Commands{}
  conn redis.Conn
+ raw = false
 )
 
 func main() {
  kingpin.Parse()
 
+ if *forceraw {
+ raw = true
+ } else {
+ if !isatty.IsTerminal(os.Stdout.Fd()) && !isatty.IsCygwinTerminal(os.Stdout.Fd()) {
+ raw = true
+ }
+ }
+
  cert := []byte{}
 
  if *rediscertfile != nil {
@@ -115,22 +126,7 @@ func main() {
  log.Fatal(err)
  }
 
- switch v := result.(type) {
- case redis.Error:
- fmt.Printf("%s\n", v.Error())
- case int64:
- fmt.Printf("%d\n", v)
- case string:
- fmt.Printf("%s\n", v)
- case []byte:
- fmt.Printf("%s\n", string(v))
- case nil:
- fmt.Printf("nil\n")
- case []interface{}:
- for i, j := range v {
- fmt.Printf("%d) %s\n", i+1, j)
- }
- }
+ printRedisResult(result)
 
  os.Exit(0)
  }
@@ -240,21 +236,41 @@ func main() {
 
  result, err := conn.Do(parts[0], args...)
 
- switch v := result.(type) {
- case redis.Error:
+ printRedisResult(result)
+ }
+}
+
+func printRedisResult(result interface{}) {
+ switch v := result.(type) {
+ case redis.Error:
+ if raw {
  fmt.Printf("%s\n", v.Error())
- case int64:
+ } else {
+ fmt.Printf("(error) %s\n", v.Error())
+ }
+ case int64:
+ if raw {
  fmt.Printf("%d\n", v)
- case string:
+ } else {
+ fmt.Printf("(integer) %d\n", v)
+ }
+ case string:
+ if raw {
  fmt.Printf("%s\n", v)
- case []byte:
+ } else {
+ fmt.Printf("%s\n", v)
+ }
+ case []byte:
+ if raw {
  fmt.Printf("%s\n", string(v))
- case nil:
- fmt.Printf("nil\n")
- case []interface{}:
- for i, j := range v {
- fmt.Printf("%d) %s\n", i+1, j)
- }
+ } else {
+ fmt.Printf("\"%s\"\n", string(v))
+ }
+ case nil:
+ fmt.Printf("nil\n")
+ case []interface{}:
+ for i, j := range v {
+ fmt.Printf("%d) %s\n", i+1, j)
  }
  }
 }