From c21c334b73da129a83521d3fd10e1888fce00da5 Mon Sep 17 00:00:00 2001 From: Kelly Brazil Date: Mon, 23 May 2022 13:43:57 -0700 Subject: [PATCH] version bump --- README.md | 5 +++-- jc/lib.py | 2 +- man/jc.1 | 8 ++++++-- setup.py | 2 +- templates/manpage_template | 6 +++++- templates/readme_template | 5 +++-- 6 files changed, 19 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 3ef26f90..0a96d406 100644 --- a/README.md +++ b/README.md @@ -248,8 +248,8 @@ option. | ` --zipinfo` | `zipinfo` command parser | [📃](https://kellyjonbrazil.github.io/jc/docs/parsers/zipinfo) | ### Options -- `-a` about `jc`. Prints information about `jc` and the parsers (in JSON, of - course!) +- `-a` about `jc`. Prints information about `jc` and the parsers (in JSON or + YAML, of course!) - `-C` force color output even when using pipes (overrides `-m` and the `NO_COLOR` env variable) - `-d` debug mode. Prints trace messages if parsing issues are encountered (use @@ -263,6 +263,7 @@ option. values and no additional semantic processing - `-u` unbuffer output - `-v` version information +- `-y` YAML output ### Exit Codes Any fatal errors within `jc` will generate an exit code of `100`, otherwise the diff --git a/jc/lib.py b/jc/lib.py index ac9411f8..cd6609f7 100644 --- a/jc/lib.py +++ b/jc/lib.py @@ -6,7 +6,7 @@ import importlib from typing import Dict, List, Iterable, Union, Iterator from jc import appdirs -__version__ = '1.19.0' +__version__ = '1.20.0' parsers = [ 'acpi', diff --git a/man/jc.1 b/man/jc.1 index 53649fb0..99d5ea43 100644 --- a/man/jc.1 +++ b/man/jc.1 @@ -1,4 +1,4 @@ -.TH jc 1 2022-05-13 1.19.0 "JSON Convert" +.TH jc 1 2022-05-23 1.20.0 "JSON Convert" .SH NAME \fBjc\fP \- JSON Convert JSONifies the output of many CLI tools and file-types .SH SYNOPSIS @@ -527,7 +527,7 @@ Options: .TP .B \fB-a\fP -about \fBjc\fP (JSON output) +about \fBjc\fP (JSON or YAML output) .TP .B \fB-C\fP @@ -564,6 +564,10 @@ unbuffer output (useful for slow streaming data with streaming parsers) .B \fB-v\fP version information +.TP +.B +\fB-y\fP +YAML output .SH EXIT CODES Any fatal errors within \fBjc\fP will generate an exit code of \fB100\fP, otherwise the exit code will be \fB0\fP. When using the "Magic" syntax (e.g. \fBjc ifconfig eth0\fP), \fBjc\fP will store the exit code of the program being parsed and add it to the \fBjc\fP exit code. This way it is easier to determine if an error was from the parsed program or \fBjc\fP. diff --git a/setup.py b/setup.py index b01602c0..0840e010 100755 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ with open('README.md', 'r') as f: setuptools.setup( name='jc', - version='1.19.0', + version='1.20.0', author='Kelly Brazil', author_email='kellyjonbrazil@gmail.com', description='Converts the output of popular command-line tools and file-types to JSON.', diff --git a/templates/manpage_template b/templates/manpage_template index bd9fbbe7..a8effee5 100644 --- a/templates/manpage_template +++ b/templates/manpage_template @@ -32,7 +32,7 @@ Options: .TP .B \fB-a\fP -about \fBjc\fP (JSON output) +about \fBjc\fP (JSON or YAML output) .TP .B \fB-C\fP @@ -69,6 +69,10 @@ unbuffer output (useful for slow streaming data with streaming parsers) .B \fB-v\fP version information +.TP +.B +\fB-y\fP +YAML output .SH EXIT CODES Any fatal errors within \fBjc\fP will generate an exit code of \fB100\fP, otherwise the exit code will be \fB0\fP. When using the "Magic" syntax (e.g. \fBjc ifconfig eth0\fP), \fBjc\fP will store the exit code of the program being parsed and add it to the \fBjc\fP exit code. This way it is easier to determine if an error was from the parsed program or \fBjc\fP. diff --git a/templates/readme_template b/templates/readme_template index 10f28a0a..5fe5b0be 100644 --- a/templates/readme_template +++ b/templates/readme_template @@ -149,8 +149,8 @@ option. | `{{ "{:>15}".format(parser.argument) }}` | {{ "{:<55}".format(parser.description) }} | {{ "{:<70}".format("[📃](https://kellyjonbrazil.github.io/jc/docs/parsers/" + parser.name + ")") }} |{% endfor %} ### Options -- `-a` about `jc`. Prints information about `jc` and the parsers (in JSON, of - course!) +- `-a` about `jc`. Prints information about `jc` and the parsers (in JSON or + YAML, of course!) - `-C` force color output even when using pipes (overrides `-m` and the `NO_COLOR` env variable) - `-d` debug mode. Prints trace messages if parsing issues are encountered (use @@ -164,6 +164,7 @@ option. values and no additional semantic processing - `-u` unbuffer output - `-v` version information +- `-y` YAML output ### Exit Codes Any fatal errors within `jc` will generate an exit code of `100`, otherwise the