Iteration

.github/workflows/unittests.yaml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - master
+      - feature/refactor
   pull_request: {}
 
 jobs:

Dockerfile

@@ -1,33 +1,29 @@
-# ======= #
-# Builder #
-# ======= #
-FROM python:3.11-slim as builder
-COPY / /semver
-RUN pip wheel --no-cache-dir --wheel-dir /wheels /semver
+FROM centos/python-36-centos7
  
-# ======== #
-# Finalize #
-# ======== #
-FROM python:3.11-slim
+USER root
 
-# Update and install git
-RUN apt-get update && apt-get install -y git
-
-# Create user
-RUN mkdir /semver && \
-    groupadd -g 10001 semver && \
-    useradd -u 10000 -g semver -d /semver semver \
-    && chown -R semver:semver /semver
-
-# Prep workspace
-RUN mkdir /workspace && \
-    chown -R semver:semver /workspace
-VOLUME /workspace
+#Perform updates
+RUN pip install --upgrade pip
+RUN yum update -y
+RUN yum -y remove git
+RUN yum -y install https://packages.endpoint.com/rhel/7/os/x86_64/endpoint-repo-1.7-1.x86_64.rpm
+RUN yum -y install git
 
 #Setup semver
-COPY --from=builder /wheels /semver/wheels
-RUN pip install --no-cache /semver/wheels/*
+ADD / /semver
+WORKDIR /semver
+RUN python setup.py sdist
+RUN pip install dist/semver-*.tar.gz
 
-USER semver:semver
+# Prep workspace
+RUN mkdir /workspace
 WORKDIR /workspace
-ENTRYPOINT [ "semver" ]
+VOLUME /workspace
+
+#Permissions
+RUN useradd -d /semverUser semverUser
+RUN chown -R semverUser:semverUser /workspace
+
+CMD [ "semver" ]
+
+USER semverUser

semver/__init__.py

@@ -27,19 +27,19 @@ def main():
     """Main entry point for the application"""
     parser = argparse.ArgumentParser(description="Bump Semantic Version.")
     parser.add_argument(
-        "-n", "--no-push", help="do not try to push", action="store_false", dest="push"
+        "-n", "--no-push", help="Do not try to push", action="store_false", dest="push"
     )
     parser.add_argument(
         "-g",
         "--global-user",
-        help="set git user at a global level",
+        help="Set git user at a global level, helps in jenkins",
         action="store_true",
         dest="global_user",
     )
     parser.add_argument(
         "-D",
         "--debug",
-        help="sets logging level to DEBUG",
+        help="Sets logging level to DEBUG",
         action="store_true",
         dest="debug",
         default=False,

semver/get_version.py

@@ -11,14 +11,14 @@ def main():
     parser.add_argument(
         "-d",
         "--dot",
-        help="switch out / for . to be used in docker tag",
+        help="Switch out / for . to be used in docker tag",
         action="store_true",
         dest="dot",
     )
     parser.add_argument(
         "-D",
         "--debug",
-        help="sets logging level to DEBUG",
+        help="Sets logging level to DEBUG",
         action="store_true",
         dest="debug",
         default=False,
@@ -26,12 +26,12 @@ def main():
     parser.add_argument(
         "-f",
         "--format",
-        help="format for pre-release version syntax",
+        help="Format for pre-release version syntax",
         choices=["npm", "maven", "docker"],
         default=None,
     )
     parser.add_argument(
-        "-b", "--build-number", help="build number, used in pre-releases", default=0
+        "-b", "--build-number", help="Build number, used in pre-releases", default=0
     )
 
     args = parser.parse_args()

semver/scm/perforce.py

@@ -0,0 +1,49 @@
+import subprocess
+from typing import Union, List
+
+import toml
+
+from semver.scm import SCM
+from semver.logger import logger
+
+
+class Perforce(SCM):
+    def __init__(self) -> None:
+        super().__init__()
+
+    def get_tag_version(self) -> str:
+        """
+        Get the latest tagged version from Perforce labels
+        :return: The latest tagged version
+        """
+        config: dict = toml.load("./.bumpversion.cfg")
+
+        tag_expression: str = config["bumpversion"]["tag_name"].replace(
+            "{new_version}", "[0-9]*.[0-9]*.[0-9]*"
+        )
+
+        logger.debug("Tag expression: " + str(tag_expression))
+
+        # Default version is `0.0.0` or what is found in
+        version = self.get_file_version(config)
+
+        # If a version is found in Perforce labels, use that the latest labeled version
+        labeled_versions: Union[List[str], None] = None
+        try:
+            proc = subprocess.run(
+                ["p4", "labels", "-e", tag_expression, "-m1"],
+                capture_output=True,
+                text=True,
+                check=True,
+            )
+            labeled_versions = proc.stdout.rstrip().split("\n")
+        except subprocess.CalledProcessError as e:
+            raise RuntimeError(
+                f"Error getting latest labeled Perforce version: {str(e.stderr).rstrip()}"
+            )
+
+        if len(labeled_versions) > 0 and labeled_versions[-1] != "":
+            version = labeled_versions[-1]
+
+        logger.debug("Label Version: " + str(version))
+        return version