Merge pull request #76 from kellyjonbrazil/dev

Dev v1.13.2

CHANGELOG

@@ -1,5 +1,67 @@
 jc changelog
 
+20200803 v1.13.2
+- Add key/value file parser (wrapper for ini parser)
+- Add date command parser
+- Update traceroute parser to more gracefully handle missing header row
+- Update traceroute parser to handle annotations
+- Update traceroute parser to only return successful probes
+
+20200727 v1.13.1
+- Add route -6 tests
+
+20200727 v1.13.0
+- Add ping and ping6 command parser tested on linux, macos, and freebsd
+- Add traceroute and traceroute6 command parser tested on linux, macos, and freebsd
+- Add tracepath command parser tested on linux
+- Update ini parser to support files only containing key/value pairs
+- Update uname parser exception with a hint to use "uname -a"
+- Update route parser to support IPv6 tables
+
+20200711 v1.12.1
+- Fix tests when using older version of pygments library
+
+20200710 v1.12.0
+- Add sysctl command parser tested on linux, macOS, and freebsd
+- Update the cli code to allow older versions of the pygments library (2.3.0) for debian packaging
+- Code cleanup on the cli
+- Add tests for the cli
+- Vendorize cgitb as tracebackplus for verbose debug messages
+
+20200625 v1.11.8
+- Add verbose debug option using -dd argument
+
+20200622 v1.11.7
+- Fix iptables parser issue which would not output the last chain
+
+20200614 v1.11.6
+- Improve and standardize empty data check for all parsers
+
+20200612 v1.11.5
+- Update airport_s parser to fix error on parsing empty data
+- Update arp parser to fix error on parsing empty data
+- Update blkid parser to fix error on parsing empty data
+- Update crontab parser to fix error on parsing empty data
+- Update crontab_u parser to fix error on parsing empty data
+- Update df parser to fix error on parsing empty data
+- Update free parser to fix error on parsing empty data
+- Update lsblk parser to fix error on parsing empty data
+- Update lsmod parser to fix error on parsing empty data
+- Update mount parser to fix error on parsing empty data
+- Update netstat parser to fix error on parsing empty data
+- Update ntpq parser to fix error on parsing empty data
+- Update ps parser to fix error on parsing empty data
+- Update route parser to fix error on parsing empty data
+- Update systemctl parser to fix error on parsing empty data
+- Update systemctl_lj parser to fix error on parsing empty data
+- Update systemctl_ls parser to fix error on parsing empty data
+- Update systemctl_luf parser to fix error on parsing empty data
+- Update uptime parser to fix error on parsing empty data
+- Update w parser to fix error on parsing empty data
+- Update xml parser to fix error on parsing empty data
+- Add tests to all parsers for no data condition
+- Update ss parser to fix integer fields
+
 20200610 v1.11.4
 - Update ls parser to fix error on parsing an empty directory
 

docgen.sh

@@ -11,6 +11,7 @@ pydocmd simple jc.parsers.blkid+ > ../docs/parsers/blkid.md
 pydocmd simple jc.parsers.crontab+ > ../docs/parsers/crontab.md
 pydocmd simple jc.parsers.crontab_u+ > ../docs/parsers/crontab_u.md
 pydocmd simple jc.parsers.csv+ > ../docs/parsers/csv.md
+pydocmd simple jc.parsers.date+ > ../docs/parsers/date.md
 pydocmd simple jc.parsers.df+ > ../docs/parsers/df.md
 pydocmd simple jc.parsers.dig+ > ../docs/parsers/dig.md
 pydocmd simple jc.parsers.dmidecode+ > ../docs/parsers/dmidecode.md
@@ -28,6 +29,7 @@ pydocmd simple jc.parsers.ifconfig+ > ../docs/parsers/ifconfig.md
 pydocmd simple jc.parsers.ini+ > ../docs/parsers/ini.md
 pydocmd simple jc.parsers.iptables+ > ../docs/parsers/iptables.md
 pydocmd simple jc.parsers.jobs+ > ../docs/parsers/jobs.md
+pydocmd simple jc.parsers.kv+ > ../docs/parsers/kv.md
 pydocmd simple jc.parsers.last+ > ../docs/parsers/last.md
 pydocmd simple jc.parsers.ls+ > ../docs/parsers/ls.md
 pydocmd simple jc.parsers.lsblk+ > ../docs/parsers/lsblk.md
@@ -37,6 +39,7 @@ pydocmd simple jc.parsers.mount+ > ../docs/parsers/mount.md
 pydocmd simple jc.parsers.netstat+ > ../docs/parsers/netstat.md
 pydocmd simple jc.parsers.ntpq+ > ../docs/parsers/ntpq.md
 pydocmd simple jc.parsers.passwd+ > ../docs/parsers/passwd.md
+pydocmd simple jc.parsers.ping+ > ../docs/parsers/ping.md
 pydocmd simple jc.parsers.pip_list+ > ../docs/parsers/pip_list.md
 pydocmd simple jc.parsers.pip_show+ > ../docs/parsers/pip_show.md
 pydocmd simple jc.parsers.ps+ > ../docs/parsers/ps.md
@@ -44,11 +47,14 @@ pydocmd simple jc.parsers.route+ > ../docs/parsers/route.md
 pydocmd simple jc.parsers.shadow+ > ../docs/parsers/shadow.md
 pydocmd simple jc.parsers.ss+ > ../docs/parsers/ss.md
 pydocmd simple jc.parsers.stat+ > ../docs/parsers/stat.md
+pydocmd simple jc.parsers.sysctl+ > ../docs/parsers/sysctl.md
 pydocmd simple jc.parsers.systemctl+ > ../docs/parsers/systemctl.md
 pydocmd simple jc.parsers.systemctl_lj+ > ../docs/parsers/systemctl_lj.md
 pydocmd simple jc.parsers.systemctl_ls+ > ../docs/parsers/systemctl_ls.md
 pydocmd simple jc.parsers.systemctl_luf+ > ../docs/parsers/systemctl_luf.md
 pydocmd simple jc.parsers.timedatectl+ > ../docs/parsers/timedatectl.md
+pydocmd simple jc.parsers.tracepath+ > ../docs/parsers/tracepath.md
+pydocmd simple jc.parsers.traceroute+ > ../docs/parsers/traceroute.md
 pydocmd simple jc.parsers.uname+ > ../docs/parsers/uname.md
 pydocmd simple jc.parsers.uptime+ > ../docs/parsers/uptime.md
 pydocmd simple jc.parsers.w+ > ../docs/parsers/w.md

docs/parsers/airport.md

@@ -1,3 +1,4 @@
+
 # jc.parsers.airport
 jc - JSON CLI output utility airport -I Parser
 
@@ -52,11 +53,13 @@ Examples:
       "channel": "48,80"
     }
 
+
 ## info
 ```python
-info(self, /, *args, **kwargs)
+info()
 ```
 
+
 ## process
 ```python
 process(proc_data)
@@ -90,6 +93,7 @@ Returns:
       "channel":           string
     }
 
+
 ## parse
 ```python
 parse(data, raw=False, quiet=False)

docs/parsers/airport_s.md

@@ -1,3 +1,4 @@
+
 # jc.parsers.airport_s
 jc - JSON CLI output utility airport -s Parser
 
@@ -84,11 +85,13 @@ Examples:
       ...
     ]
 
+
 ## info
 ```python
-info(self, /, *args, **kwargs)
+info()
 ```
 
+
 ## process
 ```python
 process(proc_data)
@@ -117,6 +120,7 @@ Returns:
       }
     ]
 
+
 ## parse
 ```python
 parse(data, raw=False, quiet=False)

docs/parsers/arp.md

@@ -1,3 +1,4 @@
+
 # jc.parsers.arp
 jc - JSON CLI output utility arp Parser
 
@@ -95,11 +96,13 @@ Examples:
       }
     ]
 
+
 ## info
 ```python
-info(self, /, *args, **kwargs)
+info()
 ```
 
+
 ## process
 ```python
 process(proc_data)
@@ -128,6 +131,7 @@ Returns:
       }
     ]
 
+
 ## parse
 ```python
 parse(data, raw=False, quiet=False)

docs/parsers/blkid.md

@@ -1,3 +1,4 @@
+
 # jc.parsers.blkid
 jc - JSON CLI output utility blkid Parser
 
@@ -75,11 +76,13 @@ Examples:
       }
     ]
 
+
 ## info
 ```python
-info(self, /, *args, **kwargs)
+info()
 ```
 
+
 ## process
 ```python
 process(proc_data)
@@ -129,6 +132,7 @@ Returns:
       }
     ]
 
+
 ## parse
 ```python
 parse(data, raw=False, quiet=False)

docs/parsers/crontab.md

@@ -1,3 +1,4 @@
+
 # jc.parsers.crontab
 jc - JSON CLI output utility crontab command and file Parser
 
@@ -128,11 +129,13 @@ Examples:
       ]
     }
 
+
 ## info
 ```python
-info(self, /, *args, **kwargs)
+info()
 ```
 
+
 ## process
 ```python
 process(proc_data)
@@ -178,6 +181,7 @@ Returns:
     }
 
 
+
 ## parse
 ```python
 parse(data, raw=False, quiet=False)

docs/parsers/crontab_u.md

@@ -1,3 +1,4 @@
+
 # jc.parsers.crontab_u
 jc - JSON CLI output utility crontab file Parser
 
@@ -129,11 +130,13 @@ Examples:
 
 
 
+
 ## info
 ```python
-info(self, /, *args, **kwargs)
+info()
 ```
 
+
 ## process
 ```python
 process(proc_data)
@@ -180,6 +183,7 @@ Returns:
     }
 
 
+
 ## parse
 ```python
 parse(data, raw=False, quiet=False)

docs/parsers/csv.md

@@ -1,3 +1,4 @@
+
 # jc.parsers.csv
 jc - JSON CLI output utility csv Parser
 
@@ -59,11 +60,13 @@ Examples:
       ...
     ]
 
+
 ## info
 ```python
-info(self, /, *args, **kwargs)
+info()
 ```
 
+
 ## process
 ```python
 process(proc_data)
@@ -86,6 +89,7 @@ Returns:
       }
     ]
 
+
 ## parse
 ```python
 parse(data, raw=False, quiet=False)

docs/parsers/date.md

@@ -0,0 +1,93 @@
+
+# jc.parsers.date
+jc - JSON CLI output utility date Parser
+
+Usage:
+
+    specify --date as the first argument if the piped input is coming from date
+
+Compatibility:
+
+    'linux', 'darwin', 'freebsd'
+
+Examples:
+
+    $ date | jc --date -p
+    {
+      "year": 2020,
+      "month_num": 7,
+      "day": 31,
+      "hour": 16,
+      "minute": 48,
+      "second": 11,
+      "month": "Jul",
+      "weekday": "Fri",
+      "weekday_num": 6,
+      "timezone": "PDT"
+    }
+
+    $ date | jc --date -p -r
+    {
+      "year": "2020",
+      "month": "Jul",
+      "day": "31",
+      "weekday": "Fri",
+      "hour": "16",
+      "minute": "50",
+      "second": "01",
+      "timezone": "PDT"
+    }
+
+
+## info
+```python
+info()
+```
+
+
+## process
+```python
+process(proc_data)
+```
+
+Final processing to conform to the schema.
+
+Parameters:
+
+    proc_data:   (dictionary) raw structured data to process
+
+Returns:
+
+    Dictionary. Structured data with the following schema:
+
+    {
+      "year":         integer,
+      "month_num":    integer,
+      "day":          integer,
+      "hour":         integer,
+      "minute":       integer,
+      "second":       integer,
+      "month":        string,
+      "weekday":      string,
+      "weekday_num":  integer,
+      "timezone":     string
+    }
+
+
+## parse
+```python
+parse(data, raw=False, quiet=False)
+```
+
+Main text parsing function
+
+Parameters:
+
+    data:        (string)  text data to parse
+    raw:         (boolean) output preprocessed JSON if True
+    quiet:       (boolean) suppress warning messages if True
+
+Returns:
+
+    Dictionary. Raw or processed structured data.
+

docs/parsers/df.md

@@ -1,3 +1,4 @@
+
 # jc.parsers.df
 jc - JSON CLI output utility df Parser
 
@@ -69,11 +70,13 @@ Examples:
       ...
     ]
 
+
 ## info
 ```python
-info(self, /, *args, **kwargs)
+info()
 ```
 
+
 ## process
 ```python
 process(proc_data)
@@ -106,6 +109,7 @@ Returns:
       }
     ]
 
+
 ## parse
 ```python
 parse(data, raw=False, quiet=False)

docs/parsers/dig.md

@@ -1,3 +1,4 @@
+
 # jc.parsers.dig
 jc - JSON CLI output utility dig Parser
 
@@ -321,11 +322,13 @@ Examples:
       }
     ]
 
+
 ## info
 ```python
-info(self, /, *args, **kwargs)
+info()
 ```
 
+
 ## process
 ```python
 process(proc_data)
@@ -393,6 +396,7 @@ Returns:
       }
     ]
 
+
 ## parse
 ```python
 parse(data, raw=False, quiet=False)

docs/parsers/dmidecode.md

@@ -1,3 +1,4 @@
+
 # jc.parsers.dmidecode
 jc - JSON CLI output utility dmidecode Parser
 
@@ -99,11 +100,13 @@ Examples:
       ...
     ]
 
+
 ## info
 ```python
-info(self, /, *args, **kwargs)
+info()
 ```
 
+
 ## process
 ```python
 process(proc_data)
@@ -134,6 +137,7 @@ Returns:
       }
     ]
 
+
 ## parse
 ```python
 parse(data, raw=False, quiet=False)

docs/parsers/du.md

@@ -1,3 +1,4 @@
+
 # jc.parsers.du
 jc - JSON CLI output utility du Parser
 
@@ -69,11 +70,13 @@ Examples:
       ...
     ]
 
+
 ## info
 ```python
-info(self, /, *args, **kwargs)
+info()
 ```
 
+
 ## process
 ```python
 process(proc_data)
@@ -96,6 +99,7 @@ Returns:
       }
     ]
 
+
 ## parse
 ```python
 parse(data, raw=False, quiet=False)

docs/parsers/env.md

@@ -1,3 +1,4 @@
+
 # jc.parsers.env
 jc - JSON CLI output utility env Parser
 
@@ -49,11 +50,13 @@ Examples:
       "_": "/usr/bin/env"
     }
 
+
 ## info
 ```python
-info(self, /, *args, **kwargs)
+info()
 ```
 
+
 ## process
 ```python
 process(proc_data)
@@ -76,6 +79,7 @@ Returns:
       }
     ]
 
+
 ## parse
 ```python
 parse(data, raw=False, quiet=False)

docs/parsers/file.md

@@ -1,3 +1,4 @@
+
 # jc.parsers.file
 jc - JSON CLI output utility file command Parser
 
@@ -44,11 +45,13 @@ Examples:
       ...
     ]
 
+
 ## info
 ```python
-info(self, /, *args, **kwargs)
+info()
 ```
 
+
 ## process
 ```python
 process(proc_data)
@@ -71,6 +74,7 @@ Returns:
       }
     ]
 
+
 ## parse
 ```python
 parse(data, raw=False, quiet=False)

docs/parsers/free.md

@@ -1,3 +1,4 @@
+
 # jc.parsers.free
 jc - JSON CLI output utility free Parser
 
@@ -49,11 +50,13 @@ Examples:
       }
     ]
 
+
 ## info
 ```python
-info(self, /, *args, **kwargs)
+info()
 ```
 
+
 ## process
 ```python
 process(proc_data)
@@ -81,6 +84,7 @@ Returns:
       }
     ]
 
+
 ## parse
 ```python
 parse(data, raw=False, quiet=False)

