Quick Save

Author: rsdoiel

Makefile

@@ -15,7 +15,12 @@ ifeq ($(OS), Windows)
 endif
 
 
-build$(EXT): bin/csvcols$(EXT) bin/csvrows$(EXT) bin/csvfind$(EXT) bin/csvjoin$(EXT) bin/jsoncols$(EXT) bin/jsonrange$(EXT) bin/xlsx2json$(EXT) bin/xlsx2csv$(EXT) bin/csv2mdtable$(EXT) bin/csv2xlsx$(EXT) bin/csv2json$(EXT) bin/vcard2json$(EXT) bin/jsonjoin$(EXT) bin/jsonmunge$(EXT) bin/findfile$(EXT) bin/finddir$(EXT) bin/mergepath$(EXT) bin/reldate$(EXT) bin/range$(EXT) bin/timefmt$(EXT) bin/urlparse$(EXT) bin/csvcleaner$(EXT) bin/string$(EXT) 
+build$(EXT): bin/csvcols$(EXT) bin/csvrows$(EXT) bin/csvfind$(EXT) bin/csvjoin$(EXT) \
+	bin/jsoncols$(EXT) bin/jsonrange$(EXT) bin/xlsx2json$(EXT) bin/xlsx2csv$(EXT) \
+	bin/csv2mdtable$(EXT) bin/csv2xlsx$(EXT) bin/csv2json$(EXT) bin/jsonjoin$(EXT) \
+	bin/jsonmunge$(EXT) bin/findfile$(EXT) bin/finddir$(EXT) bin/mergepath$(EXT) \
+	bin/reldate$(EXT) bin/range$(EXT) bin/timefmt$(EXT) bin/urlparse$(EXT) \
+	bin/csvcleaner$(EXT) bin/string$(EXT) 
 
 
 bin/csvcols$(EXT): datatools.go cmds/csvcols/csvcols.go
@@ -51,9 +56,6 @@ bin/csv2json$(EXT): datatools.go cmds/csv2json/csv2json.go
 bin/csvfind$(EXT): datatools.go cmds/csvfind/csvfind.go
 	go build -o bin/csvfind$(EXT) cmds/csvfind/csvfind.go
 
-bin/vcard2json$(EXT): datatools.go cmds/vcard2json/vcard2json.go
-	go build -o bin/vcard2json$(EXT) cmds/vcard2json/vcard2json.go
-
 bin/jsonmunge$(EXT): datatools.go cmds/jsonmunge/jsonmunge.go
 	go build -o bin/jsonmunge$(EXT) cmds/jsonmunge/jsonmunge.go
 
@@ -132,7 +134,6 @@ install:
 	env GOBIN=$(GOPATH)/bin go install cmds/range/range.go
 	env GOBIN=$(GOPATH)/bin go install cmds/timefmt/timefmt.go
 	env GOBIN=$(GOPATH)/bin go install cmds/urlparse/urlparse.go
-	env GOBIN=$(GOPATH)/bin go install cmds/vcard2json/vcard2json.go
 	env GOBIN=$(GOPATH)/bin go install cmds/xlsx2json/xlsx2json.go
 	env GOBIN=$(GOPATH)/bin go install cmds/xlsx2csv/xlsx2csv.go
 	env GOBIN=$(GOPATH)/bin go install cmds/csvcleaner/csvcleaner.go
@@ -153,7 +154,6 @@ dist/linux-amd64:
 	env  GOOS=linux GOARCH=amd64 go build -o dist/bin/csv2json cmds/csv2json/csv2json.go
 	env  GOOS=linux GOARCH=amd64 go build -o dist/bin/jsonmunge cmds/jsonmunge/jsonmunge.go
 	env  GOOS=linux GOARCH=amd64 go build -o dist/bin/jsonjoin cmds/jsonjoin/jsonjoin.go
-	env  GOOS=linux GOARCH=amd64 go build -o dist/bin/vcard2json cmds/vcard2json/vcard2json.go
 	env  GOOS=linux GOARCH=amd64 go build -o dist/bin/findfile cmds/findfile/findfile.go
 	env  GOOS=linux GOARCH=amd64 go build -o dist/bin/finddir cmds/finddir/finddir.go
 	env  GOOS=linux GOARCH=amd64 go build -o dist/bin/mergepath cmds/mergepath/mergepath.go
