Skip to content

feat: add regex validation #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lcavalcante merged 3 commits into from
May 17, 2025
Merged

feat: add regex validation #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3ae4818
wip: regex
lcavalcante May 13, 2025
7f598d9
Merge with fix/regex
lcavalcante May 17, 2025
ff5068a
Merge branch 'main' of github.com:lcavalcante/python-version-controll…
lcavalcante May 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pyvcc/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import sys
import argparse
import structlog
from pyvc.cli import main, validate_args
from pyvcc.cli import main, validate_args


log = structlog.get_logger()
Expand Down
15 changes: 9 additions & 6 deletions pyvcc/semver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -94,14 +96,15 @@ def bump_type(cls, message: str) -> BumpEnum:
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
Expand All @@ -112,7 +115,7 @@ def bump_type(cls, message: str) -> BumpEnum:
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

Expand Down
34 changes: 34 additions & 0 deletions tests/semver/test_bump_version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions uv.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.