replbase 0.0.10__tar.gz → 0.0.13__tar.gz

{replbase-0.0.10 → replbase-0.0.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: replbase
-Version: 0.0.10
+Version: 0.0.13
 Summary: "Combination of other REPL tools into a reusable class that generates a REPL"
 License: MIT
 Author: Joseph Bochinski

{replbase-0.0.10 → replbase-0.0.13}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "replbase"
-version = "0.0.10"
+version = "0.0.13"
 description = "\"Combination of other REPL tools into a reusable class that generates a REPL\""
 authors = [ "Joseph Bochinski <stirgejr@gmail.com>",]
 license = "MIT"

{replbase-0.0.10 → replbase-0.0.13}/replbase/repl_base.py

@@ -12,6 +12,7 @@
 """
 
 # region Imports
+from __future__ import annotations
 
 import argparse
 import os
@@ -51,7 +52,6 @@ class ReplCommand:
     command: Callable = None
     help_txt: str = ""
     parser: argparse.ArgumentParser = None
-    def_args: list = field(default_factory=list)
     def_kwargs: dict = field(default_factory=dict)
 
 
@@ -94,6 +94,8 @@ class ReplBase:
     """Command dictionary for prompt_toolkit. Keys are command names,
         values are the corresponding description/help text"""
 
+    parent: ReplBase = None
+
     def __post_init__(self) -> None:
         if isinstance(self.commands, dict):
             for cmd_name, cmd in self.commands.items():
@@ -228,7 +230,6 @@ class ReplBase:
     def add_command(
         self,
         cmd_name: str,
-        *def_args,
         cmd_func: Callable = None,
         help_txt: str = "",
         use_parser: bool = False,
@@ -259,8 +260,6 @@ class ReplBase:
             new_cmd.parser = argparse.ArgumentParser(
                 description=description or help_txt
             )
-        if def_args:
-            new_cmd.def_args = def_args
         if def_kwargs:
             new_cmd.def_kwargs = def_kwargs
 
@@ -281,6 +280,15 @@ class ReplBase:
                 f"[bold green]{cmd_name}:[/bold green] [cyan]{cmd.help_txt}[/cyan]"
             )
 
+    def print_prompt(self) -> None:
+        """Prints the prompt message if defined"""
+
+        if isinstance(self.init_prompt, list):
+            for line in self.init_prompt:
+                self.print(line)
+        else:
+            self.print(self.init_prompt)
+
     def run(self) -> None:
         """Initiates a REPL with the provided configuration"""
 
@@ -295,11 +303,7 @@ class ReplBase:
             tempfile=self.temp_file,
         )
 
-        if isinstance(self.init_prompt, list):
-            for line in self.init_prompt:
-                self.print(line)
-        else:
-            self.print(self.init_prompt)
+        self.print_prompt()
 
         while True:
             try:
@@ -308,6 +312,9 @@ class ReplBase:
                 if user_input.lower() in ["help", "h"]:
                     self.show_help()
                 elif user_input.lower() in self.exit_keywords:
+                    self.print(
+                        f"[bold yellow]Exiting REPL ({self.title})...[/bold yellow]"
+                    )
                     break
                 else:
                     args = shlex.split(user_input)
@@ -339,7 +346,6 @@ class ReplBase:
 
                             cmd.command(cmd.parser.parse_args(cmd_args))
                         else:
-                            cmd_args = cmd_args or cmd.def_args
                             if cmd.def_kwargs:
                                 cmd.command(*cmd_args, **cmd.def_kwargs)
                             else:
@@ -349,7 +355,9 @@ class ReplBase:
                             "[bold yellow][WARNING]: No function provided for command[/bold yellow]"
                         )
             except (EOFError, KeyboardInterrupt):
-                self.print("[bold yellow]Exiting REPL...[/bold yellow]")
+                self.print(
+                    f"[bold yellow]Exiting REPL ({self.title})...[/bold yellow]"
+                )
                 break