PyVCC 1.2.2__tar.gz → 1.3.1__tar.gz

{pyvcc-1.2.2 → pyvcc-1.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyVCC
-Version: 1.2.2
+Version: 1.3.1
 Summary: PyVCC python version controller using conventional commits
 Requires-Python: >=3.10
 Requires-Dist: pygit2>=1.18.0

{pyvcc-1.2.2 → pyvcc-1.3.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "PyVCC"
-version = "1.2.2"
+version = "1.3.1"
 description = "PyVCC python version controller using conventional commits"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -10,6 +10,9 @@ dependencies = [
     "typing-extensions>=4.0.0; python_version < '3.11'",
 ]
 
+[project.scripts]
+pyvcc = "pyvcc.__main__:main"
+
 [dependency-groups]
 dev = [
     "coverage[toml]>=7.8.0",

{pyvcc-1.2.2 → pyvcc-1.3.1}/pyvcc/__init__.py

@@ -1,4 +1,4 @@
 """PyVCC - Python Version Controller for SemVer manangment with conventional commits"""
 
-from .cli import main as main
+from .cli import run as run
 from .semver import SemVer as SemVer

pyvcc-1.3.1/pyvcc/__main__.py

@@ -0,0 +1,51 @@
+"""
+Entry point for running the package as a module.
+"""
+
+import logging
+import os
+import structlog
+import sys
+import argparse
+from pyvcc.cli import run
+from pyvcc.cli import validate_args
+
+
+def main():
+    parser = argparse.ArgumentParser(prog="PyVC", description=__doc__)
+    parser.add_argument("--root", type=str, default=".", required=False)
+    parser.add_argument("--initial-version", type=str, required=False, default="0.1.0")
+    parser.add_argument("--initial-commit", type=str, required=False, default="")
+    parser.add_argument("--verbose", "-v", action="store_true", required=False)
+    parser.add_argument("--silent", "-s", action="store_true", required=False)
+
+    args = parser.parse_args()
+    root = os.getenv(key="PYVC_REPO_ROOT", default=args.root)
+    version = os.getenv(key="PYVC_INITIAL_VERSION", default=args.initial_version)
+    commit = os.getenv(key="PYVC_INITIAL_COMMIT", default=args.initial_commit)
+    if not validate_args(root=root, version=version):
+        sys.exit(1)
+
+    log_level = logging.INFO
+    if args.verbose:
+        log_level = logging.DEBUG
+    if args.silent:
+        log_level = logging.CRITICAL
+    structlog.configure(
+        processors=[
+            structlog.dev.set_exc_info,
+            structlog.processors.add_log_level,
+            structlog.processors.StackInfoRenderer(),
+            structlog.dev.ConsoleRenderer(colors=True),
+        ],
+        wrapper_class=structlog.make_filtering_bound_logger(log_level),
+        logger_factory=structlog.PrintLoggerFactory(),
+        cache_logger_on_first_use=True,
+    )
+
+    version = run(root, version, commit)
+    sys.stdout.write(version)
+
+
+if __name__ == "__main__":
+    main()

{pyvcc-1.2.2 → pyvcc-1.3.1}/pyvcc/cli.py

@@ -2,9 +2,10 @@
 CLI parsing for pyvc command.
 """
 
-from pygit2 import Commit
 import structlog
+
 from pathlib import Path, PurePath
+from pygit2 import Commit
 from pygit2.repository import Repository
 from pygit2.enums import SortMode
 
@@ -30,7 +31,7 @@ def validate_args(root: str, version: str) -> bool:
     return is_valid
 
 
-def main(root: str, version: str, start_commit_id: str | None = None) -> str:
+def run(root: str, version: str, start_commit_id: str | None = None) -> str:
     repo_path = Path(root) / PurePath(".git")
     semver = SemVer.semver_from_string(version)
 
@@ -48,8 +49,8 @@ def main(root: str, version: str, start_commit_id: str | None = None) -> str:
 
     for commit in commit_walker:
         message = commit.message
-        log.info("commit", id=commit.id, short=commit.short_id)
+        log.debug("commit", id=commit.id, short=commit.short_id)
         semver.bump_version(message)
 
-    log.info(f"final version {str(semver)}")
+    log.debug(f"final version {str(semver)}")
     return str(semver)

{pyvcc-1.2.2 → pyvcc-1.3.1}/pyvcc/semver.py

@@ -1,7 +1,9 @@
-from enum import Enum, auto
+import re
 import sys
 import structlog
 
+from enum import Enum, auto
+
 # Python 3.11+ has Self in typing module
 if sys.version_info >= (3, 11):
     from typing import Self
@@ -94,14 +96,15 @@ class SemVer:
         message (str): commit message content
         """
 
+        regex = re.compile(r"[.*]?([a-z]*!?)(\(.*\))?:\s(.*)$")
         bump = BumpEnum.NO_BUMP
         head = message.split("\n")[0]
 
-        # TODO: regex?
-        parsed_head = head.split(":")
+        parsed_head = regex.search(head)
 
-        if len(parsed_head) > 1:
-            commit_type = parsed_head[0].strip().upper()
+        if parsed_head is not None:
+            commit_type = parsed_head.groups()[0].upper()
+            log.debug("trying bump", type=commit_type, message=head)
 
             if cls.is_breaking_change(commit_type, message):
                 bump = BumpEnum.MAJOR
@@ -112,7 +115,7 @@ class SemVer:
             else:
                 bump = BumpEnum.NO_BUMP
         else:
-            log.info("not in conventional commit spec", message=head)
+            log.error("not in conventional commit spec", message=head)
 
         return bump
 

{pyvcc-1.2.2 → pyvcc-1.3.1}/tests/cli/test_cli.py

@@ -2,7 +2,7 @@ from pygit2 import Commit
 import pytest
 from pygit2.repository import Repository
 
-from pyvcc.cli import main, validate_args
+from pyvcc.cli import run, validate_args
 from pyvcc.semver import BumpEnum, SemVer
 
 
@@ -13,14 +13,14 @@ class MockCommit:
         self.short_id = short_id
 
 
-def test_main_invalid_path():
+def test_run_invalid_path():
     with pytest.raises(Exception):
-        main("/(7", "1.0.0")
+        run("/(7", "1.0.0")
 
 
-def test_main_invalid_semver():
+def test_run_invalid_semver():
     with pytest.raises(Exception):
-        main(".", "1.0.0.2")
+        run(".", "1.0.0.2")
 
 
 def test_validate_version():
@@ -41,7 +41,7 @@ def test_single_commit(monkeypatch):
 
     monkeypatch.setattr(Repository, "walk", mock_walk)
 
-    assert main(".", "1.0.0") == "1.1.0"
+    assert run(".", "1.0.0") == "1.1.0"
 
 
 def test_two_commits(monkeypatch):
@@ -53,7 +53,7 @@ def test_two_commits(monkeypatch):
 
     monkeypatch.setattr(Repository, "walk", mock_walk)
 
-    assert main(".", "1.0.0") == "1.2.0"
+    assert run(".", "1.0.0") == "1.2.0"
 
 
 def test_head_bump_commit():
@@ -64,10 +64,10 @@ def test_head_bump_commit():
         message = commit.message
         match SemVer.bump_type(message):
             case BumpEnum.MAJOR:
-                assert main(".", "1.0.0", str(repo.head.target)) == "2.0.0"
+                assert run(".", "1.0.0", str(repo.head.target)) == "2.0.0"
             case BumpEnum.MINOR:
-                assert main(".", "1.0.0", str(repo.head.target)) == "1.1.0"
+                assert run(".", "1.0.0", str(repo.head.target)) == "1.1.0"
             case BumpEnum.PATCH:
-                assert main(".", "1.0.0", str(repo.head.target)) == "1.0.1"
+                assert run(".", "1.0.0", str(repo.head.target)) == "1.0.1"
             case BumpEnum.NO_BUMP:
-                assert main(".", "1.0.0", str(repo.head.target)) == "1.0.0"
+                assert run(".", "1.0.0", str(repo.head.target)) == "1.0.0"

{pyvcc-1.2.2 → pyvcc-1.3.1}/tests/semver/test_bump_version.py

@@ -51,6 +51,20 @@ def test_no_bump_no_type(no_cc_simple_commit: tuple[str, str]):
     assert str(version) == "1.0.0"
 
 
+def test_bump_merge():
+    version = SemVer(1, 0, 0)
+    message = "Merged feat!(xyz): break"
+    version.bump_version(message)
+    assert str(version) == "2.0.0"
+
+
+def test_bump_merge2():
+    version = SemVer(1, 0, 0)
+    message = "Merged feat(xyz): break"
+    version.bump_version(message)
+    assert str(version) == "1.1.0"
+
+
 def test_bump_multiple():
     """patch -> minor -> major"""
     version = SemVer(0, 1, 0)
@@ -107,6 +121,26 @@ def test_bump_multiple4():
     assert str(version) == "0.2.0"
 
 
+def test_bump_multiple5():
+    """patch -> patch -> minor"""
+    version = SemVer(0, 1, 0)
+
+    version.bump_version("fix: Fix login bug")
+    assert str(version) == "0.1.1"
+
+    version.bump_version("fix: Fix logout bug")
+    assert str(version) == "0.1.2"
+
+    version.bump_version("Fix logout bug")
+    assert str(version) == "0.1.2"
+
+    version.bump_version("feat(asdf): Add new feature")
+    assert str(version) == "0.2.0"
+
+    version.bump_version("Merge feat!(asdf): break new feature")
+    assert str(version) == "1.0.0"
+
+
 def test_parse_semver_str():
     version = SemVer.semver_from_string("1.1.0")
     assert str(version) == "1.1.0"

pyvcc-1.2.2/pyvcc/__main__.py

@@ -1,27 +0,0 @@
-"""
-Entry point for running the package as a module.
-"""
-
-import os
-import sys
-import argparse
-import structlog
-from pyvc.cli import main, validate_args
-
-
-log = structlog.get_logger()
-
-if __name__ == "__main__":
-    parser = argparse.ArgumentParser(prog="PyVC", description=__doc__)
-    parser.add_argument("--root", type=str, default=".", required=False)
-    parser.add_argument("--initial-version", type=str, required=False, default="0.1.0")
-    parser.add_argument("--initial-commit", type=str, required=False, default="")
-
-    args = parser.parse_args()
-    root = os.getenv(key="PYVC_REPO_ROOT", default=args.root)
-    version = os.getenv(key="PYVC_INITIAL_VERSION", default=args.initial_version)
-    commit = os.getenv(key="PYVC_INITIAL_COMMIT", default=args.initial_commit)
-    if not validate_args(root=root, version=version):
-        sys.exit(1)
-
-    main(root, version, commit)