add go1.16 support, update copyright year, doc template added M1 experimental binaries

Author: rsdoiel

INSTALL.md

@@ -1,13 +1,15 @@
 
-# Installation
+Installation
+============
 
 *datatools* is a collection of command line programs run from a shell like Bash. 
 
-## Compiled version
+Compiled version
+----------------
 
 This is generalized instructions for a release. 
 
-Compiled versions are available for Mac OS X (amd64 processor, macosx-amd64), Linux (amd64 process, linux-amd64), 
+Compiled versions are available for Mac OS X (amd64 and M1 processor, macos-amd64 and macos-arm64), Linux (amd64 process, linux-amd64), 
 Windows (amd64 processor, windows-amd64) and Rapsberry Pi (arm7 processor, raspbian-arm7)
 
 VERSION_NUMBER is a [symantic version number](http://semver.org/) (e.g. v0.1.2)
@@ -21,20 +23,22 @@ For all the released version go to the project page on Github and click latest r
 | Platform    | Zip Filename                               |
 |-------------|--------------------------------------------|
 | Windows     | datatools-VERSION_NUMBER-windows-amd64.zip |
-| Mac OS X    | datatools-VERSION_NUMBER-macosx-amd64.zip  |
+| Mac OS X    | datatools-VERSION_NUMBER-macos-amd64.zip  |
+| Mac OS X    | datatools-VERSION_NUMBER-macos-arm64.zip  |
 | Linux/Intel | datatools-VERSION_NUMBER-linux-amd64.zip   |
 | Raspbery Pi | datatools-VERSION_NUMBER-raspbian-arm7.zip |
 
 
-## The basic recipe
+The basic recipe
+----------------
 
 + Find the Zip file listed matching the architecture you're running and download it
     + (e.g. if you're on a Windows 10 laptop/Surface with a amd64 style CPU you'd choose the Zip file with "windows-amd64" in the name).
 + Download the zip file and unzip the file.  
 + Copy the contents of the folder named "bin" to a folder that is in your path 
     + (e.g. "$HOME/bin" is common).
 + Adjust your PATH if needed
-    + (e.g. `export PATH="$HOME/bin:$PATH"`)
+    + (e.g. export PATH="$HOME/bin:$PATH")
 + Test
 
 
@@ -51,7 +55,7 @@ zip file.
 
 ```shell
     cd Downloads/
-    unzip datatools-*-macosx-amd64.zip
+    unzip datatools-*-macos-amd64.zip
     mkdir -p $HOME/bin
     cp -v bin/* $HOME/bin/
     export PATH=$HOME/bin:$PATH
@@ -120,7 +124,8 @@ downloading the zip file.
 ```
 
 
-## Compiling from source
+Compiling from source
+---------------------
 
 _datatools_ is "go gettable" if you have gotten xlsx v1.0.5 package from [github.com/tealeg/xlsx](https://github.com/tealeg/xlsx).  The datatools package does not support versions v2.x and greater of xlsx. Below are the steps
 I use today with "go get" command to download the dependant packages

LICENSE

@@ -1,5 +1,5 @@
 
-Copyright (c) 2019, Caltech
+Copyright (c) 2021, Caltech
 All rights not granted herein are expressly reserved by Caltech.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

Makefile

@@ -221,7 +221,7 @@ dist/linux-amd64:
 	rm -fR dist/bin
 
 
-dist/macosx-amd64:
+dist/macos-amd64:
 	mkdir -p dist/bin
 	env  GOOS=darwin GOARCH=amd64 go build -o dist/bin/csvcols cmd/csvcols/csvcols.go
 	env  GOOS=darwin GOARCH=amd64 go build -o dist/bin/csvrows cmd/csvrows/csvrows.go
@@ -249,10 +249,41 @@ dist/macosx-amd64:
 	env  GOOS=darwin GOARCH=amd64 go build -o dist/bin/json2toml cmd/json2toml/json2toml.go
 	env  GOOS=darwin GOARCH=amd64 go build -o dist/bin/yaml2json cmd/yaml2json/yaml2json.go
 	env  GOOS=darwin GOARCH=amd64 go build -o dist/bin/json2yaml cmd/json2yaml/json2yaml.go
-	cd dist && zip -r $(PROJECT)-$(VERSION)-macosx-amd64.zip README.md LICENSE INSTALL.md bin/* docs/* how-to/* demos/*
+	cd dist && zip -r $(PROJECT)-$(VERSION)-macos-amd64.zip README.md LICENSE INSTALL.md bin/* docs/* how-to/* demos/*
 	rm -fR dist/bin
 
 
+dist/macos-arm64:
+	mkdir -p dist/bin
+	env  GOOS=darwin GOARCH=arm64 go build -o dist/bin/csvcols cmd/csvcols/csvcols.go
+	env  GOOS=darwin GOARCH=arm64 go build -o dist/bin/csvrows cmd/csvrows/csvrows.go
+	env  GOOS=darwin GOARCH=arm64 go build -o dist/bin/csvfind cmd/csvfind/csvfind.go
+	env  GOOS=darwin GOARCH=arm64 go build -o dist/bin/csvjoin cmd/csvjoin/csvjoin.go
+	env  GOOS=darwin GOARCH=arm64 go build -o dist/bin/jsoncols cmd/jsoncols/jsoncols.go
+	env  GOOS=darwin GOARCH=arm64 go build -o dist/bin/jsonrange cmd/jsonrange/jsonrange.go
+	env  GOOS=darwin GOARCH=arm64 go build -o dist/bin/xlsx2json cmd/xlsx2json/xlsx2json.go
+	env  GOOS=darwin GOARCH=arm64 go build -o dist/bin/xlsx2csv cmd/xlsx2csv/xlsx2csv.go
+	env  GOOS=darwin GOARCH=arm64 go build -o dist/bin/csv2mdtable cmd/csv2mdtable/csv2mdtable.go
+	env  GOOS=darwin GOARCH=arm64 go build -o dist/bin/csv2xlsx cmd/csv2xlsx/csv2xlsx.go
+	env  GOOS=darwin GOARCH=arm64 go build -o dist/bin/csv2json cmd/csv2json/csv2json.go
+	env  GOOS=darwin GOARCH=arm64 go build -o dist/bin/jsonmunge cmd/jsonmunge/jsonmunge.go
+	env  GOOS=darwin GOARCH=arm64 go build -o dist/bin/jsonjoin cmd/jsonjoin/jsonjoin.go
+	env  GOOS=darwin GOARCH=arm64 go build -o dist/bin/findfile cmd/findfile/findfile.go
+	env  GOOS=darwin GOARCH=arm64 go build -o dist/bin/finddir cmd/finddir/finddir.go
+	env  GOOS=darwin GOARCH=arm64 go build -o dist/bin/mergepath cmd/mergepath/mergepath.go
+	env  GOOS=darwin GOARCH=arm64 go build -o dist/bin/reldate cmd/reldate/reldate.go
+	env  GOOS=darwin GOARCH=arm64 go build -o dist/bin/range cmd/range/range.go
+	env  GOOS=darwin GOARCH=arm64 go build -o dist/bin/timefmt cmd/timefmt/timefmt.go
+	env  GOOS=darwin GOARCH=arm64 go build -o dist/bin/urlparse cmd/urlparse/urlparse.go
+	env  GOOS=darwin GOARCH=arm64 go build -o dist/bin/csvcleaner cmd/csvcleaner/csvcleaner.go
+	env  GOOS=darwin GOARCH=arm64 go build -o dist/bin/string cmd/string/string.go
+	env  GOOS=darwin GOARCH=arm64 go build -o dist/bin/toml2json cmd/toml2json/toml2json.go
+	env  GOOS=darwin GOARCH=arm64 go build -o dist/bin/json2toml cmd/json2toml/json2toml.go
+	env  GOOS=darwin GOARCH=arm64 go build -o dist/bin/yaml2json cmd/yaml2json/yaml2json.go
+	env  GOOS=darwin GOARCH=arm64 go build -o dist/bin/json2yaml cmd/json2yaml/json2yaml.go
+	cd dist && zip -r $(PROJECT)-$(VERSION)-macos-arm64.zip README.md LICENSE INSTALL.md bin/* docs/* how-to/* demos/*
+	rm -fR dist/bin
+	
 
 dist/windows-amd64:
 	mkdir -p dist/bin
@@ -329,5 +360,5 @@ distribute_docs:
 	cp -vR how-to dist/
 	./package-versions.bash > dist/package-versions.txt
 
-release: distribute_docs dist/linux-amd64 dist/macosx-amd64 dist/windows-amd64 dist/raspbian-arm7
+release: distribute_docs dist/linux-amd64 dist/macos-amd64 dist/macos-arm64 dist/windows-amd64 dist/raspbian-arm7
 

README.md

@@ -1,12 +1,14 @@
 
-# datatools
+datatools
+=========
 
 _datatools_ provides a variety of command line programs for working with 
 data in different formats as well as to ease Posix shell scripting 
 (e.g. writing scripts that run under Bash). The tools are group as data, 
 strings and scripting.
 
-## For data
+For data
+--------
 
 Command line utilities for simplifying work with CSV, JSON, TOML, YAML, 
 Excel Workbooks and plain text files or content.
@@ -36,7 +38,8 @@ Windows 10 (amd64) and Raspbian (ARM7). See https://github.com/caltechlibrary/da
 
 Use "-help" option for a full list of options for each utility (e.g. `csv2json -help`).
 
-## For strings
+For strings
+-----------
 
 _datatools_ provides the [string](docs/string/) command for working with 
 text strings (limited to memory available).  This is commonly needed when 
@@ -64,7 +67,8 @@ Some of the features included
 
 See [string](docs/string/) for full details
 
-## For scripting
+For scripting
+-------------
 
 Various utilities for simplifying work on the command line. 
 
@@ -82,7 +86,8 @@ Windows 10 (amd64) and Raspbian (ARM7). See https://github.com/caltechlibrary/da
 Use the utilities try "-help" option for a full list of options.
 
 
-## Installation
+Installation
+------------
 
 See [INSTALL.md](install.html) for details for installing pre-compiled 
 versions of the programs.

RELEASES.md

@@ -1,7 +1,9 @@
 
-# Release Process and tags
+Release Process and tags
+========================
 
-## Preleases and production releases
+Preleases and production releases
+---------------------------------
 
 This describes a simple release process organized around semantic versioned tags.
 
@@ -20,13 +22,15 @@ be followed by v0.0.10-pre, v0.0.11-pre, v0.0.12-pre before a v0.0.12 appears as
 
 Production and pre-releases should include Zip files of the compiled cli to be tested by `bash test_cmds.bash`.
 
-## Dev releases
+Dev releases
+------------
 
 Dev release may happend from time to time as needed. They should always end in a '-dev' version number (e.g. v0.0.10-dev). 
 They normally should not have any pre-compiled binaries to avoid confusion. They should be flagged as draft (pre-release)
 on Github.
 
-## Making a release
+Making a release
+----------------
 
 1. Set the version number in PACKAGE.go (where PACKAGE is the name of the package, e.g. dataset is the name of the dataset
 package so you'd change the version number in dataset.go).

TODO.md

@@ -1,17 +1,21 @@
 
-# Action Items
+Action Items
+------------
 
-## Bug
+Bug
+---
 
 + [ ] findfile v0.0.23-pre option -f, -full-path doesn't return full paths
 
-## Next
+Next
+----
 
 + [ ] upgrade to use the new cli v0.0.5-dev
 + [ ] csvrows would output a range of rows (e.g. [2:] would be all rows but the first row)
 + [ ] csv utilities should support integer ranges notation for columns and rows references, E.g. "1,3:4,7,10:" or all
 
-## Someday, Maybe
+Someday, Maybe
+--------------
 
 + [ ] finddir should have an option to exclude directories (e.g. exclude .git directories from a listing)
 + [ ] textscraper - a tool for select out text and storing it as a JSON field value, sort grep plus sed cleanup and semi-structured text (e.g. webpage)
@@ -54,7 +58,8 @@
     + [ ] show lines with prefix, suffix, containing or regxp
     + [ ] show lines without prefix, suffix, containing or regexp
 
-## Completed
+Completed
+---------
 
 + [x] consolidate string utilities (e.g. toupper, tolower, totitle) into string cli
 + [x] csvcols -col option should not be a boolean, it should take a range like other csv cli

cmd/csv2json/csv2json.go

@@ -7,7 +7,7 @@
 //
 // @author R. S. Doiel, <[email protected]>
 //
-// Copyright (c) 2017, Caltech
+// Copyright (c) 2021, Caltech
 // All rights not granted herein are expressly reserved by Caltech.
 //
 // Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

cmd/csv2mdtable/csv2mdtable.go

@@ -4,7 +4,7 @@
 //
 // @author R. S. Doiel, <[email protected]>
 //
-// Copyright (c) 2019, Caltech
+// Copyright (c) 2021, Caltech
 // All rights not granted herein are expressly reserved by Caltech.
 //
 // Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

cmd/csv2xlsx/csv2xlsx.go

@@ -4,7 +4,7 @@
 //
 // @Author R. S. Doiel, <[email protected]>
 //
-// Copyright (c) 2019, Caltech
+// Copyright (c) 2021, Caltech
 // All rights not granted herein are expressly reserved by Caltech.
 //
 // Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

cmd/csvcleaner/csvcleaner.go

@@ -4,7 +4,7 @@
 //
 // @author R. S. Doiel, <[email protected]>
 //
-// Copyright (c) 2019, Caltech
+// Copyright (c) 2021, Caltech
 // All rights not granted herein are expressly reserved by Caltech.
 //
 // Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

cmd/csvcols/csvcols.go

@@ -4,7 +4,7 @@
 //
 // @author R. S. Doiel, <[email protected]>
 //
-// Copyright (c) 2019, Caltech
+// Copyright (c) 2021, Caltech
 // All rights not granted herein are expressly reserved by Caltech.
 //
 // Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

cmd/csvfind/csvfind.go

@@ -3,7 +3,7 @@
 //
 // @author R. S. Doiel, <[email protected]>
 //
-// Copyright (c) 2019, Caltech
+// Copyright (c) 2021, Caltech
 // All rights not granted herein are expressly reserved by Caltech.
 //
 // Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

cmd/csvjoin/csvjoin.go

@@ -3,7 +3,7 @@
 //
 // @author R. S. Doiel, <[email protected]>
 //
-// Copyright (c) 2019, Caltech
+// Copyright (c) 2021, Caltech
 // All rights not granted herein are expressly reserved by Caltech.
 //
 // Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

cmd/csvrows/csvrows.go

@@ -4,7 +4,7 @@
 //
 // @author R. S. Doiel, <[email protected]>
 //
-// Copyright (c) 2019, Caltech
+// Copyright (c) 2021, Caltech
 // All rights not granted herein are expressly reserved by Caltech.
 //
 // Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

cmd/finddir/finddir.go

@@ -5,7 +5,7 @@
 //
 // @author R. S. Doiel, <[email protected]>
 //
-// Copyright (c) 2019, Caltech
+// Copyright (c) 2021, Caltech
 // All rights not granted herein are expressly reserved by Caltech.
 //
 // Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

cmd/findfile/findfile.go

@@ -5,7 +5,7 @@
 //
 // @author R. S. Doiel, <[email protected]>
 //
-// Copyright (c) 2019, Caltech
+// Copyright (c) 2021, Caltech
 // All rights not granted herein are expressly reserved by Caltech.
 //
 // Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

cmd/json2toml/json2toml.go

@@ -3,7 +3,7 @@
 //
 // @Author R. S. Doiel
 //
-// Copyright (c) 2019, Caltech
+// Copyright (c) 2021, Caltech
 // All rights not granted herein are expressly reserved by Caltech.
 //
 // Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

cmd/json2yaml/json2yaml.go

@@ -3,7 +3,7 @@
 //
 // @Author R. S. Doiel
 //
-// Copyright (c) 2019, Caltech
+// Copyright (c) 2021, Caltech
 // All rights not granted herein are expressly reserved by Caltech.
 //
 // Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

cmd/mergepath/mergepath.go

@@ -3,7 +3,7 @@
 //
 // @Author R. S. Doiel, <[email protected]>
 //
-// Copyright (c) 2019, Caltech
+// Copyright (c) 2021, Caltech
 // All rights not granted herein are expressly reserved by Caltech.
 //
 // Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

cmd/range/range.go

@@ -4,7 +4,7 @@
 //
 // @Author R. S. Doiel, <[email protected]>
 //
-// Copyright (c) 2019, Caltech
+// Copyright (c) 2021, Caltech
 // All rights not granted herein are expressly reserved by Caltech.
 //
 // Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

cmd/reldate/reldate.go

@@ -4,7 +4,7 @@
 //
 // @Author R. S. Doiel, <[email protected]>
 //
-// Copyright (c) 2019, Caltech
+// Copyright (c) 2021, Caltech
 // All rights not granted herein are expressly reserved by Caltech.
 //
 // Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

cmd/string/string.go

@@ -3,7 +3,7 @@
 //
 // @author R. S. Doiel, <[email protected]>
 //
-// Copyright (c) 2019, Caltech
+// Copyright (c) 2021, Caltech
 // All rights not granted herein are expressly reserved by Caltech.
 //
 // Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

cmd/timefmt/timefmt.go

@@ -3,7 +3,7 @@
 //
 // @Author R. S. Doiel, <[email protected]>
 //
-// Copyright (c) 2019, Caltech
+// Copyright (c) 2021, Caltech
 // All rights not granted herein are expressly reserved by Caltech.
 //
 // Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: