From a3fc2206cdc57e73d3c76a0c82b122637cd2c0b5 Mon Sep 17 00:00:00 2001 From: hparekh Date: Fri, 6 Nov 2015 15:21:53 +0530 Subject: [PATCH] Wrapped long lines in the "Tags" column. Change-Id: I0191402d046bcf6109a0c001d89f52ffe22de890 Closes-Bug: #1449511 --- mistralclient/commands/v2/actions.py | 2 +- mistralclient/commands/v2/base.py | 8 ++++++++ mistralclient/commands/v2/workbooks.py | 2 +- mistralclient/commands/v2/workflows.py | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/mistralclient/commands/v2/actions.py b/mistralclient/commands/v2/actions.py index 971b6410..cfc5cb80 100644 --- a/mistralclient/commands/v2/actions.py +++ b/mistralclient/commands/v2/actions.py @@ -53,7 +53,7 @@ def format(action=None, lister=False): action.is_system, input, desc, - ', '.join(tags) or '', + base.wrap(', '.join(tags)) or '', action.created_at, ) diff --git a/mistralclient/commands/v2/base.py b/mistralclient/commands/v2/base.py index 9f605d75..3e8239fc 100644 --- a/mistralclient/commands/v2/base.py +++ b/mistralclient/commands/v2/base.py @@ -18,6 +18,7 @@ import abc from cliff import lister import six +import textwrap @six.add_metaclass(abc.ABCMeta) @@ -53,3 +54,10 @@ def cut(string, length=25): return "%s..." % string[:length] else: return string + + +def wrap(string, width=25): + if string and len(string) > width: + return textwrap.fill(string, width) + else: + return string diff --git a/mistralclient/commands/v2/workbooks.py b/mistralclient/commands/v2/workbooks.py index 37434ce3..109ae6f0 100644 --- a/mistralclient/commands/v2/workbooks.py +++ b/mistralclient/commands/v2/workbooks.py @@ -38,7 +38,7 @@ def format(workbook=None): if workbook: data = ( workbook.name, - ', '.join(workbook.tags or '') or '', + base.wrap(', '.join(workbook.tags or '')) or '', workbook.created_at, ) diff --git a/mistralclient/commands/v2/workflows.py b/mistralclient/commands/v2/workflows.py index 269baa24..86cedc20 100644 --- a/mistralclient/commands/v2/workflows.py +++ b/mistralclient/commands/v2/workflows.py @@ -45,7 +45,7 @@ def format(workflow=None, lister=False): data = ( workflow.name, - ', '.join(tags) or '', + base.wrap(', '.join(tags)) or '', workflow.input if not lister else base.cut(workflow.input), workflow.created_at )