semvergit 0.2.1__tar.gz → 0.3.0__tar.gz

{semvergit-0.2.1/src/semvergit.egg-info → semvergit-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: semvergit
-Version: 0.2.1
+Version: 0.3.0
 Summary: Manage your project's version numbers.
 Author-email: Roy Moore <roy@moore.co.il>
 Project-URL: homepage, https://github.com/Tranquility2/semvergit
@@ -18,12 +18,10 @@ Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: click==8.1.7
-Requires-Dist: gitdb==4.0.11
-Requires-Dist: gitpython==3.1.40
-Requires-Dist: loguru==0.7.2
-Requires-Dist: semver==3.0.2
-Requires-Dist: smmap==5.0.1
+Requires-Dist: gitpython>=3.0.0
+Requires-Dist: semver>=3.0.0
+Requires-Dist: loguru>=0.7.0
+Requires-Dist: click>=8.0.0
 Provides-Extra: dev
 Requires-Dist: astroid==3.1.0; extra == "dev"
 Requires-Dist: bandit==1.7.8; extra == "dev"
@@ -73,10 +71,7 @@ Requires-Dist: tomli==2.0.1; extra == "test"
 |||
 
 # semvergit
-
-Manage your project's version numbers.
-
-## Semantic Versioning
+![semvergit](assets/semvergit-255.png)
 
 semvergit is a CLI tool to manage your project's version numbers.
 It uses [Semantic Versioning](https://semver.org/) to bump the version number.

{semvergit-0.2.1 → semvergit-0.3.0}/README.md

@@ -6,10 +6,7 @@
 |||
 
 # semvergit
-
-Manage your project's version numbers.
-
-## Semantic Versioning
+![semvergit](assets/semvergit-255.png)
 
 semvergit is a CLI tool to manage your project's version numbers.
 It uses [Semantic Versioning](https://semver.org/) to bump the version number.

{semvergit-0.2.1 → semvergit-0.3.0}/pyproject.toml

@@ -7,7 +7,6 @@ name = "semvergit"
 description = "Manage your project's version numbers."
 readme = "README.md"
 license = { file = "LICENSE.md" }
-requires-python = ">=3.8"
 keywords = ["packaging", "publishing", "release", "versioning"]
 authors = [{ name = "Roy Moore", email = "roy@moore.co.il" }]
 classifiers = [
@@ -21,15 +20,19 @@ classifiers = [
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
 ]
+requires-python = ">=3.8"
+dependencies = [
+  "gitpython>=3.0.0",
+  "semver>=3.0.0",
+  "loguru>=0.7.0",
+  "click>=8.0.0",
+]
 
-dynamic = ["version", "dependencies", "optional-dependencies"]
-
-[tool.setuptools.dynamic.dependencies]
-file = ["requirements.txt"]
+dynamic = ["version", "optional-dependencies"]
 
 [tool.setuptools.dynamic.optional-dependencies]
-dev = { file = ["requirements-dev.txt"] }
-test = { file = ["requirements-test.txt"] }
+dev = { file = ["requirements/requirements-dev.txt"] }
+test = { file = ["requirements/requirements-test.txt"] }
 
 [project.scripts]
 semvergit = "semvergit.cli:cli"
@@ -50,7 +53,6 @@ rmprefix = "v"
 quiet = true
 rebuild = true
 strip-extras = true
-no-header = true
 annotation-style = "line"
 
 [tool.black]

{semvergit-0.2.1 → semvergit-0.3.0/requirements}/requirements-dev.txt

@@ -1,26 +1,32 @@
+#
+# This file is autogenerated by pip-compile with Python 3.8
+# by the following command:
+#
+#    pip-compile --annotation-style=line --output-file=requirements/requirements-dev.txt --strip-extras requirements/requirements-dev.in
+#
 astroid==3.1.0            # via pylint
-bandit==1.7.8             # via -r requirements-dev.in
-black==24.3.0             # via -r requirements-dev.in
+bandit==1.7.8             # via -r requirements/requirements-dev.in
+black==24.3.0             # via -r requirements/requirements-dev.in
 cfgv==3.4.0               # via pre-commit
-click==8.1.7              # via -c requirements.txt, black
+click==8.1.7              # via -c requirements/requirements.txt, black
 dill==0.3.8               # via pylint
 distlib==0.3.8            # via virtualenv
 filelock==3.13.3          # via virtualenv
 identify==2.5.35          # via pre-commit
-isort==5.13.2             # via -r requirements-dev.in, pylint
+isort==5.13.2             # via -r requirements/requirements-dev.in, pylint
 markdown-it-py==3.0.0     # via rich
 mccabe==0.7.0             # via pylint
 mdurl==0.1.2              # via markdown-it-py
-mypy==1.9.0               # via -r requirements-dev.in
+mypy==1.9.0               # via -r requirements/requirements-dev.in
 mypy-extensions==1.0.0    # via black, mypy
 nodeenv==1.8.0            # via pre-commit
 packaging==24.0           # via black
 pathspec==0.12.1          # via black
 pbr==6.0.0                # via stevedore
 platformdirs==4.2.0       # via black, pylint, virtualenv
-pre-commit==3.5.0         # via -r requirements-dev.in
+pre-commit==3.5.0         # via -r requirements/requirements-dev.in
 pygments==2.17.2          # via rich
-pylint==3.1.0             # via -r requirements-dev.in
+pylint==3.1.0             # via -r requirements/requirements-dev.in
 pyyaml==6.0.1             # via bandit, pre-commit
 rich==13.7.1              # via bandit
 stevedore==5.2.0          # via bandit

semvergit-0.3.0/requirements/requirements-test.txt

@@ -0,0 +1,14 @@
+#
+# This file is autogenerated by pip-compile with Python 3.8
+# by the following command:
+#
+#    pip-compile --annotation-style=line --output-file=requirements/requirements-test.txt --strip-extras requirements/requirements-test.in
+#
+coverage==7.4.4           # via pytest-cov
+exceptiongroup==1.2.0     # via pytest
+iniconfig==2.0.0          # via pytest
+packaging==24.0           # via pytest
+pluggy==1.4.0             # via pytest
+pytest==8.1.1             # via -r requirements/requirements-test.in, pytest-cov
+pytest-cov==5.0.0         # via -r requirements/requirements-test.in
+tomli==2.0.1              # via coverage, pytest

{semvergit-0.2.1 → semvergit-0.3.0}/src/semvergit/app.py

@@ -52,7 +52,10 @@ class SemverGit:  # pylint: disable=too-few-public-methods
             logger.info("Pulling...")
             pull_remote(self.current_repo)
         self.versions = self.get_versions()
-        self.latest_version = max(self.versions)
+        if self.versions:
+            self.latest_version = max(self.versions)
+        else:
+            self.latest_version = VersionInfo.parse("0.0.0")
 
     def get_versions(self) -> List[VersionInfo]:
         """Get versions."""

{semvergit-0.2.1 → semvergit-0.3.0/src/semvergit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: semvergit
-Version: 0.2.1
+Version: 0.3.0
 Summary: Manage your project's version numbers.
 Author-email: Roy Moore <roy@moore.co.il>
 Project-URL: homepage, https://github.com/Tranquility2/semvergit
@@ -18,12 +18,10 @@ Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: click==8.1.7
-Requires-Dist: gitdb==4.0.11
-Requires-Dist: gitpython==3.1.40
-Requires-Dist: loguru==0.7.2
-Requires-Dist: semver==3.0.2
-Requires-Dist: smmap==5.0.1
+Requires-Dist: gitpython>=3.0.0
+Requires-Dist: semver>=3.0.0
+Requires-Dist: loguru>=0.7.0
+Requires-Dist: click>=8.0.0
 Provides-Extra: dev
 Requires-Dist: astroid==3.1.0; extra == "dev"
 Requires-Dist: bandit==1.7.8; extra == "dev"
@@ -73,10 +71,7 @@ Requires-Dist: tomli==2.0.1; extra == "test"
 |||
 
 # semvergit
-
-Manage your project's version numbers.
-
-## Semantic Versioning
+![semvergit](assets/semvergit-255.png)
 
 semvergit is a CLI tool to manage your project's version numbers.
 It uses [Semantic Versioning](https://semver.org/) to bump the version number.

{semvergit-0.2.1 → semvergit-0.3.0}/src/semvergit.egg-info/SOURCES.txt

@@ -1,9 +1,8 @@
 LICENSE
 README.md
 pyproject.toml
-requirements-dev.txt
-requirements-test.txt
-requirements.txt
+requirements/requirements-dev.txt
+requirements/requirements-test.txt
 src/semvergit/__init__.py
 src/semvergit/__main__.py
 src/semvergit/app.py
@@ -19,4 +18,5 @@ src/semvergit.egg-info/top_level.txt
 tests/test_app.py
 tests/test_cli.py
 tests/test_git_utils.py
+tests/test_integration.py
 tests/test_log_utils.py

{semvergit-0.2.1 → semvergit-0.3.0}/src/semvergit.egg-info/requires.txt

@@ -1,9 +1,7 @@
-click==8.1.7
-gitdb==4.0.11
-gitpython==3.1.40
-loguru==0.7.2
-semver==3.0.2
-smmap==5.0.1
+gitpython>=3.0.0
+semver>=3.0.0
+loguru>=0.7.0
+click>=8.0.0
 
 [dev]
 astroid==3.1.0

{semvergit-0.2.1 → semvergit-0.3.0}/tests/test_app.py

@@ -1,6 +1,6 @@
 """Test app."""
 
-from typing import Optional
+from typing import List, Optional
 
 from pytest import CaptureFixture, LogCaptureFixture, mark
 from semver import VersionInfo
@@ -59,6 +59,58 @@ def test_app(pull_branch: bool, expected: VersionInfo) -> None:
     assert svg.latest_version == VersionInfo(0, 0, 4)
 
 
+@mark.parametrize(
+    "dry_run",
+    [
+        True,
+        False,
+    ],
+)
+@mark.parametrize(
+    "bump_type, expected_version",
+    [
+        (str(BumpType.MAJOR), VersionInfo(1, 0, 0)),
+        (str(BumpType.MINOR), VersionInfo(0, 1, 0)),
+        (str(BumpType.PATCH), VersionInfo(0, 0, 1)),
+        (str(BumpType.PRERELEASE), VersionInfo(0, 0, 1, "dev.1")),
+    ],
+)
+@mark.parametrize(
+    "commit_message, auto_message",
+    [
+        ("testmessage", False),
+        (None, True),
+        (None, False),
+    ],
+)
+# type: ignore[no-untyped-def]
+def test_app_no_versions_update(  # pylint: disable=too-many-arguments
+    bump_type: str,
+    expected_version: VersionInfo,
+    dry_run: bool,
+    commit_message: Optional[str],
+    auto_message: bool,
+    mock_get_tags_empty,  # pylint: disable=unused-argument
+) -> None:
+    """Test app with no versions."""
+    svg = SemverGit()
+    assert svg is not None
+    assert svg.branch.name == "test_branch"
+    assert svg.versions == []
+    assert svg.latest_version == VersionInfo(0, 0, 0)
+    new_version = svg.update(bump_type, dry_run=dry_run, commit_message=commit_message, auto_message=auto_message)
+    expected_tag_str = f"{svg.version_prefix}{str(expected_version)}"
+    assert new_version == expected_tag_str
+
+
+def check_substring(substring_match: str, strings_list: List[str]) -> bool:
+    """Check if list contains substring."""
+    for item in strings_list:
+        if substring_match in item:
+            return True
+    return False
+
+
 @mark.parametrize(
     "dry_run",
     [
@@ -99,9 +151,11 @@ def test_app_update(  # pylint: disable=too-many-arguments
     expected_tag_str = f"{svg.version_prefix}{str(expected_version)}"
     assert f"Created mock-set-tag-{expected_tag_str}" in caplog.messages
     if commit_message or auto_message:
-        assert "✍️ Committing..." in caplog.messages
-    assert "📤 Pushing..." in caplog.messages
+        assert check_substring("Committing...", caplog.messages)
+    if dry_run:
+        assert check_substring("Dry run (no tag set or pushed)", caplog.messages)
+    assert check_substring("Pushing...", caplog.messages)
     assert capsys.readouterr().out == expected_tag_str
     assert new_version == expected_tag_str
     print(f"{caplog.messages=}")
-    assert f"⭐ New version tag: {expected_tag_str}" in caplog.messages
+    assert check_substring(f"New version tag: {expected_tag_str}", caplog.messages)

semvergit-0.3.0/tests/test_integration.py

@@ -0,0 +1,136 @@
+"""Integration tests for the semvergit package."""
+
+import subprocess
+import tempfile
+from typing import Optional, Tuple
+
+
+class RunCommandException(Exception):
+    """Exception raised when a command fails."""
+
+    def __init__(self, message: str) -> None:
+        """Initialize the exception."""
+        super().__init__(message)
+
+
+def run_command(command: str, cwd: str, validation_string: Optional[str] = None) -> Tuple[str, str]:
+    """Run a command in a subprocess and return the output. Raise an exception if the command fails."""
+    result = subprocess.run(command, capture_output=True, shell=True, text=True, check=False, cwd=cwd)
+    if result.returncode != 0:
+        raise RunCommandException(f"Error {result.stderr}, Code: {result.returncode}, Command output: {result.stdout}")
+    if validation_string:
+        print(f"[v] {validation_string}")
+    return (result.stdout, result.stderr)
+
+
+def add_file_to_repo(filename: str, repodirname: str, content: str) -> None:
+    """Add a file to a git repository and commit it."""
+    with open(repodirname + "/" + filename, "w", encoding="utf-8") as f:
+        f.write(content)
+    run_command(f"git add {filename}", repodirname, f"Added {filename} to the index")
+    run_command(f'git commit -m "Added {filename}"', repodirname, f"Committed {filename}")
+
+
+def check_git_log(repodirname: str, expected: str) -> None:
+    """Check the git log for the last commit."""
+    result, _ = run_command('git --no-pager log --pretty=format:"%h%d %s [%an]"', repodirname, "Checked the commit log")
+    print(f"Git Log:\n{result}")
+    assert expected in result
+
+
+def update_version(repodirname: str, version_type: str, target_version: str) -> None:
+    """Run the semvergit command to update the version."""
+    result, logs = run_command(f"semvergit -v -t {version_type}", repodirname, "Created a new version")
+    print(logs, end="")
+    assert result == target_version
+
+
+def set_credentials(repodirname: str) -> None:
+    """Set the git credentials for the repository."""
+    run_command("git config user.email 'test@test'", repodirname, "Set user email")
+    run_command("git config user.name 'Test User'", repodirname, "Set user name")
+
+
+class TestIntegration:
+    """Integration tests for the semvergit package."""
+
+    # pylint: disable=attribute-defined-outside-init
+    def setup_method(self) -> None:
+        """Create a git repository and clone it."""
+        self.tmpdirname = tempfile.mkdtemp()
+        self.repodirname = self.tmpdirname + "/repo"
+        run_command(f"mkdir {self.repodirname}", self.tmpdirname, f"Created repo directory: {self.repodirname}")
+        run_command("git -c init.defaultBranch=master init", self.repodirname, "Initialized git repository")
+        set_credentials(self.repodirname)
+        run_command("touch initial.txt", self.repodirname, "Created initial.txt")
+        run_command("git add .", self.repodirname, "Added initial.txt to the index")
+        run_command('git commit -m "Initial commit"', self.repodirname, "Committed initial.txt")
+        check_git_log(self.repodirname, "Initial commit")
+        self.clonedirname = self.tmpdirname + "/clone"
+        run_command(
+            f"git clone {self.repodirname} {self.clonedirname}", self.repodirname, f"Cloned to {self.clonedirname}"
+        )
+        set_credentials(self.clonedirname)
+
+    def teardown_method(self) -> None:
+        """Remove the temporary directory."""
+        run_command(f"rm -rf {self.tmpdirname}", self.tmpdirname)
+
+    def test_integration_patch(self) -> None:
+        """Test the integration of the semvergit package with a patch version update."""
+        add_file_to_repo("test.txt", self.clonedirname, "Hello, World!")
+        check_git_log(self.clonedirname, "Added test.txt")
+        update_version(self.clonedirname, "patch", "v0.0.1")
+        add_file_to_repo("test2.txt", self.clonedirname, "New content")
+        check_git_log(self.clonedirname, "Added test2.txt")
+        update_version(self.clonedirname, "patch", "v0.0.2")
+        check_git_log(self.clonedirname, "v0.0.2")
+
+    def test_integration_minor(self) -> None:
+        """Test the integration of the semvergit package with a minor version update."""
+        add_file_to_repo("test.txt", self.clonedirname, "Hello, World!")
+        check_git_log(self.clonedirname, "Added test.txt")
+        update_version(self.clonedirname, "minor", "v0.1.0")
+        add_file_to_repo("test2.txt", self.clonedirname, "New content")
+        check_git_log(self.clonedirname, "Added test2.txt")
+        update_version(self.clonedirname, "minor", "v0.2.0")
+        check_git_log(self.clonedirname, "v0.2.0")
+
+    def test_integration_major(self) -> None:
+        """Test the integration of the semvergit package with a major version update."""
+        add_file_to_repo("test.txt", self.clonedirname, "Hello, World!")
+        check_git_log(self.clonedirname, "Added test.txt")
+        update_version(self.clonedirname, "major", "v1.0.0")
+        add_file_to_repo("test2.txt", self.clonedirname, "New content")
+        check_git_log(self.clonedirname, "Added test2.txt")
+        update_version(self.clonedirname, "major", "v2.0.0")
+        check_git_log(self.clonedirname, "v2.0.0")
+
+    def test_integration_prerelease(self) -> None:
+        """Test the integration of the semvergit package with a prerelease version update."""
+        add_file_to_repo("test.txt", self.clonedirname, "Hello, World!")
+        check_git_log(self.clonedirname, "Added test.txt")
+        update_version(self.clonedirname, "prerelease", "v0.0.1-dev.1")
+        add_file_to_repo("test2.txt", self.clonedirname, "New content")
+        check_git_log(self.clonedirname, "Added test2.txt")
+        update_version(self.clonedirname, "prerelease", "v0.0.1-dev.2")
+        check_git_log(self.clonedirname, "v0.0.1-dev.2")
+
+    def test_integration_stack(self) -> None:
+        """Test the integration of the semvergit package with multiple version updates."""
+        add_file_to_repo("test.txt", self.clonedirname, "Hello, World!")
+        check_git_log(self.clonedirname, "Added test.txt")
+        update_version(self.clonedirname, "patch", "v0.0.1")
+        add_file_to_repo("test2.txt", self.clonedirname, "New content")
+        check_git_log(self.clonedirname, "Added test2.txt")
+        update_version(self.clonedirname, "minor", "v0.1.0")
+        add_file_to_repo("test3.txt", self.clonedirname, "More content")
+        check_git_log(self.clonedirname, "Added test3.txt")
+        update_version(self.clonedirname, "major", "v1.0.0")
+        add_file_to_repo("test4.txt", self.clonedirname, "Even more content")
+        check_git_log(self.clonedirname, "Added test4.txt")
+        update_version(self.clonedirname, "minor", "v1.1.0")
+        add_file_to_repo("test5.txt", self.clonedirname, "Some more content")
+        check_git_log(self.clonedirname, "Added test5.txt")
+        update_version(self.clonedirname, "patch", "v1.1.1")
+        check_git_log(self.clonedirname, "v1.1.1")

semvergit-0.2.1/requirements-test.txt

@@ -1,8 +0,0 @@
-coverage==7.4.4           # via pytest-cov
-exceptiongroup==1.2.0     # via pytest
-iniconfig==2.0.0          # via pytest
-packaging==24.0           # via pytest
-pluggy==1.4.0             # via pytest
-pytest==8.1.1             # via -r requirements-test.in, pytest-cov
-pytest-cov==5.0.0         # via -r requirements-test.in
-tomli==2.0.1              # via coverage, pytest

semvergit-0.2.1/requirements.txt

@@ -1,6 +0,0 @@
-click==8.1.7              # via -r requirements.in
-gitdb==4.0.11             # via gitpython
-gitpython==3.1.40         # via -r requirements.in
-loguru==0.7.2             # via -r requirements.in
-semver==3.0.2             # via -r requirements.in
-smmap==5.0.1              # via gitdb