From 6900052ecd67e5d97c7203ec0c56646f7eee1155 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Fri, 22 Jul 2016 18:02:04 +0300 Subject: [PATCH] Reorder command options --- platformio/commands/__init__.py | 2 +- platformio/commands/ci.py | 6 +++--- platformio/commands/init.py | 2 +- platformio/commands/platform.py | 4 ++-- platformio/commands/run.py | 10 +++++----- platformio/commands/test.py | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/platformio/commands/__init__.py b/platformio/commands/__init__.py index 0c05c3b0..5466a0e8 100644 --- a/platformio/commands/__init__.py +++ b/platformio/commands/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2014-2016 Ivan Kravets +# Copyright 2014-present Ivan Kravets # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/platformio/commands/ci.py b/platformio/commands/ci.py index 1df83ba8..b7b1fe32 100644 --- a/platformio/commands/ci.py +++ b/platformio/commands/ci.py @@ -53,9 +53,9 @@ def validate_path(ctx, param, value): # pylint: disable=W0613 @click.command("ci", short_help="Continuous Integration") @click.argument("src", nargs=-1, callback=validate_path) -@click.option("--lib", "-l", multiple=True, callback=validate_path) +@click.option("-l", "--lib", multiple=True, callback=validate_path) @click.option("--exclude", multiple=True) -@click.option("--board", "-b", multiple=True, metavar="ID", +@click.option("-b", "--board", multiple=True, metavar="ID", callback=validate_boards) @click.option("--build-dir", default=mkdtemp, type=click.Path(exists=True, file_okay=False, dir_okay=True, @@ -64,7 +64,7 @@ def validate_path(ctx, param, value): # pylint: disable=W0613 @click.option("--project-conf", type=click.Path(exists=True, file_okay=True, dir_okay=False, readable=True, resolve_path=True)) -@click.option("--verbose", "-v", is_flag=True) +@click.option("-v", "--verbose", is_flag=True) @click.pass_context def cli(ctx, src, lib, exclude, board, # pylint: disable=R0913 build_dir, keep_build_dir, project_conf, verbose): diff --git a/platformio/commands/init.py b/platformio/commands/init.py index ca429aa0..a7e3d750 100644 --- a/platformio/commands/init.py +++ b/platformio/commands/init.py @@ -46,7 +46,7 @@ def validate_boards(ctx, param, value): # pylint: disable=W0613 @click.option("--project-dir", "-d", default=getcwd, type=click.Path(exists=True, file_okay=False, dir_okay=True, writable=True, resolve_path=True)) -@click.option("--board", "-b", multiple=True, metavar="ID", +@click.option("-b", "--board", multiple=True, metavar="ID", callback=validate_boards) @click.option("--ide", type=click.Choice(ProjectGenerator.get_supported_ides())) diff --git a/platformio/commands/platform.py b/platformio/commands/platform.py index 0fdd6d70..eb81ddac 100644 --- a/platformio/commands/platform.py +++ b/platformio/commands/platform.py @@ -72,8 +72,8 @@ def platform_search(query, json_output): @cli.command("install", short_help="Install new platforms") @click.argument("platforms", nargs=-1, required=True) -@click.option("--with-package", multiple=True, metavar="") -@click.option("--without-package", multiple=True, metavar="") +@click.option("--with-package", multiple=True) +@click.option("--without-package", multiple=True) @click.option("--skip-default-package", is_flag=True) def platform_install(platforms, with_package, without_package, skip_default_package): diff --git a/platformio/commands/run.py b/platformio/commands/run.py index 910c15c0..9aaa9912 100644 --- a/platformio/commands/run.py +++ b/platformio/commands/run.py @@ -30,13 +30,13 @@ from platformio.managers.platform import PlatformFactory @click.command("run", short_help="Process project environments") -@click.option("--environment", "-e", multiple=True, metavar="") -@click.option("--target", "-t", multiple=True, metavar="") -@click.option("--upload-port", metavar="") -@click.option("--project-dir", "-d", default=getcwd, +@click.option("-e", "--environment", multiple=True) +@click.option("-t", "--target", multiple=True) +@click.option("--upload-port") +@click.option("-d", "--project-dir", default=getcwd, type=click.Path(exists=True, file_okay=False, dir_okay=True, writable=True, resolve_path=True)) -@click.option("--verbose", "-v", is_flag=True) +@click.option("-v", "--verbose", is_flag=True) @click.option("--disable-auto-clean", is_flag=True) @click.pass_context def cli(ctx, environment, target, upload_port, # pylint: disable=R0913,R0914 diff --git a/platformio/commands/test.py b/platformio/commands/test.py index 35b7fe97..55ea49df 100644 --- a/platformio/commands/test.py +++ b/platformio/commands/test.py @@ -32,7 +32,7 @@ from platformio.managers.platform import PlatformFactory @click.option("--environment", "-e", multiple=True, metavar="") @click.option("--skip", multiple=True, metavar="") @click.option("--upload-port", metavar="") -@click.option("--project-dir", "-d", default=getcwd, +@click.option("-d", "--project-dir", default=getcwd, type=click.Path(exists=True, file_okay=False, dir_okay=True, writable=True, resolve_path=True)) @click.option("--verbose", "-v", is_flag=True)