ywangd
diff --git a/‎.github/workflows/check-code-and-run-tests.yml‎
Lines changed: 33 additions & 24 deletions b/‎.github/workflows/check-code-and-run-tests.yml‎
Lines changed: 33 additions & 24 deletions
diff --git a/‎.pre-commit-config.yaml‎
Lines changed: 1 addition & 1 deletion b/‎.pre-commit-config.yaml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎.python-version‎
Lines changed: 1 addition & 0 deletions b/‎.python-version‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎MANIFEST.in‎
Lines changed: 5 additions & 0 deletions b/‎MANIFEST.in‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎README.md‎
Lines changed: 3 additions & 1 deletion b/‎README.md‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎__init__.py‎
Lines changed: 0 additions & 1 deletion b/‎__init__.py‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎__main__.py‎
Lines changed: 127 additions & 0 deletions b/‎__main__.py‎
Lines changed: 127 additions & 0 deletions
diff --git a/‎bin/alias.py‎
100644100755
Lines changed: 5 additions & 7 deletions b/‎bin/alias.py‎
100644100755
Lines changed: 5 additions & 7 deletions
diff --git a/‎bin/cat.py‎
100644100755
Lines changed: 16 additions & 16 deletions b/‎bin/cat.py‎
100644100755
Lines changed: 16 additions & 16 deletions
diff --git a/‎bin/cd.py‎
100644100755
Lines changed: 27 additions & 22 deletions b/‎bin/cd.py‎
100644100755
Lines changed: 27 additions & 22 deletions
@@ -2,9 +2,10 @@ name: Check code and run tests
 
 on:
   push:
-    branches: [ master ]
+    branches: [master]
   pull_request:
-    branches: [ master ]
+    branches: [master]
+  workflow_dispatch:
 
 jobs:
   pre-commit:
@@ -16,31 +17,39 @@ jobs:
           python-version: 3.x
       - uses: pre-commit/action@v3.0.1
 
+  ruff:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v7
+      - run: pip install --user ruff
+      - run: ruff check --output-format=github .
+      - run: ruff format
   build:
     runs-on: macos-latest
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.10"]  # ["2.7", "3.6", "3.10"]
+        python-version: ["3.10", "3.14"]
     steps:
-    - name: Checkout
-      uses: actions/checkout@v7
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v7
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip wheel setuptools
-        pip install ".[testing]"
-    - name: Analysing the code with flake8
-      run: |
-        # F824 `global name` / `nonlocal name` is unused: name is never assigned in scope
-        flake8 . --count --select=E9,F63,F7,F82 --ignore=F824 --show-source --statistics
-        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=88 --statistics
-    - name: Running tests
-      run: |
-        pytest --version
-        # make install test work...
-        export PYTHONPATH=$(python -m site --user-site)
-        pytest tests/ --ignore=tests/system/data/ --showlocals --verbose --show-capture=all --log-level=debug
+      - name: Checkout
+        uses: actions/checkout@v7
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v7
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip wheel setuptools
+          pip install ".[testing]"
+      - name: Analysing the code with flake8
+        run: |
+          # F824 `global name` / `nonlocal name` is unused: name is never assigned in scope
+          flake8 . --count --select=E9,F63,F7,F82 --ignore=F824 --show-source --statistics
+          flake8 . --count --exit-zero --max-complexity=10 --max-line-length=88 --statistics
+      - name: Running tests
+        run: |
+          pytest --version
+          # make install test work...
+          export PYTHONPATH=$(python -m site --user-site)
+          pytest
@@ -54,7 +54,7 @@ repos:
   #        - tomli
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.12.9
+    rev: v0.16.0
     hooks:
       - id: ruff-check
       - id: ruff-format
 
