fix brek on pipe error

Dev v1.10.1

.github/workflows/pythonapp.yml

@@ -1,4 +1,4 @@
-name: Test code
+name: Tests
 
 on:
   push:

README.md

@@ -1,3 +1,6 @@
+![Tests](https://github.com/kellyjonbrazil/jc/workflows/Tests/badge.svg?branch=master)
+![Pypi](https://img.shields.io/pypi/v/jc.svg)
+
 # JC
 JSON CLI output utility
 
@@ -136,6 +139,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,6 +1,25 @@
 jc changelog
 
-20200311 v1.9.1
+20200409 v1.10.3
+- Fix break on pipe error
+
+20200409 v1.10.2
+- Change colors to ansi and match jello colors
+
+20200402 v1.10.1
+- Code cleanup
+
+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
+
+20200312 v1.9.2
+- Updated arp parser to fix OSX detection for some edge cases
+
+20200312 v1.9.1
 - Updated file command parser to make filename splitting more robust
 
 20200311 v1.9.0

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.1'
+    version = '1.10.3'
     description = 'jc cli output JSON conversion tool'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -75,6 +80,23 @@ parsers = [
 ]
 
 
+class JcStyle(Style):
+    styles = {
+        Name.Tag: 'bold ansiblue',     # key names
+        Keyword: 'ansibrightblack',    # true, false, null
+        Number: 'ansimagenta',         # int, float
+        String: 'ansigreen'            # 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 +189,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 +204,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):
@@ -260,6 +289,12 @@ def main():
     # break on ctrl-c keyboard interrupt
     signal.signal(signal.SIGINT, ctrlc)
 
+    # break on pipe error. need try/except for windows compatibility
+    try:
+        signal.signal(signal.SIGPIPE, signal.SIG_DFL)
+    except AttributeError:
+        pass
+
     # try magic syntax first: e.g. jc -p ls -al
     magic()
 
@@ -271,12 +306,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 +353,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/arp.py

@@ -91,7 +91,7 @@ import jc.parsers.universal
 
 
 class info():
-    version = '1.1'
+    version = '1.3'
     description = 'arp command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -156,20 +156,21 @@ def parse(data, raw=False, quiet=False):
     cleandata = data.splitlines()
 
     # remove final Entries row if -v was used
-    if cleandata[-1].find('Entries:') == 0:
+    if cleandata[-1].startswith('Entries:'):
         cleandata.pop(-1)
 
     # detect if osx style was used
-    if cleandata[0].find(' ifscope ') != -1:
+    if cleandata[0][-1] == ']':
         raw_output = []
         for line in cleandata:
-            line = line.split()
-            output_line = {}
-            output_line['name'] = line[0]
-            output_line['address'] = line[1].lstrip('(').rstrip(')')
-            output_line['hwtype'] = line[-1].lstrip('[').rstrip(']')
-            output_line['hwaddress'] = line[3]
-            output_line['iface'] = line[5]
+            splitline = line.split()
+            output_line = {
+                'name': splitline[0],
+                'address': splitline[1].lstrip('(').rstrip(')'),
+                'hwtype': splitline[-1].lstrip('[').rstrip(']'),
+                'hwaddress': splitline[3],
+                'iface': splitline[5]
+            }
             raw_output.append(output_line)
 
         if raw:
@@ -178,7 +179,7 @@ def parse(data, raw=False, quiet=False):
             return process(raw_output)
 
     # detect if linux style was used
-    elif cleandata[0].find('Address') == 0:
+    elif cleandata[0].startswith('Address'):
 
         # fix header row to change Flags Mask to flags_mask
         cleandata[0] = cleandata[0].replace('Flags Mask', 'flags_mask')

jc/parsers/crontab.py

@@ -132,7 +132,7 @@ import jc.parsers.universal
 
 
 class info():
-    version = '1.1'
+    version = '1.2'
     description = 'crontab command and file parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -227,13 +227,13 @@ def parse(data, raw=False, quiet=False):
 
     # Clear any commented lines
     for i, line in reversed(list(enumerate(cleandata))):
-        if line.strip().find('#') == 0:
+        if line.strip().startswith('#'):
             cleandata.pop(i)
 
     # Pop any variable assignment lines
     cron_var = []
     for i, line in reversed(list(enumerate(cleandata))):
-        if line.find('=') != -1:
+        if '=' in line:
             var_line = cleandata.pop(i)
             var_name = var_line.split('=', maxsplit=1)[0].strip()
             var_value = var_line.split('=', maxsplit=1)[1].strip()

jc/parsers/crontab_u.py

@@ -133,7 +133,7 @@ import jc.parsers.universal
 
 
 class info():
-    version = '1.0'
+    version = '1.1'
     description = 'crontab file parser with user support'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -228,13 +228,13 @@ def parse(data, raw=False, quiet=False):
 
     # Clear any commented lines
     for i, line in reversed(list(enumerate(cleandata))):
-        if line.strip().find('#') == 0:
+        if line.strip().startswith('#'):
             cleandata.pop(i)
 
     # Pop any variable assignment lines
     cron_var = []
     for i, line in reversed(list(enumerate(cleandata))):
-        if line.find('=') != -1:
+        if '=' in line:
             var_line = cleandata.pop(i)
             var_name = var_line.split('=', maxsplit=1)[0].strip()
             var_value = var_line.split('=', maxsplit=1)[1].strip()

jc/parsers/df.py

@@ -73,7 +73,7 @@ import jc.parsers.universal
 
 
 class info():
-    version = '1.1'
+    version = '1.2'
     description = 'df command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -135,7 +135,7 @@ def process(proc_data):
 
         # change any entry for key with '_blocks' in the name to int
         for k in entry:
-            if str(k).find('_blocks') != -1:
+            if '_blocks' in str(k):
                 try:
                     blocks_int = int(entry[k])
                     entry[k] = blocks_int

jc/parsers/dig.py

@@ -324,7 +324,7 @@ import jc.utils
 
 
 class info():
-    version = '1.0'
+    version = '1.2'
     description = 'dig command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -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
           }
         ]
     """
@@ -402,6 +412,14 @@ def process(proc_data):
                 except (ValueError):
                     entry[key] = None
 
+        if 'axfr' in entry:
+            for ax in entry['axfr']:
+                try:
+                    ttl_int = int(ax['ttl'])
+                    ax['ttl'] = ttl_int
+                except (ValueError):
+                    ax['ttl'] = None
+
         if 'answer' in entry:
             for ans in entry['answer']:
                 try:
@@ -508,6 +526,25 @@ def parse_answer(answer):
             'data': answer_data}
 
 
+def parse_axfr(axfr):
+    # ; <<>> DiG 9.11.14-3-Debian <<>> @81.4.108.41 axfr zonetransfer.me +nocookie
+    # ; (1 server found)
+    # ;; global options: +cmd
+    # zonetransfer.me. 7200 IN A 5.196.105.14
+    axfr = axfr.split(maxsplit=4)
+    axfr_name = axfr[0]
+    axfr_ttl = axfr[1]
+    axfr_class = axfr[2]
+    axfr_type = axfr[3]
+    axfr_data = axfr[4]
+
+    return {'name': axfr_name,
+            'ttl': axfr_ttl,
+            'class': axfr_class,
+            'type': axfr_type,
+            'data': axfr_data}
+
+
 def parse(data, raw=False, quiet=False):
     """
     Main text parsing function
@@ -534,23 +571,38 @@ def parse(data, raw=False, quiet=False):
     question = False
     authority = False
     answer = False
+    axfr = False
 
     output_entry = {}
     for line in cleandata:
 
-        if line.find(';; ->>HEADER<<-') == 0:
+        if line.startswith('; <<>> ') and ' axfr ' in line.lower():
+            question = False
+            authority = False
+            answer = False
+            axfr = True
+            axfr_list = []
+            continue
+
+        if ';' not in line and axfr:
+            axfr_list.append(parse_axfr(line))
+            output_entry.update({'axfr': axfr_list})
+            continue
+
+        if line.startswith(';; ->>HEADER<<-'):
             output_entry = {}
             output_entry.update(parse_header(line))
             continue
 
-        if line.find(';; flags:') == 0:
+        if line.startswith(';; flags:'):
             output_entry.update(parse_flags_line(line))
             continue
 
-        if line.find(';; QUESTION SECTION:') == 0:
+        if line.startswith(';; QUESTION SECTION:'):
             question = True
             authority = False
             answer = False
+            axfr = False
             continue
 
         if question:
@@ -558,52 +610,60 @@ def parse(data, raw=False, quiet=False):
             question = False
             authority = False
             answer = False
+            axfr = False
             continue
 
-        if line.find(';; AUTHORITY SECTION:') == 0:
+        if line.startswith(';; AUTHORITY SECTION:'):
             question = False
             authority = True
             answer = False
+            axfr = False
             authority_list = []
             continue
 
-        if line.find(';') == -1 and authority:
+        if ';' not in line and authority:
             authority_list.append(parse_authority(line))
             output_entry.update({'authority': authority_list})
             continue
 
-        if line.find(';; ANSWER SECTION:') == 0:
+        if line.startswith(';; ANSWER SECTION:'):
             question = False
             authority = False
             answer = True
+            axfr = False
             answer_list = []
             continue
 
-        if line.find(';') == -1 and answer:
+        if ';' not in line and answer:
             answer_list.append(parse_answer(line))
             output_entry.update({'answer': answer_list})
             continue
 
         # footer consists of 4 lines
         # footer line 1
-        if line.find(';; Query time:') == 0:
+        if line.startswith(';; Query time:'):
             output_entry.update({'query_time': line.split(':')[1].lstrip()})
             continue
 
         # footer line 2
-        if line.find(';; SERVER:') == 0:
+        if line.startswith(';; SERVER:'):
             output_entry.update({'server': line.split(':')[1].lstrip()})
             continue
 
         # footer line 3
-        if line.find(';; WHEN:') == 0:
+        if line.startswith(';; WHEN:'):
             output_entry.update({'when': line.split(':', maxsplit=1)[1].lstrip()})
             continue
 
         # footer line 4 (last line)
-        if line.find(';; MSG SIZE  rcvd:') == 0:
+        if line.startswith(';; MSG SIZE  rcvd:'):
             output_entry.update({'rcvd': line.split(':')[1].lstrip()})
 
+            if output_entry:
+                raw_output.append(output_entry)
+        elif line.startswith(';; XFR size:'):
+            output_entry.update({'size': line.split(':')[1].lstrip()})
+
             if output_entry:
                 raw_output.append(output_entry)
 

jc/parsers/fstab.py

@@ -70,7 +70,7 @@ import jc.utils
 
 
 class info():
-    version = '1.0'
+    version = '1.1'
     description = 'fstab file parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -145,7 +145,7 @@ def parse(data, raw=False, quiet=False):
         for line in cleandata:
             output_line = {}
             # ignore commented lines
-            if line.strip().find('#') == 0:
+            if line.strip().startswith('#'):
                 continue
 
             line_list = line.split(maxsplit=6)

jc/parsers/hosts.py

@@ -61,7 +61,7 @@ import jc.utils
 
 
 class info():
-    version = '1.0'
+    version = '1.1'
     description = '/etc/hosts file parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -126,7 +126,7 @@ def parse(data, raw=False, quiet=False):
         for line in cleandata:
             output_line = {}
             # ignore commented lines
-            if line.strip().find('#') == 0:
+            if line.strip().startswith('#'):
                 continue
 
             line_list = line.split(maxsplit=1)
@@ -136,7 +136,7 @@ def parse(data, raw=False, quiet=False):
 
             comment_found = False
             for i, item in enumerate(hosts_list):
-                if item.find('#') != -1:
+                if '#' in item:
                     comment_found = True
                     comment_item = i
                     break

jc/parsers/ifconfig.py

@@ -146,7 +146,7 @@ from ifconfigparser import IfconfigParser
 
 
 class info():
-    version = '1.5'
+    version = '1.6'
     description = 'ifconfig command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -220,7 +220,7 @@ def process(proc_data):
         # convert OSX-style subnet mask to dotted quad
         if 'ipv4_mask' in entry:
             try:
-                if entry['ipv4_mask'].find('0x') == 0:
+                if entry['ipv4_mask'].startswith('0x'):
                     new_mask = entry['ipv4_mask']
                     new_mask = new_mask.lstrip('0x')
                     new_mask = '.'.join(str(int(i, 16)) for i in [new_mask[i:i + 2] for i in range(0, len(new_mask), 2)])

jc/parsers/iptables.py

@@ -134,7 +134,7 @@ import jc.utils
 
 
 class info():
-    version = '1.1'
+    version = '1.2'
     description = 'iptables command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -247,7 +247,7 @@ def parse(data, raw=False, quiet=False):
 
     for line in cleandata:
 
-        if line.find('Chain') == 0:
+        if line.startswith('Chain'):
             raw_output.append(chain)
             chain = {}
             headers = []
@@ -259,7 +259,7 @@ def parse(data, raw=False, quiet=False):
 
             continue
 
-        elif line.find('target') == 0 or line.find('pkts') == 1 or line.find('num') == 0:
+        elif line.startswith('target') or line.find('pkts') == 1 or line.startswith('num'):
             headers = []
             headers = [h for h in ' '.join(line.lower().strip().split()).split() if h]
             headers.append("options")

jc/parsers/jobs.py

@@ -77,7 +77,7 @@ import jc.utils
 
 
 class info():
-    version = '1.0'
+    version = '1.1'
     description = 'jobs command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -176,11 +176,11 @@ def parse(data, raw=False, quiet=False):
                 parsed_line.insert(0, job_number)
 
             # check for + or - in first field
-            if parsed_line[0].find('+') != -1:
+            if '+' in parsed_line[0]:
                 job_history = 'current'
                 parsed_line[0] = parsed_line[0].rstrip('+')
 
-            if parsed_line[0].find('-') != -1:
+            if '-' in parsed_line[0]:
                 job_history = 'previous'
                 parsed_line[0] = parsed_line[0].rstrip('-')
 

jc/parsers/lsof.py

@@ -97,7 +97,7 @@ import jc.parsers.universal
 
 
 class info():
-    version = '1.0'
+    version = '1.1'
     description = 'lsof command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -180,47 +180,6 @@ def parse(data, raw=False, quiet=False):
 
         raw_output = jc.parsers.universal.sparse_table_parse(cleandata)
 
-        '''
-        # find column value of last character of each header
-        header_text = cleandata.pop(0).lower()
-
-        # clean up 'size/off' header
-        # even though forward slash in a key is valid json, it can make things difficult
-        header_row = header_text.replace('/', '_')
-
-        headers = header_row.split()
-
-        header_spec = []
-        for i, h in enumerate(headers):
-            # header tuple is (index, header_name, col)
-            header_spec.append((i, h, header_row.find(h) + len(h)))
-
-        # parse lines
-        for entry in cleandata:
-            output_line = {}
-
-            # normalize data by inserting Null for missing data
-            temp_line = entry.split(maxsplit=len(headers) - 1)
-
-            for spec in header_spec:
-
-                index = spec[0]
-                header_name = spec[1]
-                col = spec[2] - 1     # subtract one since column starts at 0 instead of 1
-
-                if header_name == 'command' or header_name == 'name':
-                    continue
-                if entry[col] in string.whitespace:
-                    temp_line.insert(index, None)
-
-            name = ' '.join(temp_line[9:])
-            fixed_line = temp_line[0:9]
-            fixed_line.append(name)
-
-            output_line = dict(zip(headers, fixed_line))
-            raw_output.append(output_line)
-        '''
-
     if raw:
         return raw_output
     else:

jc/parsers/mount.py

@@ -56,7 +56,7 @@ import jc.utils
 
 
 class info():
-    version = '1.1'
+    version = '1.2'
     description = 'mount command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -165,7 +165,7 @@ def parse(data, raw=False, quiet=False):
 
     if cleandata:
         # check for OSX output
-        if cleandata[0].find(' type ') == -1:
+        if ' type ' not in cleandata[0]:
             raw_output = osx_parse(cleandata)
 
         else:

jc/parsers/netstat.py

@@ -313,7 +313,7 @@ import jc.utils
 
 
 class info():
-    version = '1.2'
+    version = '1.3'
     description = 'netstat command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -498,14 +498,14 @@ def parse_post(raw_data):
 
         if 'proto' in entry and 'kind' in entry:
             if entry['kind'] == 'network':
-                if entry['proto'].find('tcp') != -1:
+                if 'tcp' in entry['proto']:
                     entry['transport_protocol'] = 'tcp'
-                elif entry['proto'].find('udp') != -1:
+                elif 'udp' in entry['proto']:
                     entry['transport_protocol'] = 'udp'
                 else:
                     entry['transport_protocol'] = None
 
-                if entry['proto'].find('6') != -1:
+                if '6' in entry['proto']:
                     entry['network_protocol'] = 'ipv6'
                 else:
                     entry['network_protocol'] = 'ipv4'
@@ -542,19 +542,19 @@ def parse(data, raw=False, quiet=False):
 
     for line in cleandata:
 
-        if line.find('Active Internet') == 0:
+        if line.startswith('Active Internet'):
             network_list = []
             network = True
             socket = False
             continue
 
-        if line.find('Active UNIX') == 0:
+        if line.startswith('Active UNIX'):
             socket_list = []
             network = False
             socket = True
             continue
 
-        if line.find('Proto') == 0:
+        if line.startswith('Proto'):
             header_text = normalize_headers(line)
             headers = header_text.split()
             continue

jc/parsers/pip_list.py

@@ -32,7 +32,7 @@ import jc.parsers.universal
 
 
 class info():
-    version = '1.0'
+    version = '1.1'
     description = 'pip list command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -94,7 +94,7 @@ def parse(data, raw=False, quiet=False):
     cleandata = list(filter(None, linedata))
 
     # detect legacy output type
-    if cleandata[0].find(' (') != -1:
+    if ' (' in cleandata[0]:
         for row in cleandata:
             raw_output.append({'package': row.split(' (')[0],
                                'version': row.split(' (')[1].rstrip(')')})
@@ -103,7 +103,7 @@ def parse(data, raw=False, quiet=False):
     else:
         # clear separator line
         for i, line in reversed(list(enumerate(cleandata))):
-            if line.find('---') != -1:
+            if '---' in line:
                 cleandata.pop(i)
 
         cleandata[0] = cleandata[0].lower()

jc/parsers/stat.py

@@ -104,7 +104,7 @@ import jc.utils
 
 
 class info():
-    version = '1.0'
+    version = '1.1'
     description = 'stat command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -208,7 +208,7 @@ def parse(data, raw=False, quiet=False):
                 output_line['file'] = line_list[1]
 
                 # populate link_to field if -> found
-                if output_line['file'].find(' -> ') != -1:
+                if ' -> ' in output_line['file']:
                     filename = output_line['file'].split(' -> ')[0].strip('\u2018').rstrip('\u2019')
                     link = output_line['file'].split(' -> ')[1].strip('\u2018').rstrip('\u2019')
                     output_line['file'] = filename
@@ -229,7 +229,7 @@ def parse(data, raw=False, quiet=False):
                 continue
 
             # line #3
-            if line.find('Device:') == 0:
+            if line.startswith('Device:'):
                 line_list = line.split()
                 output_line['device'] = line_list[1]
                 output_line['inode'] = line_list[3]
@@ -237,7 +237,7 @@ def parse(data, raw=False, quiet=False):
                 continue
 
             # line #4
-            if line.find('Access: (') == 0:
+            if line.startswith('Access: ('):
                 line = line.replace('(', ' ').replace(')', ' ').replace('/', ' ')
                 line_list = line.split()
                 output_line['access'] = line_list[1]
@@ -249,19 +249,19 @@ def parse(data, raw=False, quiet=False):
                 continue
 
             # line #5
-            if line.find('Access: 2') == 0:
+            if line.startswith('Access: 2'):
                 line_list = line.split(maxsplit=1)
                 output_line['access_time'] = line_list[1]
                 continue
 
             # line #6
-            if line.find('Modify:') == 0:
+            if line.startswith('Modify:'):
                 line_list = line.split(maxsplit=1)
                 output_line['modify_time'] = line_list[1]
                 continue
 
             # line #7
-            if line.find('Change:') == 0:
+            if line.startswith('Change:'):
                 line_list = line.split(maxsplit=1)
                 output_line['change_time'] = line_list[1]
                 continue

jc/parsers/systemctl.py

@@ -40,7 +40,7 @@ import jc.utils
 
 
 class info():
-    version = '1.0'
+    version = '1.1'
     description = 'systemctl command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -110,7 +110,7 @@ def parse(data, raw=False, quiet=False):
     raw_output = []
 
     for entry in cleandata[1:]:
-        if entry.find('LOAD   = ') != -1:
+        if 'LOAD   = ' in entry:
             break
 
         else:

jc/parsers/systemctl_lj.py

@@ -59,7 +59,7 @@ import jc.utils
 
 
 class info():
-    version = '1.0'
+    version = '1.1'
     description = 'systemctl list-jobs command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -137,7 +137,7 @@ def parse(data, raw=False, quiet=False):
     raw_output = []
 
     for entry in cleandata[1:]:
-        if entry.find('No jobs running.') != -1 or entry.find('jobs listed.') != -1:
+        if 'No jobs running.' in entry or 'jobs listed.' in entry:
             break
 
         else:

jc/parsers/systemctl_ls.py

@@ -34,7 +34,7 @@ import jc.utils
 
 
 class info():
-    version = '1.0'
+    version = '1.1'
     description = 'systemctl list-sockets command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -102,7 +102,7 @@ def parse(data, raw=False, quiet=False):
     raw_output = []
 
     for entry in cleandata[1:]:
-        if entry.find('sockets listed.') != -1:
+        if 'sockets listed.' in entry:
             break
 
         else:

jc/parsers/systemctl_luf.py

@@ -31,7 +31,7 @@ import jc.utils
 
 
 class info():
-    version = '1.0'
+    version = '1.1'
     description = 'systemctl list-unit-files command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -99,7 +99,7 @@ def parse(data, raw=False, quiet=False):
     raw_output = []
 
     for entry in cleandata[1:]:
-        if entry.find('unit files listed.') != -1:
+        if 'unit files listed.' in entry:
             break
 
         else:

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.1',
+    version='1.10.3',
     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,

tests/fixtures/centos-7.7/dig-axfr.out

@@ -0,0 +1,60 @@
+
+; <<>> DiG 9.11.4-P2-RedHat-9.11.4-9.P2.el7 <<>> @81.4.108.41 AXFR zonetransfer.me +nocookie
+; (1 server found)
+;; global options: +cmd
+zonetransfer.me.	7200	IN	SOA	nsztm1.digi.ninja. robin.digi.ninja. 2019100801 172800 900 1209600 3600
+zonetransfer.me.	300	IN	HINFO	"Casio fx-700G" "Windows XP"
+zonetransfer.me.	301	IN	TXT	"google-site-verification=tyP28J7JAUHA9fw2sHXMgcCC0I6XBmmoVi04VlMewxA"
+zonetransfer.me.	7200	IN	MX	0 ASPMX.L.GOOGLE.COM.
+zonetransfer.me.	7200	IN	MX	10 ALT1.ASPMX.L.GOOGLE.COM.
+zonetransfer.me.	7200	IN	MX	10 ALT2.ASPMX.L.GOOGLE.COM.
+zonetransfer.me.	7200	IN	MX	20 ASPMX2.GOOGLEMAIL.COM.
+zonetransfer.me.	7200	IN	MX	20 ASPMX3.GOOGLEMAIL.COM.
+zonetransfer.me.	7200	IN	MX	20 ASPMX4.GOOGLEMAIL.COM.
+zonetransfer.me.	7200	IN	MX	20 ASPMX5.GOOGLEMAIL.COM.
+zonetransfer.me.	7200	IN	A	5.196.105.14
+zonetransfer.me.	7200	IN	NS	nsztm1.digi.ninja.
+zonetransfer.me.	7200	IN	NS	nsztm2.digi.ninja.
+_acme-challenge.zonetransfer.me. 301 IN	TXT	"6Oa05hbUJ9xSsvYy7pApQvwCUSSGgxvrbdizjePEsZI"
+_sip._tcp.zonetransfer.me. 14000 IN	SRV	0 0 5060 www.zonetransfer.me.
+14.105.196.5.IN-ADDR.ARPA.zonetransfer.me. 7200	IN PTR www.zonetransfer.me.
+asfdbauthdns.zonetransfer.me. 7900 IN	AFSDB	1 asfdbbox.zonetransfer.me.
+asfdbbox.zonetransfer.me. 7200	IN	A	127.0.0.1
+asfdbvolume.zonetransfer.me. 7800 IN	AFSDB	1 asfdbbox.zonetransfer.me.
+canberra-office.zonetransfer.me. 7200 IN A	202.14.81.230
+cmdexec.zonetransfer.me. 300	IN	TXT	"; ls"
+contact.zonetransfer.me. 2592000 IN	TXT	"Remember to call or email Pippa on +44 123 4567890 or pippa@zonetransfer.me when making DNS changes"
+dc-office.zonetransfer.me. 7200	IN	A	143.228.181.132
+deadbeef.zonetransfer.me. 7201	IN	AAAA	dead:beaf::
+dr.zonetransfer.me.	300	IN	LOC	53 20 56.558 N 1 38 33.526 W 0.00m 1m 10000m 10m
+DZC.zonetransfer.me.	7200	IN	TXT	"AbCdEfG"
+email.zonetransfer.me.	2222	IN	NAPTR	1 1 "P" "E2U+email" "" email.zonetransfer.me.zonetransfer.me.
+email.zonetransfer.me.	7200	IN	A	74.125.206.26
+Hello.zonetransfer.me.	7200	IN	TXT	"Hi to Josh and all his class"
+home.zonetransfer.me.	7200	IN	A	127.0.0.1
+Info.zonetransfer.me.	7200	IN	TXT	"ZoneTransfer.me service provided by Robin Wood - robin@digi.ninja. See http://digi.ninja/projects/zonetransferme.php for more information."
+internal.zonetransfer.me. 300	IN	NS	intns1.zonetransfer.me.
+internal.zonetransfer.me. 300	IN	NS	intns2.zonetransfer.me.
+intns1.zonetransfer.me.	300	IN	A	81.4.108.41
+intns2.zonetransfer.me.	300	IN	A	167.88.42.94
+office.zonetransfer.me.	7200	IN	A	4.23.39.254
+ipv6actnow.org.zonetransfer.me.	7200 IN	AAAA	2001:67c:2e8:11::c100:1332
+owa.zonetransfer.me.	7200	IN	A	207.46.197.32
+robinwood.zonetransfer.me. 302	IN	TXT	"Robin Wood"
+rp.zonetransfer.me.	321	IN	RP	robin.zonetransfer.me. robinwood.zonetransfer.me.
+sip.zonetransfer.me.	3333	IN	NAPTR	2 3 "P" "E2U+sip" "!^.*$!sip:customer-service@zonetransfer.me!" .
+sqli.zonetransfer.me.	300	IN	TXT	"' or 1=1 --"
+sshock.zonetransfer.me.	7200	IN	TXT	"() { :]}; echo ShellShocked"
+staging.zonetransfer.me. 7200	IN	CNAME	www.sydneyoperahouse.com.
+alltcpportsopen.firewall.test.zonetransfer.me. 301 IN A	127.0.0.1
+testing.zonetransfer.me. 301	IN	CNAME	www.zonetransfer.me.
+vpn.zonetransfer.me.	4000	IN	A	174.36.59.154
+www.zonetransfer.me.	7200	IN	A	5.196.105.14
+xss.zonetransfer.me.	300	IN	TXT	"'><script>alert('Boo')</script>"
+zonetransfer.me.	7200	IN	SOA	nsztm1.digi.ninja. robin.digi.ninja. 2019100801 172800 900 1209600 3600
+;; Query time: 182 msec
+;; SERVER: 81.4.108.41#53(81.4.108.41)
+;; WHEN: Wed Mar 25 20:01:47 PDT 2020
+;; XFR size: 50 records (messages 1, bytes 1994)
+
+

tests/fixtures/osx-10.14.6/arp-a2.json

@@ -0,0 +1 @@
+[{"name": null, "address": "169.254.81.142", "hwtype": "ethernet", "hwaddress": "60:93:17:3a:28:fc", "iface": "en0"}, {"name": "my-iphone.attlocal.net", "address": "192.168.1.64", "hwtype": "ethernet", "hwaddress": "e0:33:8f:68:39:d6", "iface": "en0"}, {"name": "my-mbp.attlocal.net", "address": "192.168.1.72", "hwtype": "ethernet", "hwaddress": "f0:18:98:3:d7:34", "iface": "en0"}, {"name": "c6180.attlocal.net", "address": "192.168.1.74", "hwtype": "ethernet", "hwaddress": "9c:b6:54:5f:fa:7c", "iface": "en0"}, {"name": "ipad.attlocal.net", "address": "192.168.1.75", "hwtype": "ethernet", "hwaddress": "4c:56:9e:5f:c7:4c", "iface": "en0"}, {"name": "mycloudex2ultra.attlocal.net", "address": "192.168.1.80", "hwtype": "ethernet", "hwaddress": "0:90:a9:ed:f4:3f", "iface": "en0"}, {"name": "family-room-5.attlocal.net", "address": "192.168.1.88", "hwtype": "ethernet", "hwaddress": "c8:d0:84:c3:e3:2d", "iface": "en0"}, {"name": "bedroom.attlocal.net", "address": "192.168.1.89", "hwtype": "ethernet", "hwaddress": "d0:3:4b:3b:29:a5", "iface": "en0"}, {"name": "heriphone.attlocal.net", "address": "192.168.1.178", "hwtype": "ethernet", "hwaddress": "90:e1:7b:ef:1:45", "iface": "en0"}, {"name": "upstairs.attlocal.net", "address": "192.168.1.186", "hwtype": "ethernet", "hwaddress": "50:32:37:d7:e5:7b", "iface": "en0"}, {"name": "rbr50.attlocal.net", "address": "192.168.1.216", "hwtype": "ethernet", "hwaddress": "3c:37:86:25:fd:f7", "iface": "en0"}, {"name": "my-mac.attlocal.net", "address": "192.168.1.221", "hwtype": "ethernet", "hwaddress": "a4:83:e7:2e:f2:8f", "iface": "en0"}, {"name": "irobot-d41934.attlocal.net", "address": "192.168.1.242", "hwtype": "ethernet", "hwaddress": "50:14:79:f2:4f:3e", "iface": "en0"}, {"name": "rbs50.attlocal.net", "address": "192.168.1.253", "hwtype": "ethernet", "hwaddress": "3c:37:86:1f:dd:a3", "iface": "en0"}, {"name": "dsldevice.attlocal.net", "address": "192.168.1.254", "hwtype": "ethernet", "hwaddress": "fc:ae:34:f1:3f:80", "iface": "en0"}, {"name": null, "address": "192.168.1.255", "hwtype": "ethernet", "hwaddress": "ff:ff:ff:ff:ff:ff", "iface": "en0"}, {"name": null, "address": "192.168.71.255", "hwtype": "ethernet", "hwaddress": "ff:ff:ff:ff:ff:ff", "iface": "vmnet8"}, {"name": null, "address": "192.168.101.255", "hwtype": "ethernet", "hwaddress": "ff:ff:ff:ff:ff:ff", "iface": "vmnet1"}, {"name": null, "address": "224.0.0.251", "hwtype": "ethernet", "hwaddress": "1:0:5e:0:0:eb", "iface": "en0"}, {"name": null, "address": "239.255.255.250", "hwtype": "ethernet", "hwaddress": "1:0:5e:7f:ff:fe", "iface": "en0"}]

tests/fixtures/osx-10.14.6/arp-a2.out

@@ -0,0 +1,20 @@
+? (169.254.81.142) at 60:93:17:3a:28:fc on en0 [ethernet]
+my-iphone.attlocal.net (192.168.1.64) at e0:33:8f:68:39:d6 on en0 ifscope [ethernet]
+my-mbp.attlocal.net (192.168.1.72) at f0:18:98:3:d7:34 on en0 ifscope [ethernet]
+c6180.attlocal.net (192.168.1.74) at 9c:b6:54:5f:fa:7c on en0 ifscope [ethernet]
+ipad.attlocal.net (192.168.1.75) at 4c:56:9e:5f:c7:4c on en0 ifscope [ethernet]
+mycloudex2ultra.attlocal.net (192.168.1.80) at 0:90:a9:ed:f4:3f on en0 ifscope [ethernet]
+family-room-5.attlocal.net (192.168.1.88) at c8:d0:84:c3:e3:2d on en0 ifscope [ethernet]
+bedroom.attlocal.net (192.168.1.89) at d0:3:4b:3b:29:a5 on en0 ifscope [ethernet]
+heriphone.attlocal.net (192.168.1.178) at 90:e1:7b:ef:1:45 on en0 ifscope [ethernet]
+upstairs.attlocal.net (192.168.1.186) at 50:32:37:d7:e5:7b on en0 ifscope [ethernet]
+rbr50.attlocal.net (192.168.1.216) at 3c:37:86:25:fd:f7 on en0 ifscope [ethernet]
+my-mac.attlocal.net (192.168.1.221) at a4:83:e7:2e:f2:8f on en0 ifscope permanent [ethernet]
+irobot-d41934.attlocal.net (192.168.1.242) at 50:14:79:f2:4f:3e on en0 ifscope [ethernet]
+rbs50.attlocal.net (192.168.1.253) at 3c:37:86:1f:dd:a3 on en0 ifscope [ethernet]
+dsldevice.attlocal.net (192.168.1.254) at fc:ae:34:f1:3f:80 on en0 ifscope [ethernet]
+? (192.168.1.255) at ff:ff:ff:ff:ff:ff on en0 ifscope [ethernet]
+? (192.168.71.255) at ff:ff:ff:ff:ff:ff on vmnet8 ifscope [ethernet]
+? (192.168.101.255) at ff:ff:ff:ff:ff:ff on vmnet1 ifscope [ethernet]
+? (224.0.0.251) at 1:0:5e:0:0:eb on en0 ifscope permanent [ethernet]
+? (239.255.255.250) at 1:0:5e:7f:ff:fe on en0 ifscope permanent [ethernet]

tests/fixtures/osx-10.14.6/dig-axfr.out

@@ -0,0 +1,59 @@
+
+; <<>> DiG 9.10.6 <<>> @81.4.108.41 AXFR zonetransfer.me
+; (1 server found)
+;; global options: +cmd
+zonetransfer.me.	7200	IN	SOA	nsztm1.digi.ninja. robin.digi.ninja. 2019100801 172800 900 1209600 3600
+zonetransfer.me.	300	IN	HINFO	"Casio fx-700G" "Windows XP"
+zonetransfer.me.	301	IN	TXT	"google-site-verification=tyP28J7JAUHA9fw2sHXMgcCC0I6XBmmoVi04VlMewxA"
+zonetransfer.me.	7200	IN	MX	0 ASPMX.L.GOOGLE.COM.
+zonetransfer.me.	7200	IN	MX	10 ALT1.ASPMX.L.GOOGLE.COM.
+zonetransfer.me.	7200	IN	MX	10 ALT2.ASPMX.L.GOOGLE.COM.
+zonetransfer.me.	7200	IN	MX	20 ASPMX2.GOOGLEMAIL.COM.
+zonetransfer.me.	7200	IN	MX	20 ASPMX3.GOOGLEMAIL.COM.
+zonetransfer.me.	7200	IN	MX	20 ASPMX4.GOOGLEMAIL.COM.
+zonetransfer.me.	7200	IN	MX	20 ASPMX5.GOOGLEMAIL.COM.
+zonetransfer.me.	7200	IN	A	5.196.105.14
+zonetransfer.me.	7200	IN	NS	nsztm1.digi.ninja.
+zonetransfer.me.	7200	IN	NS	nsztm2.digi.ninja.
+_acme-challenge.zonetransfer.me. 301 IN	TXT	"6Oa05hbUJ9xSsvYy7pApQvwCUSSGgxvrbdizjePEsZI"
+_sip._tcp.zonetransfer.me. 14000 IN	SRV	0 0 5060 www.zonetransfer.me.
+14.105.196.5.IN-ADDR.ARPA.zonetransfer.me. 7200	IN PTR www.zonetransfer.me.
+asfdbauthdns.zonetransfer.me. 7900 IN	AFSDB	1 asfdbbox.zonetransfer.me.
+asfdbbox.zonetransfer.me. 7200	IN	A	127.0.0.1
+asfdbvolume.zonetransfer.me. 7800 IN	AFSDB	1 asfdbbox.zonetransfer.me.
+canberra-office.zonetransfer.me. 7200 IN A	202.14.81.230
+cmdexec.zonetransfer.me. 300	IN	TXT	"; ls"
+contact.zonetransfer.me. 2592000 IN	TXT	"Remember to call or email Pippa on +44 123 4567890 or pippa@zonetransfer.me when making DNS changes"
+dc-office.zonetransfer.me. 7200	IN	A	143.228.181.132
+deadbeef.zonetransfer.me. 7201	IN	AAAA	dead:beaf::
+dr.zonetransfer.me.	300	IN	LOC	53 20 56.558 N 1 38 33.526 W 0.00m 1m 10000m 10m
+DZC.zonetransfer.me.	7200	IN	TXT	"AbCdEfG"
+email.zonetransfer.me.	2222	IN	NAPTR	1 1 "P" "E2U+email" "" email.zonetransfer.me.zonetransfer.me.
+email.zonetransfer.me.	7200	IN	A	74.125.206.26
+Hello.zonetransfer.me.	7200	IN	TXT	"Hi to Josh and all his class"
+home.zonetransfer.me.	7200	IN	A	127.0.0.1
+Info.zonetransfer.me.	7200	IN	TXT	"ZoneTransfer.me service provided by Robin Wood - robin@digi.ninja. See http://digi.ninja/projects/zonetransferme.php for more information."
+internal.zonetransfer.me. 300	IN	NS	intns1.zonetransfer.me.
+internal.zonetransfer.me. 300	IN	NS	intns2.zonetransfer.me.
+intns1.zonetransfer.me.	300	IN	A	81.4.108.41
+intns2.zonetransfer.me.	300	IN	A	167.88.42.94
+office.zonetransfer.me.	7200	IN	A	4.23.39.254
+ipv6actnow.org.zonetransfer.me.	7200 IN	AAAA	2001:67c:2e8:11::c100:1332
+owa.zonetransfer.me.	7200	IN	A	207.46.197.32
+robinwood.zonetransfer.me. 302	IN	TXT	"Robin Wood"
+rp.zonetransfer.me.	321	IN	RP	robin.zonetransfer.me. robinwood.zonetransfer.me.
+sip.zonetransfer.me.	3333	IN	NAPTR	2 3 "P" "E2U+sip" "!^.*$!sip:customer-service@zonetransfer.me!" .
+sqli.zonetransfer.me.	300	IN	TXT	"' or 1=1 --"
+sshock.zonetransfer.me.	7200	IN	TXT	"() { :]}; echo ShellShocked"
+staging.zonetransfer.me. 7200	IN	CNAME	www.sydneyoperahouse.com.
+alltcpportsopen.firewall.test.zonetransfer.me. 301 IN A	127.0.0.1
+testing.zonetransfer.me. 301	IN	CNAME	www.zonetransfer.me.
+vpn.zonetransfer.me.	4000	IN	A	174.36.59.154
+www.zonetransfer.me.	7200	IN	A	5.196.105.14
+xss.zonetransfer.me.	300	IN	TXT	"'><script>alert('Boo')</script>"
+zonetransfer.me.	7200	IN	SOA	nsztm1.digi.ninja. robin.digi.ninja. 2019100801 172800 900 1209600 3600
+;; Query time: 170 msec
+;; SERVER: 81.4.108.41#53(81.4.108.41)
+;; WHEN: Thu Mar 26 16:31:06 PDT 2020
+;; XFR size: 50 records (messages 1, bytes 1994)
+

tests/fixtures/ubuntu-18.04/dig-axfr.out

@@ -0,0 +1,57 @@
+; <<>> DiG 9.11.14-3-Debian <<>> @81.4.108.41 axfr zonetransfer.me +nocookie
+; (1 server found)
+;; global options: +cmd
+zonetransfer.me. 7200 IN SOA nsztm1.digi.ninja. robin.digi.ninja. 2019100801 172800 900 1209600 3600
+zonetransfer.me. 300 IN HINFO "Casio fx-700G" "Windows XP"
+zonetransfer.me. 301 IN TXT "google-site-verification=tyP28J7JAUHA9fw2sHXMgcCC0I6XBmmoVi04VlMewxA"
+zonetransfer.me. 7200 IN MX 0 ASPMX.L.GOOGLE.COM.
+zonetransfer.me. 7200 IN MX 10 ALT1.ASPMX.L.GOOGLE.COM.
+zonetransfer.me. 7200 IN MX 10 ALT2.ASPMX.L.GOOGLE.COM.
+zonetransfer.me. 7200 IN MX 20 ASPMX2.GOOGLEMAIL.COM.
+zonetransfer.me. 7200 IN MX 20 ASPMX3.GOOGLEMAIL.COM.
+zonetransfer.me. 7200 IN MX 20 ASPMX4.GOOGLEMAIL.COM.
+zonetransfer.me. 7200 IN MX 20 ASPMX5.GOOGLEMAIL.COM.
+zonetransfer.me. 7200 IN A 5.196.105.14
+zonetransfer.me. 7200 IN NS nsztm1.digi.ninja.
+zonetransfer.me. 7200 IN NS nsztm2.digi.ninja.
+_acme-challenge.zonetransfer.me. 301 IN TXT "6Oa05hbUJ9xSsvYy7pApQvwCUSSGgxvrbdizjePEsZI"
+_sip._tcp.zonetransfer.me. 14000 IN SRV 0 0 5060 www.zonetransfer.me.
+14.105.196.5.IN-ADDR.ARPA.zonetransfer.me. 7200 IN PTR www.zonetransfer.me.
+asfdbauthdns.zonetransfer.me. 7900 IN AFSDB 1 asfdbbox.zonetransfer.me.
+asfdbbox.zonetransfer.me. 7200 IN A 127.0.0.1
+asfdbvolume.zonetransfer.me. 7800 IN AFSDB 1 asfdbbox.zonetransfer.me.
+canberra-office.zonetransfer.me. 7200 IN A 202.14.81.230
+cmdexec.zonetransfer.me. 300 IN TXT "; ls"
+contact.zonetransfer.me. 2592000 IN TXT "Remember to call or email Pippa on +44 123 4567890 or pippa@zonetransfer.me when making DNS changes"
+dc-office.zonetransfer.me. 7200 IN A 143.228.181.132
+deadbeef.zonetransfer.me. 7201 IN AAAA dead:beaf::
+dr.zonetransfer.me. 300 IN LOC 53 20 56.558 N 1 38 33.526 W 0.00m 1m 10000m 10m
+DZC.zonetransfer.me. 7200 IN TXT "AbCdEfG"
+email.zonetransfer.me. 2222 IN NAPTR 1 1 "P" "E2U+email" "" email.zonetransfer.me.zonetransfer.me.
+email.zonetransfer.me. 7200 IN A 74.125.206.26
+Hello.zonetransfer.me. 7200 IN TXT "Hi to Josh and all his class"
+home.zonetransfer.me. 7200 IN A 127.0.0.1
+Info.zonetransfer.me. 7200 IN TXT "ZoneTransfer.me service provided by Robin Wood - robin@digi.ninja. See http://digi.ninja/projects/zonetransferme.php for more information."
+internal.zonetransfer.me. 300 IN NS intns1.zonetransfer.me.
+internal.zonetransfer.me. 300 IN NS intns2.zonetransfer.me.
+intns1.zonetransfer.me. 300 IN A 81.4.108.41
+intns2.zonetransfer.me. 300 IN A 167.88.42.94
+office.zonetransfer.me. 7200 IN A 4.23.39.254
+ipv6actnow.org.zonetransfer.me. 7200 IN AAAA 2001:67c:2e8:11::c100:1332
+owa.zonetransfer.me. 7200 IN A 207.46.197.32
+robinwood.zonetransfer.me. 302 IN TXT "Robin Wood"
+rp.zonetransfer.me. 321 IN RP robin.zonetransfer.me. robinwood.zonetransfer.me.
+sip.zonetransfer.me. 3333 IN NAPTR 2 3 "P" "E2U+sip" "!^.*$!sip:customer-service@zonetransfer.me!" .
+sqli.zonetransfer.me. 300 IN TXT "' or 1=1 --"
+sshock.zonetransfer.me. 7200 IN TXT "() { :]}; echo ShellShocked"
+staging.zonetransfer.me. 7200 IN CNAME www.sydneyoperahouse.com.
+alltcpportsopen.firewall.test.zonetransfer.me. 301 IN A 127.0.0.1
+testing.zonetransfer.me. 301 IN CNAME www.zonetransfer.me.
+vpn.zonetransfer.me. 4000 IN A 174.36.59.154
+www.zonetransfer.me. 7200 IN A 5.196.105.14
+xss.zonetransfer.me. 300 IN TXT "'><script>alert('Boo')</script>"
+zonetransfer.me. 7200 IN SOA nsztm1.digi.ninja. robin.digi.ninja. 2019100801 172800 900 1209600 3600
+;; Query time: 105 msec
+;; SERVER: 81.4.108.41#53(81.4.108.41)
+;; WHEN: Wed Mar 25 14:34:55 EDT 2020
+;; XFR size: 50 records (messages 1, bytes 1994)

tests/test_arp.py

@@ -34,6 +34,9 @@ class MyTests(unittest.TestCase):
         with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/osx-10.14.6/arp-a.out'), 'r', encoding='utf-8') as f:
             self.osx_10_14_6_arp_a = f.read()
 
+        with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/osx-10.14.6/arp-a2.out'), 'r', encoding='utf-8') as f:
+            self.osx_10_14_6_arp_a2 = f.read()
+
         # output
         with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/centos-7.7/arp.json'), 'r', encoding='utf-8') as f:
             self.centos_7_7_arp_json = json.loads(f.read())
@@ -59,6 +62,9 @@ class MyTests(unittest.TestCase):
         with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/osx-10.14.6/arp-a.json'), 'r', encoding='utf-8') as f:
             self.osx_10_14_6_arp_a_json = json.loads(f.read())
 
+        with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/osx-10.14.6/arp-a2.json'), 'r', encoding='utf-8') as f:
+            self.osx_10_14_6_arp_a2_json = json.loads(f.read())
+
     def test_arp_centos_7_7(self):
         """
         Test 'arp' on Centos 7.7
@@ -107,6 +113,12 @@ class MyTests(unittest.TestCase):
         """
         self.assertEqual(jc.parsers.arp.parse(self.osx_10_14_6_arp_a, quiet=True), self.osx_10_14_6_arp_a_json)
 
+    def test_arp_a2_osx_10_14_6(self):
+        """
+        Test 'arp -a' with entries with no ifscope on OSX 10.14.6
+        """
+        self.assertEqual(jc.parsers.arp.parse(self.osx_10_14_6_arp_a2, quiet=True), self.osx_10_14_6_arp_a2_json)
+
 
 if __name__ == '__main__':
     unittest.main()

tests/test_dig.py

@@ -28,6 +28,33 @@ class MyTests(unittest.TestCase):
         with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/ubuntu-18.04/dig-aaaa.out'), 'r', encoding='utf-8') as f:
             self.ubuntu_18_4_dig_aaaa = f.read()
 
+        with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/centos-7.7/dig-axfr.out'), 'r', encoding='utf-8') as f:
+            self.centos_7_7_dig_axfr = f.read()
+
+        with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/ubuntu-18.04/dig-axfr.out'), 'r', encoding='utf-8') as f:
+            self.ubuntu_18_4_dig_axfr = f.read()
+
+        with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/osx-10.11.6/dig.out'), 'r', encoding='utf-8') as f:
+            self.osx_10_11_6_dig = f.read()
+
+        with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/osx-10.11.6/dig-x.out'), 'r', encoding='utf-8') as f:
+            self.osx_10_11_6_dig_x = f.read()
+
+        with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/osx-10.11.6/dig-aaaa.out'), 'r', encoding='utf-8') as f:
+            self.osx_10_11_6_dig_aaaa = f.read()
+
+        with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/osx-10.14.6/dig.out'), 'r', encoding='utf-8') as f:
+            self.osx_10_14_6_dig = f.read()
+
+        with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/osx-10.14.6/dig-x.out'), 'r', encoding='utf-8') as f:
+            self.osx_10_14_6_dig_x = f.read()
+
+        with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/osx-10.14.6/dig-aaaa.out'), 'r', encoding='utf-8') as f:
+            self.osx_10_14_6_dig_aaaa = f.read()
+
+        with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/osx-10.14.6/dig-axfr.out'), 'r', encoding='utf-8') as f:
+            self.osx_10_14_6_dig_axfr = f.read()
+
         # output
         with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/centos-7.7/dig.json'), 'r', encoding='utf-8') as f:
             self.centos_7_7_dig_json = json.loads(f.read())
@@ -47,6 +74,33 @@ class MyTests(unittest.TestCase):
         with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/ubuntu-18.04/dig-aaaa.json'), 'r', encoding='utf-8') as f:
             self.ubuntu_18_4_dig_aaaa_json = json.loads(f.read())
 
+        with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/centos-7.7/dig-axfr.json'), 'r', encoding='utf-8') as f:
+            self.centos_7_7_dig_axfr_json = json.loads(f.read())
+
+        with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/ubuntu-18.04/dig-axfr.json'), 'r', encoding='utf-8') as f:
+            self.ubuntu_18_4_dig_axfr_json = json.loads(f.read())
+
+        with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/osx-10.11.6/dig.json'), 'r', encoding='utf-8') as f:
+            self.osx_10_11_6_dig_json = json.loads(f.read())
+
+        with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/osx-10.11.6/dig-x.json'), 'r', encoding='utf-8') as f:
+            self.osx_10_11_6_dig_x_json = json.loads(f.read())
+
+        with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/osx-10.11.6/dig-aaaa.json'), 'r', encoding='utf-8') as f:
+            self.osx_10_11_6_dig_aaaa_json = json.loads(f.read())
+
+        with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/osx-10.14.6/dig.json'), 'r', encoding='utf-8') as f:
+            self.osx_10_14_6_dig_json = json.loads(f.read())
+
+        with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/osx-10.14.6/dig-x.json'), 'r', encoding='utf-8') as f:
+            self.osx_10_14_6_dig_x_json = json.loads(f.read())
+
+        with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/osx-10.14.6/dig-aaaa.json'), 'r', encoding='utf-8') as f:
+            self.osx_10_14_6_dig_aaaa_json = json.loads(f.read())
+
+        with open(os.path.join(THIS_DIR, os.pardir, 'tests/fixtures/osx-10.14.6/dig-axfr.json'), 'r', encoding='utf-8') as f:
+            self.osx_10_14_6_dig_axfr_json = json.loads(f.read())
+
     def test_dig_centos_7_7(self):
         """
         Test 'dig' on Centos 7.7
@@ -83,6 +137,60 @@ class MyTests(unittest.TestCase):
         """
         self.assertEqual(jc.parsers.dig.parse(self.ubuntu_18_4_dig_aaaa, quiet=True), self.ubuntu_18_4_dig_aaaa_json)
 
+    def test_dig_axfr_centos_7_7(self):
+        """
+        Test 'dig axfr' on Centos 7.7
+        """
+        self.assertEqual(jc.parsers.dig.parse(self.centos_7_7_dig_axfr, quiet=True), self.centos_7_7_dig_axfr_json)
+
+    def test_dig_axfr_ubuntu_18_4(self):
+        """
+        Test 'dig axfr' on Ubuntu 18.4
+        """
+        self.assertEqual(jc.parsers.dig.parse(self.ubuntu_18_4_dig_axfr, quiet=True), self.ubuntu_18_4_dig_axfr_json)
+
+    def test_dig_osx_10_11_6(self):
+        """
+        Test 'dig' on OSX 10.11.6
+        """
+        self.assertEqual(jc.parsers.dig.parse(self.osx_10_11_6_dig, quiet=True), self.osx_10_11_6_dig_json)
+
+    def test_dig_x_osx_10_11_6(self):
+        """
+        Test 'dig -x' on OSX 10.11.6
+        """
+        self.assertEqual(jc.parsers.dig.parse(self.osx_10_11_6_dig_x, quiet=True), self.osx_10_11_6_dig_x_json)
+
+    def test_dig_aaaa_osx_10_11_6(self):
+        """
+        Test 'dig -aaaa' on OSX 10.11.6
+        """
+        self.assertEqual(jc.parsers.dig.parse(self.osx_10_11_6_dig_aaaa, quiet=True), self.osx_10_11_6_dig_aaaa_json)
+
+    def test_dig_osx_10_14_6(self):
+        """
+        Test 'dig' on OSX 10.14.6
+        """
+        self.assertEqual(jc.parsers.dig.parse(self.osx_10_14_6_dig, quiet=True), self.osx_10_14_6_dig_json)
+
+    def test_dig_x_osx_10_14_6(self):
+        """
+        Test 'dig -x' on OSX 10.14.6
+        """
+        self.assertEqual(jc.parsers.dig.parse(self.osx_10_14_6_dig_x, quiet=True), self.osx_10_14_6_dig_x_json)
+
+    def test_dig_aaaa_osx_10_14_6(self):
+        """
+        Test 'dig -aaaa' on OSX 10.14.6
+        """
+        self.assertEqual(jc.parsers.dig.parse(self.osx_10_14_6_dig_aaaa, quiet=True), self.osx_10_14_6_dig_aaaa_json)
+
+    def test_dig_axfr_osx_10_14_6(self):
+        """
+        Test 'dig axfr' on OSX 10.14.6
+        """
+        self.assertEqual(jc.parsers.dig.parse(self.osx_10_14_6_dig_axfr, quiet=True), self.osx_10_14_6_dig_axfr_json)
+
 
 if __name__ == '__main__':
     unittest.main()