Merge pull request #4 from kellyjonbrazil/dev

Dev v0.9.1

changelog.txt

@@ -1,5 +1,27 @@
 jc changelog
 
+20191023 v0.9.1
+- Add jobs parser
+- Add lsof parser
+- Add lsmod parser
+- No blocking if no piped data
+- Better help text
+- Clean up iptables parser code
+
+20191022 v0.8.1
+- Add env parser
+- Add df parser
+- Add free parser
+- Add lsblk parser
+- Add mount parser
+- Add uname parser
+- Add iptables parser
+
+20191021 v0.6.4
+- Flatten netstat parser output
+- Clean up argument parsing
+- Fix command help
+
 20191018 v0.5.5
 - Fix netstat -p parsing for Ubuntu
 - Add ps parser

jc/__init__.py

@@ -5,55 +5,67 @@
 This module serializes standard unix command line output to structured JSON
 output.
 
-Example:
+CLI Example:
 
-$ ls -al | jc | jq .
+$ ls -l /bin | jc --ls -p
 [
-    {
-        "filename": ".",
-        "suffix": Null,
-        "bytes": 224,
-        "date_updated": "Oct  1 12:09",
-        "owner_user": "joeuser",
-        "owner_group": "staff",
-        "flags": "drwxr-xr-x+",
-        "link_to": Null,
-        "links": 47
-    },
-    {
-        "filename": "..",
-        "suffix": Null,
-        "bytes": 224,
-        "date_updated": "Oct  1 12:09",
-        "owner_user": "admin",
-        "owner_group": "root",
-        "flags": "drwxr-xr-x",
-        "link_to": Null,
-        "links": 7
-    },
-    {
-        "filename": "testfile.txt",
-        "suffix": "txt",
-        "bytes": 14686,
-        "date_updated": "Oct  1 12:09",
-        "owner_user": "joeuser",
-        "owner_group": "staff",
-        "flags": "-rwxr-xr-x@",
-        "link_to": Null,
-        "links": 1
-    },
-    {
-        "filename": "ncat",
-        "suffix": Null,
-        "bytes": 14686,
-        "date_updated": "Oct  1 12:09",
-        "owner_user": "joeuser",
-        "owner_group": "staff",
-        "flags": "lrwxr-xr-x",
-        "link_to": "../Cellar/nmap/7.70/bin/ncat",
-        "links": 1
-    }
+  {
+    "filename": "bash",
+    "flags": "-r-xr-xr-x",
+    "links": 1,
+    "owner": "root",
+    "group": "wheel",
+    "bytes": 618416,
+    "date": "May 3 22:26"
+  },
+  {
+    "filename": "cat",
+    "flags": "-rwxr-xr-x",
+    "links": 1,
+    "owner": "root",
+    "group": "wheel",
+    "bytes": 23648,
+    "date": "May 3 22:26"
+  },
+  {
+    "filename": "chmod",
+    "flags": "-rwxr-xr-x",
+    "links": 1,
+    "owner": "root",
+    "group": "wheel",
+    "bytes": 30016,
+    "date": "May 3 22:26"
+  },
+  ...
 ]
