xmyshell 0.1.2__tar.gz → 0.1.4__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xmyshell
-Version: 0.1.2
+Version: 0.1.4
 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
@@ -103,6 +103,15 @@ foobar
 ❯ reload
 ```
 
+- Update xmyshell (optionally to a specific version).
+```
+❯ udpate
+```
+or
+```
+❯ update 0.1.3
+```
+
 - Syntax highlighting via `prompt_toolkit`
 - Powerful auto-completion, history search, and automatic bracket/quote pairing
 - Startup configuration: `~/.xmyshell/config.py` loaded at launch

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

@@ -93,6 +93,15 @@ foobar
 ❯ reload
 ```
 
+- Update xmyshell (optionally to a specific version).
+```
+❯ udpate
+```
+or
+```
+❯ update 0.1.3
+```
+
 - Syntax highlighting via `prompt_toolkit`
 - Powerful auto-completion, history search, and automatic bracket/quote pairing
 - Startup configuration: `~/.xmyshell/config.py` loaded at launch

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

@@ -1,6 +1,6 @@
 [project]
 name = "xmyshell"
-version = "0.1.2"
+version = "0.1.4"
 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/__main__.py

@@ -0,0 +1,20 @@
+import subprocess
+import sys
+
+
+def main() -> None:
+    argv = sys.argv
+
+    if len(argv) == 1:
+        from .main import xmyshell_main
+        xmyshell_main()
+    elif argv[1] == "--update":
+        subprocess.run([sys.executable, "-m", "xmyshell.update"] + argv[2:])
+    elif argv[1] == "--version":
+        from .meta import WELCOME_MESSAGE
+        print(WELCOME_MESSAGE)
+    elif argv[1] == "--help":
+        from .meta import HELP_MESSAGE
+        print(HELP_MESSAGE)
+    else:
+        print(f"Error: cannot parse arguments '{' '.join(argv[1:])}'")

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

@@ -13,7 +13,11 @@ def _reload() -> None:
 
 
 def xmyshell_source(path: str) -> None:
-    _updated = runpy.run_path(os.path.expanduser(path), namespace)
+    _updated = runpy.run_path(
+        path_name=os.path.expanduser(path),
+        init_globals=namespace,
+        run_name="__main__",
+    )
     namespace.clear()
     namespace.update(_updated)
 
@@ -82,7 +86,7 @@ def xmyshell_raw_command(cmd_line: str) -> int | None:
     command = args[0]
     match command:
         case "pyexec":
-            code = cmd_line[len(command):].strip()
+            code = cmd_line[len(command) :].strip()
             if not code:
                 pyerror("pyexec: missing code")
                 return -1
@@ -92,6 +96,7 @@ def xmyshell_raw_command(cmd_line: str) -> int | None:
                 return 0
             except Exception as e:
                 import traceback
+
                 namespace["last_error"] = e
                 namespace["last_traceback"] = traceback.format_exc()
                 pyerror(f"{type(e).__name__}: {e}")
@@ -128,6 +133,13 @@ def xmyshell_raw_command(cmd_line: str) -> int | None:
             _reload()
             return 0
 
+        case "update":
+            from .update import xmyshell_update
+            subprocess.run(
+                [sys.executable, "-m", "xmyshell.update"]
+                + (args[1:] if len(args) > 1 else [])
+            )
+
     if command.startswith("import") or command.startswith("from"):
         try:
             exec(cmd_line, dict(os.environ), namespace)
@@ -136,6 +148,22 @@ def xmyshell_raw_command(cmd_line: str) -> int | None:
             pyerror(f"{type(e).__name__}: {e}")
             return -1
 
+def _fix_first_word(cmd_line: str) -> str:
+    # strip is unnecessary
+    if cmd_line.startswith('"'):
+        end = cmd_line.find('"', 1)
+        if end == -1:
+            return cmd_line
+        first = cmd_line[:end + 1]
+        rest = cmd_line[end + 1:]
+    else:
+        parts = cmd_line.split(None, 1)
+        first = parts[0]
+        rest = (" " + parts[1]) if len(parts) > 1 else ""
+
+    fixed = first.replace("/", "\\")
+    return fixed + rest
+
 
 def xmyshell(cmd_line: str) -> int:
     cmd_line = cmd_line.strip()
