fix: #88 No file .git/COMMIT_EDITMSG (#89)

Author: shenxianpeng

commit_check/commit.py

@@ -14,14 +14,17 @@ def check_commit_msg(checks: list) -> int:
                     f"{YELLOW}Not found regex for commit message. skip checking.{RESET_COLOR}",
                 )
                 return PASS
-            # check the message of the current commit
-            if os.environ.get("IS_PRE_COMMIT") == "1":
+            commit_msg = ""
+            if os.environ.get("IS_PRE_COMMIT"):
+                # check the message of the current commit
                 git_dir = cmd_output(['git', 'rev-parse', '--git-dir']).strip()
                 commit_msg_file = PurePath(git_dir, "COMMIT_EDITMSG")
-                with open(commit_msg_file, 'r') as f:
-                    commit_msg = f.read()
-            else:  # check the message of the last commit
-                commit_msg = str(get_commits_info("s"))
+                try:
+                    with open(commit_msg_file, 'r') as f:
+                        commit_msg = f.read()
+                except FileNotFoundError:
+                    # check the message of the last commit
+                    commit_msg = str(get_commits_info("s"))
             result = re.match(check['regex'], commit_msg)
             if result is None:
                 print_error_message(

tests/commit_test.py

@@ -1,3 +1,4 @@
+import os
 from commit_check import PASS, FAIL
 from commit_check.commit import check_commit_msg
 
@@ -8,7 +9,27 @@
 
 
 class TestCommit:
-    def test_check_commit(self, mocker):
+
+    def test_check_commit_without_env(self, mocker):
+        # Must call get_commits_info, re.match.
+        checks = [{
+            "check": "message",
+            "regex": "dummy_regex"
+        }]
+        m_get_commits_info = mocker.patch(
+            f"{LOCATION}.get_commits_info",
+            return_value=FAKE_BRANCH_NAME
+        )
+        m_re_match = mocker.patch(
+            "re.match",
+            return_value="fake_rematch_resp"
+        )
+        retval = check_commit_msg(checks)
+        assert retval == PASS
+        assert m_get_commits_info.call_count == 0
+        assert m_re_match.call_count == 1
+
+    def test_check_commit_with_env(self, mocker):
         # Must call get_commits_info, re.match.
         checks = [{
             "check": "message",
@@ -22,6 +43,7 @@ def test_check_commit(self, mocker):
             "re.match",
             return_value="fake_rematch_resp"
         )
+        os.environ["IS_PRE_COMMIT"] = "1"
         retval = check_commit_msg(checks)
         assert retval == PASS
         assert m_get_commits_info.call_count == 1