+
+
+Module Example:
+
+>>> import jc.parsers.ls
+>>>
+>>> data='''-rwxr-xr-x  1 root  wheel    23648 May  3 22:26 cat
+... -rwxr-xr-x  1 root  wheel    30016 May  3 22:26 chmod
+... -rwxr-xr-x  1 root  wheel    29024 May  3 22:26 cp
+... -rwxr-xr-x  1 root  wheel   375824 May  3 22:26 csh
+... -rwxr-xr-x  1 root  wheel    28608 May  3 22:26 date
+... -rwxr-xr-x  1 root  wheel    32000 May  3 22:26 dd
+... -rwxr-xr-x  1 root  wheel    23392 May  3 22:26 df
+... -rwxr-xr-x  1 root  wheel    18128 May  3 22:26 echo'''
+>>>
+>>> jc.parsers.ls.parse(data)
+[{'filename': 'cat', 'flags': '-rwxr-xr-x', 'links': 1, 'owner': 'root', 'group': 'wheel', 
+'bytes': 23648, 'date': 'May 3 22:26'}, {'filename': 'chmod', 'flags': '-rwxr-xr-x', 'links': 1, 
+'owner': 'root', 'group': 'wheel', 'bytes': 30016, 'date': 'May 3 22:26'}, {'filename': 'cp', 
+'flags': '-rwxr-xr-x', 'links': 1, 'owner': 'root', 'group': 'wheel', 'bytes': 29024, 
+'date': 'May 3 22:26'}, {'filename': 'csh', 'flags': '-rwxr-xr-x', 'links': 1, 'owner': 'root', 
+'group': 'wheel', 'bytes': 375824, 'date': 'May 3 22:26'}, {'filename': 'date', 
+'flags': '-rwxr-xr-x', 'links': 1, 'owner': 'root', 'group': 'wheel', 'bytes': 28608, 
+'date': 'May 3 22:26'}, {'filename': 'dd', 'flags': '-rwxr-xr-x', 'links': 1, 'owner': 'root', 
+'group': 'wheel', 'bytes': 32000, 'date': 'May 3 22:26'}, {'filename': 'df', 'flags': '-rwxr-xr-x', 
+'links': 1, 'owner': 'root', 'group': 'wheel', 'bytes': 23392, 'date': 'May 3 22:26'}, 
+{'filename': 'echo', 'flags': '-rwxr-xr-x', 'links': 1, 'owner': 'root', 'group': 'wheel', 
+'bytes': 18128, 'date': 'May 3 22:26'}]
 """
 
 name = 'jc'

jc/jc.py

@@ -6,41 +6,111 @@ Main input module
 
 import sys
 import json
+import jc.parsers.df
+import jc.parsers.env
+import jc.parsers.free
 import jc.parsers.ifconfig
+import jc.parsers.iptables
+import jc.parsers.jobs
 import jc.parsers.ls
+import jc.parsers.lsblk
+import jc.parsers.lsmod
+import jc.parsers.lsof
+import jc.parsers.mount
 import jc.parsers.netstat
 import jc.parsers.ps
 import jc.parsers.route
+import jc.parsers.uname
+
+
+def helptext():
+    print('Usage:  jc [parser] [options]\n', file=sys.stderr)
+    print('Parsers:', file=sys.stderr)
+    print('        --df         df parser', file=sys.stderr)
+    print('        --env        env parser', file=sys.stderr)
+    print('        --free       free parser', file=sys.stderr)
+    print('        --ifconfig   iconfig parser', file=sys.stderr)
+    print('        --iptables   iptables parser', file=sys.stderr)
+    print('        --jobs       jobs parser', file=sys.stderr)
+    print('        --ls         ls parser', file=sys.stderr)
+    print('        --lsblk      lsblk parser', file=sys.stderr)
+    print('        --lsmod      lsmod parser', file=sys.stderr)
+    print('        --lsof       lsof parser', file=sys.stderr)
+    print('        --mount      mount parser', file=sys.stderr)
+    print('        --netstat    netstat parser', file=sys.stderr)
+    print('        --ps         ps parser', file=sys.stderr)
+    print('        --route      route parser', file=sys.stderr)
+    print('        --uname      uname parser\n', file=sys.stderr)
+    print('Options:', file=sys.stderr)
+    print('        -p           pretty print output\n', file=sys.stderr)
+    print('Example:', file=sys.stderr)
+    print('        ls -al | jc --ls -p\n', file=sys.stderr)
 
 
 def main():
-    pretty = False
-    data = sys.stdin.read()
-
-    if len(sys.argv) < 2:
-        print('Error: jc')
-        print('  Must specify parser. (e.g. --ls, --netstat, --ifconfig, etc.)')
-        print('  Use -p to pretty print')
-        print('Example: ls -al | jc --ls -p\n')
+    if sys.stdin.isatty():
+        print('jc:     missing piped data\n', file=sys.stderr)
+        helptext()
         exit()
 
-    arg = sys.argv[1]
+    data = sys.stdin.read()
+    pretty = False
 
-    if len(sys.argv) > 2:
-        if sys.argv[2] == '-p':
-            pretty = True
+    # options
+    if '-p' in sys.argv:
+        pretty = True
 
-    if arg == '--ifconfig':
+    # parsers
+    if '--df' in sys.argv:
+        result = jc.parsers.df.parse(data)
+
+    elif '--env' in sys.argv:
+        result = jc.parsers.env.parse(data)
+
+    elif '--free' in sys.argv:
+        result = jc.parsers.free.parse(data)
+
+    elif '--ifconfig' in sys.argv:
         result = jc.parsers.ifconfig.parse(data)
-    elif arg == '--ls':
+
+    elif '--iptables' in sys.argv:
+        result = jc.parsers.iptables.parse(data)
+
+    elif '--jobs' in sys.argv:
+        result = jc.parsers.jobs.parse(data)
+
+    elif '--ls' in sys.argv:
         result = jc.parsers.ls.parse(data)
-    elif arg == '--netstat':
+
+    elif '--lsblk' in sys.argv:
+        result = jc.parsers.lsblk.parse(data)
+
+    elif '--lsmod' in sys.argv:
+        result = jc.parsers.lsmod.parse(data)
+
+    elif '--lsof' in sys.argv:
+        result = jc.parsers.lsof.parse(data)
+
+    elif '--mount' in sys.argv:
+        result = jc.parsers.mount.parse(data)
+
+    elif '--netstat' in sys.argv:
         result = jc.parsers.netstat.parse(data)
-    elif arg == '--ps':
+
+    elif '--ps' in sys.argv:
         result = jc.parsers.ps.parse(data)
-    elif arg == '--route':
+
+    elif '--route' in sys.argv:
         result = jc.parsers.route.parse(data)
 
+    elif '--uname' in sys.argv:
+        result = jc.parsers.uname.parse(data)
+
+    else:
+        print('jc:     missing or incorrect arguments\n', file=sys.stderr)
+        helptext()
+        exit()
+
     # output resulting dictionary as json
     if pretty:
         print(json.dumps(result, indent=2))

jc/parsers/df.py

@@ -0,0 +1,55 @@
+"""jc - JSON CLI output utility df Parser
+
+Usage:
+    specify --df as the first argument if the piped input is coming from df
+
+Example:
+
+$ df | jc --df -p
+[
+  {
+    "Filesystem": "udev",
+    "1K-blocks": "977500",
+    "Used": "0",
+    "Available": "977500",
+    "Use%": "0%",
+    "Mounted": "/dev"
+  },
+  {
+    "Filesystem": "tmpfs",
+    "1K-blocks": "201732",
+    "Used": "1180",
+    "Available": "200552",
+    "Use%": "1%",
+    "Mounted": "/run"
+  },
+  {
+    "Filesystem": "/dev/sda2",
+    "1K-blocks": "20508240",
+    "Used": "5747284",
+    "Available": "13696152",
+    "Use%": "30%",
+    "Mounted": "/"
+  },
+  {
+    "Filesystem": "tmpfs",
+    "1K-blocks": "1008648",
+    "Used": "0",
+    "Available": "1008648",
+    "Use%": "0%",
+    "Mounted": "/dev/shm"
+  },
+  ...
+]
+"""
+
+
+def parse(data):
+
+    # code adapted from Conor Heine at:
+    # https://gist.github.com/cahna/43a1a3ff4d075bcd71f9d7120037a501
+
+    cleandata = data.splitlines()
+    headers = [h for h in ' '.join(cleandata[0].strip().split()).split() if h]
+    raw_data = map(lambda s: s.strip().split(None, len(headers) - 1), cleandata[1:])
+    return [dict(zip(headers, r)) for r in raw_data]

jc/parsers/env.py

@@ -0,0 +1,53 @@
+"""jc - JSON CLI output utility env Parser
+
+Usage:
+    specify --env as the first argument if the piped input is coming from env
+
+Example:
+$ env | jc --env -p
+[
+  {
+    "TERM": "xterm-256color"
+  },
+  {
+    "SHELL": "/bin/bash"
+  },
+  {
+    "USER": "root"
+  },
+  {
+    "PATH": "/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
+  },
+  {
+    "PWD": "/bin"
+  },
+  {
+    "LANG": "en_US.UTF-8"
+  },
+  {
+    "HOME": "/root"
+  },
+  {
+    "_": "/usr/bin/env"
+  }
+]
+"""
+
+
+def parse(data):
+    output = []
+
+    linedata = data.splitlines()
+
+    # Clear any blank lines
+    cleandata = list(filter(None, linedata))
+
+    if cleandata:
+
+        for entry in cleandata:
+            output_line = {}
+            parsed_line = entry.split('=', maxsplit=1)
+            output_line[parsed_line[0]] = parsed_line[1]
+            output.append(output_line)
+
+    return output

jc/parsers/free.py

@@ -0,0 +1,45 @@
+"""jc - JSON CLI output utility free Parser
+
+Usage:
+    specify --free as the first argument if the piped input is coming from free
+
+Example:
+
+$ free | jc --free -p
+[
+  {
+    "type": "Mem",
+    "total": "2017300",
+    "used": "213104",
+    "free": "1148452",
+    "shared": "1176",
+    "buff/cache": "655744",
+    "available": "1622204"
+  },
+  {
+    "type": "Swap",
+    "total": "2097148",
+    "used": "0",
+    "free": "2097148"
+  }
+]
+"""
+
+
+def parse(data):
+
+    # code adapted from Conor Heine at:
+    # https://gist.github.com/cahna/43a1a3ff4d075bcd71f9d7120037a501
+
+    cleandata = data.splitlines()
+    headers = [h for h in ' '.join(cleandata[0].strip().split()).split() if h]
+
+    headers.insert(0, "type")
+
+    raw_data = map(lambda s: s.strip().split(None, len(headers) - 1), cleandata[1:])
+    output = [dict(zip(headers, r)) for r in raw_data]
+
+    for entry in output:
+        entry['type'] = entry['type'].rstrip(':')
+
+    return output

jc/parsers/iptables.py

@@ -0,0 +1,364 @@
+"""jc - JSON CLI output utility ipables Parser
+
+Usage:
+    Specify --iptables as the first argument if the piped input is coming from iptables
+
+    Supports -vLn for all tables
+
+Examples:
+
+$ sudo iptables -L -t nat | jc --iptables -p
+[
+  {
+    "chain": "PREROUTING",
+    "rules": [
+      {
+        "target": "PREROUTING_direct",
+        "prot": "all",
+        "opt": "--",
+        "source": "anywhere",
+        "destination": "anywhere"
+      },
+      {
+        "target": "PREROUTING_ZONES_SOURCE",
+        "prot": "all",
+        "opt": "--",
+        "source": "anywhere",
+        "destination": "anywhere"
+      },
+      {
+        "target": "PREROUTING_ZONES",
+        "prot": "all",
+        "opt": "--",
+        "source": "anywhere",
+        "destination": "anywhere"
+      },
+      {
+        "target": "DOCKER",
+        "prot": "all",
+        "opt": "--",
+        "source": "anywhere",
+        "destination": "anywhere",
+        "options": "ADDRTYPE match dst-type LOCAL"
+      }
+    ]
+  },
+  {
+    "chain": "INPUT",
+    "rules": []
+  },
+  {
+    "chain": "OUTPUT",
+    "rules": [
+      {
+        "target": "OUTPUT_direct",
+        "prot": "all",
+        "opt": "--",
+        "source": "anywhere",
+        "destination": "anywhere"
+      },
+      {
+        "target": "DOCKER",
+        "prot": "all",
+        "opt": "--",
+        "source": "anywhere",
+        "destination": "!loopback/8",
+        "options": "ADDRTYPE match dst-type LOCAL"
+      }
+    ]
+  },
+  ...
+]
+
+$ sudo iptables -vnL -t filter | jc --iptables -p
+[
+  {
+    "chain": "INPUT",
+    "rules": [
+      {
+        "pkts": "1571",
+        "bytes": "3394K",
+        "target": "ACCEPT",
+        "prot": "all",
+        "opt": "--",
+        "in": "*",
+        "out": "*",
+        "source": "0.0.0.0/0",
+        "destination": "0.0.0.0/0",
+        "options": "ctstate RELATED,ESTABLISHED"
+      },
+      {
+        "pkts": "0",
+        "bytes": "0",
+        "target": "ACCEPT",
+        "prot": "all",
+        "opt": "--",
+        "in": "lo",
+        "out": "*",
+        "source": "0.0.0.0/0",
+        "destination": "0.0.0.0/0"
+      },
+      {
+        "pkts": "711",
+        "bytes": "60126",
+        "target": "INPUT_direct",
+        "prot": "all",
+        "opt": "--",
+        "in": "*",
+        "out": "*",
+        "source": "0.0.0.0/0",
+        "destination": "0.0.0.0/0"
+      },
+      {
+        "pkts": "711",
+        "bytes": "60126",
+        "target": "INPUT_ZONES_SOURCE",
+        "prot": "all",
+        "opt": "--",
+        "in": "*",
+        "out": "*",
+        "source": "0.0.0.0/0",
+        "destination": "0.0.0.0/0"
+      },
+      {
+        "pkts": "711",
+        "bytes": "60126",
+        "target": "INPUT_ZONES",
+        "prot": "all",
+        "opt": "--",
+        "in": "*",
+        "out": "*",
+        "source": "0.0.0.0/0",
+        "destination": "0.0.0.0/0"
+      },
+      {
+        "pkts": "0",
+        "bytes": "0",
+        "target": "DROP",
+        "prot": "all",
+        "opt": "--",
+        "in": "*",
+        "out": "*",
+        "source": "0.0.0.0/0",
+        "destination": "0.0.0.0/0",
+        "options": "ctstate INVALID"
+      },
+      {
+        "pkts": "710",
+        "bytes": "60078",
+        "target": "REJECT",
+        "prot": "all",
+        "opt": "--",
+        "in": "*",
+        "out": "*",
+        "source": "0.0.0.0/0",
+        "destination": "0.0.0.0/0",
+        "options": "reject-with icmp-host-prohibited"
+      }
+    ]
+  },
+  {
+    "chain": "FORWARD",
+    "rules": [
+      {
+        "pkts": "0",
+        "bytes": "0",
+        "target": "DOCKER-ISOLATION",
+        "prot": "all",
+        "opt": "--",
+        "in": "*",
+        "out": "*",
+        "source": "0.0.0.0/0",
+        "destination": "0.0.0.0/0"
+      },
+      {
+        "pkts": "0",
+        "bytes": "0",
+        "target": "DOCKER",
+        "prot": "all",
+        "opt": "--",
+        "in": "*",
+        "out": "docker0",
+        "source": "0.0.0.0/0",
+        "destination": "0.0.0.0/0"
+      },
+      {
+        "pkts": "0",
+        "bytes": "0",
+        "target": "ACCEPT",
+        "prot": "all",
+        "opt": "--",
+        "in": "*",
+        "out": "docker0",
+        "source": "0.0.0.0/0",
+        "destination": "0.0.0.0/0",
+        "options": "ctstate RELATED,ESTABLISHED"
+      },
+      {
+        "pkts": "0",
+        "bytes": "0",
+        "target": "ACCEPT",
+        "prot": "all",
+        "opt": "--",
+        "in": "docker0",
+        "out": "!docker0",
+        "source": "0.0.0.0/0",
+        "destination": "0.0.0.0/0"
+      },
+      {
+        "pkts": "0",
+        "bytes": "0",
+        "target": "ACCEPT",
+        "prot": "all",
+        "opt": "--",
+        "in": "docker0",
+        "out": "docker0",
+        "source": "0.0.0.0/0",
+        "destination": "0.0.0.0/0"
+      },
+      {
+        "pkts": "0",
+        "bytes": "0",
+        "target": "ACCEPT",
+        "prot": "all",
+        "opt": "--",
+        "in": "*",
+        "out": "*",
+        "source": "0.0.0.0/0",
+        "destination": "0.0.0.0/0",
+        "options": "ctstate RELATED,ESTABLISHED"
+      },
+      {
+        "pkts": "0",
+        "bytes": "0",
+        "target": "ACCEPT",
+        "prot": "all",
+        "opt": "--",
+        "in": "lo",
+        "out": "*",
+        "source": "0.0.0.0/0",
+        "destination": "0.0.0.0/0"
+      },
+      {
+        "pkts": "0",
+        "bytes": "0",
+        "target": "FORWARD_direct",
+        "prot": "all",
+        "opt": "--",
+        "in": "*",
+        "out": "*",
+        "source": "0.0.0.0/0",
+        "destination": "0.0.0.0/0"
+      },
+      {
+        "pkts": "0",
+        "bytes": "0",
+        "target": "FORWARD_IN_ZONES_SOURCE",
+        "prot": "all",
+        "opt": "--",
+        "in": "*",
+        "out": "*",
+        "source": "0.0.0.0/0",
+        "destination": "0.0.0.0/0"
+      },
+      {
+        "pkts": "0",
+        "bytes": "0",
+        "target": "FORWARD_IN_ZONES",
+        "prot": "all",
+        "opt": "--",
+        "in": "*",
+        "out": "*",
+        "source": "0.0.0.0/0",
+        "destination": "0.0.0.0/0"
+      },
+      {
+        "pkts": "0",
+        "bytes": "0",
+        "target": "FORWARD_OUT_ZONES_SOURCE",
+        "prot": "all",
+        "opt": "--",
+        "in": "*",
+        "out": "*",
+        "source": "0.0.0.0/0",
+        "destination": "0.0.0.0/0"
+      },
+      {
+        "pkts": "0",
+        "bytes": "0",
+        "target": "FORWARD_OUT_ZONES",
+        "prot": "all",
+        "opt": "--",
+        "in": "*",
+        "out": "*",
+        "source": "0.0.0.0/0",
+        "destination": "0.0.0.0/0"
+      },
+      {
+        "pkts": "0",
+        "bytes": "0",
+        "target": "DROP",
+        "prot": "all",
+        "opt": "--",
+        "in": "*",
+        "out": "*",
+        "source": "0.0.0.0/0",
+        "destination": "0.0.0.0/0",
+        "options": "ctstate INVALID"
+      },
+      {
+        "pkts": "0",
+        "bytes": "0",
+        "target": "REJECT",
+        "prot": "all",
+        "opt": "--",
+        "in": "*",
+        "out": "*",
+        "source": "0.0.0.0/0",
+        "destination": "0.0.0.0/0",
+        "options": "reject-with icmp-host-prohibited"
+      }
+    ]
+  },
+  ...
+]
+"""
+
+
+def parse(data):
+    output = []
+    chain = {}
+    headers = []
+
+    cleandata = data.splitlines()
+
+    for line in cleandata:
+
+        if line.find('Chain') == 0:
+            output.append(chain)
+            chain = {}
+            headers = []
+
+            parsed_line = line.split()
+
+            chain['chain'] = parsed_line[1]
+            chain['rules'] = []
+
+            continue
+
+        elif line.find('target') == 0 or line.find('pkts') == 1:
+            headers = []
+            headers = [h for h in ' '.join(line.strip().split()).split() if h]
+            headers.append("options")
+
+            continue
+
+        else:
+            rule = line.split(maxsplit=len(headers) - 1)
+            temp_rule = dict(zip(headers, rule))
+            if temp_rule:
+                chain['rules'].append(temp_rule)
+
+    output = list(filter(None, output))
+
+    return output

jc/parsers/jobs.py

@@ -0,0 +1,108 @@
+"""jc - JSON CLI output utility jobs Parser
+
+Usage:
+    specify --jobs as the first argument if the piped input is coming from jobs
+
+    Also supports the -l option
+
+Example:
+
+$ jobs -l | jc --jobs -p
+[
+  {
+    "job_number": 1,
+    "pid": 14798,
+    "status": "Running",
+    "command": "sleep 10000 &"
+  },
+  {
+    "job_number": 2,
+    "pid": 14799,
+    "status": "Running",
+    "command": "sleep 10001 &"
+  },
+  {
+    "job_number": 3,
+    "pid": 14800,
+    "status": "Running",
+    "command": "sleep 10002 &"
+  },
+  {
+    "job_number": 4,
+    "pid": 14814,
+    "history": "previous",
+    "status": "Running",
+    "command": "sleep 10003 &"
+  },
+  {
+    "job_number": 5,
+    "pid": 14815,
+    "history": "current",
+    "status": "Running",
+    "command": "sleep 10004 &"
+  }
+]
+"""
+
+
+import string
+
+
+def parse(data):
+    output = []
+
+    linedata = data.splitlines()
+
+    # Clear any blank lines
+    cleandata = list(filter(None, linedata))
+
+    if cleandata:
+
+        for entry in cleandata:
+            output_line = {}
+            remainder = []
+            job_number = ''
+            pid = ''
+            job_history = ''
+
+            parsed_line = entry.split(maxsplit=2)
+
+            # check if -l was used
+            if parsed_line[1][0] in string.digits:
+                pid = parsed_line.pop(1)
+                remainder = parsed_line.pop(1)
+                job_number = parsed_line.pop(0)
+                remainder = remainder.split(maxsplit=1)
+                
+                # rebuild parsed_line
+                parsed_line = []
+
+                for r in remainder:
+                    parsed_line.append(r)
+
+                parsed_line.insert(0, job_number)
+
+            # check for + or - in first field
+            if parsed_line[0].find('+') != -1:
+                job_history = 'current'
+                parsed_line[0] = parsed_line[0].rstrip('+')
+
+            if parsed_line[0].find('-') != -1:
+                job_history = 'previous'
+                parsed_line[0] = parsed_line[0].rstrip('-')
+
+            # clean up first field
+            parsed_line[0] = parsed_line[0].lstrip('[').rstrip(']')
+
+            # create list of dictionaries
+            output_line['job_number'] = int(parsed_line[0])
+            if pid:
+                output_line['pid'] = int(pid)
+            if job_history:
+                output_line['history'] = job_history
+            output_line['status'] = parsed_line[1]
+            output_line['command'] = parsed_line[2]
+
+            output.append(output_line)
+
+    return output

jc/parsers/ls.py

@@ -72,7 +72,7 @@ $ ls -al /usr/bin | jc --ls -p
   ...
 ]
 
-$ $ ls -l /usr/bin | jc --ls | jq .[] | jq 'select(.bytes > 50000000)'
+$ $ ls -l /usr/bin | jc --ls | jq '.[] | 'select(.bytes > 50000000)'
 {
   "filename": "emacs",
   "flags": "-r-xr-xr-x",

jc/parsers/lsblk.py

@@ -0,0 +1,70 @@
+"""jc - JSON CLI output utility lsblk Parser
+
+Usage:
+    specify --lsblk as the first argument if the piped input is coming from lsblk
+
+Example:
+
+$ lsblk | jc --lsblk -p
+[
+  {
+    "NAME": "loop0",
+    "MAJ:MIN": "7:0",
+    "RM": "0",
+    "SIZE": "54.5M",
+    "RO": "1",
+    "TYPE": "loop",
+    "MOUNTPOINT": "/snap/core18/1223"
+  },
+  {
+    "NAME": "sda",
+    "MAJ:MIN": "8:0",
+    "RM": "0",
+    "SIZE": "20G",
+    "RO": "0",
+    "TYPE": "disk"
+  },
+  {
+    "NAME": "sda1",
+    "MAJ:MIN": "8:1",
+    "RM": "0",
+    "SIZE": "1M",
+    "RO": "0",
+    "TYPE": "part"
+  },
+  {
+    "NAME": "sda2",
+    "MAJ:MIN": "8:2",
+    "RM": "0",
+    "SIZE": "20G",
+    "RO": "0",
+    "TYPE": "part",
+    "MOUNTPOINT": "/"
+  },
+  {
+    "NAME": "sr0",
+    "MAJ:MIN": "11:0",
+    "RM": "1",
+    "SIZE": "64.8M",
+    "RO": "0",
+    "TYPE": "rom"
+  }
+]
+"""
+
+
+def parse(data):
+
+    # code adapted from Conor Heine at:
+    # https://gist.github.com/cahna/43a1a3ff4d075bcd71f9d7120037a501
+
+    cleandata = data.splitlines()
+    headers = [h for h in ' '.join(cleandata[0].strip().split()).split() if h]
+
+    raw_data = map(lambda s: s.strip().split(None, len(headers) - 1), cleandata[1:])
+    output = [dict(zip(headers, r)) for r in raw_data]
+
+    for entry in output:
+        entry['NAME'] = entry['NAME'].encode('ascii', errors='ignore').decode()
+
+    return output

jc/parsers/lsmod.py

@@ -0,0 +1,80 @@
+"""jc - JSON CLI output utility lsmod Parser
+
+Usage:
+    specify --lsmod as the first argument if the piped input is coming from lsmod
+
+Example:
+
+$ lsmod | jc --lsmod -p
+[
+ {
+    "Module": "nf_nat_ipv4",
+    "Size": "14115",
+    "Used": "1",
+    "By": [
+      "iptable_nat"
+    ]
+  },
+  {
+    "Module": "nf_nat",
+    "Size": "26583",
+    "Used": "3",
+    "By": [
+      "nf_nat_ipv4",
+      "nf_nat_ipv6",
+      "nf_nat_masquerade_ipv4"
+    ]
+  },
+  {
+    "Module": "iptable_mangle",
+    "Size": "12695",
+    "Used": "1"
+  },
+  {
+    "Module": "iptable_security",
+    "Size": "12705",
+    "Used": "1"
+  },
+  {
+    "Module": "iptable_raw",
+    "Size": "12678",
+    "Used": "1"
+  },
+  {
+    "Module": "nf_conntrack",
+    "Size": "139224",
+    "Used": "7",
+    "By": [
+      "nf_nat",
+      "nf_nat_ipv4",
+      "nf_nat_ipv6",
+      "xt_conntrack",
+      "nf_nat_masquerade_ipv4",
+      "nf_conntrack_ipv4",
+      "nf_conntrack_ipv6"
+    ]
+  },
+  ...
+]
+"""
+
+
+def parse(data):
+
+    # code adapted from Conor Heine at:
+    # https://gist.github.com/cahna/43a1a3ff4d075bcd71f9d7120037a501
+
+    cleandata = data.splitlines()
+    headers = [h for h in ' '.join(cleandata[0].strip().split()).split() if h]
+
+    headers.pop(-1)
+    headers.append('By')
+
+    raw_data = map(lambda s: s.strip().split(None, len(headers) - 1), cleandata[1:])
+    output = [dict(zip(headers, r)) for r in raw_data]
+
+    for mod in output:
+        if 'By' in mod:
+            mod['By'] = mod['By'].split(',')
+
+    return output

jc/parsers/lsof.py

@@ -0,0 +1,117 @@
+"""jc - JSON CLI output utility lsof Parser
+
+Usage:
+    specify --lsof as the first argument if the piped input is coming from lsof
+
+    Limitations:
+        No additional columns are supported
+
+Example:
+
+$ sudo lsof | jc --lsof -p
+[
+  {
+    "COMMAND": "systemd",
+    "PID": "1",
+    "TID": null,
+    "USER": "root",
+    "FD": "cwd",
+    "TYPE": "DIR",
+    "DEVICE": "253,0",
+    "SIZE/OFF": "224",
+    "NODE": "64",
+    "NAME": "/"
+  },
+  {
+    "COMMAND": "systemd",
+    "PID": "1",
+    "TID": null,
+    "USER": "root",
+    "FD": "rtd",
+    "TYPE": "DIR",
+    "DEVICE": "253,0",
+    "SIZE/OFF": "224",
+    "NODE": "64",
+    "NAME": "/"
+  },
+  {
+    "COMMAND": "systemd",
+    "PID": "1",
+    "TID": null,
+    "USER": "root",
+    "FD": "txt",
+    "TYPE": "REG",
+    "DEVICE": "253,0",
+    "SIZE/OFF": "1624520",
+    "NODE": "50360451",
+    "NAME": "/usr/lib/systemd/systemd"
+  },
+  {
+    "COMMAND": "systemd",
+    "PID": "1",
+    "TID": null,
+    "USER": "root",
+    "FD": "mem",
+    "TYPE": "REG",
+    "DEVICE": "253,0",
+    "SIZE/OFF": "20064",
+    "NODE": "8146",
+    "NAME": "/usr/lib64/libuuid.so.1.3.0"
+  },
+  {
+    "COMMAND": "systemd",
+    "PID": "1",
+    "TID": null,
+    "USER": "root",
+    "FD": "mem",
+    "TYPE": "REG",
+    "DEVICE": "253,0",
+    "SIZE/OFF": "265600",
+    "NODE": "8147",
+    "NAME": "/usr/lib64/libblkid.so.1.1.0"
+  },
+  ...
+]
+"""
+
+
+def parse(data):
+    output = []
+
+    linedata = data.splitlines()
+
+    # Clear any blank lines
+    cleandata = list(filter(None, linedata))
+
+    if cleandata:
+
+        # find column value of last character of each header
+        header_row = cleandata.pop(0)
+        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:
+                if spec[1] == 'COMMAND' or spec[1] == 'NAME':
+                    continue
+                if entry[spec[2] - 1] == ' ':
+                    temp_line.insert(spec[0], None)
+
+            name = ' '.join(temp_line[9:])
+            fixed_line = temp_line[0:9]
+            fixed_line.append(name)
+
+            output_line = dict(zip(headers, fixed_line))
+            output.append(output_line)
+
+    return output

jc/parsers/mount.py

@@ -0,0 +1,75 @@
+"""jc - JSON CLI output utility mount Parser
+
+Usage:
+    specify --mount as the first argument if the piped input is coming from mount
+
+Example:
+
+$ mount | jc --mount -p
+[
+  {
+    "filesystem": "sysfs",
+    "mount_point": "/sys",
+    "type": "sysfs",
+    "access": [
+      "rw",
+      "nosuid",
+      "nodev",
+      "noexec",
+      "relatime"
+    ]
+  },
+  {
+    "filesystem": "proc",
+    "mount_point": "/proc",
+    "type": "proc",
+    "access": [
+      "rw",
+      "nosuid",
+      "nodev",
+      "noexec",
+      "relatime"
+    ]
+  },
+  {
+    "filesystem": "udev",
+    "mount_point": "/dev",
+    "type": "devtmpfs",
+    "access": [
+      "rw",
+      "nosuid",
+      "relatime",
+      "size=977500k",
+      "nr_inodes=244375",
+      "mode=755"
+    ]
+  },
+  ...
+]
+"""
+
+
+def parse(data):
+    output = []
+
+    linedata = data.splitlines()
+
+    # Clear any blank lines
+    cleandata = list(filter(None, linedata))
+
+    if cleandata:
+        for entry in cleandata:
+            output_line = {}
+            parsed_line = entry.split()
+
+            output_line['filesystem'] = parsed_line[0]
+            output_line['mount_point'] = parsed_line[2]
+            output_line['type'] = parsed_line[4]
+
+            access = parsed_line[5].lstrip('(').rstrip(')').split(',')
+
+            output_line['access'] = access
+
+            output.append(output_line)
+
+    return output

jc/parsers/netstat.py

@@ -11,154 +11,145 @@ Limitations:
 Examples:
 
 $ netstat -p | jc --netstat -p
-{
-  "client": {
-    "tcp": {
-      "ipv4": [
-        {
-          "local_address": "localhost.localdo",
-          "local_port": "34480",
-          "foreign_address": "lb-192-30-255-113",
-          "foreign_port": "https",
-          "state": "ESTABLISHED",
-          "pid": 53550,
-          "program_name": "git-remote-ht",
-          "receive_q": 0,
-          "send_q": 0
-        },
-        {
-          "local_address": "localhost.localdo",
-          "local_port": "34478",
-          "foreign_address": "lb-192-30-255-113",
-          "foreign_port": "https",
-          "state": "ESTABLISHED",
-          "pid": 53550,
-          "program_name": "git-remote-ht",
-          "receive_q": 0,
-          "send_q": 0
-        }
-      ]
-    }
+[
+  {
+    "transport_protocol": "tcp",
+    "network_protocol": "ipv4",
+    "local_address": "localhost.localdo",
+    "local_port": "34480",
+    "foreign_address": "lb-192-30-255-113",
+    "foreign_port": "https",
+    "state": "ESTABLISHED",
+    "pid": 53550,
+    "program_name": "git-remote-ht",
+    "receive_q": 0,
+    "send_q": 0
+  },
+  {
+    "transport_protocol": "tcp",
+    "network_protocol": "ipv4",
+    "local_address": "localhost.localdo",
+    "local_port": "34478",
+    "foreign_address": "lb-192-30-255-113",
+    "foreign_port": "https",
+    "state": "ESTABLISHED",
+    "pid": 53550,
+    "program_name": "git-remote-ht",
+    "receive_q": 0,
+    "send_q": 0
   }
-}
+]
 
-$ netstat -lp | jc --netstat -p
-{
-  "server": {
-    "tcp": {
-      "ipv4": [
-        {
-          "local_address": "localhost",
-          "local_port": "smtp",
-          "foreign_address": "0.0.0.0",
-          "foreign_port": "*",
-          "state": "LISTEN",
-          "pid": 1594,
-          "program_name": "master",
-          "receive_q": 0,
-          "send_q": 0
-        },
-        {
-          "local_address": "0.0.0.0",
-          "local_port": "ssh",
-          "foreign_address": "0.0.0.0",
-          "foreign_port": "*",
-          "state": "LISTEN",
-          "pid": 21918,
-          "program_name": "sshd",
-          "receive_q": 0,
-          "send_q": 0
-        }
-      ],
-      "ipv6": [
-        {
-          "local_address": "localhost",
-          "local_port": "smtp",
-          "foreign_address": "[::]",
-          "foreign_port": "*",
-          "state": "LISTEN",
-          "pid": 1594,
-          "program_name": "master",
-          "receive_q": 0,
-          "send_q": 0
-        },
-        {
-          "local_address": "[::]",
-          "local_port": "ssh",
-          "foreign_address": "[::]",
-          "foreign_port": "*",
-          "state": "LISTEN",
-          "pid": 21918,
-          "program_name": "sshd",
-          "receive_q": 0,
-          "send_q": 0
-        }
-      ]
-    },
-    "udp": {
-      "ipv4": [
-        {
-          "local_address": "0.0.0.0",
-          "local_port": "bootpc",
-          "foreign_address": "0.0.0.0",
-          "foreign_port": "*",
-          "pid": 13903,
-          "program_name": "dhclient",
-          "receive_q": 0,
-          "send_q": 0
-        },
-        {
-          "local_address": "localhost",
-          "local_port": "323",
-          "foreign_address": "0.0.0.0",
-          "foreign_port": "*",
-          "pid": 30926,
-          "program_name": "chronyd",
-          "receive_q": 0,
-          "send_q": 0
-        }
-      ],
-      "ipv6": [
-        {
-          "local_address": "localhost",
-          "local_port": "323",
-          "foreign_address": "[::]",
-          "foreign_port": "*",
-          "pid": 30926,
-          "program_name": "chronyd",
-          "receive_q": 0,
-          "send_q": 0
-        }
-      ]
-    }
+$ netstat -lpn | jc --netstat -p
+[
+  {
+    "transport_protocol": "tcp",
+    "network_protocol": "ipv4",
+    "local_address": "127.0.0.1",
+    "local_port": "42351",
+    "foreign_address": "0.0.0.0",
+    "foreign_port": "*",
+    "state": "LISTEN",
+    "pid": 1112,
+    "program_name": "containerd",
+    "receive_q": 0,
+    "send_q": 0
+  },
+  {
+    "transport_protocol": "tcp",
+    "network_protocol": "ipv4",
+    "local_address": "127.0.0.53",
+    "local_port": "53",
+    "foreign_address": "0.0.0.0",
+    "foreign_port": "*",
+    "state": "LISTEN",
+    "pid": 885,
+    "program_name": "systemd-resolve",
+    "receive_q": 0,
+    "send_q": 0
+  },
+  {
+    "transport_protocol": "tcp",
+    "network_protocol": "ipv4",
+    "local_address": "0.0.0.0",
+    "local_port": "22",
+    "foreign_address": "0.0.0.0",
+    "foreign_port": "*",
+    "state": "LISTEN",
+    "pid": 1127,
+    "program_name": "sshd",
+    "receive_q": 0,
+    "send_q": 0
+  },
+  {
+    "transport_protocol": "tcp",
+    "network_protocol": "ipv6",
+    "local_address": "::",
+    "local_port": "22",
+    "foreign_address": "::",
+    "foreign_port": "*",
+    "state": "LISTEN",
+    "pid": 1127,
+    "program_name": "sshd",
+    "receive_q": 0,
+    "send_q": 0
+  },
+  {
+    "transport_protocol": "udp",
+    "network_protocol": "ipv4",
+    "local_address": "127.0.0.53",
+    "local_port": "53",
+    "foreign_address": "0.0.0.0",
+    "foreign_port": "*",
+    "pid": 885,
+    "program_name": "systemd-resolve",
+    "receive_q": 0,
+    "send_q": 0
+  },
+  {
+    "transport_protocol": "udp",
+    "network_protocol": "ipv4",
+    "local_address": "192.168.71.131",
+    "local_port": "68",
+    "foreign_address": "0.0.0.0",
+    "foreign_port": "*",
+    "pid": 867,
+    "program_name": "systemd-network",
+    "receive_q": 0,
+    "send_q": 0
   }
-}
+]
 """
 import string
 
