xmyshell 0.1.4__tar.gz → 0.2.1__tar.gz

{xmyshell-0.1.4/xmyshell.egg-info → xmyshell-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xmyshell
-Version: 0.1.4
+Version: 0.2.1
 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
@@ -112,6 +112,12 @@ or
 ❯ update 0.1.3
 ```
 
+- Alias
+```
+❯ alias ll='ls -lh'
+❯ unalias ll
+```
+
 - Syntax highlighting via `prompt_toolkit`
 - Powerful auto-completion, history search, and automatic bracket/quote pairing
 - Startup configuration: `~/.xmyshell/config.py` loaded at launch
@@ -131,6 +137,16 @@ Returns the parent directory of a path.
 - `basename(path)`
 Returns the final component of a path.
 
+- `cat(file)`
+Shortcut for `open(file).read()`.
+
+- `alias(altname, target)`
+Same as the command.
+
+- `unalias(altname)`
+Same as the command.
+
+
 ### Reserved global varibles
 - `exit_code`
 The exit code of the last command.
@@ -138,6 +154,12 @@ The exit code of the last command.
 - `exec_duration`
 The duration which last command took.
 
+- `HOME_DIR`
+The home directory, similar to `~`.
+
+- `PROFILE`
+The path of config file.
+
 ### Keyboard Shortcuts
 - `↑↓` -> Navigate through command history.
 - `→` -> Apply selected history entry to the prompt.

{xmyshell-0.1.4 → xmyshell-0.2.1}/README.md

@@ -102,6 +102,12 @@ or
 ❯ update 0.1.3
 ```
 
+- Alias
+```
+❯ alias ll='ls -lh'
+❯ unalias ll
+```
+
 - Syntax highlighting via `prompt_toolkit`
 - Powerful auto-completion, history search, and automatic bracket/quote pairing
 - Startup configuration: `~/.xmyshell/config.py` loaded at launch
@@ -121,6 +127,16 @@ Returns the parent directory of a path.
 - `basename(path)`
 Returns the final component of a path.
 
+- `cat(file)`
+Shortcut for `open(file).read()`.
+
+- `alias(altname, target)`
+Same as the command.
+
+- `unalias(altname)`
+Same as the command.
+
+
 ### Reserved global varibles
 - `exit_code`
 The exit code of the last command.
@@ -128,6 +144,12 @@ The exit code of the last command.
 - `exec_duration`
 The duration which last command took.
 
+- `HOME_DIR`
+The home directory, similar to `~`.
+
+- `PROFILE`
+The path of config file.
+
 ### Keyboard Shortcuts
 - `↑↓` -> Navigate through command history.
 - `→` -> Apply selected history entry to the prompt.

{xmyshell-0.1.4 → xmyshell-0.2.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "xmyshell"
-version = "0.1.4"
+version = "0.2.1"
 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.1.4 → xmyshell-0.2.1}/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,7 @@ 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")
+            "clear", "grep", "find", "from", "mkdir", "rm", "reload", "mv", "help", "alias", "update")
 
 COMMON = (
     "python", "python3", "pip", "pip3", "git", "conda", "uv",
@@ -328,7 +328,16 @@ class ShellCompleter(Completer):
         if " " not in lstripped:
             if len(lstripped) < 1:
                 return
+            for alias in aliases.keys():
+                if alias.startswith(lstripped):
+                    yield Completion(
+                        alias,
+                        start_position=-len(lstripped),
+                        display=truncate(alias, MAX_DISPLAY_LEN),
+                        display_meta="alias",
+                    )
             for cmd in self._get_commands():
+                if cmd in aliases: return
                 if cmd.startswith(lstripped):
                     meta = "command" if cmd in BUILTINS else "program"
                     yield Completion(
@@ -342,7 +351,7 @@ class ShellCompleter(Completer):
         parts = lstripped.split()
         if len(parts) >= 1:
             cmd = parts[0]
-            if cmd in ("print", "pyexec"):
+            if cmd in ("print", "pyexec", "alias"):
                 param_text = lstripped[len(cmd):].lstrip()
                 yield from self._python_completion(param_text)
                 return

{xmyshell-0.1.4 → xmyshell-0.2.1}/xmyshell/data/commands.json

@@ -1,5 +1,5 @@
 {
-  "xmyshell": { "_global": ["--help", "--version"] },
+  "xmyshell": { "_global": ["--help", "--version", "--update"] },
   "git": {
     "_global": ["--help", "--version"],
     "add": {

{xmyshell-0.1.4 → xmyshell-0.2.1}/xmyshell/environment.py

@@ -5,12 +5,20 @@ import time
 from datetime import datetime
 from typing import Any
 from collections.abc import Mapping
-from .utils import XMYSHELL_MAGIC, getcwd, getlogin, HOME_DIR
+from .utils import XMYSHELL_MAGIC, getcwd, getlogin, HOME_DIR, xmyshell_cat
 
 namespace: dict[str, Any] = {}
+aliases: dict[str, str] = {}
 init_environ: dict[str, str] = dict(os.environ)
 
 
+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] = {
     "_xmyshell_magic": XMYSHELL_MAGIC,
     "__builtins__": __builtins__,
@@ -23,7 +31,11 @@ _init_namespace: dict[str, Any] = {
     "getcwd": getcwd,
     "dirname": os.path.dirname,
     "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,
     "exec_duration": 0,
     "last_error": None,

{xmyshell-0.1.4 → xmyshell-0.2.1}/xmyshell/kernel.py

@@ -1,8 +1,10 @@
+from collections.abc import Generator, Sequence
 import os
 import sys
 import runpy
 import subprocess
-from .environment import namespace
+import shlex
+from .environment import namespace, aliases, xmyshell_alias, xmyshell_unalias
 from .utils import pywarning, pyerror, getcwd
 from .meta import HELP_MESSAGE
 
@@ -52,6 +54,10 @@ def pyeval(cmd_line: str) -> str:
                 if expr:
                     try:
                         val = eval(expr, dict(os.environ), namespace)
+                        if not isinstance(
+                            val, (str, bytes, bytearray, memoryview)
+                        ) and isinstance(val, (Sequence, Generator)):
+                            val = shlex.join(str(ele) for ele in val)
                         result.append(str(val) if val is not None else '')
                     except Exception as e:
                         pywarning(f"An error occured when unfolding {expr!r}, using original string instead"
@@ -116,6 +122,28 @@ def xmyshell_raw_command(cmd_line: str) -> int | None:
                 pyerror(f"{type(e).__name__}: {e}")
                 return -1
 
+        case "alias":
+            code: str = cmd_line[len(command):].strip()
+            if not code:
+                pyerror("export: missing code")
+                return -1
+            try:
+                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:
@@ -134,11 +162,26 @@ 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 [])
-            )
+            ).returncode
+            return returncode
+
+        case "help":
+            print(HELP_MESSAGE)
+            return 0
+
+        case "clear":
+            print("\033[2J\033[H", end="")
+            return 0
+
+        case "pwd":
+            print(getcwd())
+            return 0
+
+        case "exit":
+            sys.exit(0)
 
     if command.startswith("import") or command.startswith("from"):
         try:
@@ -225,6 +268,9 @@ def xmyshell(cmd_line: str) -> int:
     if not cmd_line:
         return 0
 
+    args = cmd_line.split()
+    args[0] = aliases.get(args[0], args[0])
+    cmd_line = " ".join(args)
     args = cmd_line.split()
     command = args[0]
 
@@ -252,14 +298,6 @@ def xmyshell(cmd_line: str) -> int:
                 pyerror(f"not a directory: '{target_dir}'")
                 return -1
 
-        case "help":
-            print(HELP_MESSAGE)
-            return 0
-
-        case "clear":
-            print("\033[2J\033[H", end="")
-            return 0
-
         case "source":
             if len(args) < 2:
                 pyerror("source: missing script")
@@ -271,13 +309,6 @@ def xmyshell(cmd_line: str) -> int:
                 pyerror(f"source error: {e}")
                 return -1
 
-        case "pwd":
-            print(getcwd())
-            return 0
-
-        case "exit":
-            sys.exit(0)
-
     if os.name == "nt":
         cmd_line = _fix_first_word(cmd_line)
     if target_var:

{xmyshell-0.1.4 → xmyshell-0.2.1}/xmyshell/meta.py

@@ -29,6 +29,8 @@ Built-in Commands:
   cd <dir>                      Change directory (supports {{expr}}).
   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:
@@ -44,10 +46,19 @@ IO:
   Example: print "\\n".join(str(i) for i in range(100)) |> grep 42
 
 Helper Functions:
-  getlogin()   -  current username
-  getcwd()     -  current working directory
-  dirname(p)   -  parent directory of path
-  basename(p)  -  final component of path
+  getlogin()          -  current username
+  getcwd()            -  current working directory
+  dirname(p)          -  parent directory of path
+  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.
+  exec_duration   -  The duration which last command took.
+  HOME_DIR        -  The home directory, similar to "~".
+  PROFILE         -  The path of config file.
 
 Keyboard Shortcuts:
   ↑↓      -  Navigate through command history.

{xmyshell-0.1.4 → xmyshell-0.2.1}/xmyshell/update.py

@@ -6,8 +6,6 @@ import subprocess
 def xmyshell_update(version: str | None = None) -> None:
     if os.name == "nt":
         subprocess.run("taskkill /F /IM xmyshell.exe", shell=True)
-    else:
-        subprocess.run(["pkill", "-f", "-x", "xmyshell"])
 
     time.sleep(1)
 
@@ -19,9 +17,10 @@ def xmyshell_update(version: str | None = None) -> None:
         "--upgrade",
         "xmyshell" + (f"=={version}" if version else ""),
     ]
-    print()
+    if os.name == "nt": print()
     returncode = subprocess.run(install_args).returncode
-    print("Press <Enter> to continue ...", end="")
+    if os.name == "nt":
+        print("Press <Enter> to continue ...", end="")
     sys.exit(returncode)
 
 if __name__ == "__main__":

{xmyshell-0.1.4 → xmyshell-0.2.1}/xmyshell/utils.py

@@ -33,3 +33,8 @@ def getcwd() -> str:
         return os.getcwd()
 
 HOME_DIR = os.path.expanduser("~").replace('\\', '/')
+
+def xmyshell_cat(file_path: str) -> str:
+    file_path = os.path.expanduser(file_path)
+    with open(file_path, "r") as f:
+        return f.read()

{xmyshell-0.1.4 → xmyshell-0.2.1/xmyshell.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xmyshell
-Version: 0.1.4
+Version: 0.2.1
 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
@@ -112,6 +112,12 @@ or
 ❯ update 0.1.3
 ```
 
+- Alias
+```
+❯ alias ll='ls -lh'
+❯ unalias ll
+```
+
 - Syntax highlighting via `prompt_toolkit`
 - Powerful auto-completion, history search, and automatic bracket/quote pairing
 - Startup configuration: `~/.xmyshell/config.py` loaded at launch
@@ -131,6 +137,16 @@ Returns the parent directory of a path.
 - `basename(path)`
 Returns the final component of a path.
 
+- `cat(file)`
+Shortcut for `open(file).read()`.
+
+- `alias(altname, target)`
+Same as the command.
+
+- `unalias(altname)`
+Same as the command.
+
+
 ### Reserved global varibles
 - `exit_code`
 The exit code of the last command.
@@ -138,6 +154,12 @@ The exit code of the last command.
 - `exec_duration`
 The duration which last command took.
 
+- `HOME_DIR`
+The home directory, similar to `~`.
+
+- `PROFILE`
+The path of config file.
+
 ### Keyboard Shortcuts
 - `↑↓` -> Navigate through command history.
 - `→` -> Apply selected history entry to the prompt.