diff --git a/CHANGELOG b/CHANGELOG index edd52ac9..8657bd2d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -21,6 +21,7 @@ jc changelog - Fix Man page location in source packages - Add sfdisk command parser tested on linux - Update unit test files to change the timezone when needed (POSIX only) +- Binaries and DEB/RPM/MSI packages now include Python 3.9.5 interpreter 20210628 v1.15.6 - Fix issue to only load local plugin parsers that have filenames that end in .py diff --git a/EXAMPLES.md b/EXAMPLES.md index 2d692020..e5367789 100644 --- a/EXAMPLES.md +++ b/EXAMPLES.md @@ -2558,7 +2558,7 @@ rpm_qia | jc --rpm_qi -p # or: jc -p rpm -qia ``` ### sfdisk ```bash -sfdisk -l | jc --sfdisk -p # or jc -p sfdisk +sfdisk -l | jc --sfdisk -p # or jc -p sfdisk -l ``` ```json [ diff --git a/README.md b/README.md index f1faa28a..2d959ea6 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ ![Tests](https://github.com/kellyjonbrazil/jc/workflows/Tests/badge.svg?branch=master) ![Pypi](https://img.shields.io/pypi/v/jc.svg) -> Try the new `jc` [web demo](https://jc-web-demo.herokuapp.com/)! +> Try the `jc` [web demo](https://jc-web-demo.herokuapp.com/) > JC is [now available](https://galaxy.ansible.com/community/general) as an Ansible filter plugin in the `community.general` collection! See this [blog post](https://blog.kellybrazil.com/2020/08/30/parsing-command-output-in-ansible-with-jc/) for an example. @@ -83,7 +83,7 @@ Use Cases: - [Nornir command output parsing](https://blog.kellybrazil.com/2020/12/09/parsing-command-output-in-nornir-with-jc/) ## Installation -There are several ways to get `jc`. You can install via `pip`; other OS package repositories like `apt-get`, `dnf`, `zypper`, `pacman`, `nix-env`, `guix`, `brew`, or `portsnap`; via DEB, RPM, and MSI packaged binaries for linux and Windows; or by downloading the correct binary for your architecture and running it anywhere on your filesystem. +There are several ways to get `jc`. You can install via `pip`, OS package repositories, via DEB/RPM/MSI packaged binaries for linux and Windows, or by downloading the correct binary for your architecture and running it anywhere on your filesystem. ### Pip (macOS, linux, unix, Windows) ```bash @@ -100,7 +100,7 @@ pip3 install jc | Arch linux | `pacman -S jc` | | NixOS linux | `nix-env -iA nixpkgs.jc` or `nix-env -iA nixos.jc` | | Guix System linux | `guix install jc` | -| MacOS | `brew install jc` | +| macOS | `brew install jc` | | FreeBSD | `portsnap fetch update && cd /usr/ports/textproc/py-jc && make install clean` | | Ansible filter plugin | `ansible-galaxy collection install community.general` | diff --git a/docs/parsers/kv.md b/docs/parsers/kv.md index f88c182d..e8cdfe96 100644 --- a/docs/parsers/kv.md +++ b/docs/parsers/kv.md @@ -38,7 +38,7 @@ Examples: # but can be preserved with the -r argument occupation:"Engineer" - $ cat keyvalue.txt | jc --ini -p + $ cat keyvalue.txt | jc --kv -p { "name": "John Doe", "address": "555 California Drive", diff --git a/jc/parsers/kv.py b/jc/parsers/kv.py index 948ea34a..0feec0fc 100644 --- a/jc/parsers/kv.py +++ b/jc/parsers/kv.py @@ -35,7 +35,7 @@ Examples: # but can be preserved with the -r argument occupation:"Engineer" - $ cat keyvalue.txt | jc --ini -p + $ cat keyvalue.txt | jc --kv -p { "name": "John Doe", "address": "555 California Drive", diff --git a/man/jc.1 b/man/jc.1 index fde39e8d..521de35d 100644 --- a/man/jc.1 +++ b/man/jc.1 @@ -1,4 +1,8 @@ +<<<<<<< HEAD .TH jc 1 2021-08-13 1.16.1 "JSON CLI output utility" +======= +.TH jc 1 2021-07-22 1.16.0 "JSON CLI output utility" +>>>>>>> master .SH NAME jc \- JSONifies the output of many CLI tools and file-types .SH SYNOPSIS diff --git a/templates/readme_template b/templates/readme_template index a78568f7..da09d75d 100644 --- a/templates/readme_template +++ b/templates/readme_template @@ -1,7 +1,7 @@ ![Tests](https://github.com/kellyjonbrazil/jc/workflows/Tests/badge.svg?branch=master) ![Pypi](https://img.shields.io/pypi/v/jc.svg) -> Try the new `jc` [web demo](https://jc-web-demo.herokuapp.com/)! +> Try the `jc` [web demo](https://jc-web-demo.herokuapp.com/) > JC is [now available](https://galaxy.ansible.com/community/general) as an Ansible filter plugin in the `community.general` collection! See this [blog post](https://blog.kellybrazil.com/2020/08/30/parsing-command-output-in-ansible-with-jc/) for an example. @@ -83,7 +83,7 @@ Use Cases: - [Nornir command output parsing](https://blog.kellybrazil.com/2020/12/09/parsing-command-output-in-nornir-with-jc/) ## Installation -There are several ways to get `jc`. You can install via `pip`; other OS package repositories like `apt-get`, `dnf`, `zypper`, `pacman`, `nix-env`, `guix`, `brew`, or `portsnap`; via DEB, RPM, and MSI packaged binaries for linux and Windows; or by downloading the correct binary for your architecture and running it anywhere on your filesystem. +There are several ways to get `jc`. You can install via `pip`, OS package repositories, via DEB/RPM/MSI packaged binaries for linux and Windows, or by downloading the correct binary for your architecture and running it anywhere on your filesystem. ### Pip (macOS, linux, unix, Windows) ```bash @@ -100,7 +100,7 @@ pip3 install jc | Arch linux | `pacman -S jc` | | NixOS linux | `nix-env -iA nixpkgs.jc` or `nix-env -iA nixos.jc` | | Guix System linux | `guix install jc` | -| MacOS | `brew install jc` | +| macOS | `brew install jc` | | FreeBSD | `portsnap fetch update && cd /usr/ports/textproc/py-jc && make install clean` | | Ansible filter plugin | `ansible-galaxy collection install community.general` |