Quick Save

Author: rsdoiel

cmds/jsoncols/jsoncols.go

@@ -13,7 +13,6 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
-	"strings"
 
 	// Caltech Library Packages
 	"github.com/caltechlibrary/cli"
@@ -116,7 +115,7 @@ func main() {
 	app.BoolVar(&runInteractive, "repl", false, "run interactively")
 	app.BoolVar(&csvOutput, "csv", false, "output as CSV or other flat delimiter row")
 	app.StringVar(&delimiter, "d,delimiter", delimiter, "set the delimiter for multi-field csv output")
-	app.BoolVar(&quote, "quote", false, "if dilimiter is found in column value add quotes for non-CSV output")
+	app.BoolVar(&quote, "quote", true, "quote strings and JSON notation")
 
 	// Parse Environment and Options
 	app.Parse()
@@ -223,7 +222,7 @@ func main() {
 			cli.ExitOnError(app.Eout, err, quiet)
 			switch result.(type) {
 			case string:
-				if quote == true && strings.Contains(result.(string), delimiter) == true {
+				if quote == true {
 					fmt.Fprintf(app.Out, "%q", result)
 				} else {
 					fmt.Fprintf(app.Out, "%s", result)

demos/jsoncols/demo.bash

@@ -13,14 +13,14 @@ echo ''
 
 echo ' running: jsoncols -i myblob.json -d "|"  .name .age'
 jsoncols -i myblob.json -d "|"  .name .age > result2.txt
-echo 'expected: Doe, Jane|42'
+echo 'expected: "Doe, Jane"|42'
 echo -n '     got: '
 cat result2.txt
 echo ''
 
 echo ' running: cat myblob.json | jsoncols .name .email .age'
 cat myblob.json | jsoncols .name .email .age > result3.txt
-echo 'expected: "Doe, Jane",[email protected],42'
+echo 'expected: "Doe, Jane","[email protected]",42'
 echo -n '     got: '
 cat result3.txt
 echo ''

demos/jsoncols/result2.txt

@@ -1 +1 @@
-Doe, Jane|42
+"Doe, Jane"|42

demos/jsoncols/result3.txt

@@ -1 +1 @@
-"Doe, Jane",[email protected],42
+"Doe, Jane","[email protected]",42

test_cmds.bash

@@ -531,19 +531,19 @@ function test_findfile(){
 
 function test_jsoncols(){
     if [ -f temp.txt ]; then rm temp.txt; fi
-    jsoncols -i demos/jsoncols/myblob.json -o temp.txt  .name
+    bin/jsoncols -nl -i demos/jsoncols/myblob.json -o temp.txt  .name
     assert_exists "test_jsoncols (-i, -o)" temp.txt
     R=$(cmp demos/jsoncols/result1.txt temp.txt)
     assert_empty "test_jsoncols (result1)" "$R"
 
     if [ -f temp.txt ]; then rm temp.txt; fi
-    jsoncols -i demos/jsoncols/myblob.json -d '|'  .name .age > temp.txt
+    bin/jsoncols -nl -i demos/jsoncols/myblob.json -d '|'  .name .age > temp.txt
     assert_exists "test_jsoncols (-i, -d)" temp.txt
     R=$(cmp demos/jsoncols/result2.txt temp.txt)
     assert_empty "test_jsoncols (result2)" "$R"
 
     if [ -f temp.txt ]; then rm temp.txt; fi
-    cat demos/jsoncols/myblob.json | jsoncols .name .email .age > temp.txt
+    cat demos/jsoncols/myblob.json | bin/jsoncols -nl .name .email .age > temp.txt
     assert_exists "test_jsoncols (pipeline)" temp.txt
     R=$(cmp demos/jsoncols/result3.txt temp.txt)
     assert_empty "test_jsoncols (result3)" "$R"