Fix json formatter

Author: sharbov

open_cli/formatter.py

@@ -1,10 +1,8 @@
+import json
 import tabulate
 
-from pprint import pformat
-
-
-def format_response(response, output_format):
-    return u"\n{}\n".format(to_table(response) if output_format == "table" else pformat(response))
+JSON = "json"
+TABLE = "table"
 
 
 def to_table(response):
@@ -27,3 +25,18 @@ def to_table(response):
             headers={key: key.capitalize() for key in response[0].keys()},
             tablefmt='grid'
         )
+
+
+def to_json(response):
+    """Convert raw response into json output."""
+    return json.dumps(response, indent=2)
+
+
+FORMATTERS = {
+    JSON: to_json,
+    TABLE: to_table,
+}
+
+
+def format_response(response, output_format):
+    return u"\n{}\n".format(FORMATTERS[output_format](response))

open_cli/main.py

@@ -3,6 +3,7 @@
 import argparse
 
 import cli
+import formatter
 
 HISTORY_PATH = os.path.join(os.path.expanduser("~"), ".open-cli")
 
@@ -14,7 +15,8 @@ def main():
     args_parser.add_argument('-v', '--verbose', action='store_true', help='If set, set log level to debug')
     args_parser.add_argument('-t', '--history', type=str, default=HISTORY_PATH, help='history file path')
     args_parser.add_argument('-c', '--command', type=str, help='command to execute', required=False)
-    args_parser.add_argument('-f', '--format', type=str, choices=['raw', 'table'], default='raw',
+    args_parser.add_argument('-f', '--format', type=str,
+                             choices=formatter.FORMATTERS.keys(), default=formatter.JSON,
                              help='Set the CLI output format')
     args_parser.add_argument('--header', nargs='+', default=[],
                              help='requests headers, usage: --header x-header-1:val-1 x-header-2:val2')