diff --git a/CHANGELOG b/CHANGELOG index 491b648a..e11d3cf1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,12 +1,14 @@ jc changelog 20230105 v1.22.5 -- Add TOML parser +- Add TOML file parser +- Add AIX support for the `arp` command parser - Add AIX support for the `mount` command parser -- Fix `lsusb` parser when extra hub port status information is output -- Refactor `lsusb` parser for more code reuse -- Fix INI parser to include top-level values with no section header -- Fix INI and Key/Value parsers to only remove one quotation mark from the +- Fix `lsusb` command parser when extra hub port status information is output +- Refactor `lsusb` command parser for more code reuse +- Fix INI file parser to include top-level values with no section header +- Fix INI file parser to not specially handle the [DEFAULT] section +- Fix INI file and Key/Value parsers to only remove one quotation mark from the beginning and end of values. - Update copyright dates diff --git a/EXAMPLES.md b/EXAMPLES.md index 8c760089..8d5cf649 100644 --- a/EXAMPLES.md +++ b/EXAMPLES.md @@ -1636,21 +1636,21 @@ cat example.ini | jc --ini -p ``` ```json { - "bitbucket.org": { - "ServeraLiveInterval": "45", + "DEFAULT": { + "ServerAliveInterval": "45", "Compression": "yes", "CompressionLevel": "9", - "ForwardX11": "yes", + "ForwardX11": "yes" + }, + "bitbucket.org": { "User": "hg" }, "topsecret.server.com": { - "ServeraLiveInterval": "45", - "Compression": "yes", - "CompressionLevel": "9", - "ForwardX11": "no", - "Port": "50022" + "Port": "50022", + "ForwardX11": "no" } } + ``` ### iostat ```bash diff --git a/README.md b/README.md index 2a4084bf..9d76e358 100644 --- a/README.md +++ b/README.md @@ -775,21 +775,21 @@ cat example.ini | jc -p --ini ``` ```json { - "bitbucket.org": { - "ServeraLiveInterval": "45", + "DEFAULT": { + "ServerAliveInterval": "45", "Compression": "yes", "CompressionLevel": "9", - "ForwardX11": "yes", + "ForwardX11": "yes" + }, + "bitbucket.org": { "User": "hg" }, "topsecret.server.com": { - "ServeraLiveInterval": "45", - "Compression": "yes", - "CompressionLevel": "9", - "ForwardX11": "no", - "Port": "50022" + "Port": "50022", + "ForwardX11": "no" } } + ``` ### ls ```bash diff --git a/docs/parsers/ini.md b/docs/parsers/ini.md index 360ec5d3..e8b64677 100644 --- a/docs/parsers/ini.md +++ b/docs/parsers/ini.md @@ -11,11 +11,6 @@ Parses standard `INI` files. - Comment prefix can be `#` or `;`. Comments must be on their own line. - If duplicate keys are found, only the last value will be used. -> Note: The section identifier `[DEFAULT]` is special and provides default -> values for the section keys that follow. To disable this behavior you must -> rename the `[DEFAULT]` section identifier to something else before -> parsing. - > Note: Values starting and ending with double or single quotation marks > will have the marks removed. If you would like to keep the quotation > marks, use the `-r` command-line argument or the `raw=True` argument in diff --git a/docs/parsers/kv.md b/docs/parsers/kv.md index ba0c13e4..17721c4a 100644 --- a/docs/parsers/kv.md +++ b/docs/parsers/kv.md @@ -41,6 +41,7 @@ Examples: name = John Doe address=555 California Drive age: 34 + ; comments can include # or ; # delimiter can be = or : # quoted values have quotation marks stripped by default diff --git a/man/jc.1 b/man/jc.1 index 788452a2..df6bb5aa 100644 --- a/man/jc.1 +++ b/man/jc.1 @@ -1,4 +1,4 @@ -.TH jc 1 2023-01-06 1.22.5 "JSON Convert" +.TH jc 1 2023-01-08 1.22.5 "JSON Convert" .SH NAME \fBjc\fP \- JSON Convert JSONifies the output of many CLI tools, file-types, and strings .SH SYNOPSIS diff --git a/templates/readme_template b/templates/readme_template index 76a99b9a..f609db2e 100644 --- a/templates/readme_template +++ b/templates/readme_template @@ -640,21 +640,21 @@ cat example.ini | jc -p --ini ``` ```json { - "bitbucket.org": { - "ServeraLiveInterval": "45", + "DEFAULT": { + "ServerAliveInterval": "45", "Compression": "yes", "CompressionLevel": "9", - "ForwardX11": "yes", + "ForwardX11": "yes" + }, + "bitbucket.org": { "User": "hg" }, "topsecret.server.com": { - "ServeraLiveInterval": "45", - "Compression": "yes", - "CompressionLevel": "9", - "ForwardX11": "no", - "Port": "50022" + "Port": "50022", + "ForwardX11": "no" } } + ``` ### ls ```bash