docs/parsers/fstab.md

@@ -1,3 +1,4 @@
+
 # jc.parsers.fstab
 jc - JSON CLI output utility fstab Parser
 
@@ -67,11 +68,13 @@ Examples:
       }
     ]
 
+
 ## info
 ```python
-info(self, /, *args, **kwargs)
+info()
 ```
 
+
 ## process
 ```python
 process(proc_data)
@@ -98,6 +101,7 @@ Returns:
       }
     ]
 
+
 ## parse
 ```python
 parse(data, raw=False, quiet=False)

docs/parsers/group.md

@@ -1,3 +1,4 @@
+
 # jc.parsers.group
 jc - JSON CLI output utility /etc/group file Parser
 
@@ -91,11 +92,13 @@ Examples:
       ...
     ]
 
+
 ## info
 ```python
-info(self, /, *args, **kwargs)
+info()
 ```
 
+
 ## process
 ```python
 process(proc_data)
@@ -122,6 +125,7 @@ Returns:
       }
     ]
 
+
 ## parse
 ```python
 parse(data, raw=False, quiet=False)

docs/parsers/gshadow.md

@@ -1,3 +1,4 @@
+
 # jc.parsers.gshadow
 jc - JSON CLI output utility /etc/gshadow file Parser
 
@@ -57,11 +58,13 @@ Examples:
       ...
     ]
 
+
 ## info
 ```python
-info(self, /, *args, **kwargs)
+info()
 ```
 
+
 ## process
 ```python
 process(proc_data)
@@ -90,6 +93,7 @@ Returns:
       }
     ]
 
+
 ## parse
 ```python
 parse(data, raw=False, quiet=False)

docs/parsers/history.md

@@ -1,3 +1,4 @@
+
 # jc.parsers.history
 jc - JSON CLI output utility history Parser
 
@@ -41,11 +42,13 @@ Examples:
       ...
     }
 
+
 ## info
 ```python
-info(self, /, *args, **kwargs)
+info()
 ```
 
+
 ## process
 ```python
 process(proc_data)
@@ -68,6 +71,7 @@ Returns:
       }
     ]
 
+
 ## parse
 ```python
 parse(data, raw=False, quiet=False)

docs/parsers/hosts.md

@@ -1,3 +1,4 @@
+
 # jc.parsers.hosts
 jc - JSON CLI output utility hosts Parser
 
@@ -58,11 +59,13 @@ Examples:
       }
     ]
 
+
 ## info
 ```python
-info(self, /, *args, **kwargs)
+info()
 ```
 
+
 ## process
 ```python
 process(proc_data)
@@ -87,6 +90,7 @@ Returns:
       }
     ]
 
+
 ## parse
 ```python
 parse(data, raw=False, quiet=False)

docs/parsers/id.md

@@ -1,3 +1,4 @@
+
 # jc.parsers.id
 jc - JSON CLI output utility id Parser
 
@@ -67,11 +68,13 @@ Examples:
       }
     }
 
+
 ## info
 ```python
-info(self, /, *args, **kwargs)
+info()
 ```
 
+
 ## process
 ```python
 process(proc_data)
@@ -114,6 +117,7 @@ Returns:
       }
     }
 
+
 ## parse
 ```python
 parse(data, raw=False, quiet=False)

docs/parsers/ifconfig.md

@@ -1,3 +1,4 @@
+
 # jc.parsers.ifconfig
 jc - JSON CLI output utility ifconfig Parser
 
@@ -142,19 +143,16 @@ Examples:
       }
     ]
 
+
 ## info
 ```python
-info(self, /, *args, **kwargs)
+info()
 ```
 
+
 ## IfconfigParser
 ```python
-IfconfigParser(self, console_output)
-```
-
-## InterfaceNotFound
-```python
-InterfaceNotFound(self, /, *args, **kwargs)
+IfconfigParser(console_output)
 ```
 
 
@@ -206,6 +204,7 @@ Returns:
       }
     ]
 
+
 ## parse
 ```python
 parse(data, raw=False, quiet=False)

docs/parsers/ini.md

@@ -1,9 +1,12 @@
+
 # jc.parsers.ini
 jc - JSON CLI output utility INI Parser
 
 Usage:
 
-    specify --ini as the first argument if the piped input is coming from an INI file
+    Specify --ini as the first argument if the piped input is coming from an INI file or any
+    simple key/value pair file. Delimiter can be '=' or ':'. Missing values are supported.
+    Comment prefix can be '#' or ';'. Comments must be on their own line.
 
 Compatibility:
 
@@ -43,11 +46,13 @@ Examples:
       }
     }
 
+
 ## info
 ```python
-info(self, /, *args, **kwargs)
+info()
 ```
 
+
 ## process
 ```python
 process(proc_data)
@@ -61,13 +66,17 @@ Parameters:
 
 Returns:
 
-    Dictionary representing an ini document:
+    Dictionary representing an ini or simple key/value pair document:
 
     {
-      ini document converted to a dictionary
-      see configparser standard library documentation for more details
+      ini or key/value document converted to a dictionary - see configparser standard
+      library documentation for more details.
+
+      Note: Values starting and ending with quotation marks will have the marks removed.
+            If you would like to keep the quotation marks, use the -r or raw=True argument.
     }
 
+
 ## parse
 ```python
 parse(data, raw=False, quiet=False)

docs/parsers/iptables.md

@@ -1,3 +1,4 @@
+
 # jc.parsers.iptables
 jc - JSON CLI output utility ipables Parser
 
@@ -131,11 +132,13 @@ Examples:
       ...
     ]
 
+
 ## info
 ```python
-info(self, /, *args, **kwargs)
+info()
 ```
 
+
 ## process
 ```python
 process(proc_data)
@@ -172,6 +175,7 @@ Returns:
       }
     ]
 
+
 ## parse
 ```python
 parse(data, raw=False, quiet=False)

docs/parsers/jobs.md

@@ -1,3 +1,4 @@
+
 # jc.parsers.jobs
 jc - JSON CLI output utility jobs Parser
 
@@ -73,11 +74,13 @@ Example:
       }
     ]
 
+
 ## info
 ```python
-info(self, /, *args, **kwargs)
+info()
 ```
 
+
 ## process
 ```python
 process(proc_data)
@@ -103,6 +106,7 @@ Returns:
       }
     ]
 
+
 ## parse
 ```python
 parse(data, raw=False, quiet=False)

docs/parsers/kv.md

@@ -0,0 +1,61 @@
+
+# jc.parsers.kv
+jc - JSON CLI output utility Key/Value File Parser
+
+Usage:
+
+    Specify --kv as the first argument if the piped input is coming from a simple
+    key/value pair file. Delimiter can be '=' or ':'. Missing values are supported.
+    Comment prefix can be '#' or ';'. Comments must be on their own line.
+
+Compatibility:
+
+    'linux', 'darwin', 'cygwin', 'win32', 'aix', 'freebsd'
+
+Examples:
+
+    $ cat keyvalue.txt
+    # this file contains key/value pairs
+    name = John Doe
+    address=555 California Drive
+    age: 34
+    ; comments can include # or ;
+    # delimiter can be = or :
+    # quoted values have quotation marks stripped by default
+    # but can be preserved with the -r argument
+    occupation:"Engineer"
+
+    $ cat keyvalue.txt | jc --ini -p
+    {
+      "name": "John Doe",
+      "address": "555 California Drive",
+      "age": "34",
+      "occupation": "Engineer"
+    }
+
+
+## info
+```python
+info()
+```
+
+
+## parse
+```python
+parse(data, raw=False, quiet=False)
+```
+
+Main text parsing function
+
+    Note: this is just a wrapper for jc.parsers.ini
+
+Parameters:
+
+    data:        (string)  text data to parse
+    raw:         (boolean) output preprocessed JSON if True
+    quiet:       (boolean) suppress warning messages if True
+
+Returns:
+
+    Dictionary representing the key/value file
+

docs/parsers/last.md

@@ -1,3 +1,4 @@
+
 # jc.parsers.last
 jc - JSON CLI output utility last Parser
 
@@ -68,11 +69,13 @@ Examples:
     ]
 
 
+
 ## info
 ```python
-info(self, /, *args, **kwargs)
+info()
 ```
 
+
 ## process
 ```python
 process(proc_data)
@@ -99,6 +102,7 @@ Returns:
       }
     ]
 
+
 ## parse
 ```python
 parse(data, raw=False, quiet=False)

docs/parsers/ls.md

@@ -1,3 +1,4 @@
+
 # jc.parsers.ls
 jc - JSON CLI output utility ls Parser
 
@@ -145,11 +146,13 @@ Examples:
       "date": "May 3 2019"
     }
 
+
 ## info
 ```python
-info(self, /, *args, **kwargs)
+info()
 ```
 
+
 ## process
 ```python
 process(proc_data)
@@ -178,6 +181,7 @@ Returns:
       }
     ]
 
+
 ## parse
 ```python
 parse(data, raw=False, quiet=False)

docs/parsers/lsblk.md

@@ -1,3 +1,4 @@
+
 # jc.parsers.lsblk
 jc - JSON CLI output utility lsblk Parser
 
@@ -212,11 +213,13 @@ Examples:
       ...
     ]
 
+
 ## info
 ```python
-info(self, /, *args, **kwargs)
+info()
 ```
 
+
 ## process
 ```python
 process(proc_data)
@@ -277,6 +280,7 @@ Returns:
       }
     ]
 
+
 ## parse
 ```python
 parse(data, raw=False, quiet=False)

docs/parsers/lsmod.md

@@ -1,3 +1,4 @@
+
 # jc.parsers.lsmod
 jc - JSON CLI output utility lsmod Parser
 
@@ -103,11 +104,13 @@ Examples:
       ...
     ]
 
+
 ## info
 ```python
-info(self, /, *args, **kwargs)
+info()
 ```
 
+
 ## process
 ```python
 process(proc_data)
@@ -134,6 +137,7 @@ Returns:
       }
     ]
 
+
 ## parse
 ```python
 parse(data, raw=False, quiet=False)

docs/parsers/lsof.md

@@ -1,3 +1,4 @@
+
 # jc.parsers.lsof
 jc - JSON CLI output utility lsof Parser
 
@@ -93,11 +94,13 @@ Examples:
       ...
     ]
 
+
 ## info
 ```python
-info(self, /, *args, **kwargs)
+info()
 ```
 
+
 ## process
 ```python
 process(proc_data)
@@ -128,6 +131,7 @@ Returns:
       }
     ]
 
+
 ## parse
 ```python
 parse(data, raw=False, quiet=False)

docs/parsers/mount.md

@@ -1,3 +1,4 @@
+
 # jc.parsers.mount
 jc - JSON CLI output utility mount Parser
 
@@ -53,11 +54,13 @@ Example:
       ...
     ]
 
+
 ## info
 ```python
-info(self, /, *args, **kwargs)
+info()
 ```
 
+
 ## process
 ```python
 process(proc_data)
@@ -84,6 +87,7 @@ Returns:
       }
     ]
 
+
 ## parse
 ```python
 parse(data, raw=False, quiet=False)

docs/parsers/netstat.md

@@ -1,3 +1,4 @@
+
 # jc.parsers.netstat
 jc - JSON CLI output utility netstat Parser
 
@@ -245,11 +246,13 @@ Examples:
       }
     ]
 
+
 ## info
 ```python
-info(self, /, *args, **kwargs)
+info()
 ```
 
+
 ## process
 ```python
 process(proc_data)
@@ -364,6 +367,7 @@ Returns:
       }
     ]
 
+
 ## parse
 ```python
 parse(data, raw=False, quiet=False)

docs/parsers/ntpq.md

@@ -1,3 +1,4 @@
+
 # jc.parsers.ntpq
 jc - JSON CLI output utility ntpq Parser
 
@@ -179,11 +180,13 @@ Examples:
       }
     ]
 
+
 ## info
 ```python
-info(self, /, *args, **kwargs)
+info()
 ```
 
+
 ## process
 ```python
 process(proc_data)
@@ -216,6 +219,7 @@ Returns:
     ]
 
 
+
 ## parse
 ```python
 parse(data, raw=False, quiet=False)

docs/parsers/passwd.md

@@ -1,3 +1,4 @@
+
 # jc.parsers.passwd
 jc - JSON CLI output utility /etc/passwd file Parser
 
@@ -75,11 +76,13 @@ Examples:
       ...
     ]
 
+
 ## info
 ```python
-info(self, /, *args, **kwargs)
+info()
 ```
 
+
 ## process
 ```python
 process(proc_data)
@@ -107,6 +110,7 @@ Returns:
       }
     ]
 
+
 ## parse
 ```python
 parse(data, raw=False, quiet=False)

docs/parsers/ping.md

@@ -0,0 +1,175 @@
+
+# jc.parsers.ping
+jc - JSON CLI output utility ping Parser
+
+Usage:
+
+    specify --ping as the first argument if the piped input is coming from ping
+
+    Note:  Use the ping -c (count) option, otherwise data will not be piped to jc.
+
+Compatibility:
+
+    'linux', 'darwin', 'freebsd'
+
+Examples:
+
+    $ ping -c 3 -p ff cnn.com | jc --ping -p
+    {
+      "destination_ip": "151.101.1.67",
+      "data_bytes": 56,
+      "pattern": "0xff",
+      "destination": "cnn.com",
+      "packets_transmitted": 3,
+      "packets_received": 3,
+      "packet_loss_percent": 0.0,
+      "duplicates": 0,
+      "round_trip_ms_min": 28.015,
+      "round_trip_ms_avg": 32.848,
+      "round_trip_ms_max": 39.376,
+      "round_trip_ms_stddev": 4.79,
+      "responses": [
+        {
+          "type": "reply",
+          "bytes": 64,
+          "response_ip": "151.101.1.67",
+          "icmp_seq": 0,
+          "ttl": 59,
+          "time_ms": 28.015,
+          "duplicate": false
+        },
+        {
+          "type": "reply",
+          "bytes": 64,
+          "response_ip": "151.101.1.67",
+          "icmp_seq": 1,
+          "ttl": 59,
+          "time_ms": 39.376,
+          "duplicate": false
+        },
+        {
+          "type": "reply",
+          "bytes": 64,
+          "response_ip": "151.101.1.67",
+          "icmp_seq": 2,
+          "ttl": 59,
+          "time_ms": 31.153,
+          "duplicate": false
+        }
+      ]
+    }
+
+
+    $ ping -c 3 -p ff cnn.com | jc --ping -p -r
+    {
+      "destination_ip": "151.101.129.67",
+      "data_bytes": "56",
+      "pattern": "0xff",
+      "destination": "cnn.com",
+      "packets_transmitted": "3",
+      "packets_received": "3",
+      "packet_loss_percent": "0.0",
+      "duplicates": "0",
+      "round_trip_ms_min": "25.078",
+      "round_trip_ms_avg": "29.543",
+      "round_trip_ms_max": "32.553",
+      "round_trip_ms_stddev": "3.221",
+      "responses": [
+        {
+          "type": "reply",
+          "bytes": "64",
+          "response_ip": "151.101.129.67",
+          "icmp_seq": "0",
+          "ttl": "59",
+          "time_ms": "25.078",
+          "duplicate": false
+        },
+        {
+          "type": "reply",
+          "bytes": "64",
+          "response_ip": "151.101.129.67",
+          "icmp_seq": "1",
+          "ttl": "59",
+          "time_ms": "30.999",
+          "duplicate": false
+        },
+        {
+          "type": "reply",
+          "bytes": "64",
+          "response_ip": "151.101.129.67",
+          "icmp_seq": "2",
+          "ttl": "59",
+          "time_ms": "32.553",
+          "duplicate": false
+        }
+      ]
+    }
+
+
+## info
+```python
+info()
+```
+
+
+## process
+```python
+process(proc_data)
+```
+
+Final processing to conform to the schema.
+
+Parameters:
+
+    proc_data:   (dictionary) raw structured data to process
+
+Returns:
+
+    Dictionary. Structured data with the following schema:
+
+    {
+      "source_ip":                   string,
+      "destination_ip":              string,
+      "data_bytes":                  integer,
+      "pattern":                     string,        (null if not set)
+      "destination":                 string,
+      "packets_transmitted":         integer,
+      "packets_received":            integer,
+      "packet_loss_percent":         float,
+      "duplicates":                  integer,
+      "round_trip_ms_min":           float,
+      "round_trip_ms_avg":           float,
+      "round_trip_ms_max":           float,
+      "round_trip_ms_stddev":        float,
+      "responses": [
+        {
+          "type":                    string,        ('reply' or 'timeout')
+          "timestamp":               float,
+          "bytes":                   integer,
+          "response_ip":             string,
+          "icmp_seq":                integer,
+          "ttl":                     integer,
+          "time_ms":                 float,
+          "duplicate":               boolean
+        }
+      ]
+    }
+
+
+## parse
+```python
+parse(data, raw=False, quiet=False)
+```
+
+Main text parsing function
+
+Parameters:
+
+    data:        (string)  text data to parse
+    raw:         (boolean) output preprocessed JSON if True
+    quiet:       (boolean) suppress warning messages if True
+
+Returns:
+
+    Dictionary. Raw or processed structured data.
+

docs/parsers/pip_list.md

@@ -1,3 +1,4 @@
+
 # jc.parsers.pip_list
 jc - JSON CLI output utility pip-list Parser
 
@@ -28,11 +29,13 @@ Examples:
       ...
     ]
 
+
 ## info
 ```python
