remo-cli 1.0.2__tar.gz → 2.0.0rc1__tar.gz

{remo_cli-1.0.2 → remo_cli-2.0.0rc1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remo-cli
-Version: 1.0.2
+Version: 2.0.0rc1
 Summary: Remote development environment CLI
 License-Expression: MIT
 License-File: LICENSE

{remo_cli-1.0.2 → remo_cli-2.0.0rc1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "remo-cli"
-version = "1.0.2"
+version = "2.0.0rc1"
 description = "Remote development environment CLI"
 readme = "README.md"
 license = "MIT"

{remo_cli-1.0.2 → remo_cli-2.0.0rc1}/src/remo_cli/cli/providers/incus.py

@@ -40,6 +40,11 @@ def incus() -> None:
 )
 @click.option("--only", multiple=True, help="Only install these tools.")
 @click.option("--skip", multiple=True, help="Skip these tools.")
+@click.option(
+    "--use-ip",
+    is_flag=True,
+    help="Store the container's IP address in known_hosts instead of its name (for setups without DNS/MagicDNS).",
+)
 @click.option("--yes", "-y", is_flag=True, help="Auto-confirm prompts.")
 @click.option("-v", "--verbose", is_flag=True, help="Verbose output.")
 def create(
@@ -53,6 +58,7 @@ def create(
     memory: int,
     only: tuple[str, ...],
     skip: tuple[str, ...],
+    use_ip: bool,
     yes: bool,
     verbose: bool,
 ) -> None:
@@ -68,6 +74,7 @@ def create(
         memory=memory,
         tools_only=only,
         tools_skip=skip,
+        use_ip=use_ip,
         verbose=verbose,
     )
     sys.exit(rc)
@@ -173,9 +180,14 @@ def info(name: str, host: str, user: str) -> None:
 @incus.command()
 @click.option("--host", default="localhost", help="Incus host (default: localhost).")
 @click.option("--user", default="", help="SSH user for remote Incus host.")
-def sync(host: str, user: str) -> None:
+@click.option(
+    "--use-ip",
+    is_flag=True,
+    help="Store each container's IP address in known_hosts instead of its name (for setups without DNS/MagicDNS).",
+)
+def sync(host: str, user: str, use_ip: bool) -> None:
     """Discover containers from an Incus host."""
-    providers_incus.sync(host=host, user=user)
+    providers_incus.sync(host=host, user=user, use_ip=use_ip)
 
 
 @incus.command()

{remo_cli-1.0.2 → remo_cli-2.0.0rc1}/src/remo_cli/cli/providers/proxmox.py

@@ -38,6 +38,11 @@ def proxmox() -> None:
 @click.option("--domain", default="", help="Domain name for the container.")
 @click.option("--only", multiple=True, help="Only install these tools.")
 @click.option("--skip", multiple=True, help="Skip these tools.")
+@click.option(
+    "--use-ip",
+    is_flag=True,
+    help="Store the container's IP address in known_hosts instead of its name (for setups without DNS/MagicDNS).",
+)
 @click.option("--yes", "-y", is_flag=True, help="Auto-confirm prompts.")
 @click.option("-v", "--verbose", is_flag=True, help="Verbose output.")
 def create(
@@ -55,6 +60,7 @@ def create(
     domain: str,
     only: tuple[str, ...],
     skip: tuple[str, ...],
+    use_ip: bool,
     yes: bool,
     verbose: bool,
 ) -> None:
@@ -74,6 +80,7 @@ def create(
         domain=domain,
         tools_only=only,
         tools_skip=skip,
+        use_ip=use_ip,
         verbose=verbose,
     )
     sys.exit(rc)
@@ -179,9 +186,14 @@ def info(name: str, host: str, user: str) -> None:
 @proxmox.command()
 @click.option("--host", required=True, help="Proxmox host to scan.")
 @click.option("--user", default="", help="SSH user for the Proxmox host.")
-def sync(host: str, user: str) -> None:
+@click.option(
+    "--use-ip",
+    is_flag=True,
+    help="Store each container's IP address in known_hosts instead of its name (for setups without DNS/MagicDNS).",
+)
+def sync(host: str, user: str, use_ip: bool) -> None:
     """Discover containers from a Proxmox host."""
-    providers_proxmox.sync(host=host, user=user)
+    providers_proxmox.sync(host=host, user=user, use_ip=use_ip)
 
 
 @proxmox.command()

{remo_cli-1.0.2 → remo_cli-2.0.0rc1}/src/remo_cli/providers/incus.py

@@ -165,6 +165,7 @@ def create(
     memory: int = 0,
     tools_only: tuple[str, ...] = (),
     tools_skip: tuple[str, ...] = (),
+    use_ip: bool = False,
     verbose: bool = False,
 ) -> int:
     """Create a new Incus container and configure it with dev tools.
@@ -206,7 +207,10 @@ def create(
     rc = run_playbook("incus_site.yml", extra_vars, verbose=verbose)
 
     if rc == 0:
-        container_host = _resolve_container_ip(name, host, user) or name
+        if use_ip:
+            container_host = _resolve_container_ip(name, host, user) or name
+        else:
+            container_host = name
         save_known_host(
             KnownHost(
                 type="incus",
@@ -483,13 +487,17 @@ def info(name: str, host: str = "", user: str = "") -> int:
     return 0
 
 
-def sync(host: str = "localhost", user: str = "") -> None:
+def sync(host: str = "localhost", user: str = "", use_ip: bool = False) -> None:
     """Discover Incus containers on *host* and register them in known-hosts.
 
     For localhost, runs ``incus list -f csv -c n`` directly.  For remote hosts,
     the same command is executed over SSH.  All previously registered entries
     for the given host prefix are cleared before the newly discovered
     containers are saved.
+
+    When *use_ip* is true, each container's eth0 IP is resolved and stored as
+    the ``host`` field; otherwise the container name itself is stored (and
+    relies on DNS/MagicDNS for resolution at connect time).
     """
     if host == "localhost":
         result = subprocess.run(
@@ -523,11 +531,15 @@ def sync(host: str = "localhost", user: str = "") -> None:
     clear_known_hosts_by_prefix("incus", f"{host}/")
 
     for name in containers:
+        if use_ip:
+            container_host = _resolve_container_ip(name, host, user) or name
+        else:
+            container_host = name
         save_known_host(
             KnownHost(
                 type="incus",
                 name=f"{host}/{name}",
-                host=name,
+                host=container_host,
                 user="remo",
                 instance_id=user,
                 access_mode="direct",

{remo_cli-1.0.2 → remo_cli-2.0.0rc1}/src/remo_cli/providers/proxmox.py

@@ -180,6 +180,7 @@ def create(
     domain: str = "",
     tools_only: tuple[str, ...] = (),
     tools_skip: tuple[str, ...] = (),
+    use_ip: bool = False,
     verbose: bool = False,
 ) -> int:
     """Create a new Proxmox LXC container and configure dev tools.
@@ -241,12 +242,15 @@ def create(
 
     if rc == 0:
         vmid = _resolve_vmid(name, host, user)
-        ip = _resolve_container_ip(name, host, user, vmid=vmid) or name
+        if use_ip:
+            container_host = _resolve_container_ip(name, host, user, vmid=vmid) or name
+        else:
+            container_host = name
         save_known_host(
             KnownHost(
                 type="proxmox",
                 name=f"{host}/{name}",
-                host=ip,
+                host=container_host,
                 user="remo",
                 instance_id=vmid,
                 access_mode="direct",
@@ -541,11 +545,15 @@ def _parse_pct_config_field(config_text: str, field: str) -> str:
     return match.group(1).strip() if match else ""
 
 
-def sync(host: str, user: str = "") -> None:
+def sync(host: str, user: str = "", use_ip: bool = False) -> None:
     """Discover Proxmox LXC containers on *host* and register them.
 
     Runs ``pct list`` over SSH (or locally if host == "localhost"),
-    parses the output, then queries each container for its VMID and IP.
+    parses the output, then queries each container for its VMID. When
+    *use_ip* is true, each container's eth0 IP is also resolved and stored
+    as the ``host`` field; otherwise the container name itself is stored
+    (and relies on DNS/MagicDNS for resolution at connect time).
+
     Existing entries with the host prefix are cleared first.
     """
     if not host:
@@ -581,12 +589,15 @@ def sync(host: str, user: str = "") -> None:
     clear_known_hosts_by_prefix("proxmox", f"{host}/")
 
     for vmid, hostname in containers:
-        ip = _resolve_container_ip(hostname, host, user, vmid=vmid) or hostname
+        if use_ip:
+            container_host = _resolve_container_ip(hostname, host, user, vmid=vmid) or hostname
+        else:
+            container_host = hostname
         save_known_host(
             KnownHost(
                 type="proxmox",
                 name=f"{host}/{hostname}",
-                host=ip,
+                host=container_host,
                 user="remo",
                 instance_id=vmid,
                 access_mode="direct",