add support for hjson and json5 formats input data source

related to #106

Author: kbroch-rivosinc

.travis.yml

@@ -8,7 +8,7 @@ python:
   - '3.6'
   - '3.7'
 
-install: pip install -e .[yaml,toml,tests,xml]
+install: pip install -e .[yaml,toml,tests,xml,hjson,json5]
 
 script:
   - pytest -v

README.md

@@ -43,6 +43,16 @@ If `xmltodict` is present, you can use XML as an input data source.
 
 `$ pip install jinja2-cli[xml]`
 
+## Optional HJSON support
+If `hjson` is present, you can use HJSON as an input data source.
+
+`$ pip install jinja2-cli[hjson]`
+
+## Optional JSON5 support
+If `json5` is present, you can use JSON5 as an input data source.
+
+`$ pip install jinja2-cli[json5]`
+
 ## TODO
  * Variable inheritance and overrides
   * Tests!

jinja2cli/cli.py

@@ -69,6 +69,14 @@ class MalformedEnv(InvalidDataFormat):
     pass
 
 
+class MalformedHJSON(InvalidDataFormat):
+    pass
+
+
+class MalformedJSON5(InvalidDataFormat):
+    pass
+
+
 def get_format(fmt):
     try:
         return formats[fmt]()
@@ -206,6 +214,18 @@ def _parse_env(data):
     return _parse_env, Exception, MalformedEnv
 
 
+def _load_hjson():
+    import hjson
+
+    return hjson.loads, Exception, MalformedHJSON
+
+
+def _load_json5():
+    import json5
+
+    return json5.loads, Exception, MalformedJSON5
+
+
 # Global list of available format parsers on your system
 # mapped to the callable/Exception to parse a string into a dict
 formats = {
@@ -217,6 +237,8 @@ def _parse_env(data):
     "toml": _load_toml,
     "xml": _load_xml,
     "env": _load_env,
+    "hjson": _load_hjson,
+    "json5": _load_json5,
 }
 
 
@@ -299,6 +321,10 @@ def cli(opts, args):
                 raise InvalidDataFormat("toml: install toml to fix")
             if format == "xml":
                 raise InvalidDataFormat("xml: install xmltodict to fix")
+            if format == "hjson":
+                raise InvalidDataFormat("hjson: install hjson to fix")
+            if format == "json5":
+                raise InvalidDataFormat("json5: install json5 to fix")
             raise
         try:
             data = fn(data) or {}

setup.py

@@ -33,6 +33,8 @@
         "toml": install_requires + ["toml"],
         "xml": install_requires + ["xmltodict"],
         "tests": install_requires + tests_requires,
+        "hjson": install_requires + ["hjson"],
+        "json5": install_requires + ["json5"],
     },
     tests_require=tests_requires,
     include_package_data=True,