🐛 fix(core): fix commit icons and commit regex validation [patch candidate]

Author: JuanVilla424

commit_msg_version_bump/main.py

@@ -120,6 +120,7 @@ def get_latest_commit_message() -> str:
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
             text=True,
+            encoding="utf-8",
         ).stdout.strip()
         logger.debug(f"Latest commit message: {message}")
         return message
@@ -201,7 +202,11 @@ def bump_version(part: str) -> None:
         subprocess.CalledProcessError: If bump2version fails.
     """
     try:
-        subprocess.run(["bump2version", part], check=True)
+        subprocess.run(
+            ["bump2version", part],
+            check=True,
+            encoding="utf-8",
+        )
         logger.info(f"Successfully bumped the {part} version.")
     except subprocess.CalledProcessError as error:
         logger.error(f"Failed to bump the {part} version: {error}")
@@ -216,7 +221,11 @@ def stage_changes(pyproject_path: str = "pyproject.toml") -> None:
         pyproject_path (str): Path to the file to stage.
     """
     try:
-        subprocess.run(["git", "add", pyproject_path], check=True)
+        subprocess.run(
+            ["git", "add", pyproject_path],
+            check=True,
+            encoding="utf-8",
+        )
         logger.debug(f"Staged {pyproject_path} for commit.")
     except subprocess.CalledProcessError as e:
         logger.error(f"Failed to stage {pyproject_path}: {e}")
@@ -235,10 +244,14 @@ def amend_commit(new_commit_msg: str) -> None:
     """
     try:
         # Amend the commit with the new commit message
-        subprocess.run(["git", "commit", "--amend", "-m", new_commit_msg], check=True)
+        subprocess.run(
+            ["git", "commit", "--amend", "-m", new_commit_msg],
+            check=True,
+            encoding="utf-8",
+        )
         logger.info("Successfully amended the commit with the new version bump.")
         logger.info(
-            "Please perform a push using 'git push' to update the remote repository. Avoid use --force"
+            "Please perform a push using 'git push' to update the remote repository. Avoid using --force"
         )
     except subprocess.CalledProcessError as e:
         logger.error(f"Failed to amend the commit: {e}")
@@ -283,7 +296,7 @@ def main() -> None:
         amend_commit(updated_commit_msg)
 
         logger.info(
-            "Aborting the current push. Please perform a push using 'git push'. Avoid use --force"
+            "Aborting the current push. Please perform a push using 'git push'. Avoid using --force"
         )
         sys.exit(1)
     else:

control_commit/main.py

@@ -240,35 +240,29 @@ def main() -> None:
         if not validate_commit_message(commit_msg):
             logger.error("Commit message validation failed. Aborting commit.")
             sys.exit(1)
+        logger.debug("Commit message does not contain square brackets. Proceeding to add icon.")
 
-        # Check if the commit message contains square brackets
-        if not has_square_brackets(commit_msg):
-            logger.debug("Commit message does not contain square brackets. Proceeding to add icon.")
-
-            # Determine the type of commit to get the appropriate icon
-            type_match = COMMIT_TYPE_REGEX.match(commit_msg)
-            if type_match:
-                commit_type = type_match.group("type")
-                logger.debug(f"Detected commit type: {commit_type}")
-            else:
-                commit_type = "chore"  # Default to 'chore' if no type is found
-                logger.debug("No commit type detected. Defaulting to 'chore'.")
-                sys.exit(1)
-
-            # Add the icon to the existing commit message
-            updated_commit_msg = add_icon_to_commit_message(commit_type, commit_msg)
-
-            # Write the updated commit message back to the file
-            amend_commit(updated_commit_msg)
-
-            # Inform the user and abort the commit to allow them to review the amended message
-            logger.info(
-                "Commit message has been updated with an icon. Please review and finalize the commit."
-            )
-            sys.exit(1)
+        # Determine the type of commit to get the appropriate icon
+        type_match = COMMIT_TYPE_REGEX.match(commit_msg)
+        if type_match:
+            commit_type = type_match.group("type")
+            logger.debug(f"Detected commit type: {commit_type}")
         else:
-            logger.debug("Commit message contains square brackets. No icon added.")
-            sys.exit(0)  # Valid commit message without needing an icon; proceed
+            commit_type = "chore"  # Default to 'chore' if no type is found
+            logger.debug("No commit type detected. Defaulting to 'chore'.")
+            sys.exit(1)
+
+        # Add the icon to the existing commit message
+        updated_commit_msg = add_icon_to_commit_message(commit_type, commit_msg)
+
+        # Write the updated commit message back to the file
+        amend_commit(updated_commit_msg)
+
+        # Inform the user and abort the commit to allow them to review the amended message
+        logger.info(
+            "Commit message has been updated with an icon. Please review and finalize the commit."
+        )
+        sys.exit(1)
 
 
 if __name__ == "__main__":