chore(datasets): add remapping of headers in tabulate

Updates table header names `short_id` to `id` and `authors_csv` to `authors`.

Author: jsam

renku/cli/dataset.py

@@ -77,6 +77,7 @@
       my-dataset/
         datafile
 """
+from collections import OrderedDict
 
 import click
 from click import BadParameter
@@ -96,12 +97,15 @@ def dataset(ctx, client, datadir):
     """Handle datasets."""
     ctx.meta['renku.datasets.datadir'] = datadir
 
-    if ctx.invoked_subcommand is None:
-        table = tabulate(
-            client.datasets.values(),
-            headers=['short_id', 'name', 'authors_csv', 'created'],
-        )
-        click.echo(table)
+    if ctx.invoked_subcommand is not None:
+        return
+
+    output = tabulate(
+        client.datasets.values(),
+        headers=OrderedDict((('short_id', 'id'), ('name', None),
+                             ('created', None), ('authors_csv', 'authors'))),
+    )
+    click.echo(output)
 
 
 @dataset.command()

renku/models/_tabulate.py

@@ -32,8 +32,16 @@ def format_cell(cell, datetime_fmt=None):
 
 def tabulate(collection, headers, datetime_fmt='%Y-%m-%d %H:%M:%S', **kwargs):
     """Pretty-print a collection."""
+    if isinstance(headers, dict):
+        attrs = headers.keys()
+        # if mapping is not specified keep original
+        names = [
+            key if value is None else value for key, value in headers.items()
+        ]
+    else:
+        attrs = names = headers
     table = [(
         format_cell(cell, datetime_fmt=datetime_fmt)
-        for cell in attrgetter(*headers)(c)
+        for cell in attrgetter(*attrs)(c)
     ) for c in collection]
-    return tblte(table, headers=[h.upper() for h in headers], **kwargs)
+    return tblte(table, headers=[h.upper() for h in names], **kwargs)

tests/test_cli.py

@@ -355,8 +355,11 @@ def test_datasets_list_empty(runner, project):
     result = runner.invoke(cli.cli, ['dataset'])
     assert result.exit_code == 0
 
-    rows = result.output.split('\n')
-    assert len(rows) == 3
+    output = result.output.split('\n')
+    assert output.pop(0).split() == ['ID', 'NAME', 'CREATED', 'AUTHORS']
+    assert set(output.pop(0)) == {'-', ' '}
+    assert output.pop(0) == ''
+    assert not output
 
 
 def test_datasets_list_non_empty(runner, project):
@@ -367,8 +370,13 @@ def test_datasets_list_non_empty(runner, project):
     result = runner.invoke(cli.cli, ['dataset'])
     assert result.exit_code == 0
 
-    rows = set(result.output.split('\n'))
-    assert len(rows) == 4
+    output = result.output.split('\n')
+
+    assert output.pop(0).split() == ['ID', 'NAME', 'CREATED', 'AUTHORS']
+    assert set(output.pop(0)) == {'-', ' '}
+    assert 'dataset' in output.pop(0)
+    assert output.pop(0) == ''
+    assert not output
 
 
 def test_multiple_file_to_dataset(