@@ -180,7 +180,6 @@ dist/macosx-amd64:
 	env  GOOS=darwin GOARCH=amd64 go build -o dist/bin/csv2mdtable cmds/csv2mdtable/csv2mdtable.go
 	env  GOOS=darwin GOARCH=amd64 go build -o dist/bin/csv2xlsx cmds/csv2xlsx/csv2xlsx.go
 	env  GOOS=darwin GOARCH=amd64 go build -o dist/bin/csv2json cmds/csv2json/csv2json.go
-	env  GOOS=darwin GOARCH=amd64 go build -o dist/bin/vcard2json cmds/vcard2json/vcard2json.go
 	env  GOOS=darwin GOARCH=amd64 go build -o dist/bin/jsonmunge cmds/jsonmunge/jsonmunge.go
 	env  GOOS=darwin GOARCH=amd64 go build -o dist/bin/jsonjoin cmds/jsonjoin/jsonjoin.go
 	env  GOOS=darwin GOARCH=amd64 go build -o dist/bin/findfile cmds/findfile/findfile.go
@@ -210,7 +209,6 @@ dist/windows-amd64:
 	env  GOOS=windows GOARCH=amd64 go build -o dist/bin/csv2mdtable.exe cmds/csv2mdtable/csv2mdtable.go
 	env  GOOS=windows GOARCH=amd64 go build -o dist/bin/csv2xlsx.exe cmds/csv2xlsx/csv2xlsx.go
 	env  GOOS=windows GOARCH=amd64 go build -o dist/bin/csv2json.exe cmds/csv2json/csv2json.go
-	env  GOOS=windows GOARCH=amd64 go build -o dist/bin/vcard2json.exe cmds/vcard2json/vcard2json.go
 	env  GOOS=windows GOARCH=amd64 go build -o dist/bin/jsonmunge.exe cmds/jsonmunge/jsonmunge.go
 	env  GOOS=windows GOARCH=amd64 go build -o dist/bin/jsonjoin.exe cmds/jsonjoin/jsonjoin.go
 	env  GOOS=windows GOARCH=amd64 go build -o dist/bin/findfile.exe cmds/findfile/findfile.go
@@ -241,7 +239,6 @@ dist/raspbian-arm7:
 	env  GOOS=linux GOARCH=arm GOARM=7 go build -o dist/bin/csv2mdtable cmds/csv2mdtable/csv2mdtable.go
 	env  GOOS=linux GOARCH=arm GOARM=7 go build -o dist/bin/csv2xlsx cmds/csv2xlsx/csv2xlsx.go
 	env  GOOS=linux GOARCH=arm GOARM=7 go build -o dist/bin/csv2json cmds/csv2json/csv2json.go
-	env  GOOS=linux GOARCH=arm GOARM=7 go build -o dist/bin/vcard2json cmds/vcard2json/vcard2json.go
 	env  GOOS=linux GOARCH=arm GOARM=7 go build -o dist/bin/jsonmunge cmds/jsonmunge/jsonmunge.go
 	env  GOOS=linux GOARCH=arm GOARM=7 go build -o dist/bin/jsonjoin cmds/jsonjoin/jsonjoin.go
 	env  GOOS=linux GOARCH=arm GOARM=7 go build -o dist/bin/findfile cmds/findfile/findfile.go

README.md

@@ -6,39 +6,37 @@ Posix shell scripting (e.g. writing scripts that run under Bash). The tools are
 
 ## For data
 
-Command line utilities for simplifying work with CSV, JSON, Excel Workbooks and plain text files or content and
-general purpose shell scripting. 
+Command line utilities for simplifying work with CSV, JSON, Excel Workbooks and plain text files or content.
 
-+ [csv2json](docs/csv2json.html) - a tool to take a CSV file and convert it into a JSON blob array or a list of JSON blobs one per line
++ [csv2json](docs/csv2json.html) - a tool to take a CSV file and convert it into a JSON array or a list of JSON blobs one per line
 + [csv2mdtable](docs/csv2mdtable.html) - a tool to render CSV as a Github Flavored Markdown table
-+ [csv2xlsx](docs/csv2xlsx.html) - a tool to take a CSV file and add it as a sheet to a Excel Workbook file.
-+ [csvcleaner](docs/csvcleaner.html) - normalize a CSV column by column count, delimiter handling, space trimming
++ [csv2xlsx](docs/csv2xlsx.html) - a tool to take a CSV file and add it as a sheet to a Excel Workbook
++ [csvcleaner](docs/csvcleaner.html) - normalize a CSV file by column and row including trimming spaces and removing comments
 + [csvcols](docs/csvcols.html) - a tool for formatting command line arguments into CSV row of columns or filtering CSV rows for specific columns
