fix: fixed scopes option by making it a flag

Refs: #101, #102

Author: mjspeck

conventional_pre_commit/hook.py

@@ -28,7 +28,12 @@ def main(argv=[]):
         action="store_true",
         help="Force commit to strictly follow Conventional Commits formatting. Disallows fixup! style commits.",
     )
-    parser.add_argument("scopes", type=str, nargs="*", default=None, help="Optional list of scopes to support")
+    parser.add_argument(
+        "--scopes",
+        type=str,
+        default=None,
+        help="Optional list of scopes to support. Scopes should be separated by commas with no spaces (e.g. api,client)",
+    )
 
     if len(argv) < 1:
         argv = sys.argv[1:]
@@ -52,12 +57,16 @@ def main(argv=[]):
         """
         )
         return RESULT_FAIL
+    if args.scopes:
+        scopes = args.scopes.split(",")
+    else:
+        scopes = args.scopes
 
     if not args.strict:
         if format.has_autosquash_prefix(message):
             return RESULT_SUCCESS
 
-    if format.is_conventional(message, args.types, args.optional_scope, args.scopes):
+    if format.is_conventional(message, args.types, args.optional_scope, scopes):
         return RESULT_SUCCESS
     else:
         print(

tests/conftest.py

@@ -52,3 +52,8 @@ def conventional_commit_bad_multi_line_path():
 @pytest.fixture
 def conventional_commit_multi_line_path():
     return get_message_path("conventional_commit_multi_line")
+
+
+@pytest.fixture
+def conventional_commit_with_multiple_scopes_path():
+    return get_message_path("conventional_commit_with_multiple_scopes")

tests/messages/conventional_commit_with_multiple_scopes

@@ -0,0 +1 @@
+feat(api,client): added new endpoint with client support

tests/test_hook.py

@@ -142,6 +142,16 @@ def test_subprocess_success__conventional_with_scope(cmd, conventional_commit_wi
     assert result == RESULT_SUCCESS
 
 
+def test_subprocess_success__conventional_with_multiple_scopes(cmd, conventional_commit_with_multiple_scopes_path):
+    result = subprocess.call((cmd, "--scopes", "api,client", conventional_commit_with_multiple_scopes_path))
+    assert result == RESULT_SUCCESS
+
+
+def test_subprocess_fail__conventional_with_multiple_scopes(cmd, conventional_commit_with_multiple_scopes_path):
+    result = subprocess.call((cmd, "--scopes", "api", conventional_commit_with_multiple_scopes_path))
+    assert result == RESULT_FAIL
+
+
 def test_subprocess_success__fixup_commit(cmd, fixup_commit_path):
     result = subprocess.call((cmd, fixup_commit_path))