sshplex 1.6.3__tar.gz → 1.6.4__tar.gz

{sshplex-1.6.3/sshplex.egg-info → sshplex-1.6.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sshplex
-Version: 1.6.3
+Version: 1.6.4
 Summary: Multiplex your SSH connections with style
 Author-email: MJAHED Sabri <contact@sabrimjahed.com>
 License: MIT

{sshplex-1.6.3 → sshplex-1.6.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "sshplex"
-version = "1.6.3"
+version = "1.6.4"
 description = "Multiplex your SSH connections with style"
 authors = [{name = "MJAHED Sabri", email = "contact@sabrimjahed.com"}]
 readme = "README.md"

{sshplex-1.6.3 → sshplex-1.6.4}/sshplex/__init__.py

@@ -1,4 +1,4 @@
 """SSHplex - SSH Connection Multiplexer"""
-__version__ = "1.6.3"
+__version__ = "1.6.4"
 __author__ = "MJAHED Sabri"
 __email__ = "contact@sabrimjahed.com"

{sshplex-1.6.3 → sshplex-1.6.4}/sshplex/lib/commands.py

@@ -45,7 +45,6 @@ def clear_cache(config: Any, logger: Any, no_cache_message: str = "No cache to c
         )
     else:
         print(f"🗑️  {no_cache_message}")
-        return 0
 
     if cache.clear_cache():
         print("✅ Cache cleared successfully")

{sshplex-1.6.3 → sshplex-1.6.4}/sshplex/lib/sot/factory.py

@@ -56,15 +56,38 @@ class SoTFactory:
             self.logger.error("No import configurations found in sot.import")
             return False
 
+        sot_config = self.config.sot
+        providers_explicitly_set = True
+        if hasattr(sot_config, "model_fields_set"):
+            providers_explicitly_set = "providers" in getattr(
+                sot_config,
+                "model_fields_set",
+                set(),
+            )
+
+        provider_types_source = "config"
         enabled_provider_types = {
             str(provider_type).strip()
-            for provider_type in (getattr(self.config.sot, 'providers', []) or [])
+            for provider_type in (getattr(sot_config, "providers", []) or [])
             if str(provider_type).strip()
         }
 
+        if not providers_explicitly_set:
+            provider_types_source = "imports"
+            enabled_provider_types = {
+                str(getattr(import_config, "type", "")).strip()
+                for import_config in configured_imports
+                if str(getattr(import_config, "type", "")).strip()
+            }
+            if enabled_provider_types:
+                self.logger.info(
+                    "No explicit sot.providers configured; inferred enabled provider "
+                    f"types from imports: {sorted(enabled_provider_types)}"
+                )
+
         if enabled_provider_types:
             self.logger.info(
-                f"Enabled provider types from config: {sorted(enabled_provider_types)}"
+                f"Enabled provider types from {provider_types_source}: {sorted(enabled_provider_types)}"
             )
 
         for import_config in configured_imports:

{sshplex-1.6.3 → sshplex-1.6.4}/sshplex/lib/ui/session_manager.py

@@ -116,6 +116,7 @@ class ITerm2SessionManager(ModalScreen):
         self.logger = get_logger()
         self.config = config
         self.tabs: List[ITerm2ManagedTab] = []
+        self.visible_tabs: List[ITerm2ManagedTab] = []
         self.table: Optional[DataTable] = None
         self.current_session_name = current_session_name
         self.show_current_only = bool(current_session_name)
@@ -198,11 +199,12 @@ class ITerm2SessionManager(ModalScreen):
         try:
             self.tabs = await asyncio.to_thread(self._fetch_tabs_blocking)
             self.populate_table()
-            if self.table and self.tabs:
+            if self.table and self.visible_tabs:
                 self.table.move_cursor(row=0)
             self.logger.info(f"SSHplex: Loaded {len(self.tabs)} managed iTerm2 tabs")
         except Exception as e:
             self.logger.error(f"SSHplex: Failed to load iTerm2 managed tabs: {e}")
+            self.visible_tabs = []
             if self.table is not None:
                 self.table.clear()
                 self.table.add_row("Error loading tabs", str(e), "-", "-")
@@ -212,15 +214,17 @@ class ITerm2SessionManager(ModalScreen):
             return
 
         self.table.clear()
-        visible_tabs = self.tabs
+        self.visible_tabs = list(self.tabs)
         if self.show_current_only and self.current_session_name:
-            visible_tabs = [tab for tab in self.tabs if tab.session_name == self.current_session_name]
+            self.visible_tabs = [
+                tab for tab in self.tabs if tab.session_name == self.current_session_name
+            ]
 
-        if not visible_tabs:
+        if not self.visible_tabs:
             self.table.add_row("No SSHplex iTerm2 tabs", "-", "-", "-")
             return
 
-        for tab in visible_tabs:
+        for tab in self.visible_tabs:
             self.table.add_row(
                 tab.hostname,
                 tab.session_name,
@@ -230,26 +234,26 @@ class ITerm2SessionManager(ModalScreen):
             )
 
     def action_move_up(self) -> None:
-        if self.table and self.tabs:
+        if self.table and self.visible_tabs:
             current_row = self.table.cursor_row
             if current_row > 0:
                 self.table.move_cursor(row=current_row - 1)
 
     def action_move_down(self) -> None:
-        if self.table and self.tabs:
+        if self.table and self.visible_tabs:
             current_row = self.table.cursor_row
-            if current_row < len(self.tabs) - 1:
+            if current_row < len(self.visible_tabs) - 1:
                 self.table.move_cursor(row=current_row + 1)
 
     def action_kill_session(self) -> None:
-        if not self.table or not self.tabs:
+        if not self.table or not self.visible_tabs:
             return
 
         cursor_row = self.table.cursor_row
-        if cursor_row < 0 or cursor_row >= len(self.tabs):
+        if cursor_row < 0 or cursor_row >= len(self.visible_tabs):
             return
 
-        tab = self.tabs[cursor_row]
+        tab = self.visible_tabs[cursor_row]
         self._do_kill_tab(tab)
 
     def _do_kill_tab(self, tab_item: ITerm2ManagedTab) -> None:
@@ -341,6 +345,8 @@ class ITerm2SessionManager(ModalScreen):
         )
         self.app.notify(f"Showing {mode}", timeout=2)
         self.populate_table()
+        if self.table and self.visible_tabs:
+            self.table.move_cursor(row=0)
 
     def action_close_manager(self) -> None:
         self.dismiss()

{sshplex-1.6.3 → sshplex-1.6.4/sshplex.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sshplex
-Version: 1.6.3
+Version: 1.6.4
 Summary: Multiplex your SSH connections with style
 Author-email: MJAHED Sabri <contact@sabrimjahed.com>
 License: MIT

{sshplex-1.6.3 → sshplex-1.6.4}/sshplex.egg-info/SOURCES.txt

@@ -39,5 +39,7 @@ sshplex/lib/utils/__init__.py
 sshplex/lib/utils/iterm2.py
 sshplex/lib/utils/ssh_config.py
 tests/test_cache.py
+tests/test_commands.py
 tests/test_config.py
+tests/test_iterm2_session_manager.py
 tests/test_main.py

sshplex-1.6.4/tests/test_commands.py

@@ -0,0 +1,49 @@
+"""Tests for shared command helpers."""
+
+from __future__ import annotations
+
+from types import SimpleNamespace
+from unittest.mock import MagicMock, patch
+
+from sshplex.lib.commands import clear_cache
+
+
+def _minimal_config() -> SimpleNamespace:
+    return SimpleNamespace(cache=SimpleNamespace(cache_dir="~/.cache/sshplex", ttl_hours=24))
+
+
+def test_clear_cache_still_attempts_delete_when_metadata_missing(capsys) -> None:
+    """clear_cache should delete files even when metadata can't be read."""
+    config = _minimal_config()
+    logger = MagicMock()
+
+    fake_cache = MagicMock()
+    fake_cache.get_cache_info.return_value = None
+    fake_cache.clear_cache.return_value = True
+
+    with patch("sshplex.lib.commands.HostCache", return_value=fake_cache):
+        result = clear_cache(config, logger, no_cache_message="Clearing cache...")
+
+    assert result == 0
+    fake_cache.clear_cache.assert_called_once()
+    captured = capsys.readouterr().out
+    assert "Clearing cache" in captured
+    assert "Cache cleared successfully" in captured
+
+
+def test_clear_cache_returns_failure_when_delete_fails(capsys) -> None:
+    """clear_cache should return non-zero when file deletion fails."""
+    config = _minimal_config()
+    logger = MagicMock()
+
+    fake_cache = MagicMock()
+    fake_cache.get_cache_info.return_value = None
+    fake_cache.clear_cache.return_value = False
+
+    with patch("sshplex.lib.commands.HostCache", return_value=fake_cache):
+        result = clear_cache(config, logger, no_cache_message="Clearing cache...")
+
+    assert result == 1
+    fake_cache.clear_cache.assert_called_once()
+    captured = capsys.readouterr().out
+    assert "Failed to clear cache" in captured

sshplex-1.6.4/tests/test_iterm2_session_manager.py

@@ -0,0 +1,61 @@
+"""Regression tests for iTerm2 session manager row targeting."""
+
+from __future__ import annotations
+
+from types import SimpleNamespace
+
+from sshplex.lib.ui.session_manager import ITerm2ManagedTab, ITerm2SessionManager
+
+
+class FakeTable:
+    """Simple DataTable test double with the subset we need."""
+
+    def __init__(self) -> None:
+        self.cursor_row = 0
+        self.rows: list[tuple[tuple[str, ...], str | None]] = []
+
+    def clear(self) -> None:
+        self.rows.clear()
+
+    def add_row(self, *values: str, key: str | None = None) -> None:
+        self.rows.append((values, key))
+
+    def move_cursor(self, row: int) -> None:
+        self.cursor_row = row
+
+
+def test_kill_session_targets_visible_filtered_tab() -> None:
+    """Kill action should map to the visible filtered row, not raw tabs index."""
+    manager = ITerm2SessionManager(config=SimpleNamespace(), current_session_name="current")
+    manager.table = FakeTable()
+    manager.tabs = [
+        ITerm2ManagedTab(
+            tab_id="tab-other",
+            window_id="w1",
+            session_name="other",
+            hostname="other-host",
+            pane_count=1,
+        ),
+        ITerm2ManagedTab(
+            tab_id="tab-current",
+            window_id="w1",
+            session_name="current",
+            hostname="current-host",
+            pane_count=2,
+        ),
+    ]
+
+    killed: dict[str, ITerm2ManagedTab] = {}
+
+    def _capture_kill(tab: ITerm2ManagedTab) -> None:
+        killed["tab"] = tab
+
+    manager._do_kill_tab = _capture_kill  # type: ignore[method-assign]
+    manager.populate_table()
+
+    assert [tab.tab_id for tab in manager.visible_tabs] == ["tab-current"]
+    manager.table.cursor_row = 0
+
+    manager.action_kill_session()
+
+    assert killed["tab"].tab_id == "tab-current"