Fix an issue with `--json-output` // Resolve #42

This commit is contained in:
Ivan Kravets
2015-01-05 22:58:55 +02:00
parent 09159c3ac0
commit 8c53cf1d3c
4 changed files with 14 additions and 3 deletions

View File

@@ -1,6 +1,11 @@
Release History Release History
=============== ===============
0.10.2 (2015-01-?)
------------------
* Fixed an issue with ``--json-output`` (`issue #42 <https://github.com/ivankravets/platformio/issues/42>`_)
0.10.1 (2015-01-02) 0.10.1 (2015-01-02)
------------------- -------------------

View File

@@ -1,12 +1,15 @@
# Copyright (C) Ivan Kravets <me@ikravets.com> # Copyright (C) Ivan Kravets <me@ikravets.com>
# See LICENSE for details. # See LICENSE for details.
import json
import click import click
from platformio import app, exception from platformio import app, exception
from platformio.libmanager import LibraryManager from platformio.libmanager import LibraryManager
from platformio.util import get_api_result, get_lib_dir from platformio.util import get_api_result, get_lib_dir
LIBLIST_TPL = ("[{id:^14}] {name:<25} {compatibility:<30} " LIBLIST_TPL = ("[{id:^14}] {name:<25} {compatibility:<30} "
"\"{authornames}\": {description}") "\"{authornames}\": {description}")
@@ -160,7 +163,7 @@ def lib_list(json_output):
items = lm.get_installed().values() items = lm.get_installed().values()
if json_output: if json_output:
click.echo(items) click.echo(json.dumps(items))
return return
if not items: if not items:

View File

@@ -1,6 +1,8 @@
# Copyright (C) Ivan Kravets <me@ikravets.com> # Copyright (C) Ivan Kravets <me@ikravets.com>
# See LICENSE for details. # See LICENSE for details.
import json
import click import click
from platformio.platforms.base import PlatformFactory from platformio.platforms.base import PlatformFactory
@@ -23,7 +25,7 @@ def cli(json_output):
}) })
if json_output: if json_output:
click.echo(data) click.echo(json.dumps(data))
else: else:
for item in data: for item in data:
click.echo("{name:<20} with packages: {pkgs}".format( click.echo("{name:<20} with packages: {pkgs}".format(

View File

@@ -1,6 +1,7 @@
# Copyright (C) Ivan Kravets <me@ikravets.com> # Copyright (C) Ivan Kravets <me@ikravets.com>
# See LICENSE for details. # See LICENSE for details.
import json
import sys import sys
import click import click
@@ -19,7 +20,7 @@ def cli():
def serialports_list(json_output): def serialports_list(json_output):
if json_output: if json_output:
click.echo(get_serialports()) click.echo(json.dumps(get_serialports()))
return return
for item in get_serialports(): for item in get_serialports():