Merge pull request #17 from simeji/fix-cli-option

remove -p option

README.md

@@ -81,6 +81,4 @@ curl -s http://rdg.afilias.info/rdap/domain/example.info | jig
 
 ### Option
 
--p : Pretty print (output json)
-
 -q : Print query (for jq)

cmd/coverage.out

@@ -0,0 +1,10 @@
+mode: set
+github.com/simeji/jig/cmd/jig.go:10.13,22.2 8 0
+github.com/simeji/jig/cmd/jig.go:24.62,27.30 2 1
+github.com/simeji/jig/cmd/jig.go:30.2,30.11 1 1
+github.com/simeji/jig/cmd/jig.go:42.2,42.10 1 1
+github.com/simeji/jig/cmd/jig.go:27.30,29.3 1 1
+github.com/simeji/jig/cmd/jig.go:30.11,32.3 1 1
+github.com/simeji/jig/cmd/jig.go:32.3,32.19 1 1
+github.com/simeji/jig/cmd/jig.go:32.19,38.3 0 1
+github.com/simeji/jig/cmd/jig.go:38.3,41.3 2 1

cmd/jig.go

@@ -11,33 +11,24 @@ func main() {
 	content := os.Stdin
 
 	var query bool
-	var pretty bool
 
 	flag.BoolVar(&query, "q", false, "output query")
-	flag.BoolVar(&pretty, "p", false, "pretty print")
 	flag.Parse()
 
 	e := jig.NewEngine(content)
-	os.Exit(run(e, query, pretty))
+	os.Exit(run(e, query))
 }
 
-func run(e jig.EngineInterface, query bool, pretty bool) int {
+func run(e jig.EngineInterface, query bool) int {
 
 	result := e.Run()
 	if result.GetError() != nil {
 		return 2
 	}
 	if query {
 		fmt.Printf("%s", result.GetQueryString())
-	} else if pretty {
-		//s, _, _, err := e.manager.GetPretty(e.query, true)
-		//if err != nil {
-		//return 1
-		//}
-		//fmt.Printf("%s", s)
 	} else {
-		s := result.GetContent()
-		fmt.Printf("%s", s)
+		fmt.Printf("%s", result.GetContent())
 	}
 	return 0
 }

cmd/jig_test.go

@@ -20,22 +20,22 @@ func TestJigRun(t *testing.T) {
 	var assert = assert.New(t)
 
 	e := &EngineMock{err: nil}
-	result := run(e, false, false)
+	result := run(e, false)
 	assert.Zero(result)
 	assert.Equal(2, called)
 
-	result = run(e, true, false)
+	result = run(e, true)
 	assert.Equal(1, called)
 
-	result = run(e, false, true)
+	result = run(e, false)
 	assert.Zero(result)
 }
 
 func TestJigRunWithError(t *testing.T) {
 	called = 0
 	var assert = assert.New(t)
 	e := &EngineMock{err: fmt.Errorf("")}
-	result := run(e, false, false)
+	result := run(e, false)
 	assert.Equal(2, result)
 	assert.Equal(0, called)
 }

engine.go

@@ -137,6 +137,7 @@ func (e *Engine) Run() EngineResultInterface {
 					cc, _, _, err := e.manager.Get(e.query, true)
 					return &EngineResult{
 						content: cc,
+						qs:      e.query.StringGet(),
 						err:     err,
 					}
 				}