termainer 0.5.2a0__tar.gz → 0.5.3__tar.gz

{termainer-0.5.2a0/src/termainer.egg-info → termainer-0.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: termainer
-Version: 0.5.2a0
+Version: 0.5.3
 Summary: Container observability and operations directly from your terminal
 Author: Alan Stefanov
 License: MIT

{termainer-0.5.2a0 → termainer-0.5.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "termainer"
-version = "0.5.2-alpha"
+version = "0.5.3"
 description = "Container observability and operations directly from your terminal"
 readme = "README.md"
 requires-python = ">=3.10"

{termainer-0.5.2a0 → termainer-0.5.3}/src/termainer/app.py

@@ -24,7 +24,7 @@ from .providers.swarm import SwarmProvider
 from .remote.ssh import SSHConnection
 from .server_manager import ServerConnection, ServerManager, provider_class_for
 from .ui.splash import BootScreen
-from .version import VERSION
+from .version import VERSION_DISPLAY
 
 
 def _check_command(command: list[str]) -> bool:
@@ -99,7 +99,7 @@ def run_doctor() -> int:
 
     checks.append(True)
     core_checks.append(True)
-    _print_doctor_line(True, "Version", VERSION)
+    _print_doctor_line(True, "Version", VERSION_DISPLAY)
 
     print()
     if all(checks):
@@ -275,7 +275,7 @@ def parse_args() -> argparse.Namespace:
     parser.add_argument(
         "--version",
         action="version",
-        version=f"%(prog)s {VERSION}",
+        version=f"%(prog)s {VERSION_DISPLAY}",
         help="Show version and exit",
     )
     parser.add_argument(

{termainer-0.5.2a0 → termainer-0.5.3}/src/termainer/ui/dashboard.py

@@ -27,7 +27,7 @@ from ..remote.ssh import SSHConnection
 from ..server_manager import ServerConnection, ServerManager, provider_class_for
 from ..storage import save_provider_servers_cache, get_cached_aliases
 from ..utils.helpers import build_report_header, format_timestamp
-from ..version import VERSION
+from ..version import VERSION_DISPLAY
 from .widgets import ContainerItem, DetailsWidget, LogWidget, StatsWidget
 
 
@@ -155,7 +155,7 @@ class Dashboard(Screen):
         )
 
         brand_row = Horizontal(
-            Static(f"[bold #22d3ee][ ][/] [bold #22d3ee]TERMAINER[/] [#5c5c5c]v{VERSION}[/]", id="top-brand"),
+            Static(f"[bold #22d3ee][ ][/] [bold #22d3ee]TERMAINER[/] [#5c5c5c]v{VERSION_DISPLAY}[/]", id="top-brand"),
             Static(_("dashboard.tagline"), id="top-tagline"),
             Static(connection_status, id="top-status"),
             id="top-bar-row",

{termainer-0.5.2a0 → termainer-0.5.3}/src/termainer/ui/environment.py

@@ -25,7 +25,7 @@ from ..storage import (
     save_provider_servers_cache,
     save_user_server,
 )
-from ..version import VERSION
+from ..version import VERSION_DISPLAY
 from .dashboard import Dashboard
 
 
@@ -212,7 +212,7 @@ class ServerSelectionModal(ModalScreen[Optional[List[str]]]):
                     Static(_("environment.modal.info_app_config"), id="info-app-config"),
                     Static("[bold]➕ " + _("environment.modal.info_howto_title") + "[/]", id="info-howto-title"),
                     Static(_("environment.modal.info_howto"), id="info-howto"),
-                    Static(_("environment.modal.info_thanks", version=VERSION), id="info-thanks"),
+                    Static(_("environment.modal.info_thanks", version=VERSION_DISPLAY), id="info-thanks"),
                     Static("[dim]" + _("environment.modal.info_feedback") + "[/]", id="info-feedback"),
                     id="sel-body-right",
                 ),
@@ -497,7 +497,7 @@ class EnvironmentScreen(Screen):
             rows.append(Horizontal(*row_cards, id=f"env-row-{len(rows)}"))
 
         yield Vertical(
-            Static(f"[bold #22d3ee]TERMAINER[/] [#808080]v{VERSION}[/]", id="env-brand"),
+            Static(f"[bold #22d3ee]TERMAINER[/] [#808080]v{VERSION_DISPLAY}[/]", id="env-brand"),
             Static(_("environment.title"), id="env-title"),
             Static(
                 f"[dim]{_('environment.copy')}[/]",
@@ -608,14 +608,16 @@ class EnvironmentScreen(Screen):
         provider_name = action_name.replace("open_provider_", "")
 
         matches = self._servers_for_provider(provider_name)
+        servers = get_all_ssh_servers()
+
+        if servers:
+            self.app.push_screen(
+                ServerSelectionModal(provider_name, servers),
+                lambda aliases: self._on_server_selected(aliases, provider_name, matches)
+            )
+            return
+
         if not matches:
-            servers = get_all_ssh_servers()
-            if servers:
-                self.app.push_screen(
-                    ServerSelectionModal(provider_name, servers),
-                    lambda aliases: self._on_server_selected(aliases, provider_name)
-                )
-                return
             if self._provider_cli_available(provider_name):
                 if provider_name in {"kubernetes", "openshift"}:
                     if self._has_remote_servers:
@@ -649,16 +651,34 @@ class EnvironmentScreen(Screen):
             )
         )
 
-    def _on_server_selected(self, aliases: Optional[List[str]], provider_name: str) -> None:
+    def _on_server_selected(
+        self,
+        aliases: Optional[List[str]],
+        provider_name: str,
+        existing_matches: Optional[List[ServerConnection]] = None,
+    ) -> None:
         if not aliases:
+            if existing_matches:
+                self.app.switch_screen(
+                    Dashboard(
+                        ServerManager(existing_matches),
+                        server_label=None,
+                        root_server_manager=self._server_manager,
+                    )
+                )
             return
         self.app.push_screen(ConnectingModal(provider_name))
-        self.run_worker(self._probe_servers(aliases, provider_name))
-
-    async def _probe_servers(self, aliases: List[str], provider_name: str) -> None:
+        self.run_worker(self._probe_servers(aliases, provider_name, existing_matches or []))
+
+    async def _probe_servers(
+        self,
+        aliases: List[str],
+        provider_name: str,
+        existing_matches: Optional[List[ServerConnection]] = None,
+    ) -> None:
         health_check = HEALTH_CHECKS.get(provider_name, [provider_name])
         servers = get_all_ssh_servers()
-        successful: List[ServerConnection] = []
+        successful: List[ServerConnection] = list(existing_matches or [])
 
         async def probe_one(alias: str) -> Optional[ServerConnection]:
             srv = servers.get(alias)
@@ -691,7 +711,7 @@ class EnvironmentScreen(Screen):
 
         save_provider_servers_cache(provider_name, [c.label for c in successful])
 
-        if not successful:
+        if len(successful) == len(existing_matches or []):
             self.notify(
                 _("environment.notify.ssh_probe_not_found", provider=provider_name.capitalize()),
                 severity="warning",

{termainer-0.5.2a0 → termainer-0.5.3}/src/termainer/ui/home.py

@@ -9,7 +9,7 @@ from textual.widgets import Static
 
 from ..locale import _
 from ..server_manager import ServerManager
-from ..version import VERSION
+from ..version import VERSION_DISPLAY
 
 
 # ── ASCII art ─────────────────────────────────────────────────────────────────
@@ -38,7 +38,7 @@ class HeaderWidget(Horizontal):
 
     def compose(self) -> ComposeResult:
         yield Static(
-            f"[bold #66FF33][ >_ ][/]  [bold #66FF33]TERMAINER[/] [dim #66FF33]v{VERSION}[/]",
+            f"[bold #66FF33][ >_ ][/]  [bold #66FF33]TERMAINER[/] [dim #66FF33]v{VERSION_DISPLAY}[/]",
             id="home-logo",
         )
         yield Static(f"─── {_('home.welcome')} ───", id="home-welcome")

{termainer-0.5.2a0 → termainer-0.5.3}/src/termainer/ui/splash.py

@@ -9,10 +9,10 @@ from textual.widgets import Static
 
 from ..locale import _
 from ..server_manager import ServerManager
-from ..version import VERSION
+from ..version import VERSION_DISPLAY
 
 
-_BRAND = f"[bold #66FF33]  [ >_ ]  T · E · R · M · A · I · N · E · R   v{VERSION}  [/]"
+_BRAND = f"[bold #66FF33]  [ >_ ]  T · E · R · M · A · I · N · E · R   v{VERSION_DISPLAY}  [/]"
 
 _BOOT_STEP_KEYS: list[tuple[str, str]] = [
     ("splash.boot.init",     "#66FF33"),

termainer-0.5.3/src/termainer/version.py

@@ -0,0 +1,12 @@
+import re
+
+VERSION = "0.5.3"
+
+
+def _to_display(v: str) -> str:
+    for tag, label in [("a", "alpha"), ("b", "beta"), ("rc", "rc")]:
+        v = re.sub(rf"{tag}(\d+)$", rf"-{label}\1", v)
+    return v
+
+
+VERSION_DISPLAY = _to_display(VERSION)

{termainer-0.5.2a0 → termainer-0.5.3/src/termainer.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: termainer
-Version: 0.5.2a0
+Version: 0.5.3
 Summary: Container observability and operations directly from your terminal
 Author: Alan Stefanov
 License: MIT

termainer-0.5.2a0/src/termainer/version.py

@@ -1 +0,0 @@
-VERSION = "0.5.2-alpha"