clan_cli: URI parser now only has HTTP and FILE. Also clan:///home/user or clan://~/Downloads is supported

pkgs/clan-cli/tests/test_clan_uri.py

@@ -2,7 +2,7 @@ from pathlib import Path
 
 import pytest
 
-from clan_cli.clan_uri import ClanScheme, ClanURI
+from clan_cli.clan_uri import ClanParameters, ClanScheme, ClanURI
 from clan_cli.errors import ClanError
 
 
@@ -17,7 +17,7 @@ def test_local_uri() -> None:
 
 
 def test_unsupported_schema() -> None:
-    with pytest.raises(ClanError, match="Unsupported scheme: ftp"):
+    with pytest.raises(ClanError, match="Unsupported uri components: .*"):
         # Create a ClanURI object from an unsupported URI
         ClanURI("clan://ftp://ftp.example.com")
 
@@ -27,12 +27,24 @@ def test_is_remote() -> None:
     uri = ClanURI("clan://https://example.com")
 
     match uri.scheme:
-        case ClanScheme.HTTPS.value(url):
+        case ClanScheme.HTTP.value(url):
             assert url == "https://example.com"  # type: ignore
         case _:
             assert False
 
 
+def test_direct_local_path() -> None:
+    # Create a ClanURI object from a remote URI
+    uri = ClanURI("clan://~/Downloads")
+    assert uri.get_internal() == "~/Downloads"
+
+
+def test_direct_local_path2() -> None:
+    # Create a ClanURI object from a remote URI
+    uri = ClanURI("clan:///home/user/Downloads")
+    assert uri.get_internal() == "/home/user/Downloads"
+
+
 def test_remote_with_clanparams() -> None:
     # Create a ClanURI object from a remote URI with parameters
     uri = ClanURI("clan://https://example.com")
@@ -40,19 +52,47 @@ def test_remote_with_clanparams() -> None:
     assert uri.params.flake_attr == "defaultVM"
 
     match uri.scheme:
-        case ClanScheme.HTTPS.value(url):
+        case ClanScheme.HTTP.value(url):
             assert url == "https://example.com"  # type: ignore
         case _:
             assert False
 
 
+def test_from_path_with_custom() -> None:
+    # Create a ClanURI object from a remote URI with parameters
+    uri_str = Path("/home/user/Downloads")
+    params = ClanParameters(flake_attr="myVM")
+    uri = ClanURI.from_path(uri_str, params)
+    assert uri.params.flake_attr == "myVM"
+
+    match uri.scheme:
+        case ClanScheme.FILE.value(path):
+            assert path == Path("/home/user/Downloads")  # type: ignore
+        case _:
+            assert False
+
+
+def test_from_path_with_default() -> None:
+    # Create a ClanURI object from a remote URI with parameters
+    uri_str = Path("/home/user/Downloads")
+    params = ClanParameters()
+    uri = ClanURI.from_path(uri_str, params)
+    assert uri.params.flake_attr == "defaultVM"
+
+    match uri.scheme:
+        case ClanScheme.FILE.value(path):
+            assert path == Path("/home/user/Downloads")  # type: ignore
+        case _:
+            assert False
+
+
 def test_remote_with_all_params() -> None:
     # Create a ClanURI object from a remote URI with parameters
     uri = ClanURI("clan://https://example.com?flake_attr=myVM&password=1234")
     assert uri.params.flake_attr == "myVM"
 
     match uri.scheme:
-        case ClanScheme.HTTPS.value(url):
+        case ClanScheme.HTTP.value(url):
             assert url == "https://example.com?password=1234"  # type: ignore
         case _:
             assert False