utils: import cli printer from reana-commons

Signed-off-by: Dinos Kousidis <[email protected]>

reana_client/cli/code.py

@@ -32,7 +32,7 @@
 from ..errors import FileUploadError
 from ..api.client import UploadType
 from ..config import default_organization, default_user
-from ..utils import cli_printer
+from reana_commons.utils import click_table_printer
 
 
 @click.group(
@@ -100,7 +100,7 @@ def code_list(ctx, user, organization, workflow, _filter, output_format):
                         rows=None, cols=list(_filter))
                 click.echo(tablib_data.export(output_format))
             else:
-                cli_printer(headers, _filter, data)
+                click_table_printer(headers, _filter, data)
 
         except Exception as e:
             logging.debug(traceback.format_exc())

reana_client/cli/inputs.py

@@ -31,7 +31,7 @@
 from ..config import default_organization, default_user
 from ..errors import FileUploadError
 from ..api.client import UploadType
-from ..utils import cli_printer
+from reana_commons.utils import click_table_printer
 
 
 @click.group(
@@ -99,7 +99,7 @@ def inputs_list(ctx, user, organization, workflow, _filter, output_format):
                         rows=None, cols=list(_filter))
                 click.echo(tablib_data.export(output_format))
             else:
-                cli_printer(headers, _filter, data)
+                click_table_printer(headers, _filter, data)
 
         except Exception as e:
             logging.debug(traceback.format_exc())

reana_client/cli/outputs.py

@@ -30,7 +30,7 @@
 import tablib
 
 from ..config import default_download_path, default_organization, default_user
-from ..utils import cli_printer
+from reana_commons.utils import click_table_printer
 
 
 @click.group(
@@ -100,7 +100,7 @@ def outputs_list(ctx, user, organization, workflow, _filter, output_format):
                         rows=None, cols=list(_filter))
                 click.echo(tablib_data.export(output_format))
             else:
-                cli_printer(headers, _filter, data)
+                click_table_printer(headers, _filter, data)
 
         except Exception as e:
             logging.debug(traceback.format_exc())

reana_client/cli/workflow.py

@@ -33,7 +33,8 @@
 from ..config import (default_organization, default_user,
                       reana_yaml_default_file_path)
 from ..utils import get_workflow_name_and_run_number, load_reana_spec, \
-    load_workflow_spec, is_uuid_v4, workflow_uuid_or_name, cli_printer
+    load_workflow_spec, is_uuid_v4, workflow_uuid_or_name
+from reana_commons.utils import click_table_printer
 
 
 class _WorkflowStatus(Enum):
@@ -107,7 +108,7 @@ def workflow_list(ctx, user, organization, _filter, output_format):
 
             click.echo(tablib_data.export(output_format))
         else:
-            cli_printer(headers, _filter, data)
+            click_table_printer(headers, _filter, data)
 
     except Exception as e:
         logging.debug(traceback.format_exc())
@@ -322,7 +323,7 @@ def workflow_status(ctx, user, organization, workflow, _filter, output_format):
 
                 click.echo(data.export(output_format))
             else:
-                cli_printer(headers, _filter, data)
+                click_table_printer(headers, _filter, data)
 
         except Exception as e:
             logging.debug(traceback.format_exc())

reana_client/utils.py

@@ -209,25 +209,3 @@ def get_analysis_root():
                 analysis_root = parent_dir
     analysis_root += '/'
     return analysis_root
-
-
-def cli_printer(headers, _filter, data):
-    """Print a response in a tabulated format."""
-    _filter = [h.lower() for h in _filter] + [h.upper() for h in _filter]
-    headers = [h for h in headers if not _filter or h in _filter]
-    # Maximum header width
-    header_widths = [len(h) for h in headers]
-
-    for row in data:
-        for idx in range(len(headers)):
-            # If a row contains an element which is wider update maximum width
-            if header_widths[idx] < len(str(row[idx])):
-                header_widths[idx] = len(str(row[idx]))
-    # Prepare the format string with the maximum widths
-    formatted_output_parts = ['{{:<{0}}}'.format(hw)
-                              for hw in header_widths]
-    formatted_output = '   '.join(formatted_output_parts)
-    # Print the table with the headers capitalized
-    click.echo(formatted_output.format(*[h.upper() for h in headers]))
-    for row in data:
-        click.echo(formatted_output.format(*row))

setup.py

@@ -73,6 +73,7 @@
     'strict-rfc3339==0.7',  # FIXME remove once yadage-schemas solves deps.
     'tablib>=0.12.1',
     'webcolors==1.7',  # FIXME remove once yadage-schemas solves deps.
+    'reana-commons',
 ]
 
 packages = find_packages()