Skip to content

Commit 04d0bcf

Browse files
committed
Merge pull request #469 from nathansamson/nathan/client-config-improvements
Nathan/client config improvements
2 parents 5c0e011 + 7419a54 commit 04d0bcf

1 file changed

Lines changed: 16 additions & 3 deletions

File tree

client/deis.py

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -790,11 +790,13 @@ def config_list(self, args):
790790
"""
791791
List environment variables for an application
792792
793-
Usage: deis config:list [--app=<app>]
793+
Usage: deis config:list [--oneline] [--app=<app>]
794794
"""
795795
app = args.get('--app')
796796
if not app:
797797
app = self._session.app
798+
799+
oneline = args.get('--oneline')
798800
response = self._dispatch('get', "/api/apps/{}/config".format(app))
799801
if response.status_code == requests.codes.ok: # @UndefinedVariable
800802
config = response.json()
@@ -804,8 +806,19 @@ def config_list(self, args):
804806
if len(items) == 0:
805807
print('No configuration')
806808
return
807-
for k, v in values.items():
808-
print("{k}: {v}".format(**locals()))
809+
keys = sorted(values)
810+
811+
if not oneline:
812+
width = max(map(len, keys)) + 5
813+
for k in keys:
814+
v = values[k]
815+
print(("{k:<"+str(width)+"} {v}").format(**locals()))
816+
else:
817+
output = []
818+
for k in keys:
819+
v = values[k]
820+
output.append("{k}={v}".format(**locals()))
821+
print(' '.join(output))
809822
else:
810823
raise ResponseError(response)
811824

0 commit comments

Comments
 (0)