nercone-shell 0.3.7__tar.gz → 0.4.0__tar.gz

{nercone_shell-0.3.7 → nercone_shell-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: nercone-shell
-Version: 0.3.7
+Version: 0.4.0
 Summary: Modern shell for Developers
 Author: Nercone
 Author-email: Nercone <nercone@diamondgotcat.net>
@@ -68,7 +68,7 @@ nersh
 ```
 
 ## Configuration
-The configuration file is usually located at `~/.nercone/nercone-shell/config.json`.
+The configuration file is usually located at `~/.nersh/config.json`.
 If the file does not exist when Nersh starts, it will be automatically created.
 
 The following is the default configuration file:
@@ -81,7 +81,7 @@ The following is the default configuration file:
             "SHELL": "None"
         },
         "autoruns": [
-            "<path to home directory>/.nercone/nercone-shell/autostart.sh"
+            "<path to home directory>/.nersh/autostart.sh"
         ]
     },
     "compatibility": {
@@ -101,14 +101,17 @@ These settings customize the behavior of Nersh.
 - `autoruns`: Sets the shell scripts you want to run at startup in array format.
 
 ### Compatibility
-This setting allows Nersh to function properly in special environments.
+These settings allows Nersh to function properly in special environments.
 - `report_invisible_characters`: A Boolean value that enables reporting of invisible characters to readline, which is necessary in some environments, such as Linux without a GUI (TUI only).
 
 ### Experimental
 The Experimental setting is used to enable experimental features.
 It enables new features that are incomplete, have many bugs, or have unfixable bugs.
 Some features are difficult to completely disable, so they are effectively disabled. (Bugs in external libraries/modules, etc.)
-
 - `command_history` The readline command history feature.
     - It was marked as an experimental feature because there were frequent issues with the layout collapsing when retracing the history.
     - Since cannot to find a way to disable the history feature in the readline module, it is effectively disabled by clearing the history after each input.
+
+---
+
+![PyPI - Version](https://img.shields.io/pypi/v/nercone-shell)

{nercone_shell-0.3.7 → nercone_shell-0.4.0}/README.md

@@ -53,7 +53,7 @@ nersh
 ```
 
 ## Configuration
-The configuration file is usually located at `~/.nercone/nercone-shell/config.json`.
+The configuration file is usually located at `~/.nersh/config.json`.
 If the file does not exist when Nersh starts, it will be automatically created.
 
 The following is the default configuration file:
@@ -66,7 +66,7 @@ The following is the default configuration file:
             "SHELL": "None"
         },
         "autoruns": [
-            "<path to home directory>/.nercone/nercone-shell/autostart.sh"
+            "<path to home directory>/.nersh/autostart.sh"
         ]
     },
     "compatibility": {
@@ -86,14 +86,17 @@ These settings customize the behavior of Nersh.
 - `autoruns`: Sets the shell scripts you want to run at startup in array format.
 
 ### Compatibility
-This setting allows Nersh to function properly in special environments.
+These settings allows Nersh to function properly in special environments.
 - `report_invisible_characters`: A Boolean value that enables reporting of invisible characters to readline, which is necessary in some environments, such as Linux without a GUI (TUI only).
 
 ### Experimental
 The Experimental setting is used to enable experimental features.
 It enables new features that are incomplete, have many bugs, or have unfixable bugs.
 Some features are difficult to completely disable, so they are effectively disabled. (Bugs in external libraries/modules, etc.)
-
 - `command_history` The readline command history feature.
     - It was marked as an experimental feature because there were frequent issues with the layout collapsing when retracing the history.
     - Since cannot to find a way to disable the history feature in the readline module, it is effectively disabled by clearing the history after each input.
+
+---
+
+![PyPI - Version](https://img.shields.io/pypi/v/nercone-shell)

{nercone_shell-0.3.7 → nercone_shell-0.4.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "nercone-shell"
-version = "0.3.7"
+version = "0.4.0"
 description = "Modern shell for Developers"
 readme = { file = "README.md", content-type = "text/markdown" }
 authors = [

{nercone_shell-0.3.7 → nercone_shell-0.4.0}/src/nercone_shell/__main__.py

@@ -28,10 +28,10 @@ except AttributeError:
 try:
     VERSION: str = version("nercone-shell")
 except PackageNotFoundError:
-    VERSION: str = "0.0.0"
+    VERSION: str = "(version unknown)"
 ENVIRONMENT: dict = {}
-NERSH_AUTORUN: str = os.environ.get("NERSH_AUTORUN", None)
-NERSH_PATH = Path(os.environ.get("NERSH_PATH", str(Path(Path("~").expanduser(), ".nercone", "nercone-shell"))))
+NERSH_AUTORUN: str | None = os.environ.get("NERSH_AUTORUN", None)
+NERSH_PATH = Path(os.environ.get("NERSH_PATH", str(Path(Path("~").expanduser(), ".nersh"))))
 NERSH_HISTORY_PATH = Path(os.environ.get("NERSH_HISTORY_PATH", str(Path(NERSH_PATH, "history.txt"))))
 NERSH_CONFIG: dict = {}
 NERSH_CONFIG_PATH = Path(os.environ.get("NERSH_CONFIG_PATH", str(Path(NERSH_PATH, "config.json"))))
@@ -40,10 +40,10 @@ NERSH_CONFIG_DEFAULT: dict = {
         "show_version": True,
         "accent_color": "blue",
         "override_env": {
-            "SHELL": f"{shutil.which('nersh')}"
+            "SHELL": f"{shutil.which('nersh') or 'nersh'}"
         },
-        "autoruns": [
-            f"{Path(NERSH_PATH, 'autostart.sh')}"
+        "autorun": [
+            f"{Path(NERSH_PATH, 'autorun.sh')}"
         ]
     },
     "compatibility": {
@@ -162,11 +162,11 @@ def shorten_path(path: str) -> str:
     return path_str
 
 def show_version():
-    print(f"Nersh v{VERSION}")
+    print(f"Nersh {VERSION}")
 
 def reset():
     global ENVIRONMENT, NERSH_CONFIG
-    ENVIRONMENT = {"PWD": f"{Path(Path("~").expanduser())}"}
+    ENVIRONMENT = {"PWD": f"{Path('~').expanduser()}"}
     NERSH_CONFIG = {}
     reload()
 
@@ -202,14 +202,17 @@ def run_line(command: str) -> int:
     cmd = args[0]
     if cmd == "version":
         show_version()
+        return 0
     elif cmd == "reset":
         reset()
+        return 0
     elif cmd == "reload":
         reload()
+        return 0
     elif cmd == "cd":
         target = " ".join(args[1:])
         if not target:
-            ENVIRONMENT["PWD"] = f"{Path("~").expanduser()}"
+            ENVIRONMENT["PWD"] = f"{Path('~').expanduser()}"
         target = os.path.expanduser(target)
         target_path = Path(target)
         if not target_path.is_absolute():
@@ -218,12 +221,16 @@ def run_line(command: str) -> int:
             resolved_path = target_path.resolve()
             if resolved_path.is_dir():
                 ENVIRONMENT["PWD"] = str(resolved_path)
+                return 0
             elif resolved_path.exists():
                 print(f"Not a directory: {target}")
+                return 1
             else:
                 print(f"Not exist: {target}")
+                return 1
         except FileNotFoundError:
             print(f"Not exist: {target}")
+            return 1
     elif cmd == "export":
         content = command.strip()[6:].strip()
         if "=" in content:
@@ -235,6 +242,7 @@ def run_line(command: str) -> int:
             if not content:
                 for k, v in ENVIRONMENT.items():
                     print(f"{k}={v}")
+        return 0
     elif cmd == "source" or cmd == ".":
         if len(args) < 2:
             print(f"{cmd}: filename argument required")
@@ -242,7 +250,7 @@ def run_line(command: str) -> int:
         target = args[1]
         target_path = Path(os.path.expanduser(target))
         if not target_path.is_absolute():
-            target_path = Path(ENVIRONMENT.get("PWD")) / target_path
+            target_path = Path(ENVIRONMENT.get("PWD", Path("~").expanduser())) / target_path
         if target_path.is_file():
             try:
                 with target_path.open("r") as f:
@@ -255,6 +263,7 @@ def run_line(command: str) -> int:
         else:
             print(f"nersh: {target}: No such file")
             return 1
+        return 0
     elif cmd == "exit":
         if NERSH_CONFIG.get("experimental", {}).get("command_history", False):
             readline.write_history_file(str(NERSH_HISTORY_PATH))
@@ -270,18 +279,18 @@ def run_script(script: str):
     for line in script.split('\n'):
         run_line(line)
 
-def main() -> int:
+def main():
     reset()
     completer = NershCompleter()
     readline.set_completer(completer.complete)
-    if 'libedit' in readline.__doc__:
+    if 'libedit' in str(readline.__doc__):
         readline.parse_and_bind("bind ^I rl_complete")
     else:
         readline.parse_and_bind("tab: complete")
     readline.set_completer_delims(' \t\n;')
     if NERSH_CONFIG.get("customization", {}).get("show_version", True):
         show_version()
-    for p in NERSH_CONFIG.get("customization", {}).get("autoruns", []):
+    for p in NERSH_CONFIG.get("customization", {}).get("autorun", []):
         if Path(p).is_file():
             with Path(p).open("r") as f:
                 run_script(f.read())
@@ -297,9 +306,9 @@ def main() -> int:
         try:
             RL_PROMPT_START_IGNORE = "\001" if NERSH_CONFIG.get("compatibility", {}).get("report_invisible_characters", False) else ""
             RL_PROMPT_END_IGNORE = "\002" if NERSH_CONFIG.get("compatibility", {}).get("report_invisible_characters", False) else ""
-            color_accent = f"{RL_PROMPT_START_IGNORE}{ModernColor.color(NERSH_CONFIG.get('customization', {}).get('accent_color', 'blue'))}{RL_PROMPT_END_IGNORE}"
-            color_reset = f"{RL_PROMPT_START_IGNORE}{ModernColor.color('reset')}{RL_PROMPT_END_IGNORE}"
-            run_line(input(f"{color_accent}{getpass.getuser().lower()}{color_reset}@{hostname.lower()} {color_accent}{shorten_path(ENVIRONMENT.get('PWD', f'{Path('~').expanduser()}'))}{color_reset}> "))
+            color_accent = f"{RL_PROMPT_START_IGNORE}{ModernColor.from_name(NERSH_CONFIG.get('customization', {}).get('accent_color', 'blue'))}{RL_PROMPT_END_IGNORE}"
+            color_reset = f"{RL_PROMPT_START_IGNORE}{ModernColor.from_name('reset')}{RL_PROMPT_END_IGNORE}"
+            run_line(input(f"{color_accent}{getpass.getuser().lower()}{color_reset}@{hostname.lower()} {color_accent}{shorten_path(ENVIRONMENT.get('PWD', str(Path('~').expanduser())))}{color_reset}> "))
             if not NERSH_CONFIG.get("experimental", {}).get("command_history", False):
                 readline.clear_history()
         except KeyboardInterrupt: