x/solar
Code Issues Proposed changes

cli.py: add option to print out resource as JSON

Browse Source
This commit is contained in:
Przemyslaw Kaminski 2015-05-28 13:06:04 +02:00
parent 07e5d9845a
commit bd03d4c6ad
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cli.py
View File

@ -66,7 +66,15 @@ def init_cli_resource():
@click.argument('path') @click.argument('path')
@click.option('--all/--one', default=False) @click.option('--all/--one', default=False)
@click.option('--tag', default=None) @click.option('--tag', default=None)
def show(tag, all, path): @click.option('--use-json/--no-use-json', default=False)
def show(use_json, tag, all, path):
import json
import six
printer = lambda r: six.print_(r)
if use_json:
printer = lambda r: six.print_(json.dumps(r.to_dict()))
if all or tag: if all or tag:
for name, resource in xr.load_all(path).items(): for name, resource in xr.load_all(path).items():
show = True show = True
@ -75,10 +83,9 @@ def init_cli_resource():
show = False show = False
if show: if show:
print resource printer(resource)
print
else: else:
print xr.load(path) printer(xr.load(path))
resource.add_command(show) resource.add_command(show)

17
solar/solar/core/resource.py
View File

@ -1,8 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import copy import copy
import json
import os import os
import shutil
from copy import deepcopy from copy import deepcopy
@ -45,11 +43,16 @@ class Resource(object):
self.tags = tags or [] self.tags = tags or []
def __repr__(self): def __repr__(self):
return ("Resource(name='{0}', metadata={1}, args={2}, " return ("Resource(name='{name}', metadata={metadata}, args={args}, "
"tags={3})").format(self.name, "tags={tags})").format(**self.to_dict)
json.dumps(self.metadata),
json.dumps(self.args_show()), def to_dict(self):
self.tags) return {
'name': self.name,
'metadata': self.metadata,
'args': self.args_show(),
'tags': self.tags,
}
def args_show(self): def args_show(self):
def formatter(v): def formatter(v):