-info(self, /, *args, **kwargs)
+info()
 ```
 
+
 ## process
 ```python
 process(proc_data)
@@ -56,6 +59,7 @@ Returns:
       }
     ]
 
+
 ## parse
 ```python
 parse(data, raw=False, quiet=False)

docs/parsers/pip_show.md

@@ -1,3 +1,4 @@
+
 # jc.parsers.pip_show
 jc - JSON CLI output utility pip-show Parser
 
@@ -39,11 +40,13 @@ Examples:
       }
     ]
 
+
 ## info
 ```python
-info(self, /, *args, **kwargs)
+info()
 ```
 
+
 ## process
 ```python
 process(proc_data)
@@ -75,6 +78,7 @@ Returns:
     ]
 
 
+
 ## parse
 ```python
 parse(data, raw=False, quiet=False)

docs/parsers/ps.md

@@ -1,3 +1,4 @@
+
 # jc.parsers.ps
 jc - JSON CLI output utility ps Parser
 
@@ -173,11 +174,13 @@ Examples:
       ...
     ]
 
+
 ## info
 ```python
-info(self, /, *args, **kwargs)
+info()
 ```
 
+
 ## process
 ```python
 process(proc_data)
@@ -215,6 +218,7 @@ Returns:
       }
     ]
 
+
 ## parse
 ```python
 parse(data, raw=False, quiet=False)

docs/parsers/route.md

@@ -1,3 +1,4 @@
+
 # jc.parsers.route
 jc - JSON CLI output utility route Parser
 
@@ -80,11 +81,13 @@ Examples:
     ]
 
 
+
 ## info
 ```python
-info(self, /, *args, **kwargs)
+info()
 ```
 
+
 ## process
 ```python
 process(proc_data)
@@ -119,6 +122,7 @@ Returns:
       }
     ]
 
+
 ## parse
 ```python
 parse(data, raw=False, quiet=False)

docs/parsers/shadow.md

@@ -1,3 +1,4 @@
+
 # jc.parsers.shadow
 jc - JSON CLI output utility /etc/shadow file Parser
 
@@ -81,11 +82,13 @@ Examples:
       ...
     ]
 
+
 ## info
 ```python
-info(self, /, *args, **kwargs)
+info()
 ```
 
+
 ## process
 ```python
 process(proc_data)
@@ -114,6 +117,7 @@ Returns:
       }
     ]
 
+
 ## parse
 ```python
 parse(data, raw=False, quiet=False)

docs/parsers/ss.md

@@ -1,3 +1,4 @@
+
 # jc.parsers.ss
 jc - JSON CLI output utility ss Parser
 
@@ -247,11 +248,13 @@ Examples:
         }
       ]
 
+
 ## info
 ```python
-info(self, /, *args, **kwargs)
+info()
 ```
 
+
 ## process
 ```python
 process(proc_data)
@@ -289,6 +292,7 @@ Returns:
 
     Information from https://www.cyberciti.biz/files/ss.html used to define field names
 
+
 ## parse
 ```python
 parse(data, raw=False, quiet=False)

docs/parsers/stat.md

@@ -1,3 +1,4 @@
+
 # jc.parsers.stat
 jc - JSON CLI output utility stat Parser
 
@@ -101,11 +102,13 @@ Examples:
       ..
     ]
 
+
 ## info
 ```python
-info(self, /, *args, **kwargs)
+info()
 ```
 
+
 ## process
 ```python
 process(proc_data)
@@ -149,6 +152,7 @@ Returns:
       }
     ]
 
+
 ## parse
 ```python
 parse(data, raw=False, quiet=False)

docs/parsers/sysctl.md

@@ -0,0 +1,88 @@
+
+# jc.parsers.sysctl
+jc - JSON CLI output utility sysctl -a Parser
+
+Usage:
+
+    specify --sysctl as the first argument if the piped input is coming from sysctl -a
+
+    Note: since sysctl output is not easily parsable only a very simple key/value object
+          will be output. An attempt is made to convert obvious integers and floats. If no
+          conversion is desired, use the -r (raw) option.
+
+Compatibility:
+
+    'linux', 'darwin', 'freebsd'
+
+Examples:
+
+    $ sysctl | jc --sysctl -p
+    {
+      "user.cs_path": "/usr/bin:/bin:/usr/sbin:/sbin",
+      "user.bc_base_max": 99,
+      "user.bc_dim_max": 2048,
+      "user.bc_scale_max": 99,
+      "user.bc_string_max": 1000,
+      "user.coll_weights_max": 2,
+      "user.expr_nest_max": 32
+      ...
+    }
+
+    $ sysctl | jc --sysctl -p -r
+    {
+      "user.cs_path": "/usr/bin:/bin:/usr/sbin:/sbin",
+      "user.bc_base_max": "99",
+      "user.bc_dim_max": "2048",
+      "user.bc_scale_max": "99",
+      "user.bc_string_max": "1000",
+      "user.coll_weights_max": "2",
+      "user.expr_nest_max": "32",
+      ...
+    }
+
+
+## info
+```python
+info()
+```
+
+
+## process
+```python
+process(proc_data)
+```
+
+Final processing to conform to the schema.
+
+Parameters:
+
+    proc_data:   (dictionary) raw structured data to process
+
+Returns:
+
+    Dictionary. Structured data with the following schema:
+
+    {
+      "foo":     string/integer/float,         # best guess based on value
+      "bar":     string/integer/float,
+      "baz":     string/integer/float
+    }
+
+
+## parse
+```python
+parse(data, raw=False, quiet=False)
+```
+
+Main text parsing function
+
+Parameters:
+
+    data:        (string)  text data to parse
+    raw:         (boolean) output preprocessed JSON if True
+    quiet:       (boolean) suppress warning messages if True
+
+Returns:
+
+    Dictionary. Raw or processed structured data.
+

docs/parsers/systemctl.md

@@ -1,3 +1,4 @@
+
 # jc.parsers.systemctl
 jc - JSON CLI output utility systemctl Parser
 
@@ -37,11 +38,13 @@ Examples:
       ...
     ]
 
+
 ## info
 ```python
-info(self, /, *args, **kwargs)
+info()
 ```
 
+
 ## process
 ```python
 process(proc_data)
@@ -67,6 +70,7 @@ Returns:
       }
     ]
 
+
 ## parse
 ```python
 parse(data, raw=False, quiet=False)

docs/parsers/systemctl_lj.md

@@ -1,3 +1,4 @@
+
 # jc.parsers.systemctl_lj
 jc - JSON CLI output utility systemctl-lj Parser
 
@@ -56,11 +57,13 @@ Examples:
     ]
 
 
+
 ## info
 ```python
-info(self, /, *args, **kwargs)
+info()
 ```
 
+
 ## process
 ```python
 process(proc_data)
@@ -85,6 +88,7 @@ Returns:
       }
     ]
 
+
 ## parse
 ```python
 parse(data, raw=False, quiet=False)

docs/parsers/systemctl_ls.md

@@ -1,3 +1,4 @@
+
 # jc.parsers.systemctl_ls
 jc - JSON CLI output utility systemctl-ls Parser
 
@@ -31,11 +32,13 @@ Examples:
       ...
     ]
 
+
 ## info
 ```python
-info(self, /, *args, **kwargs)
+info()
 ```
 
+
 ## process
 ```python
 process(proc_data)
@@ -59,6 +62,7 @@ Returns:
       }
     ]
 
+
 ## parse
 ```python
 parse(data, raw=False, quiet=False)

docs/parsers/systemctl_luf.md

@@ -1,3 +1,4 @@
+
 # jc.parsers.systemctl_luf
 jc - JSON CLI output utility systemctl-luf Parser
 
@@ -28,11 +29,13 @@ Examples:
       ...
     ]
 
+
 ## info
 ```python
-info(self, /, *args, **kwargs)
+info()
 ```
 
+
 ## process
 ```python
 process(proc_data)
@@ -55,6 +58,7 @@ Returns:
       }
     ]
 
+
 ## parse
 ```python
 parse(data, raw=False, quiet=False)

docs/parsers/timedatectl.md

@@ -1,3 +1,4 @@
+
 # jc.parsers.timedatectl
 jc - JSON CLI output utility timedatectl Parser
 
@@ -35,11 +36,13 @@ Examples:
       "dst_active": "yes"
     }
 
+
 ## info
 ```python
-info(self, /, *args, **kwargs)
+info()
 ```
 
+
 ## process
 ```python
 process(proc_data)
@@ -68,6 +71,7 @@ Returns:
       "dst_active":                        boolean
     }
 
+
 ## parse
 ```python
 parse(data, raw=False, quiet=False)

docs/parsers/tracepath.md

@@ -0,0 +1,162 @@
+
+# jc.parsers.tracepath
+jc - JSON CLI output utility tracepath Parser
+
+Usage:
+
+    specify --tracepath as the first argument if the piped input is coming from tracepath
+
+Compatibility:
+
+    'linux'
+
+Examples:
+
+    $ tracepath6 3ffe:2400:0:109::2 | jc --tracepath -p
+    {
+      "pmtu": 1480,
+      "forward_hops": 2,
+      "return_hops": 2,
+      "hops": [
+        {
+          "ttl": 1,
+          "guess": true,
+          "host": "[LOCALHOST]",
+          "reply_ms": null,
+          "pmtu": 1500,
+          "asymmetric_difference": null,
+          "reached": false
+        },
+        {
+          "ttl": 1,
+          "guess": false,
+          "host": "dust.inr.ac.ru",
+          "reply_ms": 0.411,
+          "pmtu": null,
+          "asymmetric_difference": null,
+          "reached": false
+        },
+        {
+          "ttl": 2,
+          "guess": false,
+          "host": "dust.inr.ac.ru",
+          "reply_ms": 0.39,
+          "pmtu": 1480,
+          "asymmetric_difference": 1,
+          "reached": false
+        },
+        {
+          "ttl": 2,
+          "guess": false,
+          "host": "3ffe:2400:0:109::2",
+          "reply_ms": 463.514,
+          "pmtu": null,
+          "asymmetric_difference": null,
+          "reached": true
+        }
+      ]
+    }
+
+    $ tracepath6 3ffe:2400:0:109::2 | jc --tracepath -p -r
+    {
+      "pmtu": "1480",
+      "forward_hops": "2",
+      "return_hops": "2",
+      "hops": [
+        {
+          "ttl": "1",
+          "guess": true,
+          "host": "[LOCALHOST]",
+          "reply_ms": null,
+          "pmtu": "1500",
+          "asymmetric_difference": null,
+          "reached": false
+        },
+        {
+          "ttl": "1",
+          "guess": false,
+          "host": "dust.inr.ac.ru",
+          "reply_ms": "0.411",
+          "pmtu": null,
+          "asymmetric_difference": null,
+          "reached": false
+        },
+        {
+          "ttl": "2",
+          "guess": false,
+          "host": "dust.inr.ac.ru",
+          "reply_ms": "0.390",
+          "pmtu": "1480",
+          "asymmetric_difference": "1",
+          "reached": false
+        },
+        {
+          "ttl": "2",
+          "guess": false,
+          "host": "3ffe:2400:0:109::2",
+          "reply_ms": "463.514",
+          "pmtu": null,
+          "asymmetric_difference": null,
+          "reached": true
+        }
+      ]
+    }
+
+
+
+## info
+```python
+info()
+```
+
+
+## process
+```python
+process(proc_data)
+```
+
+Final processing to conform to the schema.
+
+Parameters:
+
+    proc_data:   (dictionary) raw structured data to process
+
+Returns:
+
+    Dictionary. Structured data with the following schema:
+
+    {
+      "pmtu":                       integer,
+      "forward_hops":               integer,
+      "return_hops":                integer,
+      "hops": [
+        {
+          "ttl":                    integer,
+          "guess":                  boolean,
+          "host":                   string,
+          "reply_ms":               float,
+          "pmtu":                   integer,
+          "asymmetric_difference":  integer,
+          "reached":                boolean
+        }
+      ]
+    }
+
+
+## parse
+```python
+parse(data, raw=False, quiet=False)
+```
+
+Main text parsing function
+
+Parameters:
+
+    data:        (string)  text data to parse
+    raw:         (boolean) output preprocessed JSON if True
+    quiet:       (boolean) suppress warning messages if True
+
+Returns:
+
+    Dictionary. Raw or processed structured data.
+

docs/parsers/traceroute.md

@@ -0,0 +1,155 @@
+
+# jc.parsers.traceroute
+jc - JSON CLI output utility traceroute Parser
+
+Usage:
+
+    specify --traceroute as the first argument if the piped input is coming from traceroute
+
+    Note: On some operating systems you will need to redirect STDERR to STDOUT for destination
+          info since the header line is sent to STDERR. A warning message will be printed to
+          STDERR if the header row is not found.
+
+          e.g. $ traceroute 8.8.8.8 2>&1 | jc --traceroute
+
+Compatibility:
+
+    'linux', 'darwin', 'freebsd'
+
+Examples:
+
+    $ traceroute google.com | jc --traceroute -p
+    {
+      "destination_ip": "216.58.194.46",
+      "destination_name": "google.com",
+      "hops": [
+        {
+          "hop": 1,
+          "probes": [
+            {
+              "annotation": null,
+              "asn": null,
+              "ip": "216.230.231.141",
+              "name": "216-230-231-141.static.houston.tx.oplink.net",
+              "rtt": 198.574
+            },
+            {
+              "annotation": null,
+              "asn": null,
+              "ip": "216.230.231.141",
+              "name": "216-230-231-141.static.houston.tx.oplink.net",
+              "rtt": null
+            },
+            {
+              "annotation": null,
+              "asn": null,
+              "ip": "216.230.231.141",
+              "name": "216-230-231-141.static.houston.tx.oplink.net",
+              "rtt": 198.65
+            }
+          ]
+        },
+        ...
+      ]
+    }
+
+    $ traceroute google.com  | jc --traceroute -p -r
+    {
+      "destination_ip": "216.58.194.46",
+      "destination_name": "google.com",
+      "hops": [
+        {
+          "hop": "1",
+          "probes": [
+            {
+              "annotation": null,
+              "asn": null,
+              "ip": "216.230.231.141",
+              "name": "216-230-231-141.static.houston.tx.oplink.net",
+              "rtt": "198.574"
+            },
+            {
+              "annotation": null,
+              "asn": null,
+              "ip": "216.230.231.141",
+              "name": "216-230-231-141.static.houston.tx.oplink.net",
+              "rtt": null
+            },
+            {
+              "annotation": null,
+              "asn": null,
+              "ip": "216.230.231.141",
+              "name": "216-230-231-141.static.houston.tx.oplink.net",
+              "rtt": "198.650"
+            }
+          ]
+        },
+        ...
+      ]
+    }
+
+
+## info
+```python
+info()
+```
+
+
+## Hop
+```python
+Hop(idx)
+```
+
+
+## process
+```python
+process(proc_data)
+```
+
+Final processing to conform to the schema.
+
+Parameters:
+
+    proc_data:   (dictionary) raw structured data to process
+
+Returns:
+
+    Dictionary. Structured data with the following schema:
+
+    {
+      "destination_ip":         string,
+      "destination_name":       string,
+      "hops": [
+        {
+          "hop":                integer,
+          "probes": [
+            {
+              "annotation":     string,
+              "asn":            integer,
+              "ip":             string,
+              "name":           string,
+              "rtt":            float
+            }
+          ]
+        }
+      ]
+    }
+
+
+## parse
+```python
+parse(data, raw=False, quiet=False)
+```
+
+Main text parsing function
+
+Parameters:
+
+    data:        (string)  text data to parse
+    raw:         (boolean) output preprocessed JSON if True
+    quiet:       (boolean) suppress warning messages if True
+
+Returns:
+
+    Dictionary. Raw or processed structured data.
+

docs/parsers/uname.md

@@ -1,3 +1,4 @@
+
 # jc.parsers.uname
 jc - JSON CLI output utility uname Parser
 
@@ -27,11 +28,13 @@ Example:
       "kernel_version": "#74-Ubuntu SMP Tue Sep 17 17:06:04 UTC 2019"
     }
 
+
 ## info
 ```python
