flyshell 1.1.2__tar.gz → 1.1.4__tar.gz

{flyshell-1.1.2/src/flyshell.egg-info → flyshell-1.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flyshell
-Version: 1.1.2
+Version: 1.1.4
 Summary: A modular, zero-dependency command-line environment in Python.
 License: MIT
 Requires-Python: >=3.10

{flyshell-1.1.2 → flyshell-1.1.4}/src/flyshell/abstract/parent_cmd.py

@@ -43,28 +43,28 @@ class ParentCmd(BaseCmd):
             f"\nFor subcommand assistance use '{self.name} <subcmd> -h' or '--help'\n"
         )
 
-    def execute(self, args: List[str]) -> Union[int, Tuple[int, str], str, None]:
+    def execute(self, args: List[str]) -> Tuple[int, str]:
         if not args or args[0] in ("-h", "--help"):
             self.help()
-            return 0
+            return (0, "")
         sub_name = args[0].lower()
         sub_args = args[1:]
         if sub_name not in self._sub_registry:
-            print(
-                f"\nCommand Error: Unknown subcommand '{sub_name}' for '{self.name}'."
+            err = (
+                f"\nCommand Error: Unknown subcommand '{sub_name}' for '{self.name}'.\n"
+                f"Use '{self.name} -h' or '--help' to see all valid subcommands.\n"
             )
-            print(f"Use '{self.name} -h' or '--help' to see all valid subcommands.\n")
-            return 1
+            return (1, err)
         target = self._sub_registry[sub_name]
         if "-h" in sub_args or "--help" in sub_args:
             target.help(prefix=self.name)
-            return 0
+            return (0, "")
         if len(sub_args) < target.min_args:
-            print(
+            err_lines = [
                 f"\nCommand Error: '{self.name} {target.name}' requires at least {target.min_args} argument(s)."
-            )
+            ]
             if target.options:
-                print(f"Accepted arguments: {target.options}")
-            print()
-            return 1
+                err_lines.append(f"Accepted arguments: {target.options}")
+            err_lines.append("")
+            return (1, "\n".join(err_lines))
         return target.execute(sub_args)

{flyshell-1.1.2 → flyshell-1.1.4}/src/flyshell/builtin/utils.py

@@ -83,8 +83,7 @@ class Kill(BaseCmd):
         if choice == "y":
             print("\nShutting down...")
             sys.exit(0)
-        else:
-            return (1, "\nAction cancelled.\n")
+        return (1, "\nAction cancelled.\n")
 
 
 class Reboot(BaseCmd):
@@ -113,6 +112,7 @@ class Reboot(BaseCmd):
                 signal.signal(signal.SIGINT, old_handler)
         else:
             os.execv(cmd[0], cmd)
+        return (0, "")
 
 
 class Sleep(BaseCmd):

{flyshell-1.1.2 → flyshell-1.1.4}/src/flyshell/constants.py

@@ -5,8 +5,8 @@ import os
 import platform
 import time
 
-BUILD = 115
-VERSION = "1.1.2"
+BUILD = 117
+VERSION = "1.1.4"
 
 
 def _resolve_app_dir() -> Path:

{flyshell-1.1.2 → flyshell-1.1.4}/src/flyshell/core/loader.py

@@ -33,10 +33,17 @@ def scan_plugins(plugin_folder=None):
             if entry.exists():
                 file_path = entry
                 plugin_name = item.name
-        if not file_path:
+        if not file_path or not plugin_name:
+            continue
+        if plugin_name in RESERVED_NAMES:
+            print(
+                f"\n⚠️ Collision Error - Plugin '{plugin_name}' conflicts with a built-in Flyshell command and will not be loaded."
+            )
             continue
         try:
             spec = importlib.util.spec_from_file_location(plugin_name, file_path)
+            if spec is None or spec.loader is None:
+                continue
             module = importlib.util.module_from_spec(spec)
             spec.loader.exec_module(module)
             for _, obj in inspect.getmembers(module, inspect.isclass):
@@ -51,12 +58,6 @@ def scan_plugins(plugin_folder=None):
     loaded_count = 0
     first_print = True
     for name, entries in candidates.items():
-        failed = False
-        if name in RESERVED_NAMES:
-            print(
-                f"\n⚠️ Collision Error - Plugin '{name}' conflicts with a built-in Flyshell command and will not be loaded."
-            )
-            failed = True
         if len(entries) > 1:
             paths = "\n    - ".join(str(path) for _, path in entries)
             print(
@@ -65,8 +66,6 @@ def scan_plugins(plugin_folder=None):
             print(
                 "The above plugins will not be loaded. Please rename them to unique names."
             )
-            failed = True
-        if failed:
             continue
         instance, _ = entries[0]
         c.PLUGINS[name] = instance

{flyshell-1.1.2 → flyshell-1.1.4/src/flyshell.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flyshell
-Version: 1.1.2
+Version: 1.1.4
 Summary: A modular, zero-dependency command-line environment in Python.
 License: MIT
 Requires-Python: >=3.10

{flyshell-1.1.2 → flyshell-1.1.4}/tests/test_loader.py

@@ -41,3 +41,15 @@ def test_loader_handles_broken_plugin_gracefully(tmp_path, monkeypatch):
     monkeypatch.setattr(c, "USER_PLUGIN_DIR", tmp_path)
     loader.scan_plugins(plugin_folder=tmp_path)
     assert "broken" not in c.PLUGINS
+
+
+def test_loader_does_not_execute_code_in_reserved_plugin(tmp_path, monkeypatch):
+    sentinel = tmp_path / "sentinel.txt"
+    bad_plugin = tmp_path / "cd.py"
+    bad_plugin.write_text(
+        f"from pathlib import Path\nPath('{sentinel.as_posix()}').write_text('executed')\n"
+    )
+    monkeypatch.setattr(c, "USER_PLUGIN_DIR", tmp_path)
+    loader.scan_plugins(plugin_folder=tmp_path)
+    assert "cd" not in c.PLUGINS
+    assert not sentinel.exists()