Merge pull request #6 from y13i/stdin_input

Stdin input

.travis.yml

@@ -4,9 +4,11 @@ go:
 env:
 - PATH=/home/travis/gopath/bin:$PATH
 install:
-- go get github.com/codegangsta/cli
+- go get github.com/urfave/cli
 - go get github.com/ghodss/yaml
 - go get github.com/bitly/go-simplejson
+- go get golang.org/x/crypto/ssh/terminal
+before_deploy:
 - go get -v github.com/mitchellh/gox
 - gox -output build/{{.OS}}_{{.Arch}}/{{.Dir}}
 - cd build

README.md

@@ -114,3 +114,16 @@ employees:
 - firstName: Peter
   lastName: Jones
 ```
+
+### Input from STDIN
+
+```
+$ echo '{"employees":[{"firstName":"John","lastName":"Doe"},{"firstName":"Anna","lastName":"Smith"},{"firstName":"Peter","lastName":"Jones"}]}' | j2y
+employees:
+- firstName: John
+  lastName: Doe
+- firstName: Anna
+  lastName: Smith
+- firstName: Peter
+  lastName: Jones
+```

lib/get_input_bytes.go

@@ -1,9 +1,11 @@
 package j2yLib
 
 import (
+	"bufio"
 	"fmt"
 	"io/ioutil"
 	"os"
+	"strings"
 )
 
 func GetInputBytes(source, str string) []byte {
@@ -21,6 +23,20 @@ func GetInputBytes(source, str string) []byte {
 			fmt.Printf("err: %v\n", err)
 			os.Exit(1)
 		}
+	case "STDIN":
+		scanner := bufio.NewScanner(os.Stdin)
+
+		var inputLines []string
+
+		for scanner.Scan() {
+			inputLines = append(inputLines, scanner.Text())
+		}
+
+		if err := scanner.Err(); err != nil {
+			fmt.Fprintln(os.Stderr, "reading standard input:", err)
+		}
+
+		inputBytes = []byte(strings.Join(inputLines, ""))
 	default:
 		fmt.Println("unknown source.")
 		os.Exit(1)

main.go

@@ -2,17 +2,18 @@ package main
 
 import (
 	"fmt"
-	"github.com/codegangsta/cli"
-	"os"
+	"github.com/urfave/cli"
 	"github.com/y13i/j2y/lib"
+	"golang.org/x/crypto/ssh/terminal"
+	"os"
 )
 
 func main() {
 	app := cli.NewApp()
 
 	app.Name    = "j2y"
 	app.Usage   = "convert JSON to YAML"
-	app.Version = "0.0.7"
+	app.Version = "0.0.8"
 
 	app.Flags = []cli.Flag{
 		cli.StringFlag{
@@ -37,19 +38,23 @@ func main() {
 		},
 	}
 
-	app.Action = func(command *cli.Context) {
+	app.Action = func(command *cli.Context) error {
 		var source      string
 		var outputBytes []byte
 
-		if command.Bool("eval") {
-			source = "ARGV"
-		} else {
-			if command.Args().First() == "" {
-				fmt.Println("`j2y --help` to view usage.")
-				os.Exit(1)
-			}
+		if terminal.IsTerminal(0) {
+			if command.Bool("eval") {
+				source = "ARGV"
+			} else {
+				if command.Args().First() == "" {
+					fmt.Println("`j2y --help` to view usage.")
+					os.Exit(1)
+				}
 
-			source = "FILE"
+				source = "FILE"
+			}
+		} else {
+			source = "STDIN"
 		}
 
 		inputBytes := j2yLib.GetInputBytes(source, command.Args().First())
@@ -61,6 +66,8 @@ func main() {
 		}
 
 		j2yLib.Output(outputBytes, command.String("output"))
+
+		return nil
 	}
 
 	app.Run(os.Args)