-output = {}
-
-
-class state():
-    section = ''
-    session = ''
-    network = ''
-
-    client_tcp_ip4 = []
-    client_tcp_ip6 = []
-    client_udp_ip4 = []
-    client_udp_ip6 = []
-
-    server_tcp_ip4 = []
-    server_tcp_ip6 = []
-    server_udp_ip4 = []
-    server_udp_ip6 = []
+output = []
 
 
 def parse_line(entry):
-    parsed_line = entry.split()
     output_line = {}
 
+    if entry.find('tcp') == 0:
+        output_line['transport_protocol'] = 'tcp'
+
+        if entry.find('p6') == 2:
+            output_line['network_protocol'] = 'ipv6'
+
+        else:
+            output_line['network_protocol'] = 'ipv4'
+
+    elif entry.find('udp') == 0:
+        output_line['transport_protocol'] = 'udp'
+
+        if entry.find('p6') == 2:
+            output_line['network_protocol'] = 'ipv6'
+
+        else:
+            output_line['network_protocol'] = 'ipv4'
+    else:
+        return
+
+    parsed_line = entry.split()
+
     output_line['local_address'] = parsed_line[3].rsplit(':', 1)[0]
     output_line['local_port'] = parsed_line[3].rsplit(':', 1)[-1]
     output_line['foreign_address'] = parsed_line[4].rsplit(':', 1)[0]