-info(self, /, *args, **kwargs)
+info()
 ```
 
+
 ## process
 ```python
 process(proc_data)
@@ -58,6 +61,7 @@ Returns:
         "kernel_version":     string
     }
 
+
 ## parse
 ```python
 parse(data, raw=False, quiet=False)

docs/parsers/uptime.md

@@ -1,3 +1,4 @@
+
 # jc.parsers.uptime
 jc - JSON CLI output utility uptime Parser
 
@@ -31,11 +32,13 @@ Example:
       "load_15m": "0.05"
     }
 
+
 ## info
 ```python
-info(self, /, *args, **kwargs)
+info()
 ```
 
+
 ## process
 ```python
 process(proc_data)
@@ -60,6 +63,7 @@ Returns:
       "load_15m": float
     }
 
+
 ## parse
 ```python
 parse(data, raw=False, quiet=False)

docs/parsers/w.md

@@ -1,3 +1,4 @@
+
 # jc.parsers.w
 jc - JSON CLI output utility w Parser
 
@@ -79,11 +80,13 @@ Examples:
       }
     ]
 
+
 ## info
 ```python
-info(self, /, *args, **kwargs)
+info()
 ```
 
+
 ## process
 ```python
 process(proc_data)
@@ -112,6 +115,7 @@ Returns:
       }
     ]
 
+
 ## parse
 ```python
 parse(data, raw=False, quiet=False)

docs/parsers/who.md

@@ -1,3 +1,4 @@
+
 # jc.parsers.who
 jc - JSON CLI output utility who Parser
 
@@ -99,11 +100,13 @@ Examples:
       }
     ]
 
+
 ## info
 ```python
-info(self, /, *args, **kwargs)
+info()
 ```
 
+
 ## process
 ```python
 process(proc_data)
@@ -133,6 +136,7 @@ Returns:
       }
     ]
 
+
 ## parse
 ```python
 parse(data, raw=False, quiet=False)

docs/parsers/xml.md

@@ -1,3 +1,4 @@
+
 # jc.parsers.xml
 jc - JSON CLI output utility XML Parser
 
@@ -55,11 +56,13 @@ Examples:
       ...
     }
 
+
 ## info
 ```python
-info(self, /, *args, **kwargs)
+info()
 ```
 
+
 ## process
 ```python
 process(proc_data)
@@ -80,6 +83,7 @@ Returns:
       See https://github.com/martinblech/xmltodict for details
     }
 
+
 ## parse
 ```python
 parse(data, raw=False, quiet=False)

docs/parsers/yaml.md

@@ -1,3 +1,4 @@
+
 # jc.parsers.yaml
 jc - JSON CLI output utility YAML Parser
 
@@ -67,11 +68,13 @@ Examples:
       }
     ]
 
+
 ## info
 ```python
-info(self, /, *args, **kwargs)
+info()
 ```
 
+
 ## process
 ```python
 process(proc_data)
@@ -94,6 +97,7 @@ Returns:
       }
     ]
 
+
 ## parse
 ```python
 parse(data, raw=False, quiet=False)

docs/readme.md

@@ -1,3 +1,4 @@
+
 # jc
 JC - JSON CLI output utility
 

docs/utils.md

@@ -1,5 +1,7 @@
+
 # utils
 jc - JSON CLI output utility utils
+
 ## warning_message
 ```python
 warning_message(message)
@@ -15,6 +17,7 @@ Returns:
 
     no return, just prints output to STDERR
 
+
 ## error_message
 ```python
 error_message(message)
@@ -30,6 +33,7 @@ Returns:
 
     no return, just prints output to STDERR
 
+
 ## compatibility
 ```python
 compatibility(mod_name, compatible)
@@ -48,3 +52,19 @@ Returns:
 
     no return, just prints output to STDERR
 
+
+## has_data
+```python
+has_data(data)
+```
+
+Checks if the input contains data. If there are any non-whitespace characters then return True, else return False
+
+Parameters:
+
+    data:        (string) input to check whether it contains data
+
+Returns:
+
+    Boolean      True if input string (data) contains non-whitespace characters, otherwise False
+

jc/cli.py

@@ -11,18 +11,18 @@ import importlib
 import textwrap
 import signal
 import json
+import pygments
 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
 import jc.appdirs as appdirs
 
 
 class info():
-    version = '1.11.4'
-    description = 'jc cli output JSON conversion tool'
+    version = '1.13.2'
+    description = 'JSON CLI output utility'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
 
