flyshell 1.1.3__tar.gz → 1.1.5__tar.gz

{flyshell-1.1.3/src/flyshell.egg-info → flyshell-1.1.5}/PKG-INFO

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

{flyshell-1.1.3 → flyshell-1.1.5}/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.3 → flyshell-1.1.5}/src/flyshell/builtin/utils.py

@@ -81,10 +81,8 @@ class Kill(BaseCmd):
     def execute(self, args):
         choice = input("\nAre you sure [y/n]?: ").strip().lower()
         if choice == "y":
-            print("\nShutting down...")
-            sys.exit(0)
-        else:
-            return (1, "\nAction cancelled.\n")
+            return (-1, "\nShutting down...\n")
+        return (1, "\nAction cancelled.\n")
 
 
 class Reboot(BaseCmd):
@@ -113,6 +111,7 @@ class Reboot(BaseCmd):
                 signal.signal(signal.SIGINT, old_handler)
         else:
             os.execv(cmd[0], cmd)
+        return (0, "")
 
 
 class Sleep(BaseCmd):

{flyshell-1.1.3 → flyshell-1.1.5}/src/flyshell/constants.py

@@ -5,8 +5,8 @@ import os
 import platform
 import time
 
-BUILD = 116
-VERSION = "1.1.3"
+BUILD = 118
+VERSION = "1.1.5"
 
 
 def _resolve_app_dir() -> Path:

{flyshell-1.1.3 → flyshell-1.1.5}/src/flyshell/core/auth.py

@@ -102,7 +102,7 @@ def login_flow(is_lock=False) -> bool:
         i -= 1
         print("\nAccount Error: Password does not match.")
         if i == 0:
-            print("Too many attempts.\n")
+            print("Too many attempts.")
             return False
         print(f"You have {i} attempts remaining.\n")
 
@@ -118,5 +118,4 @@ class Lock(BaseCmd):
         if login_flow(is_lock=True):
             return (0, "")
         else:
-            print("\nShutting down...\n")
-            sys.exit(0)
+            return (-1, "\nShutting down...\n")

{flyshell-1.1.3 → flyshell-1.1.5}/src/flyshell/core/directory.py

@@ -8,6 +8,7 @@ from flyshell.core import auth, data
 
 from datetime import datetime, timezone
 import shlex
+import sys
 
 
 class Cmds(BaseCmd):
@@ -145,6 +146,10 @@ def _execute_single(raw_cmd: str) -> int:
             code, message = result
             if message:
                 print(message)
+            if code == -1:
+                sys.exit(0)
+            elif code == -2:
+                sys.exit(1)
             return code
         elif isinstance(result, int):
             return result

{flyshell-1.1.3 → flyshell-1.1.5}/src/flyshell/core/loader.py

@@ -1,4 +1,4 @@
-# src/flyshell/core/loader.py
+# src\flyshell\core\loader.py
 
 from flyshell import constants as c
 from flyshell.abstract.base_plugin import BasePlugin

{flyshell-1.1.3 → flyshell-1.1.5}/src/flyshell/main.py

@@ -84,7 +84,7 @@ def main():
                 if auth.login_flow():
                     console.boot()
                 else:
-                    print("Shutting down...\n")
+                    print("\nShutting down...\n")
                     sys.exit(0)
             else:
                 print(

{flyshell-1.1.3 → flyshell-1.1.5/src/flyshell.egg-info}/PKG-INFO

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