From 94f31601874e5b4b2977abfe970d0c78fa796d46 Mon Sep 17 00:00:00 2001
From: brettlangdon <brett@blangdon.com>
Date: Sat, 7 Nov 2015 11:40:56 -0500
Subject: [PATCH] use proper directory structure

---
 Makefile          |  4 +--
 cmd/jsonstream.go | 83 -----------------------------------------------
 2 files changed, 2 insertions(+), 85 deletions(-)
 delete mode 100644 cmd/jsonstream.go

diff --git a/Makefile b/Makefile
index 73c0f2a..a6efbff 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-jsonstream: ./cmd/jsonstream.go ./reader.go ./formatter.go ./utils.go
-	go build cmd/jsonstream.go
+jsonstream: ./cmd/jsonstream/jsonstream.go ./reader.go ./formatter.go ./utils.go
+	go build cmd/jsonstream/jsonstream.go
 
 clean:
 	rm ./jsonstream
diff --git a/cmd/jsonstream.go b/cmd/jsonstream.go
deleted file mode 100644
index f15ab1f..0000000
--- a/cmd/jsonstream.go
+++ /dev/null
@@ -1,83 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"io"
-	"os"
-
-	"github.com/alexflint/go-arg"
-	"github.com/brettlangdon/jsonstream"
-)
-
-var args struct {
-	File string   `arg:"-f,help:JSON stream file to read from"`
-	TSV  bool     `arg:"-t,help:Reformat the JSON stream to TSV '<value>\t<value>'"`
-	Key  bool     `arg:"-k,help:Whether or not to include the key in --tsv. '<key>=<value>\t<key>=<value>'"`
-	Keys []string `arg:"positional,help:Which keys from the input JSON stream to include in the output"`
-}
-
-func init() {
-	arg.MustParse(&args)
-}
-
-func getReader() (reader *jsonstream.Reader, err error) {
-	var input io.Reader
-	input = os.Stdin
-	if args.File != "" {
-		input, err = os.Open(args.File)
-	}
-
-	if err == nil {
-		reader = jsonstream.NewReader(input, args.Keys)
-	}
-	return reader, err
-}
-
-func getFormatter() (formatter *jsonstream.Formatter, err error) {
-	var format jsonstream.FormatType
-	format = jsonstream.FormatJSON
-
-	if args.TSV {
-		format = jsonstream.FormatTSV
-		if args.Key {
-			format = jsonstream.FormatTSVKey
-		}
-	}
-
-	if err == nil {
-		formatter = jsonstream.NewFormatter(format)
-	}
-	return formatter, err
-}
-
-func main() {
-	var err error
-	var reader *jsonstream.Reader
-	var formatter *jsonstream.Formatter
-
-	reader, err = getReader()
-	if err != nil {
-		panic(err)
-	}
-	formatter, err = getFormatter()
-	if err != nil {
-		panic(err)
-	}
-
-	for {
-		data, err := reader.ReadLine()
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			panic(err)
-		}
-
-		var output []byte
-		output, err = formatter.Format(data)
-		if err != nil {
-			panic(err)
-		}
-		fmt.Printf("%s\r\n", output)
-	}
-}