Added -quote option to jsoncols and fixed references to depreciated shelltools

Author: rsdoiel

cmds/finddir/finddir.go

@@ -32,7 +32,7 @@ import (
 
 	// CaltechLibrary packages
 	"github.com/caltechlibrary/cli"
-	"github.com/caltechlibrary/shelltools"
+	"github.com/caltechlibrary/datatools"
 )
 
 var (
@@ -152,7 +152,7 @@ func main() {
 	args := flag.Args()
 
 	// Configuration and command line interation
-	cfg := cli.New(appName, appName, fmt.Sprintf(shelltools.LicenseText, appName, shelltools.Version), shelltools.Version)
+	cfg := cli.New(appName, appName, fmt.Sprintf(datatools.LicenseText, appName, datatools.Version), datatools.Version)
 	cfg.UsageText = fmt.Sprintf(usage, appName)
 	cfg.DescriptionText = fmt.Sprintf(description, appName)
 	cfg.ExampleText = fmt.Sprintf(examples, appName)

cmds/findfile/findfile.go

@@ -32,7 +32,7 @@ import (
 
 	// Caltech Library Packages
 	"github.com/caltechlibrary/cli"
-	"github.com/caltechlibrary/shelltools"
+	"github.com/caltechlibrary/datatools"
 )
 
 var (
@@ -151,7 +151,7 @@ func main() {
 	flag.Parse()
 	args := flag.Args()
 	// Configuration and command line interation
-	cfg := cli.New(appName, appName, fmt.Sprintf(shelltools.LicenseText, appName, shelltools.Version), shelltools.Version)
+	cfg := cli.New(appName, appName, fmt.Sprintf(datatools.LicenseText, appName, datatools.Version), datatools.Version)
 	cfg.UsageText = fmt.Sprintf(usage, appName)
 	cfg.DescriptionText = fmt.Sprintf(description, appName)
 	cfg.ExampleText = fmt.Sprintf(examples, appName)

cmds/jsoncols/jsoncols.go

@@ -14,6 +14,7 @@ import (
 	"io/ioutil"
 	"os"
 	"path"
+	"strings"
 
 	// Caltech Library Packages
 	"github.com/caltechlibrary/cli"
@@ -88,6 +89,7 @@ Would yield
 	delimiter      = ","
 	expressions    []string
 	permissive     bool
+	quote          bool
 )
 
 func handleError(err error, exitCode int) {
@@ -117,6 +119,7 @@ func init() {
 	flag.BoolVar(&runInteractive, "r", false, "run interactively")
 	flag.BoolVar(&runInteractive, "repl", false, "run interactively")
 	flag.StringVar(&delimiter, "d", delimiter, "set the delimiter for multi-field output")
+	flag.BoolVar(&quote, "quote", false, "if dilimiter is found in column value add quotes")
 	flag.BoolVar(&permissive, "permissive", false, "suppress error messages")
 	flag.BoolVar(&permissive, "quiet", false, "suppress error messages")
 }
@@ -197,15 +200,23 @@ func main() {
 			if err == nil {
 				switch result.(type) {
 				case string:
-					fmt.Fprintf(out, "%s", result)
+					if quote == true && strings.Contains(result.(string), delimiter) == true {
+						fmt.Fprintf(out, "%q", result)
+					} else {
+						fmt.Fprintf(out, "%s", result)
+					}
 				case json.Number:
 					fmt.Fprintf(out, "%s", result.(json.Number).String())
 				default:
 					src, err := json.Marshal(result)
 					if err != nil {
 						handleError(err, 1)
 					}
-					fmt.Fprintf(out, "%s", src)
+					if quote == true {
+						fmt.Fprintf(out, "%q", src)
+					} else {
+						fmt.Fprintf(out, "%s", src)
+					}
 				}
 			} else {
 				handleError(err, 1)

cmds/mergepath/mergepath.go

@@ -27,7 +27,7 @@ import (
 
 	// CaltechLibrary packages
 	"github.com/caltechlibrary/cli"
-	"github.com/caltechlibrary/shelltools"
+	"github.com/caltechlibrary/datatools"
 )
 
 var (
@@ -110,7 +110,7 @@ func main() {
 	flag.Parse()
 
 	// Configuration and command line interation
-	cfg := cli.New(appName, appName, fmt.Sprintf(shelltools.LicenseText, appName, shelltools.Version), shelltools.Version)
+	cfg := cli.New(appName, appName, fmt.Sprintf(datatools.LicenseText, appName, datatools.Version), datatools.Version)
 	cfg.UsageText = fmt.Sprintf(usage, appName)
 	cfg.DescriptionText = fmt.Sprintf(description, appName)
 	cfg.ExampleText = fmt.Sprintf(examples, appName)

cmds/range/range.go

@@ -31,7 +31,7 @@ import (
 
 	// CaltechLibrary Packages
 	"github.com/caltechlibrary/cli"
-	"github.com/caltechlibrary/shelltools"
+	"github.com/caltechlibrary/datatools"
 )
 
 var (
@@ -132,7 +132,7 @@ func main() {
 	appName := path.Base(os.Args[0])
 	flag.Parse()
 	// Configuration and command line interation
-	cfg := cli.New(appName, appName, fmt.Sprintf(shelltools.LicenseText, appName, shelltools.Version), shelltools.Version)
+	cfg := cli.New(appName, appName, fmt.Sprintf(datatools.LicenseText, appName, datatools.Version), datatools.Version)
 	cfg.UsageText = fmt.Sprintf(usage, appName)
 	cfg.DescriptionText = fmt.Sprintf(description, appName)
 	cfg.ExampleText = fmt.Sprintf(examples, appName, appName, appName, appName, appName)

cmds/reldate/reldate.go

@@ -30,8 +30,8 @@ import (
 
 	// Local package
 	"github.com/caltechlibrary/cli"
-	"github.com/caltechlibrary/shelltools"
-	"github.com/caltechlibrary/shelltools/reldate"
+	"github.com/caltechlibrary/datatools"
+	"github.com/caltechlibrary/datatools/reldate"
 )
 
 var (
@@ -162,7 +162,7 @@ func main() {
 	flag.Parse()
 
 	// Configuration and command line interation
-	cfg := cli.New(appName, appName, fmt.Sprintf(shelltools.LicenseText, appName, shelltools.Version), shelltools.Version)
+	cfg := cli.New(appName, appName, fmt.Sprintf(datatools.LicenseText, appName, datatools.Version), datatools.Version)
 	cfg.UsageText = fmt.Sprintf(usage, appName)
 	cfg.DescriptionText = fmt.Sprintf(description, appName)
 	cfg.ExampleText = fmt.Sprintf(examples, appName, appName, appName, appName, appName)

cmds/timefmt/timefmt.go

@@ -28,8 +28,8 @@ import (
 
 	// CaltechLibrary Packages
 	"github.com/caltechlibrary/cli"
-	"github.com/caltechlibrary/shelltools"
-	"github.com/caltechlibrary/shelltools/timefmt"
+	"github.com/caltechlibrary/datatools"
+	"github.com/caltechlibrary/datatools/timefmt"
 )
 
 var (
@@ -130,7 +130,7 @@ func main() {
 	args := flag.Args()
 
 	// Configuration and command line interation
-	cfg := cli.New(appName, appName, fmt.Sprintf(shelltools.LicenseText, appName, shelltools.Version), shelltools.Version)
+	cfg := cli.New(appName, appName, fmt.Sprintf(datatools.LicenseText, appName, datatools.Version), datatools.Version)
 	cfg.UsageText = fmt.Sprintf(usage, appName)
 	cfg.DescriptionText = fmt.Sprintf(description, appName, appName)
 	cfg.ExampleText = fmt.Sprintf(examples, appName, appName)

cmds/urlparse/urlparse.go

@@ -27,7 +27,7 @@ import (
 
 	// CaltechLibrary Packages
 	"github.com/caltechlibrary/cli"
-	"github.com/caltechlibrary/shelltools"
+	"github.com/caltechlibrary/datatools"
 )
 
 var (
@@ -129,7 +129,7 @@ func main() {
 	flag.Parse()
 
 	// Configuration and command line interation
-	cfg := cli.New(appName, appName, fmt.Sprintf(shelltools.LicenseText, appName, shelltools.Version), shelltools.Version)
+	cfg := cli.New(appName, appName, fmt.Sprintf(datatools.LicenseText, appName, datatools.Version), datatools.Version)
 	cfg.UsageText = fmt.Sprintf(usage, appName)
 	cfg.DescriptionText = fmt.Sprintf(description, appName)
 	cfg.ExampleText = fmt.Sprintf(examples, appName, appName, appName, appName, appName, appName)