make Print format gnostic

Massimiliano Pippi · Massimiliano Pippi · commit 2cf99bc047f8 · 2019-09-20T15:50:41.000+02:00
diff --git a/cli/feedback/exported.go b/cli/feedback/exported.go
@@ -52,8 +52,8 @@ func Printf(format string, v ...interface{}) {
 }
 
 // Print behaves like fmt.Print but writes on the out writer and adds a newline.
-func Print(v ...interface{}) {
-	fb.Print(v...)
+func Print(v interface{}) {
+	fb.Print(v)
 }
 
 // Errorf behaves like fmt.Printf but writes on the error writer and adds a
@@ -74,7 +74,9 @@ func PrintJSON(v interface{}) {
 	fb.PrintJSON(v)
 }
 
-// PrintResult is a convenient wrapper...
+// PrintResult is a convenient wrapper to provide feedback for complex data,
+// where the contents can't be just serialized to JSON but requires more
+// structure.
 func PrintResult(res Result) {
 	fb.PrintResult(res)
 }
diff --git a/cli/feedback/feedback.go b/cli/feedback/feedback.go
@@ -86,8 +86,12 @@ func (fb *Feedback) Printf(format string, v ...interface{}) {
 }
 
 // Print behaves like fmt.Print but writes on the out writer and adds a newline.
-func (fb *Feedback) Print(v ...interface{}) {
-	fmt.Fprintln(fb.out, v...)
+func (fb *Feedback) Print(v interface{}) {
+	if fb.format == JSON {
+		fb.PrintJSON(v)
+	} else {
+		fmt.Fprintln(fb.out, v)
+	}
 }
 
 // Errorf behaves like fmt.Printf but writes on the error writer and adds a
@@ -109,18 +113,16 @@ func (fb *Feedback) PrintJSON(v interface{}) {
 	if d, err := json.MarshalIndent(v, "", "  "); err != nil {
 		fb.Errorf("Error during JSON encoding of the output: %v", err)
 	} else {
-		fb.Print(string(d))
+		fmt.Fprint(fb.out, string(d))
 	}
 }
 
-// PrintResult is a convenient wrapper...
+// PrintResult is a convenient wrapper to provide feedback for complex data,
+// where the contents can't be just serialized to JSON but requires more
+// structure.
 func (fb *Feedback) PrintResult(res Result) {
 	if fb.format == JSON {
-		if d, err := json.MarshalIndent(res.Data(), "", "  "); err != nil {
-			fb.Errorf("Error during JSON encoding of the output: %v", err)
-		} else {
-			fb.Print(string(d))
-		}
+		fb.PrintJSON(res.Data())
 	} else {
 		fb.Print(fmt.Sprintf("%s", res))
 	}

Original file line number	Diff line number	Diff line change
`@@ -52,8 +52,8 @@ func Printf(format string, v ...interface{}) {`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`// Print behaves like fmt.Print but writes on the out writer and adds a newline.`
`55`		`-func Print(v ...interface{}) {`
`56`		`- fb.Print(v...)`
	`55`	`+func Print(v interface{}) {`
	`56`	`+ fb.Print(v)`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`// Errorf behaves like fmt.Printf but writes on the error writer and adds a`
`@@ -74,7 +74,9 @@ func PrintJSON(v interface{}) {`
`74`	`74`	`fb.PrintJSON(v)`
`75`	`75`	`}`
`76`	`76`
`77`		`-// PrintResult is a convenient wrapper...`
	`77`	`+// PrintResult is a convenient wrapper to provide feedback for complex data,`
	`78`	`+// where the contents can't be just serialized to JSON but requires more`
	`79`	`+// structure.`
`78`	`80`	`func PrintResult(res Result) {`
`79`	`81`	`fb.PrintResult(res)`
`80`	`82`	`}`