xmyshell 0.2.0__tar.gz → 0.2.2__tar.gz

{xmyshell-0.2.0/xmyshell.egg-info → xmyshell-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xmyshell
-Version: 0.2.0
+Version: 0.2.2
 Summary: XmyShell is a shell-like tool built on top of prompt_toolkit which provides a persistent Python runtime.
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
@@ -115,6 +115,7 @@ or
 - Alias
 ```
 ❯ alias ll='ls -lh'
+❯ unalias ll
 ```
 
 - Syntax highlighting via `prompt_toolkit`
@@ -142,6 +143,9 @@ Shortcut for `open(file).read()`.
 - `alias(altname, target)`
 Same as the command.
 
+- `unalias(altname)`
+Same as the command.
+
 
 ### Reserved global varibles
 - `exit_code`

{xmyshell-0.2.0 → xmyshell-0.2.2}/README.md

@@ -105,6 +105,7 @@ or
 - Alias
 ```
 ❯ alias ll='ls -lh'
+❯ unalias ll
 ```
 
 - Syntax highlighting via `prompt_toolkit`
@@ -132,6 +133,9 @@ Shortcut for `open(file).read()`.
 - `alias(altname, target)`
 Same as the command.
 
+- `unalias(altname)`
+Same as the command.
+
 
 ### Reserved global varibles
 - `exit_code`

{xmyshell-0.2.0 → xmyshell-0.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "xmyshell"
-version = "0.2.0"
+version = "0.2.2"
 description = "XmyShell is a shell-like tool built on top of prompt_toolkit which provides a persistent Python runtime."
 readme = "README.md"
 requires-python = ">=3.12"

{xmyshell-0.2.0 → xmyshell-0.2.2}/xmyshell/completer.py

@@ -8,7 +8,7 @@ import pkgutil
 from string import whitespace
 from prompt_toolkit.completion import Completer, Completion
 from prompt_toolkit.document import Document
-from .environment import namespace
+from .environment import namespace, aliases
 from .utils import truncate
 from pathlib import Path
 
@@ -16,7 +16,8 @@ MAX_DISPLAY_LEN = 24
 MAX_META_LEN = 12
 
 BUILTINS = ("cd", "cp", "cat", "echo", "exit", "import", "ls", "print", "pyexec", "pwd", "source",
-            "clear", "grep", "find", "from", "mkdir", "rm", "reload", "mv", "help", "alias", "update")
+            "clear", "grep", "find", "from", "mkdir", "rm", "reload", "mv", "help",
+            "update", "alias", "unalias")
 
 COMMON = (
     "python", "python3", "pip", "pip3", "git", "conda", "uv",
@@ -312,6 +313,28 @@ class ShellCompleter(Completer):
                     display_meta="flag",
                 )
 
+    def _command_completion(self, text):
+        for cmd in self._get_commands():
+            if cmd in aliases: continue
+            if cmd.startswith(text):
+                meta = "command" if cmd in BUILTINS else "program"
+                yield Completion(
+                    cmd,
+                    start_position=-len(text),
+                    display=truncate(cmd, MAX_DISPLAY_LEN),
+                    display_meta=meta,
+                )
+
+    def _alias_completion(self, text):
+        for alias in aliases.keys():
+            if alias.startswith(text):
+                yield Completion(
+                    alias,
+                    start_position=-len(text),
+                    display=truncate(alias, MAX_DISPLAY_LEN),
+                    display_meta="alias",
+                )
+
     def get_completions(self, document: Document, complete_event):
         text = document.text_before_cursor
         if "=>" in text: return
@@ -328,15 +351,8 @@ class ShellCompleter(Completer):
         if " " not in lstripped:
             if len(lstripped) < 1:
                 return
-            for cmd in self._get_commands():
-                if cmd.startswith(lstripped):
-                    meta = "command" if cmd in BUILTINS else "program"
-                    yield Completion(
-                        cmd,
-                        start_position=-len(lstripped),
-                        display=truncate(cmd, MAX_DISPLAY_LEN),
-                        display_meta=meta,
-                    )
+            yield from self._alias_completion(lstripped)
+            yield from self._command_completion(lstripped)
 
         # special built-ins
         parts = lstripped.split()
@@ -346,6 +362,9 @@ class ShellCompleter(Completer):
                 param_text = lstripped[len(cmd):].lstrip()
                 yield from self._python_completion(param_text)
                 return
+            if cmd == "unalias":
+                param_text = lstripped[len(cmd):].lstrip()
+                yield from self._alias_completion(param_text)
             if cmd == "from":
                 if not lstripped.endswith(parts[-1]):
                     parts.append("")

{xmyshell-0.2.0 → xmyshell-0.2.2}/xmyshell/environment.py

@@ -11,8 +11,12 @@ namespace: dict[str, Any] = {}
 aliases: dict[str, str] = {}
 init_environ: dict[str, str] = dict(os.environ)
 
-def xmyshell_alias(source: str, target: str) -> None:
-    aliases.update({source: target})
+
+def xmyshell_alias(altname: str, target: str) -> None:
+    aliases.update({altname: target})
+
+def xmyshell_unalias(altname: str) -> None:
+    aliases.pop(altname)
 
 
 _init_namespace: dict[str, Any] = {
@@ -29,6 +33,7 @@ _init_namespace: dict[str, Any] = {
     "basename": os.path.basename,
     "cat": xmyshell_cat,
     "alias": xmyshell_alias,
+    "unalias": xmyshell_unalias,
     "HOME_DIR": HOME_DIR,
     "PROFILE": f"{HOME_DIR}/.xmyshell/config.py",
     "exit_code": 0,

{xmyshell-0.2.0 → xmyshell-0.2.2}/xmyshell/kernel.py

@@ -4,7 +4,7 @@ import sys
 import runpy
 import subprocess
 import shlex
-from .environment import namespace, aliases
+from .environment import namespace, aliases, xmyshell_alias, xmyshell_unalias
 from .utils import pywarning, pyerror, getcwd
 from .meta import HELP_MESSAGE
 
@@ -128,14 +128,22 @@ def xmyshell_raw_command(cmd_line: str) -> int | None:
                 pyerror("export: missing code")
                 return -1
             try:
-                alias_source, alias_target = code.split('=', 1)
-                alias_source = alias_source.strip()
-                aliases[alias_source] = eval(alias_target, namespace, {})
+                altname, alias_target = code.split('=', 1)
+                altname = altname.strip()
+                xmyshell_alias(altname, eval(alias_target, namespace, {}))
                 return 0
             except Exception as e:
                 pyerror(f"{type(e).__name__}: {e}")
                 return -1
 
+        case "unalias":
+            name: str = cmd_line[len(command):].strip()
+            if not name:
+                pyerror("export: missing name")
+                return -1
+            xmyshell_unalias(name)
+            return 0
+
         case "print":
             expr = cmd_line[len(command):].strip()
             if not expr:
@@ -154,12 +162,11 @@ def xmyshell_raw_command(cmd_line: str) -> int | None:
             return 0
 
         case "update":
-            from .update import xmyshell_update
-            subprocess.run(
+            returncode = subprocess.run(
                 [sys.executable, "-m", "xmyshell.update"]
                 + (args[1:] if len(args) > 1 else [])
-            )
-            return 0
+            ).returncode
+            return returncode
 
         case "help":
             print(HELP_MESSAGE)

{xmyshell-0.2.0 → xmyshell-0.2.2}/xmyshell/meta.py

@@ -30,6 +30,7 @@ Built-in Commands:
   pwd                           Print working directory.
   clear                         Clear the terminal screen.
   alias altname=<cmd>           Create an alias command.
+  unalias altname               Remove an alias command.
   exit                          Exit XmyShell.
 
 Inline Python:
@@ -51,6 +52,7 @@ Helper Functions:
   basename(p)         -  final component of path
   cat(file)           -  Shortcut for open(file).read().
   alias(altname, cmd) -  Same as the command.
+  unalias(altname) -  Same as the command.
 
 Built-in variables:
   exit_code       -  The exit code of the last command.

{xmyshell-0.2.0 → xmyshell-0.2.2/xmyshell.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xmyshell
-Version: 0.2.0
+Version: 0.2.2
 Summary: XmyShell is a shell-like tool built on top of prompt_toolkit which provides a persistent Python runtime.
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
@@ -115,6 +115,7 @@ or
 - Alias
 ```
 ❯ alias ll='ls -lh'
+❯ unalias ll
 ```
 
 - Syntax highlighting via `prompt_toolkit`
@@ -142,6 +143,9 @@ Shortcut for `open(file).read()`.
 - `alias(altname, target)`
 Same as the command.
 
+- `unalias(altname)`
+Same as the command.
+
 
 ### Reserved global varibles
 - `exit_code`