@@ -189,11 +180,9 @@ def parse(data):
     for line in cleandata:
 
         if line.find('Active Internet connections (w/o servers)') == 0:
-            state.section = 'client'
             continue
 
         if line.find('Active Internet connections (only servers)') == 0:
-            state.section = 'server'
             continue
 
         if line.find('Proto') == 0:
@@ -202,119 +191,7 @@ def parse(data):
         if line.find('Active UNIX') == 0:
             break
 
-        if state.section == 'client':
-            if line.find('tcp') == 0:
-                state.session = 'tcp'
-                if line.find('p6') == 2:
-                    state.network = 'ipv6'
-                else:
-                    state.network = 'ipv4'
-            elif line.find('udp') == 0:
-                state.session = 'udp'
-                if line.find('p6') == 2:
-                    state.network = 'ipv6'
-                else:
-                    state.network = 'ipv4'
-        elif state.section == 'server':
-            if line.find('tcp') == 0:
-                state.session = 'tcp'
-                if line.find('p6') == 2:
-                    state.network = 'ipv6'
-                else:
-                    state.network = 'ipv4'
-            elif line.find('udp') == 0:
-                state.session = 'udp'
-                if line.find('p6') == 2:
-                    state.network = 'ipv6'
-                else:
-                    state.network = 'ipv4'
+        output.append(parse_line(line))
 
