Fix last bug, make CLI prettier.

Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>

Gopkg.lock

@@ -121,6 +121,12 @@
   revision = "777bb3f19bcafe2575ffb2a3e46af92509ae9594"
   version = "v1.2"
 
+[[projects]]
+  name = "github.com/fatih/color"
+  packages = ["."]
+  revision = "5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4"
+  version = "v1.7.0"
+
 [[projects]]
   name = "github.com/ghodss/yaml"
   packages = ["."]
@@ -321,6 +327,18 @@
   ]
   revision = "8b799c424f57fa123fc63a99d6383bc6e4c02578"
 
+[[projects]]
+  name = "github.com/mattn/go-colorable"
+  packages = ["."]
+  revision = "167de6bfdfba052fa6b2d3664c8f5272e23c9072"
+  version = "v0.0.9"
+
+[[projects]]
+  name = "github.com/mattn/go-isatty"
+  packages = ["."]
+  revision = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39"
+  version = "v0.0.3"
+
 [[projects]]
   name = "github.com/matttproud/golang_protobuf_extensions"
   packages = ["pbutil"]
@@ -814,6 +832,6 @@
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "f2dd40edc3d19bf19d5233c8cf72ca403c7f3c9dbd63c63807ca438885f46c87"
+  inputs-digest = "fbeade10a57bc52ffd7c522a42cacecfd50c2dc83a05473018d9ff046bc5a3e3"
   solver-name = "gps-cdcl"
   solver-version = 1

cmd/logcli/main.go

@@ -8,8 +8,13 @@ import (
 	"net/http"
 	"net/url"
 	"os"
+	"strings"
+	"time"
+
+	"github.com/fatih/color"
 
 	"github.com/grafana/logish/pkg/logproto"
+	"github.com/grafana/logish/pkg/querier"
 )
 
 var defaultAddr = "https://log-us.grafana.net/api/prom/query"
@@ -50,5 +55,16 @@ func main() {
 		log.Fatalf("Error decoding response: %v", err)
 	}
 
-	fmt.Println(queryResponse.String())
+	iter := querier.NewQueryResponseIterator(&queryResponse)
+	for iter.Next() {
+		fmt.Println(
+			color.BlueString(iter.Entry().Timestamp.Format(time.RFC822)),
+			color.RedString(iter.Labels()),
+			strings.TrimSpace(iter.Entry().Line),
+		)
+	}
+
+	if err := iter.Error(); err != nil {
+		log.Fatalf("Error from iterator: %v", err)
+	}
 }

pkg/querier/iterator.go

@@ -151,8 +151,8 @@ func (i *heapIterator) Close() error {
 	return nil
 }
 
-func queryResponseIterator(resp *logproto.QueryResponse) EntryIterator {
-	is := make([]EntryIterator, len(resp.Streams))
+func NewQueryResponseIterator(resp *logproto.QueryResponse) EntryIterator {
+	is := make([]EntryIterator, 0, len(resp.Streams))
 	for i := range resp.Streams {
 		is = append(is, newStreamIterator(resp.Streams[i]))
 	}
@@ -181,7 +181,7 @@ func (i *queryClientIterator) Next() bool {
 			return false
 		}
 
-		i.curr = queryResponseIterator(batch)
+		i.curr = NewQueryResponseIterator(batch)
 	}
 
 	return true