add -m option info

README.md

@@ -1,3 +1,5 @@
+![Test code](https://github.com/kellyjonbrazil/jc/workflows/Test%20code/badge.svg?branch=master)
+
 # JC
 JSON CLI output utility
 
@@ -136,6 +138,7 @@ The JSON output can be compact (default) or pretty formatted with the `-p` optio
 ### Options
 - `-a` about `jc`. Prints information about `jc` and the parsers (in JSON, of course!)
 - `-d` debug mode. Prints trace messages if parsing issues encountered
+- `-m` monochrome JSON output
 - `-p` pretty format the JSON output
 - `-q` quiet mode. Suppresses warning messages
 - `-r` raw output. Provides a more literal JSON output with all values as text and no additional sematic processing

changelog.txt

@@ -1,5 +1,9 @@
 jc changelog
 
+20200402 v1.10.0
+- Add color output by default when not piping data to another program
+- Add -m option for monochrome output
+
 20200326 v1.9.3
 - Add axfr support for dig command parser
 

docs/parsers/dig.md

@@ -353,6 +353,15 @@ Returns:
         "answer_num":     integer,
         "authority_num":  integer,
         "additional_num": integer,
+        "axfr": [
+          {
+            "name":       string,
+            "class":      string,
+            "type":       string,
+            "ttl":        integer,
+            "data":       string
+          }
+        ],
         "question": {
           "name":         string,
           "class":        string,
@@ -380,6 +389,7 @@ Returns:
         "server":         string,
         "when":           string,
         "rcvd":           integer
+        "size":           string
       }
     ]
 

jc/cli.py

@@ -9,11 +9,16 @@ import importlib
 import textwrap
 import signal
 import json
+from pygments import highlight
+from pygments.style import Style
+from pygments.token import (Name, Number, String, Keyword)
+from pygments.lexers import JsonLexer
+from pygments.formatters import Terminal256Formatter
 import jc.utils
 
 
 class info():
-    version = '1.9.3'
+    version = '1.10.0'
     description = 'jc cli output JSON conversion tool'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -75,6 +80,28 @@ parsers = [
 ]
 
 
+class JcStyle(Style):
+    BLUE = '#2c5dcd'
+    GREY = '#4d4d4d'
+    PURPLE = '#5918bb'
+    GREEN = '#00cc00'
+
+    styles = {
+        Name.Tag: 'bold {}'.format(BLUE),    # key names
+        Keyword: GREY,                       # true, false, null
+        Number: PURPLE,                      # int, float
+        String: GREEN                        # string
+    }
+
+
+def piped_output():
+    """returns False if stdout is a TTY. True if output is being piped to another program"""
+    if sys.stdout.isatty():
+        return False
+    else:
+        return True
+
+
 def ctrlc(signum, frame):
     """exit with error on SIGINT"""
     sys.exit(1)
@@ -167,6 +194,7 @@ def helptext(message):
     Options:
             -a               about jc
             -d               debug - show trace messages
+            -m               monochrome output
             -p               pretty print output
             -q               quiet - suppress warnings
             -r               raw JSON output
@@ -181,11 +209,17 @@ def helptext(message):
     print(textwrap.dedent(helptext_string), file=sys.stderr)
 
 
-def json_out(data, pretty=False):
-    if pretty:
-        print(json.dumps(data, indent=2))
+def json_out(data, pretty=False, mono=False, piped_out=False):
+    if not mono and not piped_out:
+        if pretty:
+            print(highlight(json.dumps(data, indent=2), JsonLexer(), Terminal256Formatter(style=JcStyle))[0:-1])
+        else:
+            print(highlight(json.dumps(data), JsonLexer(), Terminal256Formatter(style=JcStyle))[0:-1])
     else:
-        print(json.dumps(data))
+        if pretty:
+            print(json.dumps(data, indent=2))
+        else:
+            print(json.dumps(data))
 
 
 def generate_magic_command(args):
@@ -271,12 +305,13 @@ def main():
             options.extend(opt[1:])
 
     debug = 'd' in options
+    mono = 'm' in options
     pretty = 'p' in options
     quiet = 'q' in options
     raw = 'r' in options
 
     if 'a' in options:
-        json_out(about_jc(), pretty=pretty)
+        json_out(about_jc(), pretty=pretty, mono=mono, piped_out=piped_output())
         exit()
 
     if sys.stdin.isatty():
@@ -317,7 +352,7 @@ def main():
         helptext('missing or incorrect arguments')
         sys.exit(1)
 
-    json_out(result, pretty=pretty)
+    json_out(result, pretty=pretty, mono=mono, piped_out=piped_output())
 
 
 if __name__ == '__main__':

jc/parsers/dig.py

@@ -361,6 +361,15 @@ def process(proc_data):
             "answer_num":     integer,
             "authority_num":  integer,
             "additional_num": integer,
+            "axfr": [
+              {
+                "name":       string,
+                "class":      string,
+                "type":       string,
+                "ttl":        integer,
+                "data":       string
+              }
+            ],
             "question": {
               "name":         string,
               "class":        string,
@@ -388,6 +397,7 @@ def process(proc_data):
             "server":         string,
             "when":           string,
             "rcvd":           integer
+            "size":           string
           }
         ]
     """

requirements.txt

@@ -1,3 +1,4 @@
 ifconfig-parser>=0.0.5
 ruamel.yaml>=0.15.0
 xmltodict>=0.12.0
+Pygments>=2.5.2

setup.py

@@ -5,14 +5,15 @@ with open('README.md', 'r') as f:
 
 setuptools.setup(
     name='jc',
-    version='1.9.3',
+    version='1.10.0',
     author='Kelly Brazil',
     author_email='kellyjonbrazil@gmail.com',
     description='This tool serializes the output of popular command line tools and filetypes to structured JSON output.',
     install_requires=[
         'ifconfig-parser>=0.0.5',
         'ruamel.yaml>=0.15.0',
-        'xmltodict>=0.12.0'
+        'xmltodict>=0.12.0',
+        'Pygments>=2.5.2'
     ],
     license='MIT',
     long_description=long_description,