-        # client section
-        if state.section == 'client' and state.session == 'tcp' and state.network == 'ipv4':
-            state.client_tcp_ip4.append(parse_line(line))
-
-        if state.section == 'client' and state.session == 'tcp' and state.network == 'ipv6':
-            state.client_tcp_ip6.append(parse_line(line))
-
-        if state.section == 'client' and state.session == 'udp' and state.network == 'ipv4':
-            state.client_udp_ip4.append(parse_line(line))
-
-        if state.section == 'client' and state.session == 'udp' and state.network == 'ipv6':
-            state.client_udp_ip6.append(parse_line(line))
-
-        # server section
-        if state.section == 'server' and state.session == 'tcp' and state.network == 'ipv4':
-            state.server_tcp_ip4.append(parse_line(line))
-
-        if state.section == 'server' and state.session == 'tcp' and state.network == 'ipv6':
-            state.server_tcp_ip6.append(parse_line(line))
-
-        if state.section == 'server' and state.session == 'udp' and state.network == 'ipv4':
-            state.server_udp_ip4.append(parse_line(line))
-
-        if state.section == 'server' and state.session == 'udp' and state.network == 'ipv6':
-            state.server_udp_ip6.append(parse_line(line))
-
-        state.session = ''
-        state.network = ''
-
-    # build dictionary
-    # client section
-    if state.client_tcp_ip4:
-        if 'client' not in output:
-            output['client'] = {}
-        if 'tcp' not in output['client']:
-            output['client']['tcp'] = {}
-        output['client']['tcp']['ipv4'] = state.client_tcp_ip4
-
-    if state.client_tcp_ip6:
-        if 'client' not in output:
-            output['client'] = {}
-        if 'tcp' not in output['client']:
-            output['client']['tcp'] = {}
-        output['client']['tcp']['ipv6'] = state.client_tcp_ip6
-
-    if state.client_udp_ip4:
-        if 'client' not in output:
-            output['client'] = {}
-        if 'udp' not in output['client']:
-            output['client']['udp'] = {}
-        output['client']['udp']['ipv4'] = state.client_udp_ip4
-
-    if state.client_udp_ip6:
-        if 'client' not in output:
-            output['client'] = {}
-        if 'udp' not in output['client']:
-            output['client']['udp'] = {}
-        output['client']['udp']['ipv6'] = state.client_udp_ip6
-
-    # server section
-    if state.server_tcp_ip4:
-        if 'server' not in output:
-            output['server'] = {}
-        if 'tcp' not in output['server']:
-            output['server']['tcp'] = {}
-        output['server']['tcp']['ipv4'] = state.server_tcp_ip4
-
-    if state.server_tcp_ip6:
-        if 'server' not in output:
-            output['server'] = {}
-        if 'tcp' not in output['server']:
-            output['server']['tcp'] = {}
-        output['server']['tcp']['ipv6'] = state.server_tcp_ip6
-
-    if state.server_udp_ip4:
-        if 'server' not in output:
-            output['server'] = {}
-        if 'udp' not in output['server']:
-            output['server']['udp'] = {}
-        output['server']['udp']['ipv4'] = state.server_udp_ip4
-
-    if state.server_udp_ip6:
-        if 'server' not in output:
-            output['server'] = {}
-        if 'udp' not in output['server']:
-            output['server']['udp'] = {}
-        output['server']['udp']['ipv6'] = state.server_udp_ip6
-
-    return output
+    clean_output = list(filter(None, output))
+    return clean_output

