git-commitflow 1.1.0__tar.gz → 1.1.2__tar.gz

{git_commitflow-1.1.0 → git_commitflow-1.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: git-commitflow
-Version: 1.1.0
+Version: 1.1.2
 Summary: A git add/commit/push helper
 Home-page: https://github.com/jamescherti/git-commitflow
 Author: James Cherti
@@ -27,6 +27,7 @@ Dynamic: classifier
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
+Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary

{git_commitflow-1.1.0 → git_commitflow-1.1.2}/git_commitflow/__init__.py

@@ -29,28 +29,29 @@ import colorama
 from .git_commitflow import GitCommitFlow
 
 
-def git_commitflow_cli():
-    """The git-commitflow command-line interface."""
-    logging.basicConfig(level=logging.INFO, stream=sys.stdout,
-                        format="%(asctime)s %(name)s: %(message)s")
-    colorama.init()
+def flush_stdin():
+    """Clear any pending input from the standard input buffer.
 
+    This function ensures that no stale or unintended data remains in stdin
+    before reading user input interactively. On Windows, it uses the msvcrt
+    module to discard characters from the input buffer. On POSIX-compliant
+    systems (e.g., Linux, macOS...), it uses select to check for available
+    input without blocking and either discards the data by reading or flushes
+    it using termios.tcflush if stdin is a terminal.
+    """
     try:
-        import platform  # pylint: disable=import-outside-toplevel
         if os.name == "nt":
             import msvcrt  # pylint: disable=import-outside-toplevel
 
-            # Check if there's input in the buffer
+            # For Windows systems, Check if there is any pending input in the
+            # buffer Discard characters one at a time until the buffer is empty
             while msvcrt.kbhit():
-                # Read and discard one character at a time
                 msvcrt.getch()
-        elif os.name == "posix" or platform.system() in ["Linux", "Darwin"]:
-            # For Unix-like systems, check if there's any pending input in
-            # stdin without blocking
+        elif os.name == "posix":
             import select  # pylint: disable=import-outside-toplevel
 
-            # Check if there is any pending input in stdin without blocking
-            # If input is available, flush the stdin buffer
+            # For Unix-like systems, check if there's any pending input in
+            # stdin without blocking
             stdin, _, _ = select.select([sys.stdin], [], [], 0)
             if stdin:
                 if sys.stdin.isatty():
@@ -61,10 +62,20 @@ def git_commitflow_cli():
                     tcflush(sys.stdin.fileno(), TCIFLUSH)
                 else:
                     # Read and discard input (in chunks)
-                    sys.stdin.read(1024)
+                    while sys.stdin.read(1024):
+                        pass
     except ImportError:
         pass
 
+
+def git_commitflow_cli():
+    """The git-commitflow command-line interface."""
+    logging.basicConfig(level=logging.INFO, stream=sys.stdout,
+                        format="%(asctime)s %(name)s: %(message)s")
+    colorama.init()
+
+    flush_stdin()
+
     try:
         GitCommitFlow().main()
     except subprocess.CalledProcessError as main_proc_err:

{git_commitflow-1.1.0 → git_commitflow-1.1.2}/git_commitflow/git_commitflow.py

@@ -372,22 +372,25 @@ class GitCommitFlow:
 
         print(f"Author: {Fore.YELLOW + git_author + Fore.RESET} ")
         print("Branch:", Fore.YELLOW + self.branch + Fore.RESET)
-        print("Git message: ", end="")
 
-        commit_message = self.git_config_get("custom.commit-message").strip()
-        previous_message = ""
-        if commit_message:
-            print(Fore.YELLOW + commit_message + Fore.RESET)
-        elif self.amount_commits > 0:
+        # commit_message = self.git_config_get("custom.commit-message").strip()
+        # previous_message = ""
+        # if commit_message:
+        #     print(Fore.YELLOW + commit_message + Fore.RESET)
+
+        if self.amount_commits > 0:
             previous_message = \
                 "\n".join(
                     self._run("git --no-pager log -1 --pretty=%B")).rstrip()
-            print(Fore.YELLOW + previous_message + Fore.RESET)
+            print("Previous git message: ",
+                  Fore.YELLOW + previous_message + Fore.RESET)
+            self.readline_manager.append_to_history(previous_message)
 
-        commit_message = self.prompt_git_commit_message(commit_message)
+        # commit_message = self.prompt_git_commit_message(commit_message)
+        commit_message = self.prompt_git_commit_message("")
 
         # TODO: move this to a function
-        logging.debug("[DEBUG] Previous message: %s", previous_message)
+        # logging.debug("[DEBUG] Previous message: %s", previous_message)
         logging.debug("[DEBUG] Commit message: %s", commit_message)
 
         return commit_message

{git_commitflow-1.1.0 → git_commitflow-1.1.2}/git_commitflow/readline_manager.py

@@ -21,18 +21,16 @@
 
 import logging
 import readline
-import sys
 from pathlib import Path
-from typing import List, Optional, Set, Union
 
 
 class ReadlineSimpleCompleter:
-    def __init__(self, options: List[str]):
+    def __init__(self, options: list[str]):
         """Initialize with a sorted list of options."""
         self.complete_with = sorted(options)
-        self.matches: List[str] = []
+        self.matches: list[str] = []
 
-    def complete(self, _, state: int) -> Optional[str]:
+    def complete(self, _, state: int):
         """Return the next possible completion for 'text'."""
         if state == 0:
             orig_line = readline.get_line_buffer()
@@ -46,13 +44,13 @@ class ReadlineSimpleCompleter:
 
 
 class ReadlineManager:
-    def __init__(self, history_file: Union[str, Path, None] = None,
+    def __init__(self, history_file=None,
                  history_length=-1):
         """Manage readline settings, history, and input."""
         self.history_file = Path(history_file) if history_file else None
-        self.keywords: Set[str] = set()
+        self.keywords = set()
         self.history_length = history_length
-        self.history = []
+        # self.history = []
         self._init_history()
 
     def _init_history(self):
@@ -64,7 +62,7 @@ class ReadlineManager:
             readline.set_history_length(self.history_length)
 
         # History
-        readline.read_history_file(self.history_file)
+        self.read_history_file()
 
         # Keywords
         # if self.history_file and self.history_file.exists():
@@ -77,7 +75,8 @@ class ReadlineManager:
         logging.debug("[DEBUG] History loaded")
 
     def append_to_history(self, string):
-        self.history.append(string)
+        # self.history.append(string)
+        readline.add_history(string)
 
         # # Truncate history
         # if self.history_length >= 0 \
@@ -90,7 +89,12 @@ class ReadlineManager:
         #     with open(self.history_file, "a", encoding="utf-8") as fhandler:
         #         fhandler.write(f"{string}\n")
 
-    def _save_history(self):
+    def read_history_file(self):
+        """Read the current readline history to the specified file."""
+        if self.history_file:
+            readline.read_history_file(self.history_file)
+
+    def save_history_file(self):
         """Save the current readline history to the specified file."""
         if self.history_file:
             logging.debug("[DEBUG] History saved")
@@ -99,10 +103,12 @@ class ReadlineManager:
     def readline_input(self, prompt: str,
                        default: str = "",
                        required: bool = False,
-                       complete_with: Union[List[str], None] = None) -> str:
+                       complete_with=None) -> str:
         """
         Prompt for input with optional readline autocompletion and command
         history saving.
+
+        :complete_with: A list of strings to complete with.
         """
         all_keywords = self.keywords | \
             set(complete_with if complete_with else {})
@@ -128,7 +134,7 @@ class ReadlineManager:
                     break
             finally:
                 if save_history and self.history_file:
-                    self._save_history()
+                    self.save_history_file()
 
             return default if value == "" else value
         finally:

{git_commitflow-1.1.0 → git_commitflow-1.1.2}/git_commitflow.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: git-commitflow
-Version: 1.1.0
+Version: 1.1.2
 Summary: A git add/commit/push helper
 Home-page: https://github.com/jamescherti/git-commitflow
 Author: James Cherti
@@ -27,6 +27,7 @@ Dynamic: classifier
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
+Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary

{git_commitflow-1.1.0 → git_commitflow-1.1.2}/setup.py

@@ -23,7 +23,7 @@ from setuptools import find_packages, setup
 
 setup(
     name="git-commitflow",
-    version="1.1.0",
+    version="1.1.2",
     packages=find_packages(),
     description="A git add/commit/push helper",
     long_description=((Path(__file__).parent.resolve().joinpath("README.md"))