-+ [csvfind](docs/csvfind.html) - a tool for filtering a CSV file by column's value 
-+ [csvjoin](docs/csvjoin.html) - a tool to join to CSV files on common values in designated columns, writes combined CSV rows to stdout
++ [csvfind](docs/csvfind.html) - a tool for filtering a CSV file rows by column
++ [csvjoin](docs/csvjoin.html) - a tool to join two CSV files on common values in designated columns, writes combined CSV rows
 + [csvrows](docs/csvrows.html) - a tool for formatting command line arguments into CSV columns of rows or filtering CSV columns for specific rows
 + [jsoncols](docs/jsoncols.html) - a tool for exploring and extracting JSON values into columns
 + [jsonjoin](docs/jsonjoin.html) - a tool for joining JSON object documents
 + [jsonmunge](docs/jsonmunge.html) - a tool to transform JSON documents into something else
-+ [jsonrange](docs/jsonrange.html) - a tool for iterating for JSON maps and arrays
-+ [vcard2json](docs/vcard2json.html) - an experimental tool to convert vCards to JSON
-+ [xlsx2csv](docs/xlsx2csv.html) - a tool for converting Excel Workbooks sheets to a CSV file(s)
++ [jsonrange](docs/jsonrange.html) - a tool for iterating over JSON objects and arrays (return keys or values)
++ [xlsx2csv](docs/xlsx2csv.html) - a tool for converting Excel Workbooks sheets to CSV files
 + [xlsx2json](docs/xlsx2json.html) - a tool for converting Excel Workbooks to JSON files
 
 
 Compiled versions are provided for Linux (amd64), Mac OS X (amd64),
 Windows 10 (amd64) and Raspbian (ARM7). See https://github.com/caltechlibrary/datatools/releases.
 
-Use the utilities try "-help" option for a full list of options for each utility.
+Use "-help" option for a full list of options for each utility (e.g. `csv2json -help`).
 
 ## For strings
 
-_datatools_ provides for working with string data (limited to memory available) as this is commonly needed when cleanup data for
-analysis and the old Unix stand bys- grep, awk, sed, tr are at times unwieldly. For the
-time things that are common in most language like, trimming, spliting, joining and transforming
-case we provide the [string](docs/string/) command. The _string_ command also makes it easy
-to join JSON string arrays into a string using a delimiter or split a string into a JSON array
-based on a delimiter. The form of the command is `string [OPTIONS] [ACTION] [ARCTIONS_PARAMETERS...]`
+_datatools_ provides the [string](docs/string/) command for working with text strings (limited to memory available).
+This is commonly needed when cleanup data for analysis. The _string_ command was created for when the old Unix 
+stand bys- grep, awk, sed, tr are unwieldly or inconvient. _string_ provides operations are common in most language 
+like, trimming, spliting, and transforming letter case.  The _string_ command also makes it easy to join 
+JSON string arrays into single a string using a delimiter or split a string into a JSON array
+based on a delimiter. The form of the command is `string [OPTIONS] [ACTION] [ARCTION_PARAMETERS...]`
 
 ```shell
     string toupper "one two three"
@@ -76,13 +74,12 @@ Use the utilities try "-help" option for a full list of options.
 
 ## Installation
 
-_datatools_ is go get-able.
+See [INSTALL.md](install.html) for details for installing pre-compiled versions of the programs.
+
+_datatools_ are go get-able. If you have go v1.8 (or newer) you can install with the command below.
 
 ```
     go get github.com/caltechlibrary/datatools/...
 ```
 
-Or see [INSTALL.md](install.html) for details for installing 
-compiled versions of the programs.
-
 

cmds/csvfind/csvfind.go

@@ -107,6 +107,7 @@ func main() {
 	app.StringVar(&outputFName, "o,output", "", "output filename")
 	app.BoolVar(&quiet, "quiet", false, "suppress error messages")
 	app.BoolVar(&newLine, "nl,newline", true, "include trailing newline from output")
+	app.BoolVar(&generateMarkdownDocs, "generate-markdown-docs", false, "generation markdown documentation")
 
 	// App Options
 	app.IntVar(&col, "col,cols", 0, "column to search for match in the CSV file")

cmds/jsoncols/jsoncols.go

@@ -109,6 +109,7 @@ func main() {
 	app.StringVar(&outputFName, "o,output", "", "output filename")
 	app.BoolVar(&quiet, "quiet", false, "suppress error messages")
 	app.BoolVar(&newLine, "nl,newline", false, "if true add a trailing newline")
+	app.BoolVar(&generateMarkdownDocs, "generate-markdown-docs", false, "generate markdown documentation")
 
 	// Application Specific Options
 	app.BoolVar(&runInteractive, "r", false, "run interactively")

cmds/jsonmunge/jsonmunge.go

@@ -86,7 +86,7 @@ func main() {
 	app.BoolVar(&showExamples, "examples", false, "display example(s)")
 	app.StringVar(&inputFName, "i,input", "", "input filename")
 	app.StringVar(&outputFName, "o,output", "", "output filename")
-	app.BoolVar(&generateMarkdownDocs, "generateMarkdownDocs", false, "generate markdown documentation")
+	app.BoolVar(&generateMarkdownDocs, "generate-markdown-docs", false, "generate markdown documentation")
 	app.BoolVar(&quiet, "quiet", false, "suppress error messages")
 	app.BoolVar(&newLine, "nl,newline", false, "if true add a trailing newline")
 

cmds/jsonrange/jsonrange.go

@@ -259,7 +259,7 @@ func main() {
 	app.BoolVar(&showExamples, "examples", false, "display example(s)")
 	app.StringVar(&inputFName, "i,input", "", "read JSON from file")
 	app.StringVar(&outputFName, "o,output", "", "write to output file")
-	app.BoolVar(&generateMarkdownDocs, "generateMarkdownDocs", false, "generate markdown docs")
+	app.BoolVar(&generateMarkdownDocs, "generate-markdown-docs", false, "generate markdown docs")
 	app.BoolVar(&quiet, "quiet", false, "suppress error messages")
 	app.BoolVar(&newLine, "nl,newline", false, "if true add a trailing newline")
 

cmds/reldate/reldate.go

@@ -157,6 +157,7 @@ func main() {
 	app.BoolVar(&showExamples, "examples", false, "display example(s)")
 	app.BoolVar(&quiet, "quiet", false, "suppress error messages")
 	app.BoolVar(&newLine, "nl,newline", true, "if true add a trailing newline")
+	app.BoolVar(&generateMarkdownDocs, "generate-markdown-docs", false, "generate markdown documentation")
 
 	// App Specific Options
 	app.StringVar(&relativeTo, "f,from", relativeTo, relativeToUsage)

cmds/vcard2json/vcard2json.go

@@ -35,7 +35,7 @@ import (
 )
 
 const (
-	Version = `v0.0.20-dev`
+	Version = `v0.0.20-pre`
 
 	LicenseText = `
 %s %s

