Merge pull request #18 from kellyjonbrazil/master

Sync to Dev

CHANGELOG

@@ -1,5 +1,11 @@
 jtbl changelog
 
+20230522 v1.5.2
+- Fix output for empty array
+
+20230228 v1.5.1
+- Preserve long float formatting
+
 20230114 v1.5.0
 - Be more tolerant of loading JSON Lines with blank lines and whitespace
 

jtbl/cli.py

@@ -7,7 +7,7 @@
 import tabulate
 import shutil
 
-__version__ = '1.5.0'
+__version__ = '1.5.2'
 SUCCESS, ERROR = True, False
 
 
@@ -172,6 +172,11 @@ def check_data(data=None, columns=0):
 
         return SUCCESS, data
 
+    if data == []:
+        return SUCCESS, ''
+
+    return ERROR, data
+
 
 def get_headers(data):
     """scan the data and return a dictionary of all of the headers in order"""
@@ -271,7 +276,7 @@ def make_table(
         table_format = 'plain'
         headers = ''
 
-    return (SUCCESS, tabulate.tabulate(data, headers=headers, tablefmt=table_format))
+    return (SUCCESS, tabulate.tabulate(data, headers=headers, tablefmt=table_format, floatfmt=''))
 
 
 def main():

man/jtbl.1

@@ -1,4 +1,4 @@
-.TH jtbl 1 2022-04-04 1.3.1 "JTBL - JSON tables in the terminal"
+.TH jtbl 1 2023-02-28 1.5.1 "JTBL - JSON tables in the terminal"
 .SH NAME
 jtbl \- Print JSON and JSON Lines data as a table in the terminal
 .SH SYNOPSIS
@@ -64,6 +64,6 @@ Kelly Brazil ([email protected])
 https://github.com/kellyjonbrazil/jtbl
 
 .SH COPYRIGHT
-Copyright (c) 2020-2022 Kelly Brazil
+Copyright (c) 2020-2023 Kelly Brazil
 
 License: MIT License

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name='jtbl',
-    version='1.5.0',
+    version='1.5.2',
     author='Kelly Brazil',
     author_email='[email protected]',
     description='A simple cli tool to print JSON and JSON Lines data as a table in the terminal.',

tests/test_make_table.py

@@ -9,6 +9,16 @@ def setUp(self):
         self.SUCCESS, self.ERROR = True, False
         self.columns = 80
 
+    def test_empty_dict(self):
+        stdin = {}
+        expected = ''
+        self.assertEqual(jtbl.cli.make_table(data=stdin, columns=self.columns), (self.SUCCESS, expected))
+
+    def test_empty_list(self):
+        stdin = []
+        expected = ''
+        self.assertEqual(jtbl.cli.make_table(data=stdin, columns=self.columns), (self.SUCCESS, expected))
+
     def test_simple_key_value(self):
         stdin = [{"key": "value"}]
         expected = textwrap.dedent('''\
@@ -329,6 +339,11 @@ def test_jc_dig_answer(self):
 
         self.assertEqual(jtbl.cli.make_table(data=stdin, columns=80), (self.SUCCESS, expected))
 
+    def test_float_format(self):
+        stdin = [{"a": 1000000, "b": 1000000.1}]
+        expected = '      a          b\n-------  ---------\n1000000  1000000.1'
+
+        self.assertEqual(jtbl.cli.make_table(data=stdin, columns=80), (self.SUCCESS, expected))
 
     def test_json_lines(self):
         """test JSON Lines data"""