RemoteRF 2.2.4__tar.gz → 2.2.5__tar.gz

{remoterf-2.2.4/src/remoterf.egg-info → remoterf-2.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remoterf
-Version: 2.2.4
+Version: 2.2.5
 Summary: A python API to remotely access signal centric hardware. Client-side only! Courtesy of Wireless Lab @ UCLA & Prof. Ian Roberts.
 Author-email: Ethan Ge <ethoGalaxy@gmail.com>
 License-Expression: GPL-3.0-or-later

{remoterf-2.2.4 → remoterf-2.2.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "remoterf"
-version = "2.2.4"
+version = "2.2.5"
 description = "A python API to remotely access signal centric hardware. Client-side only! Courtesy of Wireless Lab @ UCLA & Prof. Ian Roberts."
 readme = "README.md"
 license = "GPL-3.0-or-later"

{remoterf-2.2.4 → remoterf-2.2.5}/src/remoterf/core/app.py

@@ -258,7 +258,7 @@ def _account_command(command):
         from ..deployment import homes
         typed = pending_username or _ask('Username or Email' if account.is_https_home else 'Username')
         pending_username = None
-        # `ethan@ucla` typed at ucla is `ethan` there.
+        # `alice@ucla` typed at ucla is `alice` there.
         name, where = homes.split_account(typed)
         here = homes.GLOBAL_ACCOUNTS if account.is_https_home else home_name
         account.username = name if where == here else typed
@@ -1628,9 +1628,12 @@ def run(backend=None, *, register=False, enrollment_code=None, server_label=None
         # Continue below the banner rather than wiping the screen: with a
         # stored login the wipe came a split second after everything appeared.
         session_line()
+        from ..deployment import homes
+        # The prompt is the account's full name: alice@ucla, alice@global.
+        where = homes.GLOBAL_ACCOUNTS if account.is_https_home else (home_name or 'remoterf')
         while True:
             try:
-                inpu = session.prompt(stylize(f'{account.username}@remoterf: ', Sty.BOLD))
+                inpu = session.prompt(stylize(f'{account.username}@{where}: ', Sty.BOLD))
                 if inpu in ('register', 'verify', 'login', 'forgot-password', 'reset-password'):
                     authenticated = _account_command(inpu)
                     if inpu == 'reset-password' and not welcome(show_banner=False):

{remoterf-2.2.4 → remoterf-2.2.5}/src/remoterf/deployment/homes.py

@@ -273,7 +273,7 @@ GLOBAL_ACCOUNTS = "global"
 
 
 def split_account(text: str) -> tuple[str, str | None]:
-    """`ethan@ucla` -> ("ethan", "ucla"). A bare name, or an email (a dot
+    """`alice@ucla` -> ("alice", "ucla"). A bare name, or an email (a dot
     after the @; deployment names never have one), names no deployment."""
     text = text.strip()
     name, at, where = text.rpartition("@")

{remoterf-2.2.4 → remoterf-2.2.5}/src/remoterf/remoterf_cli.py

@@ -150,7 +150,7 @@ def print_help() -> None:
     printf("  remoterf -h | --help", Sty.CYAN, "              Show this help", Sty.DEFAULT)
     print()
     printf("Commands:", (Sty.BOLD, Sty.MAGENTA))
-    printf("  remoterf -l | --login [target]", Sty.CYAN, "    Login: last used, 'global', a home name, or an account (ethan@ucla)", Sty.DEFAULT)
+    printf("  remoterf -l | --login [target]", Sty.CYAN, "    Login: last used, 'global', a home name, or an account (username@lab)", Sty.DEFAULT)
     printf("  remoterf -r | --register [global]", Sty.CYAN, " Register with an enrollment code (or a RemoteRF Global account)", Sty.DEFAULT)
     printf("  remoterf homes", Sty.CYAN, "                    List saved deployment homes", Sty.DEFAULT)
     printf("  remoterf -v | --version", Sty.CYAN, "           Print version", Sty.DEFAULT)
@@ -171,7 +171,7 @@ def print_help() -> None:
     printf("  remoterf --login", Sty.GREEN)
     printf("  remoterf --login ucla", Sty.GREEN)
     printf("  remoterf --login global", Sty.GREEN)
-    printf("  remoterf --login ethan@ucla", Sty.GREEN)
+    printf("  remoterf --login jdoe@ucla", Sty.GREEN)
     printf("  remoterf homes", Sty.GREEN)
     printf("  remoterf --version", Sty.GREEN)
     printf("  remoterf --config --addr 203.0.113.10:12321", Sty.GREEN)
@@ -417,10 +417,10 @@ def _login(target: str | None) -> int:
 
 
 def _login_by_username() -> int:
-    """A fresh install: an account says where it lives (`ethan@ucla`), so
+    """A fresh install: an account says where it lives (`alice@ucla`), so
     asking for it is enough. Enter registers, as `-l` here always did."""
     try:
-        name = input('Account, e.g. ethan@ucla (Enter to register): ').strip()
+        name = input('Account (username@lab, Enter to register): ').strip()
     except (EOFError, KeyboardInterrupt):
         print()
         return 1

{remoterf-2.2.4 → remoterf-2.2.5/src/remoterf.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remoterf
-Version: 2.2.4
+Version: 2.2.5
 Summary: A python API to remotely access signal centric hardware. Client-side only! Courtesy of Wireless Lab @ UCLA & Prof. Ian Roberts.
 Author-email: Ethan Ge <ethoGalaxy@gmail.com>
 License-Expression: GPL-3.0-or-later

{remoterf-2.2.4 → remoterf-2.2.5}/tests/test_cli_login_fresh.py

@@ -29,14 +29,14 @@ def test_login_on_a_fresh_install_registers_on_enter():
 def test_an_account_name_says_where_it_lives():
     from remoterf.deployment.homes import split_account
 
-    assert split_account(" ian@ucla ") == ("ian", "ucla")
-    assert split_account("Ian@UCLA") == ("Ian", "ucla")
-    assert split_account("ian@global") == ("ian", "global")
-    assert split_account("ian") == ("ian", None)
-    assert split_account("ian@ucla.edu") == ("ian@ucla.edu", None)  # an email
+    assert split_account(" jdoe@ucla ") == ("jdoe", "ucla")
+    assert split_account("JDoe@UCLA") == ("JDoe", "ucla")
+    assert split_account("jdoe@global") == ("jdoe", "global")
+    assert split_account("jdoe") == ("jdoe", None)
+    assert split_account("jdoe@ucla.edu") == ("jdoe@ucla.edu", None)  # an email
     assert split_account("a@b@ucla") == ("a@b", "ucla")
     assert split_account("@ucla") == ("@ucla", None)
-    assert split_account("ian@") == ("ian@", None)
+    assert split_account("jdoe@") == ("jdoe@", None)
 
 
 def test_login_on_a_fresh_install_goes_to_the_lab_in_the_account_name():
@@ -46,7 +46,7 @@ def test_login_on_a_fresh_install_goes_to_the_lab_in_the_account_name():
     route = {"kind": "relay", "host": "ucla.global.remoterf.net", "port": 12321}
     with tmp, env, \
             mock.patch("remoterf.config.config.require_tos_for_login", return_value=True), \
-            mock.patch("builtins.input", return_value="ian@ucla"), \
+            mock.patch("builtins.input", return_value="jdoe@ucla"), \
             mock.patch("remoterf.deployment.homes.register_home",
                        return_value=("ucla", {"display_name": "UCLA"}, route)) as register_home, \
             mock.patch.object(remoterf_cli, "_account_shell", return_value=0) as shell:
@@ -54,13 +54,13 @@ def test_login_on_a_fresh_install_goes_to_the_lab_in_the_account_name():
     register_home.assert_called_once_with("ucla.global.remoterf.net")
     assert shell.call_args.kwargs["register"] is False
     assert shell.call_args.kwargs["home"] == "ucla"
-    assert shell.call_args.kwargs["username"] == "ian"
+    assert shell.call_args.kwargs["username"] == "jdoe"
 
 
 def test_login_on_a_fresh_install_global_bare_names_and_emails_go_to_global():
     from remoterf import remoterf_cli
 
-    for typed, username in (("ian@global", "ian"), ("ian", "ian"), ("ian@ucla.edu", "ian@ucla.edu")):
+    for typed, username in (("jdoe@global", "jdoe"), ("jdoe", "jdoe"), ("jdoe@ucla.edu", "jdoe@ucla.edu")):
         tmp, env = _fresh_home()
         with tmp, env, \
                 mock.patch("remoterf.config.config.require_tos_for_login", return_value=True), \
@@ -78,7 +78,7 @@ def test_login_to_a_lab_that_does_not_answer():
     tmp, env = _fresh_home()
     with tmp, env, \
             mock.patch("remoterf.config.config.require_tos_for_login", return_value=True), \
-            mock.patch("builtins.input", return_value="ian@nolab"), \
+            mock.patch("builtins.input", return_value="jdoe@nolab"), \
             mock.patch("remoterf.deployment.homes.register_home",
                        side_effect=RuntimeError("no such deployment")) as register_home, \
             mock.patch.object(remoterf_cli, "_account_shell") as shell:
@@ -96,8 +96,8 @@ def test_login_with_an_account_uses_the_saved_home():
             mock.patch("remoterf.deployment.homes.homes", return_value={"ucla": {}}), \
             mock.patch("remoterf.deployment.homes.register_home") as register_home, \
             mock.patch.object(remoterf_cli, "_use_home", return_value=0) as use_home:
-        assert remoterf_cli._login("ian@ucla") == 0
-    use_home.assert_called_once_with("ucla", register=False, username="ian")
+        assert remoterf_cli._login("jdoe@ucla") == 0
+    use_home.assert_called_once_with("ucla", register=False, username="jdoe")
     register_home.assert_not_called()
 
 
@@ -190,14 +190,14 @@ def _login_at(home, typed, *, https=False, pending=None):
 
 
 def test_a_found_username_is_not_asked_again():
-    username, ask = _login_at("ucla", None, pending="ian")
-    assert username == "ian"
+    username, ask = _login_at("ucla", None, pending="jdoe")
+    assert username == "jdoe"
     ask.assert_called_once_with("Password (Hidden)", hidden=True)
 
 
 def test_the_full_account_name_works_at_its_own_home_only():
-    assert _login_at("ucla", "ian@ucla")[0] == "ian"
-    assert _login_at("ucla", "ian")[0] == "ian"
-    assert _login_at("otheruni", "ian@ucla")[0] == "ian@ucla"  # not this lab's: no such name here
-    assert _login_at(None, "ian@global", https=True)[0] == "ian"
-    assert _login_at(None, "ian@ucla.edu", https=True)[0] == "ian@ucla.edu"  # an email
+    assert _login_at("ucla", "jdoe@ucla")[0] == "jdoe"
+    assert _login_at("ucla", "jdoe")[0] == "jdoe"
+    assert _login_at("otheruni", "jdoe@ucla")[0] == "jdoe@ucla"  # not this lab's: no such name here
+    assert _login_at(None, "jdoe@global", https=True)[0] == "jdoe"
+    assert _login_at(None, "jdoe@ucla.edu", https=True)[0] == "jdoe@ucla.edu"  # an email

{remoterf-2.2.4 → remoterf-2.2.5}/tests/test_homes.py

@@ -444,7 +444,7 @@ def test_every_command_after_login_goes_native_to_the_home(reachable, monkeypatc
         return response
 
     monkeypatch.setattr(grpc_acc, "rpc_client", rpc_client)
-    account = grpc_acc.RemoteRFAccount("ethan", "secret")
+    account = grpc_acc.RemoteRFAccount("jdoe", "secret")
     # A deployment-native account is not an HTTPS home: no Global in the path.
     assert not account.is_https_home
 
@@ -466,7 +466,7 @@ def test_every_command_after_login_goes_native_to_the_home(reachable, monkeypatc
     assert token == "reservation-token"
     # Credentials go to the HOME itself, never through any broker.
     for _, args in sent:
-        assert args["un"].string_value == "ethan"
+        assert args["un"].string_value == "jdoe"
 
     # And the transport those calls ride is this HOME's own direct channel.
     monkeypatch.setattr("grpc.secure_channel", lambda *a, **k: mock.Mock())
@@ -626,7 +626,7 @@ def test_reserve_shows_the_token_even_when_the_driver_fetch_fails(monkeypatch, c
 
     monkeypatch.setattr(grpc_acc, "rpc_client", rpc_client)
     monkeypatch.setattr("remoterf.drivers.dynamic_device.install_driver", install_driver)
-    account = grpc_acc.RemoteRFAccount("ethan", "secret")
+    account = grpc_acc.RemoteRFAccount("jdoe", "secret")
     now = datetime.datetime.now()
 
     assert account.reserve_device(0, now, now + datetime.timedelta(hours=1)) == "reservation-token"