jc/parsers/uname.py

@@ -0,0 +1,42 @@
+"""jc - JSON CLI output utility uname Parser
+
+Usage:
+    specify --uname as the first argument if the piped input is coming from uname
+
+Limitations:
+    must use 'uname -a'
+
+Example:
+
+$ uname -a | jc --uname -p
+{
+  "kernel_name": "Linux",
+  "node_name": "user-ubuntu",
+  "kernel_release": "4.15.0-65-generic",
+  "operating_system": "GNU/Linux",
+  "hardware_platform": "x86_64",
+  "processor": "x86_64",
+  "machine": "x86_64",
+  "kernel_version": "#74-Ubuntu SMP Tue Sep 17 17:06:04 UTC 2019"
+}
+"""
+
+
+def parse(data):
+    output = {}
+    parsed_line = data.split(maxsplit=3)
+
+    output['kernel_name'] = parsed_line.pop(0)
+    output['node_name'] = parsed_line.pop(0)
+    output['kernel_release'] = parsed_line.pop(0)
+
+    parsed_line = parsed_line[-1].rsplit(maxsplit=4)
+
+    output['operating_system'] = parsed_line.pop(-1)
+    output['hardware_platform'] = parsed_line.pop(-1)
+    output['processor'] = parsed_line.pop(-1)
+    output['machine'] = parsed_line.pop(-1)
+
+    output['kernel_version'] = parsed_line.pop(0)
+
+    return output

setup.py

@@ -5,7 +5,7 @@ with open('README.md', 'r') as f:
 
 setuptools.setup(
     name='jc',
-    version='0.5.5',
+    version='0.9.1',
     author='Kelly Brazil',
     author_email='kellyjonbrazil@gmail.com',
     description='This tool serializes the output of popular command line tools to structured JSON output.',