datatools.go

@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Caltech Library's Digital Library Development Sandbox</title>
+    <link href='https://fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css'>
+    <link rel="stylesheet" href="/css/site.css">
+</head>
+<body>
+<header>
+<a href="http://library.caltech.edu"><img src="/assets/liblogo.gif" alt="Caltech Library logo"></a>
+</header>
+<nav>
+<ul>
+<li><a href="/">Home</a></li>
+<li><a href="./">README</a></li>
+<li><a href="license.html">LICENSE</a></li>
+<li><a href="install.html">INSTALL</a></li>
+<li><a href="docs/">Documentation</a></li>
+<li><a href="how-to/">How To</a></li>
+<li><a href="https://github.com/caltechlibrary/datatools">Github</a></li>
+</ul>
+
+</nav>
+
+<section>
+<h1>Demo of csv2json</h1>
+
+<p>Convert data1.csv to data1.json using command line options and Unix pipes. The result will be an array
+of JSON objects.</p>
+
+<pre><code class="language-shell">    csv2json -i data1.csv -o data1.json
+    cat data1.csv | csv2json &gt; data1.json
+</code></pre>
+
+<p>Convert data1.csv to JSON blobs, one line per blob.</p>
+
+<pre><code class="language-shell">    csv2json -as-blobs -i data1.csv
+    cat data1.csv | csv2json -as-blobs
+</code></pre>
+
+</section>
+
+<footer>
+<span><h1><A href="http://caltech.edu">Caltech</a></h1></span>
+<span>&copy; 2017 <a href="https://www.library.caltech.edu/copyright">Caltech library</a></span>
+<address>1200 E California Blvd, Mail Code 1-32, Pasadena, CA 91125-3200</address> 
+<span>Phone: <a href="tel:+1-626-395-3405">(626)395-3405</a></span>
+<span><a href="mailto:[email protected]">Email Us</a></span>
+<a class="cl-hide" href="sitemap.xml">Site Map</a>
+</footer>
+</body>
+</html>