@@ -0,0 +1 @@
+3.10
@@ -0,0 +1,5 @@
+include README.md
+include CHANGELOG.md
+include LICENSE
+include py.typed
+include pyproject.toml
@@ -35,7 +35,9 @@ environment and great treasures may be found within.
 **StaSh can be easily installed via one line of python command**
 (courtesy of [@whitone](https://forum.omz-software.com/user/whitone)).
 ```Python
-import requests as r; exec(r.get('https://bit.ly/get-stash').content)
+import requests as r
+
+exec(r.get("https://bit.ly/get-stash").content)
 ```
 Simply copy the above line, paste into Pythonista interactive prompt and
 execute. It installs StaSh as a Python module under the `site-packages`
 
@@ -1,2 +1 @@
-# -*- coding: utf-8 -*-
 from . import core as stash
@@ -0,0 +1,127 @@
+"""
+Launch StaSh in a more flexible and reliable way.
+"""
+
+import argparse
+import sys
+
+# fix from https://github.com/ywangd/stash/pull/499
+if hasattr(sys, "_exit"):
+    sys.exit = sys._exit
+
+module_names = (
+    "stash",
+    "system.shcommon",
+    "system.shstreams",
+    "system.shscreens",
+    "system.shui",
+    "system.shui.base",
+    "system.shio",
+    "system.shiowrapper",
+    "system.shparsers",
+    "system.shruntime",
+    "system.shthreads",
+    "system.shuseractionproxy",
+    "system.shhistory",
+)
+
+# Attempt to reload modules when startup, does not seem to work
+if "stash.stash" in sys.modules:
+    for name in module_names:
+        sys.modules.pop("stash." + name)
+from stash import stash
+
+ap = argparse.ArgumentParser()
+ap.add_argument(
+    "--no-cfgfile", action="store_true", help="do not load external config files"
+)
+ap.add_argument(
+    "--no-rcfile", action="store_true", help="do not load external resource file"
+)
+ap.add_argument(
+    "--no-historyfile",
+    action="store_true",
+    help="do not load history file from last session",
+)
+ap.add_argument(
+    "--log-level",
+    choices=["DEBUG", "INFO", "WARN", "ERROR", "CRITICAL"],
+    default="INFO",
+    help="the logging level",
+)
+ap.add_argument("--log-file", help="the file to send logging messages")
+ap.add_argument(
+    "--debug-switch",
+    default="",
+    help="a comma separate list to turn on debug switch for components",
+)
+ap.add_argument("-c", "--command", default=None, dest="command", help="command to run")
+ap.add_argument(
+    "args",  # the editor shortcuts may pass additional arguments
+    nargs="*",
+    help="additional arguments (ignored)",
+)
+
+
+def main():
+    ns = ap.parse_args()
+
+    log_setting = {
+        "level": ns.log_level,
+        "file": ns.log_file,
+    }
+
+    if ns.debug_switch == "":
+        debug = (
+            # stash._DEBUG_STREAM,
+            # stash._DEBUG_RENDERER,
+            # stash._DEBUG_MAIN_SCREEN,
+            # stash._DEBUG_MINI_BUFFER,
+            # stash._DEBUG_IO,
+            # stash._DEBUG_UI,
+            # stash._DEBUG_TERMINAL,
+            # stash._DEBUG_TV_DELEGATE,
+            # stash._DEBUG_RUNTIME,
+            # stash._DEBUG_PARSER,
+            # stash._DEBUG_EXPANDER,
+            # stash._DEBUG_COMPLETER,
+        )
+    elif ns.debug_switch == "all":
+        debug = []
+        for key in dir(stash):
+            if key.startswith("_DEBUG_"):
+                value = getattr(stash, key, None)
+                if value is not None:
+                    debug.append(value)
+    else:
+        debug = []
+        for ds in ns.debug_switch.split(","):
+            ds = getattr(stash, f"_DEBUG_{ds.upper()}", None)
+            if ds is not None:
+                debug.append(ds)
+
+    if ns.command:
+        # tell StaSh not to run any command if command is passed
+        # (we will call the command manually later)
+        ctp = False
+    else:
+        # tell StaSh to run the default command (totd.py)
+        ctp = None
+
+    _stash = stash.StaSh(
+        debug=debug,
+        log_setting=log_setting,
+        no_cfgfile=ns.no_cfgfile,
+        no_rcfile=ns.no_rcfile,
+        no_historyfile=ns.no_historyfile,
+        command=ctp,
+    )
+
+    _stash.launch(ns.command)
+    if ns.command is not None:
+        # TODO: _stash.launch() may block, which prevents this from being executed
+        _stash(ns.command, add_to_history=False, persistent_level=0)
+
+
+if __name__ == "__main__":
+    main()
@@ -1,12 +1,10 @@
-# -*- coding: utf-8 -*-
+#!/usr/bin/env python
 # Example of accessing the shell object from script
 # This ability completely removes the need of plugins
 """List or define shell aliases."""
 
-from __future__ import print_function
-
-import sys
 import argparse
+import sys
 
 
 def main(args):
@@ -22,7 +20,7 @@ def main(args):
 
     if ns.expr is None:
         for k, v in current_state.aliases.items():
-            print("{}={}".format(k, v[0]))
+            print(f"{k}={v[0]}")
 
     else:
         if "=" in ns.expr:
@@ -38,9 +36,9 @@ def main(args):
             sys.exit(0)
         else:
             try:
-                print("{}={}".format(ns.expr, current_state.aliases[ns.expr]))
+                print(f"{ns.expr}={current_state.aliases[ns.expr]}")
             except KeyError as err:
-                raise KeyError("alias: {} not found".format(err.message))
+                raise KeyError(f"alias: {err} not found")
 
 
 if __name__ == "__main__":
 
@@ -1,39 +1,39 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 """Print the contents of the given files."""
 
-from __future__ import print_function
-
 import argparse
+import fileinput
 import string
 import sys
-import fileinput
+from collections.abc import Sequence
 
 
-def filter_non_printable(s):
+def filter_non_printable(s: str) -> str:
     return "".join(
         [c if c.isalnum() or c.isspace() or c in string.punctuation else " " for c in s]
     )
 
 
-def main(args):
+def main(args: Sequence[str]) -> None:
     p = argparse.ArgumentParser(description=__doc__)
+    # NOTE: keep as plain str, not Path - fileinput's "-" stdin sentinel is a
+    # direct string comparison (`self._filename == '-'`), which a Path never
+    # equals, breaking `some_cmd | cat -`.
     p.add_argument("files", action="store", nargs="*", help="files to print")
     ns = p.parse_args(args)
 
-    status = 0
-
-    fileinput.close()  # in case it is not closed
     try:
-        for line in fileinput.input(ns.files, openhook=fileinput.hook_encoded("utf-8")):
-            print(filter_non_printable(line), end="")
+        with fileinput.input(files=ns.files, encoding="utf-8") as fin:
+            for line in fin:
+                print(filter_non_printable(line), end="")
+    except KeyboardInterrupt:
+        print("\nOperation interrupted by user.", file=sys.stderr)
+        sys.exit(1)
     except Exception as e:
-        print("cat: %s" % str(e))
-        status = 1
-    finally:
-        fileinput.close()
+        print("cat: error: %s" % str(e), file=sys.stderr)
+        sys.exit(1)
 
-    sys.exit(status)
+    sys.exit(0)
 
 
 if __name__ == "__main__":
 
@@ -1,44 +1,49 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 """Change the current working directory."""
 
-from __future__ import print_function
-
 import argparse
 import os
 import sys
+from collections.abc import Sequence
+from pathlib import Path
 
 
-def main(args):
+def main(args: Sequence[str]) -> None:
     p = argparse.ArgumentParser(description=__doc__)
+    HOME2_DEFAULT = os.environ.get("HOME2", Path("~").expanduser() / "Documents")
     p.add_argument(
         "dir",
         action="store",
+        type=Path,
         nargs="?",
-        default=os.environ["HOME2"],
+        default=HOME2_DEFAULT,
         help="the new working directory",
     )
     ns = p.parse_args(args)
 
-    status = 0
-
     try:
-        if os.path.exists(ns.dir):
-            if os.path.isdir(ns.dir):
-                # chdir does not raise exception until listdir is called, so check for access here
-                if os.access(ns.dir, os.R_OK):
-                    os.chdir(ns.dir)
-                else:
-                    print("cd: {} access denied".format(ns.dir))
-            else:
-                print("cd: %s: Not a directory" % ns.dir)
-        else:
-            print("cd: %s: No such file or directory" % ns.dir)
+        err = ""
+        if not ns.dir.exists():
+            err = f"cd: {ns.dir}: No such file or directory"
+        elif not ns.dir.is_dir():
+            err = f"cd: {ns.dir}: Not a directory"
+        elif not os.access(ns.dir, os.R_OK):  # X_OK allows dir enter
+            err = f"cd: {ns.dir}: Access denied"
+
+        if err:
+            print(err)
+            sys.exit(1)
+            return  # Add return to stop execution in the mocked environment
+
+        os.chdir(ns.dir)
+        sys.exit(0)  # Moved to be inside the try block
+
+    except KeyboardInterrupt:
+        print("\nOperation interrupted by user.", file=sys.stderr)
+        sys.exit(1)
     except Exception as err:
-        print("cd: {}: {!s}".format(type(err).__name__, err), file=sys.stderr)
-        status = 1
-
-    sys.exit(status)
+        print(f"cd: {type(err).__name__}: {err!s}", file=sys.stderr)
+        sys.exit(1)
 
 
 if __name__ == "__main__":
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`		`-# -- coding: utf-8 --`
`2`	`1`	`from . import core as stash`