New PIO Account with "username" and profile support

platformio/commands/account/client.py

@@ -20,13 +20,13 @@ import time
 import requests.adapters
 from requests.packages.urllib3.util.retry import Retry  # pylint:disable=import-error
 
-from platformio import app
+from platformio import __pioaccount_api__, app
 from platformio.commands.account import exception
 
 
 class AccountClient(object):
     def __init__(
-        self, api_base_url="https://api.accounts.platformio.org", retries=3,
+        self, api_base_url=__pioaccount_api__, retries=3,
     ):
         if api_base_url.endswith("/"):
             api_base_url = api_base_url[:-1]

platformio/commands/account/command.py

@@ -44,7 +44,7 @@ def validate_username(value):
 def validate_email(value):
     value = str(value).strip()
     if not re.match(r"^[a-z\d_.+-]+@[a-z\d\-]+\.[a-z\d\-.]+$", value, flags=re.I):
-        raise click.BadParameter("Invalid E-Mail address")
+        raise click.BadParameter("Invalid email address")
     return value
 
 
@@ -90,7 +90,7 @@ def account_register(username, email, password, firstname, lastname):
 
 
 @cli.command("login", short_help="Log in to PIO Account")
-@click.option("-u", "--username", prompt="Username or e-mail")
+@click.option("-u", "--username", prompt="Username or email")
 @click.option("-p", "--password", prompt=True, hide_input=True)
 def account_login(username, password):
     client = AccountClient()
@@ -127,13 +127,13 @@ def account_token(password, regenerate, json_output):
 
 
 @cli.command("forgot", short_help="Forgot password")
-@click.option("--username", prompt="Username or e-mail")
+@click.option("--username", prompt="Username or email")
 def account_forgot(username):
     client = AccountClient()
     client.forgot_password(username)
     return click.secho(
         "If this account is registered, we will send the "
-        "further instructions to your E-Mail.",
+        "further instructions to your email.",
         fg="green",
     )
 

platformio/commands/remote/command.py

@@ -343,10 +343,10 @@ def device_monitor(ctx, agents, **kwargs):
     kwargs["baud"] = kwargs["baud"] or 9600
 
     def _tx_target(sock_dir):
-        pioplus_argv = ["remote", "device", "monitor"]
-        pioplus_argv.extend(device_helpers.options_to_argv(kwargs, project_options))
-        pioplus_argv.extend(["--sock", sock_dir])
-        subprocess.call([proc.where_is_program("platformio")] + pioplus_argv)
+        subcmd_argv = ["remote", "device", "monitor"]
+        subcmd_argv.extend(device_helpers.options_to_argv(kwargs, project_options))
+        subcmd_argv.extend(["--sock", sock_dir])
+        subprocess.call([proc.where_is_program("platformio")] + subcmd_argv)
 
     sock_dir = mkdtemp(suffix="pio")
     sock_file = os.path.join(sock_dir, "sock")