@@ -250,6 +278,8 @@ def xmyshell(cmd_line: str) -> int:
         case "exit":
             sys.exit(0)
 
+    if os.name == "nt":
+        cmd_line = _fix_first_word(cmd_line)
     if target_var:
         result = subprocess.run(
             cmd_line, shell=True, env=os.environ, capture_output=True, text=True

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

@@ -17,18 +17,19 @@ HELP_MESSAGE    = f"""\033[1;36m
 {WELCOME_MESSAGE}
 
 Built-in Commands:
-  help                        Show helping documents.
-  print <expr>                Evaluate and print a Python expression.
-  pyexec <stmt>               Execute a Python statement (e.g. pyexec x = 1).
-  source <file.py>            Run a Python script in the current namespace.
-  export NAME=VALUE           Set an environment variable (supports {{expr}}).
-  import <module> [as <alt>]  Import a Python module.
-  from <module> import *      Import names from a module.
-  reload                      Reload environment (e.g. exit virtualenv).
-  cd <dir>                    Change directory (supports {{expr}}).
-  pwd                         Print working directory.
-  clear                       Clear the terminal screen.
-  exit                        Exit XmyShell.
+  help                          Show help documents.
+  print <expr>                  Evaluate and print a Python expression.
+  pyexec <stmt>                 Execute a Python statement (e.g. pyexec x = 1).
+  source <file.py>              Run a Python script in the current namespace.
+  export <NAME>=<value>         Set an environment variable (supports {{expr}}).
+  import <module> [as <alt>]    Import a Python module.
+  from <module> import <names>  Import names from a module.
+  reload                        Reload environment (e.g. exit virtualenv).
+  update [<version>]            Update xmyshell (optionally to a specific version).
+  cd <dir>                      Change directory (supports {{expr}}).
+  pwd                           Print working directory.
+  clear                         Clear the terminal screen.
+  exit                          Exit XmyShell.
 
 Inline Python:
   Use {{expression}} anywhere in a command to expand its result.

xmyshell-0.1.4/xmyshell/update.py

@@ -0,0 +1,29 @@
+import os
+import sys
+import time
+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)
+
+    install_args = [
+        sys.executable,
+        "-m",
+        "pip",
+        "install",
+        "--upgrade",
+        "xmyshell" + (f"=={version}" if version else ""),
+    ]
+    print()
+    returncode = subprocess.run(install_args).returncode
+    print("Press <Enter> to continue ...", end="")
+    sys.exit(returncode)
+
+if __name__ == "__main__":
+    version = sys.argv[1] if len(sys.argv) >= 2 else None
+    xmyshell_update(version)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xmyshell
-Version: 0.1.2
+Version: 0.1.4
 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
@@ -103,6 +103,15 @@ foobar
 ❯ reload
 ```
 
+- Update xmyshell (optionally to a specific version).
+```
+❯ udpate
+```
+or
+```
+❯ update 0.1.3
+```
+
 - Syntax highlighting via `prompt_toolkit`
 - Powerful auto-completion, history search, and automatic bracket/quote pairing
 - Startup configuration: `~/.xmyshell/config.py` loaded at launch

{xmyshell-0.1.2 → xmyshell-0.1.4}/xmyshell.egg-info/SOURCES.txt

@@ -12,6 +12,7 @@ xmyshell/lexer.py
 xmyshell/main.py
 xmyshell/meta.py
 xmyshell/themes.py
+xmyshell/update.py
 xmyshell/utils.py
 xmyshell.egg-info/PKG-INFO
 xmyshell.egg-info/SOURCES.txt

xmyshell-0.1.2/xmyshell/__main__.py

@@ -1,12 +0,0 @@
-import sys
-
-def main() -> None:
-    if "--version" in sys.argv:
-        from .meta import WELCOME_MESSAGE
-        print(WELCOME_MESSAGE)
-    elif "--help" in sys.argv:
-        from .meta import HELP_MESSAGE
-        print(HELP_MESSAGE)
-    else:
-        from .main import xmyshell_main
-        xmyshell_main()