@@ -37,6 +37,7 @@ parsers = [
     'crontab',
     'crontab-u',
     'csv',
+    'date',
     'df',
     'dig',
     'dmidecode',
@@ -54,6 +55,7 @@ parsers = [
     'ini',
     'iptables',
     'jobs',
+    'kv',
     'last',
     'ls',
     'lsblk',
@@ -63,6 +65,7 @@ parsers = [
     'netstat',
     'ntpq',
     'passwd',
+    'ping',
     'pip-list',
     'pip-show',
     'ps',
@@ -70,11 +73,14 @@ parsers = [
     'shadow',
     'ss',
     'stat',
+    'sysctl',
     'systemctl',
     'systemctl-lj',
     'systemctl-ls',
     'systemctl-luf',
     'timedatectl',
+    'tracepath',
+    'traceroute',
     'uname',
     'uptime',
     'w',
@@ -86,8 +92,8 @@ parsers = [
 # List of custom or override parsers.
 # Allow any <user_data_dir>/jc/jcparsers/*.py
 local_parsers = []
-data_dir = appdirs.user_data_dir("jc", "jc")
-local_parsers_dir = os.path.join(data_dir, "jcparsers")
+data_dir = appdirs.user_data_dir('jc', 'jc')
+local_parsers_dir = os.path.join(data_dir, 'jcparsers')
 if os.path.isdir(local_parsers_dir):
     sys.path.append(data_dir)
     for name in os.listdir(local_parsers_dir):
@@ -98,8 +104,52 @@ if os.path.isdir(local_parsers_dir):
                 parsers.append(plugin_name)
 
 
-def set_env_colors():
+# We only support 2.3.0+, pygments changed color names in 2.4.0.
+# startswith is sufficient and avoids potential exceptions from split and int.
+if pygments.__version__.startswith('2.3.'):
+    PYGMENT_COLOR = {
+        'black': '#ansiblack',
+        'red': '#ansidarkred',
+        'green': '#ansidarkgreen',
+        'yellow': '#ansibrown',
+        'blue': '#ansidarkblue',
+        'magenta': '#ansipurple',
+        'cyan': '#ansiteal',
+        'gray': '#ansilightgray',
+        'brightblack': '#ansidarkgray',
+        'brightred': '#ansired',
+        'brightgreen': '#ansigreen',
+        'brightyellow': '#ansiyellow',
+        'brightblue': '#ansiblue',
+        'brightmagenta': '#ansifuchsia',
+        'brightcyan': '#ansiturquoise',
+        'white': '#ansiwhite',
+    }
+else:
+    PYGMENT_COLOR = {
+        'black': 'ansiblack',
+        'red': 'ansired',
+        'green': 'ansigreen',
+        'yellow': 'ansiyellow',
+        'blue': 'ansiblue',
+        'magenta': 'ansimagenta',
+        'cyan': 'ansicyan',
+        'gray': 'ansigray',
+        'brightblack': 'ansibrightblack',
+        'brightred': 'ansibrightred',
+        'brightgreen': 'ansibrightgreen',
+        'brightyellow': 'ansibrightyellow',
+        'brightblue': 'ansibrightblue',
+        'brightmagenta': 'ansibrightmagenta',
+        'brightcyan': 'ansibrightcyan',
+        'white': 'ansiwhite',
+    }
+
+
+def set_env_colors(env_colors=None):
     """
+    Return a dictionary to be used in Pygments custom style class.
+
     Grab custom colors from JC_COLORS environment variable. JC_COLORS env variable takes 4 comma
     separated string values and should be in the format of:
 
@@ -115,40 +165,36 @@ def set_env_colors():
     JC_COLORS=default,default,default,default
 
     """
-    env_colors = os.getenv('JC_COLORS')
     input_error = False
 
     if env_colors:
         color_list = env_colors.split(',')
     else:
+        color_list = ['default', 'default', 'default', 'default']
+
+    if len(color_list) != 4:
         input_error = True
 
-    if env_colors and len(color_list) != 4:
-        print('jc:   Warning: could not parse JC_COLORS environment variable\n', file=sys.stderr)
-        input_error = True
-
-    if env_colors:
-        for color in color_list:
-            if color not in ['black', 'red', 'green', 'yellow', 'blue', 'magenta', 'cyan', 'gray', 'brightblack', 'brightred',
-                             'brightgreen', 'brightyellow', 'brightblue', 'brightmagenta', 'brightcyan', 'white', 'default']:
-                print('jc:   Warning: could not parse JC_COLORS environment variable\n', file=sys.stderr)
-                input_error = True
+    for color in color_list:
+        if color != 'default' and color not in PYGMENT_COLOR:
+            input_error = True
 
     # if there is an issue with the env variable, just set all colors to default and move on
     if input_error:
+        print('jc:   Warning: could not parse JC_COLORS environment variable\n', file=sys.stderr)
         color_list = ['default', 'default', 'default', 'default']
 
     # Try the color set in the JC_COLORS env variable first. If it is set to default, then fall back to default colors
     return {
-        Name.Tag: f'bold ansi{color_list[0]}' if not color_list[0] == 'default' else 'bold ansiblue',   # key names
-        Keyword: f'ansi{color_list[1]}' if not color_list[1] == 'default' else 'ansibrightblack',       # true, false, null
-        Number: f'ansi{color_list[2]}' if not color_list[2] == 'default' else 'ansimagenta',            # numbers
-        String: f'ansi{color_list[3]}' if not color_list[3] == 'default' else 'ansigreen'               # strings
+        Name.Tag: f'bold {PYGMENT_COLOR[color_list[0]]}' if not color_list[0] == 'default' else f"bold {PYGMENT_COLOR['blue']}",   # key names
+        Keyword: PYGMENT_COLOR[color_list[1]] if not color_list[1] == 'default' else PYGMENT_COLOR['brightblack'],                 # true, false, null
+        Number: PYGMENT_COLOR[color_list[2]] if not color_list[2] == 'default' else PYGMENT_COLOR['magenta'],                      # numbers
+        String: PYGMENT_COLOR[color_list[3]] if not color_list[3] == 'default' else PYGMENT_COLOR['green']                         # strings
     }
 
 
 def piped_output():
-    """returns False if stdout is a TTY. True if output is being piped to another program"""
+    """Return False if stdout is a TTY. True if output is being piped to another program"""
     if sys.stdout.isatty():
         return False
     else:
@@ -156,34 +202,34 @@ def piped_output():
 
 
 def ctrlc(signum, frame):
-    """exit with error on SIGINT"""
+    """Exit with error on SIGINT"""
     sys.exit(1)
 
 
 def parser_shortname(parser_argument):
-    """short name of the parser with dashes and no -- prefix"""
+    """Return short name of the parser with dashes and no -- prefix"""
     return parser_argument[2:]
 
 
 def parser_argument(parser):
-    """short name of the parser with dashes and with -- prefix"""
+    """Return short name of the parser with dashes and with -- prefix"""
     return f'--{parser}'
 
 
 def parser_mod_shortname(parser):
-    """short name of the parser's module name (no -- prefix and dashes converted to underscores)"""
+    """Return short name of the parser's module name (no -- prefix and dashes converted to underscores)"""
     return parser.replace('--', '').replace('-', '_')
 
 
 def parser_module(parser):
-    """import the module just in time and return the module object"""
+    """Import the module just in time and return the module object"""
     shortname = parser_mod_shortname(parser)
     path = ('jcparsers.' if shortname in local_parsers else 'jc.parsers.')
     return importlib.import_module(path + shortname)
 
 
 def parsers_text(indent=0, pad=0):
-    """return the argument and description information from each parser"""
+    """Return the argument and description information from each parser"""
     ptext = ''
     for parser in parsers:
         parser_arg = parser_argument(parser)
@@ -201,7 +247,7 @@ def parsers_text(indent=0, pad=0):
 
 
 def about_jc():
-    """return jc info and the contents of each parser.info as a dictionary"""
+    """Return jc info and the contents of each parser.info as a dictionary"""
     parser_list = []
 
     for parser in parsers:
@@ -231,7 +277,7 @@ def about_jc():
 
 
 def helptext(message):
-    """return the help text with the list of parsers"""
+    """Return the help text with the list of parsers"""
     parsers_string = parsers_text(indent=12, pad=17)
 
     helptext_string = f'''
@@ -247,7 +293,7 @@ def helptext(message):
 {parsers_string}
     Options:
             -a               about jc
-            -d               debug - show trace messages
+            -d               debug - show traceback (-dd for verbose traceback)
             -m               monochrome output
             -p               pretty print output
             -q               quiet - suppress warnings
@@ -260,30 +306,30 @@ def helptext(message):
 
             jc -p ls -al
     '''
-    print(textwrap.dedent(helptext_string), file=sys.stderr)
-
-
-def json_out(data, pretty=False, mono=False, piped_out=False):
-    # set colors
-    class JcStyle(Style):
-        styles = set_env_colors()
+    return textwrap.dedent(helptext_string)
 
 
+def json_out(data, pretty=False, env_colors=None, mono=False, piped_out=False):
+    """Return a JSON formatted string. String may include color codes or be pretty printed."""
     if not mono and not piped_out:
+        # set colors
+        class JcStyle(Style):
+            styles = set_env_colors(env_colors)
+
         if pretty:
-            print(highlight(json.dumps(data, indent=2), JsonLexer(), Terminal256Formatter(style=JcStyle))[0:-1])
+            return str(highlight(json.dumps(data, indent=2), JsonLexer(), Terminal256Formatter(style=JcStyle))[0:-1])
         else:
-            print(highlight(json.dumps(data), JsonLexer(), Terminal256Formatter(style=JcStyle))[0:-1])
+            return str(highlight(json.dumps(data), JsonLexer(), Terminal256Formatter(style=JcStyle))[0:-1])
     else:
         if pretty:
-            print(json.dumps(data, indent=2))
+            return json.dumps(data, indent=2)
         else:
-            print(json.dumps(data))
+            return json.dumps(data)
 
 
 def generate_magic_command(args):
     """
-    Returns a tuple with a boolean and a command, where the boolean signifies that
+    Return a tuple with a boolean and a command, where the boolean signifies that
     the command is valid, and the command is either a command string or None.
     """
 
@@ -316,7 +362,7 @@ def generate_magic_command(args):
     magic_dict = {}
     parser_info = about_jc()['parsers']
 
-    # Create a dictionary of magic_commands to their respective parsers.
+    # create a dictionary of magic_commands to their respective parsers.
     for entry in parser_info:
         # Update the dict with all of the magic commands for this parser, if they exist.
         magic_dict.update({mc: entry['argument'] for mc in entry.get('magic_commands', [])})
@@ -325,7 +371,7 @@ def generate_magic_command(args):
     one_word_command = args_given[0]
     two_word_command = ' '.join(args_given[0:2])
 
-    # Try to get a parser for two_word_command, otherwise get one for one_word_command
+    # try to get a parser for two_word_command, otherwise get one for one_word_command
     found_parser = magic_dict.get(two_word_command, magic_dict.get(one_word_command))
 
     # construct a new command line using the standard syntax: COMMAND | jc --PARSER -OPTIONS
@@ -338,6 +384,7 @@ def generate_magic_command(args):
 
 
 def magic():
+    """Runs the command generated by generate_magic_command() to support magic syntax"""
     valid_command, run_command = generate_magic_command(sys.argv)
     if valid_command:
         os.system(run_command)
@@ -345,7 +392,7 @@ def magic():
     elif run_command is None:
         return
     else:
-        helptext(f'parser not found for "{run_command}"')
+        print(helptext(f'parser not found for "{run_command}"'), file=sys.stderr)
         sys.exit(1)
 
 
@@ -359,6 +406,8 @@ def main():
     except AttributeError:
         pass
 
+    jc_colors = os.getenv('JC_COLORS')
+
     # try magic syntax first: e.g. jc -p ls -al
     magic()
 
@@ -370,54 +419,54 @@ def main():
             options.extend(opt[1:])
 
     debug = 'd' in options
+    verbose_debug = True if options.count('d') > 1 else False
     mono = 'm' in options
     pretty = 'p' in options
     quiet = 'q' in options
     raw = 'r' in options
 
+    if verbose_debug:
+        import jc.tracebackplus
+        jc.tracebackplus.enable(context=11)
+
     if 'a' in options:
-        json_out(about_jc(), pretty=pretty, mono=mono, piped_out=piped_output())
+        print(json_out(about_jc(), pretty=pretty, env_colors=jc_colors, mono=mono, piped_out=piped_output()))
         sys.exit(0)
 
     if sys.stdin.isatty():
-        helptext('missing piped data')
+        print(helptext('missing piped data'), file=sys.stderr)
         sys.exit(1)
 
     data = sys.stdin.read()
 
     found = False
 
-    if debug:
-        for arg in sys.argv:
-            parser_name = parser_shortname(arg)
+    for arg in sys.argv:
+        parser_name = parser_shortname(arg)
 
-            if parser_name in parsers:
-                # load parser module just in time so we don't need to load all modules
-                parser = parser_module(arg)
+        if parser_name in parsers:
+            # load parser module just in time so we don't need to load all modules
+            parser = parser_module(arg)
+            try:
                 result = parser.parse(data, raw=raw, quiet=quiet)
                 found = True
                 break
-    else:
-        for arg in sys.argv:
-            parser_name = parser_shortname(arg)
 
-            if parser_name in parsers:
-                # load parser module just in time so we don't need to load all modules
-                parser = parser_module(arg)
-                try:
-                    result = parser.parse(data, raw=raw, quiet=quiet)
-                    found = True
-                    break
-                except Exception:
+            except Exception:
+                if debug:
+                    raise
+                else:
+                    import jc.utils
                     jc.utils.error_message(
-                        f'{parser_name} parser could not parse the input data. Did you use the correct parser?\n         For details use the -d option.')
+                        f'{parser_name} parser could not parse the input data. Did you use the correct parser?\n'
+                        '                 For details use the -d or -dd option.')
                     sys.exit(1)
 
     if not found:
-        helptext('missing or incorrect arguments')
+        print(helptext('missing or incorrect arguments'), file=sys.stderr)
         sys.exit(1)
 
-    json_out(result, pretty=pretty, mono=mono, piped_out=piped_output())
+    print(json_out(result, pretty=pretty, env_colors=jc_colors, mono=mono, piped_out=piped_output()))
 
 
 if __name__ == '__main__':

jc/parsers/airport.py

@@ -55,7 +55,7 @@ import jc.utils
 
 
 class info():
-    version = '1.0'
+    version = '1.1'
     description = 'airport -I command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -131,9 +131,11 @@ def parse(data, raw=False, quiet=False):
 
     raw_output = {}
 
-    for line in filter(None, data.splitlines()):
-        linedata = line.split(':', maxsplit=1)
-        raw_output[linedata[0].strip().lower().replace(' ', '_').replace('.', '_')] = linedata[1].strip()
+    if jc.utils.has_data(data):
+
+        for line in filter(None, data.splitlines()):
+            linedata = line.split(':', maxsplit=1)
+            raw_output[linedata[0].strip().lower().replace(' ', '_').replace('.', '_')] = linedata[1].strip()
 
     if raw:
         return raw_output

jc/parsers/airport_s.py

@@ -88,7 +88,7 @@ import jc.parsers.universal
 
 
 class info():
-    version = '1.0'
+    version = '1.2'
     description = 'airport -s command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -170,15 +170,17 @@ def parse(data, raw=False, quiet=False):
     if not quiet:
         jc.utils.compatibility(__name__, info.compatible)
 
-    cleandata = data.splitlines()
+    raw_output = []
+    cleandata = list(filter(None, data.splitlines()))
 
-    # fix headers
-    cleandata[0] = cleandata[0].lower()
-    cleandata[0] = cleandata[0].replace('-', '_')
-    cleandata[0] = cleandata[0].replace('security (auth/unicast/group)', 'security')
+    if jc.utils.has_data(data):
+        # fix headers
+        cleandata[0] = cleandata[0].lower()
+        cleandata[0] = cleandata[0].replace('-', '_')
+        cleandata[0] = cleandata[0].replace('security (auth/unicast/group)', 'security')
 
-    # parse the data
-    raw_output = jc.parsers.universal.sparse_table_parse(cleandata)
+        # parse the data
+        raw_output = jc.parsers.universal.sparse_table_parse(cleandata)
 
     if raw:
         return raw_output

jc/parsers/arp.py

@@ -99,7 +99,7 @@ import jc.parsers.universal
 
 
 class info():
-    version = '1.4'
+    version = '1.6'
     description = 'arp command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -171,69 +171,65 @@ def parse(data, raw=False, quiet=False):
     if not quiet:
         jc.utils.compatibility(__name__, info.compatible)
 
-    cleandata = data.splitlines()
+    raw_output = []
+    cleandata = list(filter(None, data.splitlines()))
 
-    # remove final Entries row if -v was used
-    if cleandata[-1].startswith('Entries:'):
-        cleandata.pop(-1)
+    if jc.utils.has_data(data):
 
-    # detect if freebsd/osx style was used
-    if cleandata[0][-1] == ']':
-        raw_output = []
-        for line in cleandata:
-            splitline = line.split()
-            output_line = {
-                'name': splitline[0],
-                'address': splitline[1].lstrip('(').rstrip(')'),
-                'hwtype': splitline[-1].lstrip('[').rstrip(']'),
-                'hwaddress': splitline[3],
-                'iface': splitline[5]
-            }
+        # remove final Entries row if -v was used
+        if cleandata[-1].startswith('Entries:'):
+            cleandata.pop(-1)
 
-            if 'permanent' in splitline:
-                output_line['permanent'] = True
+        # detect if freebsd/osx style was used
+        if cleandata[0][-1] == ']':
+            for line in cleandata:
+                splitline = line.split()
+                output_line = {
+                    'name': splitline[0],
+                    'address': splitline[1].lstrip('(').rstrip(')'),
+                    'hwtype': splitline[-1].lstrip('[').rstrip(']'),
+                    'hwaddress': splitline[3],
+                    'iface': splitline[5]
+                }
+
+                if 'permanent' in splitline:
+                    output_line['permanent'] = True
+                else:
+                    output_line['permanent'] = False
+
+                if 'expires' in splitline:
+                    output_line['expires'] = splitline[-3]
+
+                raw_output.append(output_line)
+
+            if raw:
+                return raw_output
             else:
-                output_line['permanent'] = False
+                return process(raw_output)
 
-            if 'expires' in splitline:
-                output_line['expires'] = splitline[-3]
+        # detect if linux style was used
+        elif cleandata[0].startswith('Address'):
 
-            raw_output.append(output_line)
+            # fix header row to change Flags Mask to flags_mask
+            cleandata[0] = cleandata[0].replace('Flags Mask', 'flags_mask')
+            cleandata[0] = cleandata[0].lower()
 
-        if raw:
-            return raw_output
+            raw_output = jc.parsers.universal.simple_table_parse(cleandata)
+
+        # otherwise, try bsd style
         else:
-            return process(raw_output)
+            for line in cleandata:
+                line = line.split()
+                output_line = {
+                    'name': line[0],
+                    'address': line[1].lstrip('(').rstrip(')'),
+                    'hwtype': line[4].lstrip('[').rstrip(']'),
+                    'hwaddress': line[3],
+                    'iface': line[6],
+                }
+                raw_output.append(output_line)
 
-    # detect if linux style was used
-    elif cleandata[0].startswith('Address'):
-
-        # fix header row to change Flags Mask to flags_mask
-        cleandata[0] = cleandata[0].replace('Flags Mask', 'flags_mask')
-        cleandata[0] = cleandata[0].lower()
-
-        raw_output = jc.parsers.universal.simple_table_parse(cleandata)
-
-        if raw:
-            return raw_output
-        else:
-            return process(raw_output)
-
-    # otherwise, try bsd style
+    if raw:
+        return raw_output
     else:
-        raw_output = []
-        for line in cleandata:
-            line = line.split()
-            output_line = {
-                'name': line[0],
-                'address': line[1].lstrip('(').rstrip(')'),
-                'hwtype': line[4].lstrip('[').rstrip(']'),
-                'hwaddress': line[3],
-                'iface': line[6],
-            }
-            raw_output.append(output_line)
-
-        if raw:
-            return raw_output
-        else:
-            return process(raw_output)
+        return process(raw_output)

jc/parsers/blkid.py

@@ -79,7 +79,7 @@ import jc.utils
 
 
 class info():
-    version = '1.0'
+    version = '1.2'
     description = 'blkid command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -176,7 +176,8 @@ def parse(data, raw=False, quiet=False):
 
     raw_output = []
 
-    if data:
+    if jc.utils.has_data(data):
+
         # if the first field is a device, use normal parsing:
         if data.split(maxsplit=1)[0][-1] == ':':
             linedata = data.splitlines()

jc/parsers/crontab.py

@@ -132,7 +132,7 @@ import jc.parsers.universal
 
 
 class info():
-    version = '1.2'
+    version = '1.4'
     description = 'crontab command and file parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -225,44 +225,46 @@ def parse(data, raw=False, quiet=False):
     # Clear any blank lines
     cleandata = list(filter(None, cleandata))
 
-    # Clear any commented lines
-    for i, line in reversed(list(enumerate(cleandata))):
-        if line.strip().startswith('#'):
-            cleandata.pop(i)
+    if jc.utils.has_data(data):
 
-    # Pop any variable assignment lines
-    cron_var = []
-    for i, line in reversed(list(enumerate(cleandata))):
-        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()
-            cron_var.append({'name': var_name,
-                             'value': var_value})
+        # Clear any commented lines
+        for i, line in reversed(list(enumerate(cleandata))):
+            if line.strip().startswith('#'):
+                cleandata.pop(i)
 
-    raw_output['variables'] = cron_var
+        # Pop any variable assignment lines
+        cron_var = []
+        for i, line in reversed(list(enumerate(cleandata))):
+            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()
+                cron_var.append({'name': var_name,
+                                 'value': var_value})
 
-    # Pop any shortcut lines
-    shortcut_list = []
-    for i, line in reversed(list(enumerate(cleandata))):
-        if line.strip().startswith('@'):
-            shortcut_line = cleandata.pop(i)
-            occurrence = shortcut_line.split(maxsplit=1)[0].strip().lstrip('@')
-            cmd = shortcut_line.split(maxsplit=1)[1].strip()
-            shortcut_list.append({'occurrence': occurrence,
-                                  'command': cmd})
+        raw_output['variables'] = cron_var
 
-    # Add header row for parsing
-    cleandata[:0] = ['minute hour day_of_month month day_of_week command']
+        # Pop any shortcut lines
+        shortcut_list = []
+        for i, line in reversed(list(enumerate(cleandata))):
+            if line.strip().startswith('@'):
+                shortcut_line = cleandata.pop(i)
+                occurrence = shortcut_line.split(maxsplit=1)[0].strip().lstrip('@')
+                cmd = shortcut_line.split(maxsplit=1)[1].strip()
+                shortcut_list.append({'occurrence': occurrence,
+                                      'command': cmd})
 
-    if len(cleandata) > 1:
-        cron_list = jc.parsers.universal.simple_table_parse(cleandata)
+        # Add header row for parsing
+        cleandata[:0] = ['minute hour day_of_month month day_of_week command']
 
-        raw_output['schedule'] = cron_list
+        if len(cleandata) > 1:
+            cron_list = jc.parsers.universal.simple_table_parse(cleandata)
 
-    # Add shortcut entries back in
-    for item in shortcut_list:
-        raw_output['schedule'].append(item)
+            raw_output['schedule'] = cron_list
+
+        # Add shortcut entries back in
+        for item in shortcut_list:
+            raw_output['schedule'].append(item)
 
     if raw:
         return raw_output

jc/parsers/crontab_u.py

@@ -133,7 +133,7 @@ import jc.parsers.universal
 
 
 class info():
-    version = '1.1'
+    version = '1.3'
     description = 'crontab file parser with user support'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -226,46 +226,48 @@ def parse(data, raw=False, quiet=False):
     # Clear any blank lines
     cleandata = list(filter(None, cleandata))
 
-    # Clear any commented lines
-    for i, line in reversed(list(enumerate(cleandata))):
-        if line.strip().startswith('#'):
-            cleandata.pop(i)
+    if jc.utils.has_data(data):
 
-    # Pop any variable assignment lines
-    cron_var = []
-    for i, line in reversed(list(enumerate(cleandata))):
-        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()
-            cron_var.append({'name': var_name,
-                             'value': var_value})
+        # Clear any commented lines
+        for i, line in reversed(list(enumerate(cleandata))):
+            if line.strip().startswith('#'):
+                cleandata.pop(i)
 
-    raw_output['variables'] = cron_var
+        # Pop any variable assignment lines
+        cron_var = []
+        for i, line in reversed(list(enumerate(cleandata))):
+            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()
+                cron_var.append({'name': var_name,
+                                 'value': var_value})
 
-    # Pop any shortcut lines
-    shortcut_list = []
-    for i, line in reversed(list(enumerate(cleandata))):
-        if line.strip().startswith('@'):
-            shortcut_line = cleandata.pop(i)
-            occurrence = shortcut_line.split(maxsplit=1)[0].strip().lstrip('@')
-            usr = shortcut_line.split(maxsplit=2)[1].strip()
-            cmd = shortcut_line.split(maxsplit=2)[2].strip()
-            shortcut_list.append({'occurrence': occurrence,
-                                  'user': usr,
-                                  'command': cmd})
+        raw_output['variables'] = cron_var
 
-    # Add header row for parsing
-    cleandata[:0] = ['minute hour day_of_month month day_of_week user command']
+        # Pop any shortcut lines
+        shortcut_list = []
+        for i, line in reversed(list(enumerate(cleandata))):
+            if line.strip().startswith('@'):
+                shortcut_line = cleandata.pop(i)
+                occurrence = shortcut_line.split(maxsplit=1)[0].strip().lstrip('@')
+                usr = shortcut_line.split(maxsplit=2)[1].strip()
+                cmd = shortcut_line.split(maxsplit=2)[2].strip()
+                shortcut_list.append({'occurrence': occurrence,
+                                      'user': usr,
+                                      'command': cmd})
 
-    if len(cleandata) > 1:
-        cron_list = jc.parsers.universal.simple_table_parse(cleandata)
+        # Add header row for parsing
+        cleandata[:0] = ['minute hour day_of_month month day_of_week user command']
 
-        raw_output['schedule'] = cron_list
+        if len(cleandata) > 1:
+            cron_list = jc.parsers.universal.simple_table_parse(cleandata)
 
-    # Add shortcut entries back in
-    for item in shortcut_list:
-        raw_output['schedule'].append(item)
+            raw_output['schedule'] = cron_list
+
+        # Add shortcut entries back in
+        for item in shortcut_list:
+            raw_output['schedule'].append(item)
 
     if raw:
         return raw_output

jc/parsers/csv.py

@@ -63,7 +63,7 @@ import csv
 
 
 class info():
-    version = '1.0'
+    version = '1.1'
     description = 'CSV file parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -123,7 +123,8 @@ def parse(data, raw=False, quiet=False):
     # Clear any blank lines
     cleandata = list(filter(None, cleandata))
 
-    if cleandata:
+    if jc.utils.has_data(data):
+
         dialect = None
         try:
             dialect = csv.Sniffer().sniff(data[:1024])

jc/parsers/date.py

@@ -0,0 +1,160 @@
+"""jc - JSON CLI output utility date Parser
+
+Usage:
+
+    specify --date as the first argument if the piped input is coming from date
+
+Compatibility:
+
+    'linux', 'darwin', 'freebsd'
+
+Examples:
+
+    $ date | jc --date -p
+    {
+      "year": 2020,
+      "month_num": 7,
+      "day": 31,
+      "hour": 16,
+      "minute": 48,
+      "second": 11,
+      "month": "Jul",
+      "weekday": "Fri",
+      "weekday_num": 6,
+      "timezone": "PDT"
+    }
+
+    $ date | jc --date -p -r
+    {
+      "year": "2020",
+      "month": "Jul",
+      "day": "31",
+      "weekday": "Fri",
+      "hour": "16",
+      "minute": "50",
+      "second": "01",
+      "timezone": "PDT"
+    }
+"""
+import jc.utils
+
+
+class info():
+    version = '1.0'
+    description = 'date command parser'
+    author = 'Kelly Brazil'
+    author_email = 'kellyjonbrazil@gmail.com'
+
+    # compatible options: linux, darwin, cygwin, win32, aix, freebsd
+    compatible = ['linux', 'darwin', 'freebsd']
+    magic_commands = ['date']
+
+
+__version__ = info.version
+
+
+def process(proc_data):
+    """
+    Final processing to conform to the schema.
+
+    Parameters:
+
+        proc_data:   (dictionary) raw structured data to process
+
+    Returns:
+
+        Dictionary. Structured data with the following schema:
+
+        {
+          "year":         integer,
+          "month_num":    integer,
+          "day":          integer,
+          "hour":         integer,
+          "minute":       integer,
+          "second":       integer,
+          "month":        string,
+          "weekday":      string,
+          "weekday_num":  integer,
+          "timezone":     string
+        }
+    """
+    month_map = {
+        "Jan": 1,
+        "Feb": 2,
+        "Mar": 3,
+        "Apr": 4,
+        "May": 5,
+        "Jun": 6,
+        "Jul": 7,
+        "Aug": 8,
+        "Sep": 9,
+        "Oct": 10,
+        "Nov": 11,
+        "Dec": 12
+    }
+
+    weekday_map = {
+        "Sun": 1,
+        "Mon": 2,
+        "Tue": 3,
+        "Wed": 4,
+        "Thu": 5,
+        "Fri": 6,
+        "Sat": 7
+    }
+
+    if proc_data:
+        return {
+            "year": int(proc_data['year']),
+            'month_num': month_map[proc_data['month']],
+            "day": int(proc_data['day']),
+            "hour": int(proc_data['hour']),
+            "minute": int(proc_data['minute']),
+            "second": int(proc_data['second']),
+            "month": proc_data['month'],
+            "weekday": proc_data['weekday'],
+            "weekday_num": weekday_map[proc_data['weekday']],
+            "timezone": proc_data['timezone']
+        }
+    else:
+        return {}
+
+
+def parse(data, raw=False, quiet=False):
+    """
+    Main text parsing function
+
+    Parameters:
+
+        data:        (string)  text data to parse
+        raw:         (boolean) output preprocessed JSON if True
+        quiet:       (boolean) suppress warning messages if True
+
+    Returns:
+
+        Dictionary. Raw or processed structured data.
+    """
+    if not quiet:
+        jc.utils.compatibility(__name__, info.compatible)
+
+    raw_output = {}
+
+    if jc.utils.has_data(data):
+        data = data.replace(':', ' ')
+        split_data = data.split()
+
+        raw_output = {
+            "year": split_data[7],
+            "month": split_data[1],
+            "day": split_data[2],
+            "weekday": split_data[0],
+            "hour": split_data[3],
+            "minute": split_data[4],
+            "second": split_data[5],
+            "timezone": split_data[6]
+        }
+
+    if raw:
+        return raw_output
+    else:
+        return process(raw_output)

jc/parsers/df.py

@@ -73,7 +73,7 @@ import jc.parsers.universal
 
 
 class info():
-    version = '1.3'
+    version = '1.5'
     description = 'df command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -184,14 +184,17 @@ def parse(data, raw=False, quiet=False):
         jc.utils.compatibility(__name__, info.compatible)
 
     cleandata = data.splitlines()
+    raw_output = []
 
-    # fix headers
-    cleandata[0] = cleandata[0].lower()
-    cleandata[0] = cleandata[0].replace('-', '_')
-    cleandata[0] = cleandata[0].replace('mounted on', 'mounted_on')
+    if jc.utils.has_data(data):
 
-    # parse the data
-    raw_output = jc.parsers.universal.sparse_table_parse(cleandata)
+        # fix headers
+        cleandata[0] = cleandata[0].lower()
+        cleandata[0] = cleandata[0].replace('-', '_')
+        cleandata[0] = cleandata[0].replace('mounted on', 'mounted_on')
+
+        # parse the data
+        raw_output = jc.parsers.universal.sparse_table_parse(cleandata)
 
     if raw:
         return raw_output

jc/parsers/dig.py

@@ -324,7 +324,7 @@ import jc.utils
 
 
 class info():
-    version = '1.2'
+    version = '1.3'
     description = 'dig command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -574,100 +574,103 @@ def parse(data, raw=False, quiet=False):
     axfr = False
 
     output_entry = {}
-    for line in cleandata:
 
-        if line.startswith('; <<>> ') and ' axfr ' in line.lower():
-            question = False
-            authority = False
-            answer = False
-            axfr = True
-            axfr_list = []
-            continue
+    if jc.utils.has_data(data):
+        for line in cleandata:
 
-        if ';' not in line and axfr:
-            axfr_list.append(parse_axfr(line))
-            output_entry.update({'axfr': axfr_list})
-            continue
+            if line.startswith('; <<>> ') and ' axfr ' in line.lower():
+                question = False
+                authority = False
+                answer = False
+                axfr = True
+                axfr_list = []
+                continue
 
-        if line.startswith(';; ->>HEADER<<-'):
-            output_entry = {}
-            output_entry.update(parse_header(line))
-            continue
+            if ';' not in line and axfr:
+                axfr_list.append(parse_axfr(line))
+                output_entry.update({'axfr': axfr_list})
+                continue
 
-        if line.startswith(';; flags:'):
-            output_entry.update(parse_flags_line(line))
-            continue
+            if line.startswith(';; ->>HEADER<<-'):
+                output_entry = {}
+                output_entry.update(parse_header(line))
+                continue
 
-        if line.startswith(';; QUESTION SECTION:'):
-            question = True
-            authority = False
-            answer = False
-            axfr = False
-            continue
+            if line.startswith(';; flags:'):
+                output_entry.update(parse_flags_line(line))
+                continue
 
-        if question:
-            output_entry['question'] = parse_question(line)
-            question = False
-            authority = False
-            answer = False
-            axfr = False
-            continue
+            if line.startswith(';; QUESTION SECTION:'):
+                question = True
+                authority = False
+                answer = False
+                axfr = False
+                continue
 
-        if line.startswith(';; AUTHORITY SECTION:'):
-            question = False
-            authority = True
-            answer = False
-            axfr = False
-            authority_list = []
-            continue
+            if question:
+                output_entry['question'] = parse_question(line)
+                question = False
+                authority = False
+                answer = False
+                axfr = False
+                continue
 
-        if ';' not in line and authority:
-            authority_list.append(parse_authority(line))
-            output_entry.update({'authority': authority_list})
-            continue
+            if line.startswith(';; AUTHORITY SECTION:'):
+                question = False
+                authority = True
+                answer = False
+                axfr = False
+                authority_list = []
+                continue
 
-        if line.startswith(';; ANSWER SECTION:'):
-            question = False
-            authority = False
-            answer = True
-            axfr = False
-            answer_list = []
-            continue
+            if ';' not in line and authority:
+                authority_list.append(parse_authority(line))
+                output_entry.update({'authority': authority_list})
+                continue
 
-        if ';' not in line and answer:
-            answer_list.append(parse_answer(line))
-            output_entry.update({'answer': answer_list})
-            continue
+            if line.startswith(';; ANSWER SECTION:'):
+                question = False
+                authority = False
+                answer = True
+                axfr = False
+                answer_list = []
+                continue
 
-        # footer consists of 4 lines
-        # footer line 1
-        if line.startswith(';; Query time:'):
-            output_entry.update({'query_time': line.split(':')[1].lstrip()})
-            continue
+            if ';' not in line and answer:
+                answer_list.append(parse_answer(line))
+                output_entry.update({'answer': answer_list})
+                continue
 
-        # footer line 2
-        if line.startswith(';; SERVER:'):
-            output_entry.update({'server': line.split(':')[1].lstrip()})
-            continue
+            # footer consists of 4 lines
+            # footer line 1
+            if line.startswith(';; Query time:'):
+                output_entry.update({'query_time': line.split(':')[1].lstrip()})
+                continue
 
-        # footer line 3
-        if line.startswith(';; WHEN:'):
-            output_entry.update({'when': line.split(':', maxsplit=1)[1].lstrip()})
-            continue
+            # footer line 2
+            if line.startswith(';; SERVER:'):
+                output_entry.update({'server': line.split(':')[1].lstrip()})
+                continue
 
-        # footer line 4 (last line)
-        if line.startswith(';; MSG SIZE  rcvd:'):
-            output_entry.update({'rcvd': line.split(':')[1].lstrip()})
+            # footer line 3
+            if line.startswith(';; WHEN:'):
+                output_entry.update({'when': line.split(':', maxsplit=1)[1].lstrip()})
+                continue
 
-            if output_entry:
-                raw_output.append(output_entry)
-        elif line.startswith(';; XFR size:'):
-            output_entry.update({'size': line.split(':')[1].lstrip()})
+            # footer line 4 (last line)
+            if line.startswith(';; MSG SIZE  rcvd:'):
+                output_entry.update({'rcvd': line.split(':')[1].lstrip()})
 
-            if output_entry:
-                raw_output.append(output_entry)
+                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)
+
+        raw_output = list(filter(None, raw_output))
 
-    raw_output = list(filter(None, raw_output))
     if raw:
         return raw_output
     else:

jc/parsers/dmidecode.py

@@ -102,7 +102,7 @@ import jc.utils
 
 
 class info():
-    version = '1.0'
+    version = '1.1'
     description = 'dmidecode command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -190,148 +190,150 @@ def parse(data, raw=False, quiet=False):
 
     raw_output = []
 
-    data = data.splitlines()
+    if jc.utils.has_data(data):
 
-    # remove header rows
-    for row in data.copy():
-        if row:
-            data.pop(0)
-        else:
-            break
+        data = data.splitlines()
 
-    # main parsing loop
-    for line in data:
-        # new item
-        if not line:
-            item_header = True
-            item_values = False
-            value_list = False
+        # remove header rows
+        for row in data.copy():
+            if row:
+                data.pop(0)
+            else:
+                break
+
+        # main parsing loop
+        for line in data:
+            # new item
+            if not line:
+                item_header = True
+                item_values = False
+                value_list = False
+
+                if item:
+                    if values:
+                        item['values'][attribute] = values
+                    if key_data:
+                        item['values'][f'{key}_data'] = key_data
+                    raw_output.append(item)
+
+                item = {}
+                header = None
+                key = None
+                val = None
+                attribute = None
+                values = []
+                key_data = []
+                continue
+
+            # header
+            if line.startswith('Handle ') and line.endswith('bytes'):
+
+                # Handle 0x0000, DMI type 0, 24 bytes
+                header = line.replace(',', ' ').split()
+                item = {
+                    'handle': header[1],
+                    'type': header[4],
+                    'bytes': header[5]
+                }
+                continue
+
+            # description
+            if item_header:
+                item_header = False
+                item_values = True
+                value_list = False
+
+                item['description'] = line
+                item['values'] = {}
+                continue
+
+            # new item if multiple descriptions in handle
+            if not item_header and not line.startswith('\t'):
+                item_header = False
+                item_values = True
+                value_list = False
+
+                if item:
+                    if values:
+                        item['values'][attribute] = values
+                    if key_data:
+                        item['values'][f'{key}_data'] = key_data
+                    raw_output.append(item)
+
+                item = {
+                    'handle': header[1],
+                    'type': header[4],
+                    'bytes': header[5],
+                    'description': line,
+                    'values': {}
+                }
+
+                key = None
+                val = None
+                attribute = None
+                values = []
+                key_data = []
+                continue
+
+            # keys and values
+            if item_values \
+               and len(line.split(':', maxsplit=1)) == 2 \
+               and line.startswith('\t') \
+               and not line.startswith('\t\t') \
+               and not line.strip().endswith(':'):
+                item_header = False
+                item_values = True
+                value_list = False
 
-            if item:
                 if values:
                     item['values'][attribute] = values
+                    values = []
                 if key_data:
                     item['values'][f'{key}_data'] = key_data
-                raw_output.append(item)
+                    key_data = []
 
-            item = {}
-            header = None
-            key = None
-            val = None
-            attribute = None
-            values = []
-            key_data = []
-            continue
+                key = line.split(':', maxsplit=1)[0].strip().lower().replace(' ', '_')
+                val = line.split(':', maxsplit=1)[1].strip()
+                item['values'].update({key: val})
+                continue
 
-        # header
-        if line.startswith('Handle ') and line.endswith('bytes'):
+            # multi-line key
+            if item_values \
+               and line.startswith('\t') \
+               and not line.startswith('\t\t') \
+               and line.strip().endswith(':'):
+                item_header = False
+                item_values = True
+                value_list = True
 
-            # Handle 0x0000, DMI type 0, 24 bytes
-            header = line.replace(',', ' ').split()
-            item = {
-                'handle': header[1],
-                'type': header[4],
-                'bytes': header[5]
-            }
-            continue
-
-        # description
-        if item_header:
-            item_header = False
-            item_values = True
-            value_list = False
-
-            item['description'] = line
-            item['values'] = {}
-            continue
-
-        # new item if multiple descriptions in handle
-        if not item_header and not line.startswith('\t'):
-            item_header = False
-            item_values = True
-            value_list = False
-
-            if item:
                 if values:
                     item['values'][attribute] = values
+                    values = []
                 if key_data:
                     item['values'][f'{key}_data'] = key_data
-                raw_output.append(item)
+                    key_data = []
 
-            item = {
-                'handle': header[1],
-                'type': header[4],
-                'bytes': header[5],
-                'description': line,
-                'values': {}
-            }
-
-            key = None
-            val = None
-            attribute = None
-            values = []
-            key_data = []
-            continue
-
-        # keys and values
-        if item_values \
-           and len(line.split(':', maxsplit=1)) == 2 \
-           and line.startswith('\t') \
-           and not line.startswith('\t\t') \
-           and not line.strip().endswith(':'):
-            item_header = False
-            item_values = True
-            value_list = False
-
-            if values:
-                item['values'][attribute] = values
+                attribute = line[:-1].strip().lower().replace(' ', '_')
                 values = []
-            if key_data:
-                item['values'][f'{key}_data'] = key_data
-                key_data = []
+                continue
 
-            key = line.split(':', maxsplit=1)[0].strip().lower().replace(' ', '_')
-            val = line.split(':', maxsplit=1)[1].strip()
-            item['values'].update({key: val})
-            continue
+            # multi-line values
+            if value_list \
+               and line.startswith('\t\t'):
+                values.append(line.strip())
+                continue
 
-        # multi-line key
-        if item_values \
-           and line.startswith('\t') \
-           and not line.startswith('\t\t') \
-           and line.strip().endswith(':'):
-            item_header = False
-            item_values = True
-            value_list = True
+            # data for hybrid multi-line objects
+            if item_values \
+               and not value_list \
+               and line.startswith('\t\t'):
+                if f'{key}_data' not in item['values']:
+                    item['values'][f'{key}_data'] = []
+                key_data.append(line.strip())
+                continue
 
-            if values:
-                item['values'][attribute] = values
-                values = []
-            if key_data:
-                item['values'][f'{key}_data'] = key_data
-                key_data = []
-
-            attribute = line[:-1].strip().lower().replace(' ', '_')
-            values = []
-            continue
-
-        # multi-line values
-        if value_list \
-           and line.startswith('\t\t'):
-            values.append(line.strip())
-            continue
-
-        # data for hybrid multi-line objects
-        if item_values \
-           and not value_list \
-           and line.startswith('\t\t'):
-            if f'{key}_data' not in item['values']:
-                item['values'][f'{key}_data'] = []
-            key_data.append(line.strip())
-            continue
-
-    if item:
-        raw_output.append(item)
+        if item:
+            raw_output.append(item)
 
     if raw:
         return raw_output

jc/parsers/du.py

@@ -73,7 +73,7 @@ import jc.parsers.universal
 
 
 class info():
-    version = '1.1'
+    version = '1.2'
     description = 'du command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -137,12 +137,12 @@ def parse(data, raw=False, quiet=False):
         jc.utils.compatibility(__name__, info.compatible)
 
     raw_output = []
-    cleandata = data.splitlines()
 
     # Clear any blank lines
-    cleandata = list(filter(None, cleandata))
+    cleandata = list(filter(None, data.splitlines()))
+
+    if jc.utils.has_data(data):
 
-    if cleandata:
         cleandata.insert(0, 'size name')
         raw_output = jc.parsers.universal.simple_table_parse(cleandata)
 

jc/parsers/env.py

@@ -52,7 +52,7 @@ import jc.utils
 
 
 class info():
-    version = '1.1'
+    version = '1.2'
     description = 'env command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -116,12 +116,10 @@ def parse(data, raw=False, quiet=False):
 
     raw_output = {}
 
-    linedata = data.splitlines()
-
     # Clear any blank lines
-    cleandata = list(filter(None, linedata))
+    cleandata = list(filter(None, data.splitlines()))
 
-    if cleandata:
+    if jc.utils.has_data(data):
 
         for entry in cleandata:
             parsed_line = entry.split('=', maxsplit=1)

jc/parsers/file.py

@@ -48,7 +48,7 @@ import jc.parsers.universal
 
 
 class info():
-    version = '1.1'
+    version = '1.2'
     description = 'file command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -104,23 +104,26 @@ def parse(data, raw=False, quiet=False):
     raw_output = []
 
     warned = False
-    for line in filter(None, data.splitlines()):
-        linedata = line.rsplit(': ', maxsplit=1)
 
-        try:
-            filename = linedata[0].strip()
-            filetype = linedata[1].strip()
+    if jc.utils.has_data(data):
 
-            raw_output.append(
-                {
-                    'filename': filename,
-                    'type': filetype
-                }
-            )
-        except IndexError:
-            if not warned:
-                jc.utils.warning_message('Filenames with newline characters detected. Some filenames may be truncated.')
-                warned = True
+        for line in filter(None, data.splitlines()):
+            linedata = line.rsplit(': ', maxsplit=1)
+
+            try:
+                filename = linedata[0].strip()
+                filetype = linedata[1].strip()
+
+                raw_output.append(
+                    {
+                        'filename': filename,
+                        'type': filetype
+                    }
+                )
+            except IndexError:
+                if not warned:
+                    jc.utils.warning_message('Filenames with newline characters detected. Some filenames may be truncated.')
+                    warned = True
 
     if raw:
         return raw_output

jc/parsers/foo.py

@@ -78,9 +78,11 @@ def parse(data, raw=False, quiet=False):
 
     raw_output = []
 
-    for line in filter(None, data.splitlines()):
-        # parse the content
-        pass
+    if jc.utils.has_data(data):
+
+        for line in filter(None, data.splitlines()):
+            # parse the content
+            pass
 
     if raw:
         return raw_output

jc/parsers/free.py

@@ -53,7 +53,7 @@ import jc.parsers.universal
 
 
 class info():
-    version = '1.0'
+    version = '1.2'
     description = 'free command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -122,14 +122,18 @@ def parse(data, raw=False, quiet=False):
         jc.utils.compatibility(__name__, info.compatible)
 
     cleandata = data.splitlines()
-    cleandata[0] = cleandata[0].lower()
-    cleandata[0] = cleandata[0].replace('buff/cache', 'buff_cache')
-    cleandata[0] = 'type ' + cleandata[0]
+    raw_output = []
 
-    raw_output = jc.parsers.universal.simple_table_parse(cleandata)
+    if jc.utils.has_data(data):
 
-    for entry in raw_output:
-        entry['type'] = entry['type'].rstrip(':')
+        cleandata[0] = cleandata[0].lower()
+        cleandata[0] = cleandata[0].replace('buff/cache', 'buff_cache')
+        cleandata[0] = 'type ' + cleandata[0]
+
+        raw_output = jc.parsers.universal.simple_table_parse(cleandata)
+
+        for entry in raw_output:
+            entry['type'] = entry['type'].rstrip(':')
 
     if raw:
         return raw_output

jc/parsers/fstab.py

@@ -70,7 +70,7 @@ import jc.utils
 
 
 class info():
-    version = '1.2'
+    version = '1.3'
     description = 'fstab file parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -141,7 +141,8 @@ def parse(data, raw=False, quiet=False):
     # Clear any blank lines
     cleandata = list(filter(None, cleandata))
 
-    if cleandata:
+    if jc.utils.has_data(data):
+
         for line in cleandata:
             output_line = {}
             # ignore commented lines

jc/parsers/group.py

@@ -94,7 +94,7 @@ import jc.utils
 
 
 class info():
-    version = '1.0'
+    version = '1.1'
     description = '/etc/group file parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -169,7 +169,8 @@ def parse(data, raw=False, quiet=False):
     # Clear any blank lines
     cleandata = list(filter(None, cleandata))
 
-    if cleandata:
+    if jc.utils.has_data(data):
+
         for entry in cleandata:
             if entry.startswith('#'):
                 continue

jc/parsers/gshadow.py

@@ -60,7 +60,7 @@ import jc.utils
 
 
 class info():
-    version = '1.0'
+    version = '1.1'
     description = '/etc/gshadow file parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -131,7 +131,8 @@ def parse(data, raw=False, quiet=False):
     # Clear any blank lines
     cleandata = list(filter(None, cleandata))
 
-    if cleandata:
+    if jc.utils.has_data(data):
+
         for entry in cleandata:
             if entry.startswith('#'):
                 continue

jc/parsers/history.py

@@ -44,7 +44,7 @@ import jc.utils
 
 
 class info():
-    version = '1.2'
+    version = '1.3'
     description = 'history command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -108,17 +108,19 @@ def parse(data, raw=False, quiet=False):
 
     raw_output = {}
 
-    # split lines and clear out any non-ascii chars
-    linedata = data.encode('ascii', errors='ignore').decode().splitlines()
+    if jc.utils.has_data(data):
 
-    # Skip any blank lines
-    for entry in filter(None, linedata):
-        try:
-            parsed_line = entry.split(maxsplit=1)
-            raw_output[parsed_line[0]] = parsed_line[1]
-        except IndexError:
-            # need to catch indexerror in case there is weird input from prior commands
-            pass
+        # split lines and clear out any non-ascii chars
+        linedata = data.encode('ascii', errors='ignore').decode().splitlines()
+
+        # Skip any blank lines
+        for entry in filter(None, linedata):
+            try:
+                parsed_line = entry.split(maxsplit=1)
+                raw_output[parsed_line[0]] = parsed_line[1]
+            except IndexError:
+                # need to catch indexerror in case there is weird input from prior commands
+                pass
 
     if raw:
         return raw_output

jc/parsers/hosts.py

@@ -61,7 +61,7 @@ import jc.utils
 
 
 class info():
-    version = '1.1'
+    version = '1.2'
     description = '/etc/hosts file parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -117,12 +117,12 @@ def parse(data, raw=False, quiet=False):
         jc.utils.compatibility(__name__, info.compatible)
 
     raw_output = []
-    cleandata = data.splitlines()
 
     # Clear any blank lines
-    cleandata = list(filter(None, cleandata))
+    cleandata = list(filter(None, data.splitlines()))
+
+    if jc.utils.has_data(data):
 
-    if cleandata:
         for line in cleandata:
             output_line = {}
             # ignore commented lines

jc/parsers/id.py

@@ -70,7 +70,7 @@ import jc.utils
 
 
 class info():
-    version = '1.0'
+    version = '1.1'
     description = 'id command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -166,12 +166,12 @@ def parse(data, raw=False, quiet=False):
         jc.utils.compatibility(__name__, info.compatible)
 
     raw_output = {}
-    cleandata = data.split()
 
     # Clear any blank lines
-    cleandata = list(filter(None, cleandata))
+    cleandata = list(filter(None, data.split()))
+
+    if jc.utils.has_data(data):
 
-    if cleandata:
         for section in cleandata:
             if section.startswith('uid'):
                 uid_parsed = section.replace('(', '=').replace(')', '=')

jc/parsers/ifconfig.py

@@ -147,7 +147,7 @@ import jc.utils
 
 
 class info():
-    version = '1.7'
+    version = '1.8'
     description = 'ifconfig command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -372,8 +372,6 @@ class IfconfigParser(object):
 
 
 class InterfaceNotFound(Exception):
-    """
-    """
     pass
 
 
@@ -475,14 +473,16 @@ def parse(data, raw=False, quiet=False):
 
     raw_output = []
 
-    parsed = IfconfigParser(console_output=data)
-    interfaces = parsed.get_interfaces()
+    if jc.utils.has_data(data):
 
-    # convert ifconfigparser output to a dictionary
-    for iface in interfaces:
-        d = interfaces[iface]._asdict()
-        dct = dict(d)
-        raw_output.append(dct)
+        parsed = IfconfigParser(console_output=data)
+        interfaces = parsed.get_interfaces()
+
+        # convert ifconfigparser output to a dictionary
+        for iface in interfaces:
+            d = interfaces[iface]._asdict()
+            dct = dict(d)
+            raw_output.append(dct)
 
     if raw:
         return raw_output

jc/parsers/ini.py

@@ -2,7 +2,9 @@
 
 Usage:
 
-    specify --ini as the first argument if the piped input is coming from an INI file
+    Specify --ini as the first argument if the piped input is coming from an INI file or any
+    simple key/value pair file. Delimiter can be '=' or ':'. Missing values are supported.
+    Comment prefix can be '#' or ';'. Comments must be on their own line.
 
 Compatibility:
 
@@ -47,7 +49,7 @@ import configparser
 
 
 class info():
-    version = '1.0'
+    version = '1.3'
     description = 'INI file parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -70,15 +72,33 @@ def process(proc_data):
 
     Returns:
 
-        Dictionary representing an ini document:
+        Dictionary representing an ini or simple key/value pair document:
 
         {
-          ini document converted to a dictionary
-          see configparser standard library documentation for more details
+          ini or key/value document converted to a dictionary - see configparser standard
+          library documentation for more details.
+
+          Note: Values starting and ending with quotation marks will have the marks removed.
+                If you would like to keep the quotation marks, use the -r or raw=True argument.
         }
     """
+    # remove quotation marks from beginning and end of values
+    for heading in proc_data:
+        # standard ini files with headers
+        if isinstance(proc_data[heading], dict):
+            for key, value in proc_data[heading].items():
+                if value is not None and value.startswith('"') and value.endswith('"'):
+                    proc_data[heading][key] = value.lstrip('"').rstrip('"')
+                elif value is None:
+                    proc_data[heading][key] = ''
+
+        # simple key/value files with no headers
+        else:
+            if proc_data[heading] is not None and proc_data[heading].startswith('"') and proc_data[heading].endswith('"'):
+                proc_data[heading] = proc_data[heading].lstrip('"').rstrip('"')
+            elif proc_data[heading] is None:
+                proc_data[heading] = ''
 
-    # No further processing
     return proc_data
 
 
@@ -101,10 +121,19 @@ def parse(data, raw=False, quiet=False):
 
     raw_output = {}
 
-    if data:
-        ini = configparser.ConfigParser()
-        ini.read_string(data)
-        raw_output = {s: dict(ini.items(s)) for s in ini.sections()}
+    if jc.utils.has_data(data):
+
+        ini = configparser.ConfigParser(allow_no_value=True, interpolation=None)
+        try:
+            ini.read_string(data)
+            raw_output = {s: dict(ini.items(s)) for s in ini.sections()}
+
+        except configparser.MissingSectionHeaderError:
+            data = '[data]\n' + data
+            ini.read_string(data)
+            output_dict = {s: dict(ini.items(s)) for s in ini.sections()}
+            for key, value in output_dict['data'].items():
+                raw_output[key] = value
 
     if raw:
         return raw_output

jc/parsers/iptables.py

@@ -134,7 +134,7 @@ import jc.utils
 
 
 class info():
-    version = '1.2'
+    version = '1.4'
     description = 'iptables command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -194,19 +194,19 @@ def process(proc_data):
             if 'bytes' in rule:
                 multiplier = 1
                 if rule['bytes'][-1] == 'K':
-                    multiplier = 1000
+                    multiplier = 10 ** 3
                     rule['bytes'] = rule['bytes'].rstrip('K')
                 elif rule['bytes'][-1] == 'M':
-                    multiplier = 1000000
+                    multiplier = 10 ** 6
                     rule['bytes'] = rule['bytes'].rstrip('M')
                 elif rule['bytes'][-1] == 'G':
-                    multiplier = 1000000000
+                    multiplier = 10 ** 9
                     rule['bytes'] = rule['bytes'].rstrip('G')
                 elif rule['bytes'][-1] == 'T':
-                    multiplier = 1000000000000
+                    multiplier = 10 ** 12
                     rule['bytes'] = rule['bytes'].rstrip('T')
                 elif rule['bytes'][-1] == 'P':
-                    multiplier = 1000000000000000
+                    multiplier = 10 ** 15
                     rule['bytes'] = rule['bytes'].rstrip('P')
 
                 try:
@@ -243,36 +243,39 @@ def parse(data, raw=False, quiet=False):
     chain = {}
     headers = []
 
-    cleandata = data.splitlines()
+    if jc.utils.has_data(data):
 
-    for line in cleandata:
+        for line in list(filter(None, data.splitlines())):
 
-        if line.startswith('Chain'):
+            if line.startswith('Chain'):
+                if chain:
+                    raw_output.append(chain)
+
+                chain = {}
+                headers = []
+
+                parsed_line = line.split()
+
+                chain['chain'] = parsed_line[1]
+                chain['rules'] = []
+
+                continue
+
+            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")
+
+                continue
+
+            else:
+                rule = line.split(maxsplit=len(headers) - 1)
+                temp_rule = dict(zip(headers, rule))
+                if temp_rule:
+                    chain['rules'].append(temp_rule)
+
+        if chain:
             raw_output.append(chain)
-            chain = {}
-            headers = []
-
-            parsed_line = line.split()
-
-            chain['chain'] = parsed_line[1]
-            chain['rules'] = []
-
-            continue
-
-        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")
-
-            continue
-
-        else:
-            rule = line.split(maxsplit=len(headers) - 1)
-            temp_rule = dict(zip(headers, rule))
-            if temp_rule:
-                chain['rules'].append(temp_rule)
-
-    raw_output = list(filter(None, raw_output))
 
     if raw:
         return raw_output

jc/parsers/jobs.py

@@ -77,7 +77,7 @@ import jc.utils
 
 
 class info():
-    version = '1.1'
+    version = '1.2'
     description = 'jobs command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -144,12 +144,10 @@ def parse(data, raw=False, quiet=False):
 
     raw_output = []
 
-    linedata = data.splitlines()
-
     # Clear any blank lines
-    cleandata = list(filter(None, linedata))
+    cleandata = list(filter(None, data.splitlines()))
 
-    if cleandata:
+    if jc.utils.has_data(data):
 
         for entry in cleandata:
             output_line = {}

jc/parsers/kv.py

@@ -0,0 +1,67 @@
+"""jc - JSON CLI output utility Key/Value File Parser
+
+Usage:
+
+    Specify --kv as the first argument if the piped input is coming from a simple
+    key/value pair file. Delimiter can be '=' or ':'. Missing values are supported.
+    Comment prefix can be '#' or ';'. Comments must be on their own line.
+
+Compatibility:
+
+    'linux', 'darwin', 'cygwin', 'win32', 'aix', 'freebsd'
+
+Examples:
+
+    $ cat keyvalue.txt
+    # this file contains key/value pairs
+    name = John Doe
+    address=555 California Drive
+    age: 34
+    ; comments can include # or ;
+    # delimiter can be = or :
+    # quoted values have quotation marks stripped by default
+    # but can be preserved with the -r argument
+    occupation:"Engineer"
+
+    $ cat keyvalue.txt | jc --ini -p
+    {
+      "name": "John Doe",
+      "address": "555 California Drive",
+      "age": "34",
+      "occupation": "Engineer"
+    }
+"""
+
+
+class info():
+    version = '1.0'
+    description = 'Key/Value file parser'
+    author = 'Kelly Brazil'
+    author_email = 'kellyjonbrazil@gmail.com'
+    details = 'This is a wrapper for the INI parser'
+
+    # compatible options: linux, darwin, cygwin, win32, aix, freebsd
+    compatible = ['linux', 'darwin', 'cygwin', 'win32', 'aix', 'freebsd']
+
+
+__version__ = info.version
+
+
+def parse(data, raw=False, quiet=False):
+    """
+    Main text parsing function
+
+        Note: this is just a wrapper for jc.parsers.ini
+
+    Parameters:
+
+        data:        (string)  text data to parse
+        raw:         (boolean) output preprocessed JSON if True
+        quiet:       (boolean) suppress warning messages if True
+
+    Returns:
+
+        Dictionary representing the key/value file
+    """
+    import jc.parsers.ini
+    return jc.parsers.ini.parse(data, raw=raw, quiet=quiet)

jc/parsers/last.py

@@ -72,7 +72,7 @@ import jc.utils
 
 
 class info():
-    version = '1.2'
+    version = '1.3'
     description = 'last and lastb command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -149,12 +149,12 @@ def parse(data, raw=False, quiet=False):
         jc.utils.compatibility(__name__, info.compatible)
 
     raw_output = []
-    cleandata = data.splitlines()
 
     # Clear any blank lines
-    cleandata = list(filter(None, cleandata))
+    cleandata = list(filter(None, data.splitlines()))
+
+    if jc.utils.has_data(data):
 
-    if cleandata:
         for entry in cleandata:
             output_line = {}
 

jc/parsers/ls.py

@@ -149,7 +149,7 @@ import jc.utils
 
 
 class info():
-    version = '1.5'
+    version = '1.6'
     description = 'ls command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -226,7 +226,8 @@ def parse(data, raw=False, quiet=False):
 
     linedata = data.splitlines()
 
-    if linedata:
+    if jc.utils.has_data(data):
+
         # Delete first line if it starts with 'total 1234'
         if re.match(r'total [0-9]+', linedata[0]):
             linedata.pop(0)

jc/parsers/lsblk.py

@@ -216,7 +216,7 @@ import jc.parsers.universal
 
 
 class info():
-    version = '1.3'
+    version = '1.5'
     description = 'lsblk command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -327,20 +327,23 @@ def parse(data, raw=False, quiet=False):
     if not quiet:
         jc.utils.compatibility(__name__, info.compatible)
 
-    linedata = data.splitlines()
     # Clear any blank lines
-    cleandata = list(filter(None, linedata))
-    cleandata = data.splitlines()
+    cleandata = list(filter(None, data.splitlines()))
+    raw_output = []
 
-    cleandata[0] = cleandata[0].lower()
-    cleandata[0] = cleandata[0].replace(':', '_')
-    cleandata[0] = cleandata[0].replace('-', '_')
+    if jc.utils.has_data(data):
 
-    raw_output = jc.parsers.universal.sparse_table_parse(cleandata)
+        cleandata = data.splitlines()
 
-    # clean up non-ascii characters, if any
-    for entry in raw_output:
-        entry['name'] = entry['name'].encode('ascii', errors='ignore').decode()
+        cleandata[0] = cleandata[0].lower()
+        cleandata[0] = cleandata[0].replace(':', '_')
+        cleandata[0] = cleandata[0].replace('-', '_')
+
+        raw_output = jc.parsers.universal.sparse_table_parse(cleandata)
+
+        # clean up non-ascii characters, if any
+        for entry in raw_output:
+            entry['name'] = entry['name'].encode('ascii', errors='ignore').decode()
 
     if raw:
         return raw_output

jc/parsers/lsmod.py

@@ -107,7 +107,7 @@ import jc.parsers.universal
 
 
 class info():
-    version = '1.1'
+    version = '1.3'
     description = 'lsmod command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -175,13 +175,17 @@ def parse(data, raw=False, quiet=False):
         jc.utils.compatibility(__name__, info.compatible)
 
     cleandata = data.splitlines()
-    cleandata[0] = cleandata[0].lower()
+    raw_output = []
 
-    raw_output = jc.parsers.universal.simple_table_parse(cleandata)
+    if jc.utils.has_data(data):
 
-    for mod in raw_output:
-        if 'by' in mod:
-            mod['by'] = mod['by'].split(',')
+        cleandata[0] = cleandata[0].lower()
+
+        raw_output = jc.parsers.universal.simple_table_parse(cleandata)
+
+        for mod in raw_output:
+            if 'by' in mod:
+                mod['by'] = mod['by'].split(',')
 
     if raw:
         return raw_output

jc/parsers/lsof.py

@@ -97,7 +97,7 @@ import jc.parsers.universal
 
 
 class info():
-    version = '1.1'
+    version = '1.2'
     description = 'lsof command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -169,12 +169,11 @@ def parse(data, raw=False, quiet=False):
 
     raw_output = []
 
-    linedata = data.splitlines()
-
     # Clear any blank lines
-    cleandata = list(filter(None, linedata))
+    cleandata = list(filter(None, data.splitlines()))
+
+    if jc.utils.has_data(data):
 
-    if cleandata:
         cleandata[0] = cleandata[0].lower()
         cleandata[0] = cleandata[0].replace('/', '_')
 

jc/parsers/mount.py

@@ -56,7 +56,7 @@ import jc.utils
 
 
 class info():
-    version = '1.3'
+    version = '1.5'
     description = 'mount command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -158,12 +158,12 @@ def parse(data, raw=False, quiet=False):
     if not quiet:
         jc.utils.compatibility(__name__, info.compatible)
 
-    linedata = data.splitlines()
-
     # Clear any blank lines
-    cleandata = list(filter(None, linedata))
+    cleandata = list(filter(None, data.splitlines()))
+    raw_output = []
+
+    if jc.utils.has_data(data):
 
-    if cleandata:
         # check for OSX output
         if ' type ' not in cleandata[0]:
             raw_output = osx_parse(cleandata)

jc/parsers/netstat.py

@@ -247,7 +247,7 @@ Examples:
 
 
 class info():
-    version = '1.6'
+    version = '1.8'
     description = 'netstat command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -431,29 +431,30 @@ def parse(data, raw=False, quiet=False):
     if not quiet:
         jc.utils.compatibility(__name__, info.compatible)
 
-    cleandata = data.splitlines()
-    cleandata = list(filter(None, cleandata))
+    cleandata = list(filter(None, data.splitlines()))
     raw_output = []
 
-    # check for FreeBSD/OSX vs Linux
-    # is this from FreeBSD/OSX?
-    if cleandata[0] == 'Active Internet connections' \
-       or cleandata[0] == 'Active Internet connections (including servers)' \
-       or cleandata[0] == 'Active Multipath Internet connections' \
-       or cleandata[0] == 'Active LOCAL (UNIX) domain sockets' \
-       or cleandata[0] == 'Registered kernel control modules' \
-       or cleandata[0] == 'Active kernel event sockets' \
-       or cleandata[0] == 'Active kernel control sockets' \
-       or cleandata[0] == 'Routing tables' \
-       or cleandata[0].startswith('Name  '):
+    if jc.utils.has_data(data):
 
-        import jc.parsers.netstat_freebsd_osx
-        raw_output = jc.parsers.netstat_freebsd_osx.parse(cleandata)
+        # check for FreeBSD/OSX vs Linux
+        # is this from FreeBSD/OSX?
+        if cleandata[0] == 'Active Internet connections' \
+           or cleandata[0] == 'Active Internet connections (including servers)' \
+           or cleandata[0] == 'Active Multipath Internet connections' \
+           or cleandata[0] == 'Active LOCAL (UNIX) domain sockets' \
+           or cleandata[0] == 'Registered kernel control modules' \
+           or cleandata[0] == 'Active kernel event sockets' \
+           or cleandata[0] == 'Active kernel control sockets' \
+           or cleandata[0] == 'Routing tables' \
+           or cleandata[0].startswith('Name  '):
 
-    # use linux parser
-    else:
-        import jc.parsers.netstat_linux
-        raw_output = jc.parsers.netstat_linux.parse(cleandata)
+            import jc.parsers.netstat_freebsd_osx
+            raw_output = jc.parsers.netstat_freebsd_osx.parse(cleandata)
+
+        # use linux parser
+        else:
+            import jc.parsers.netstat_linux
+            raw_output = jc.parsers.netstat_linux.parse(cleandata)
 
     if raw:
         return raw_output

jc/parsers/ntpq.py

@@ -183,7 +183,7 @@ import jc.parsers.universal
 
 
 class info():
-    version = '1.1'
+    version = '1.3'
     description = 'ntpq -p command parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -268,28 +268,30 @@ def parse(data, raw=False, quiet=False):
     if not quiet:
         jc.utils.compatibility(__name__, info.compatible)
 
+    cleandata = data.splitlines()
     raw_output = []
 
-    cleandata = data.splitlines()
-    cleandata[0] = 's ' + cleandata[0]
-    cleandata[0] = cleandata[0].lower()
+    if jc.utils.has_data(data):
 
-    # delete header delimiter
-    del cleandata[1]
+        cleandata[0] = 's ' + cleandata[0]
+        cleandata[0] = cleandata[0].lower()
 
-    # separate first character with a space for easier parsing
-    for i, line in list(enumerate(cleandata[1:])):
-        if line[0] == ' ':
-            # fixup for no-state
-            cleandata[i + 1] = '~  ' + line[1:]
-        else:
-            # fixup - realign columns since we added the 's' column
-            cleandata[i + 1] = line[:1] + '  ' + line[1:]
+        # delete header delimiter
+        del cleandata[1]
 
-        # fixup for occaisional ip/hostname fields with a space
-        cleandata[i + 1] = cleandata[i + 1].replace(' (', '_(')
+        # separate first character with a space for easier parsing
+        for i, line in list(enumerate(cleandata[1:])):
+            if line[0] == ' ':
+                # fixup for no-state
+                cleandata[i + 1] = '~  ' + line[1:]
+            else:
+                # fixup - realign columns since we added the 's' column
+                cleandata[i + 1] = line[:1] + '  ' + line[1:]
 
-    raw_output = jc.parsers.universal.simple_table_parse(cleandata)
+            # fixup for occaisional ip/hostname fields with a space
+            cleandata[i + 1] = cleandata[i + 1].replace(' (', '_(')
+
+        raw_output = jc.parsers.universal.simple_table_parse(cleandata)
 
     if raw:
         return raw_output

jc/parsers/passwd.py

@@ -78,7 +78,7 @@ import jc.utils
 
 
 class info():
-    version = '1.0'
+    version = '1.1'
     description = '/etc/passwd file parser'
     author = 'Kelly Brazil'
     author_email = 'kellyjonbrazil@gmail.com'
@@ -146,12 +146,12 @@ def parse(data, raw=False, quiet=False):
         jc.utils.compatibility(__name__, info.compatible)
 
     raw_output = []
-    cleandata = data.splitlines()
 
     # Clear any blank lines
-    cleandata = list(filter(None, cleandata))
+    cleandata = list(filter(None, data.splitlines()))
+
+    if jc.utils.has_data(data):
 
-    if cleandata:
         for entry in cleandata:
             if entry.startswith('#'):
                 continue