Rework get_version and various improvements

semver/get_version.py

@@ -1,62 +1,57 @@
 import argparse
-import re
-import subprocess
-from semver.logger import logging, logger, console_logger
-from semver.utils import get_tag_version, get_file_version, DEVNULL
+
+from semver.logger import logging, console_logger
 from semver import SemVer
-from semver.bump import bump_version
-
-def get_version(build=0,version_format=None,dot=False):
-    version = get_tag_version()
-
-    # Get the commit hash of the version 
-    v_hash = subprocess.Popen(['git', 'rev-list', '-n', '1', version], stdout=subprocess.PIPE,
-                             stderr=DEVNULL, cwd='.').stdout.read().decode('utf-8').rstrip()
-    # Get the current commit hash
-    c_hash = subprocess.Popen(['git', 'rev-parse', 'HEAD'], stdout=subprocess.PIPE,
-                             stderr=DEVNULL, cwd='.').stdout.read().decode('utf-8').rstrip()
-
-    # If the version commit hash and current commit hash
-    # do not match return the branch name else return the version
-    if v_hash != c_hash:
-        logger.debug("v_hash and c_hash do not match!")
-        branch = subprocess.Popen(['git', 'rev-parse', '--abbrev-ref', 'HEAD'], stdout=subprocess.PIPE,
-                            stderr=DEVNULL, cwd='.').stdout.read().decode('utf-8').rstrip()
-        semver = SemVer()
-        semver.merged_branch = branch
-        logger.debug("merged branch is: {}".format(semver.merged_branch))
-        version_type = semver.get_version_type()
-        logger.debug("version type is: {}".format(version_type))
-        if version_type:
-
-            next_version = bump_version(get_tag_version(), version_type, False, False)
-
-            if version_format in ('npm','docker'):
-                return "{}-{}.{}".format(next_version,re.sub(r'[/_]', '-', branch),build)
-            if version_format == 'maven':
-                qualifier = 'SNAPSHOT' if build == 0 else build
-                return "{}-{}-{}".format(next_version,re.sub(r'[/_]', '-', branch),qualifier)
-        if dot:
-            branch = branch.replace('/','.')
-        return branch
-    return version
+from semver.utils import setting_to_array
+from semver.scm.git import Git
 
 
 def main():
-    parser = argparse.ArgumentParser(description='Get Version or Branch.')
-    parser.add_argument('-d', '--dot', 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', action='store_true', dest='debug', default=False)
-    parser.add_argument('-f', '--format', 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)
-   
+    parser = argparse.ArgumentParser(description="Get Version or Branch.")
+    parser.add_argument(
+        "-d",
+        "--dot",
+        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",
+        action="store_true",
+        dest="debug",
+        default=False,
+    )
+    parser.add_argument(
+        "-f",
+        "--format",
+        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
+    )
+
     args = parser.parse_args()
 
     if args.debug:
         console_logger.setLevel(logging.DEBUG)
 
-    print(get_version(args.build_number,args.format,args.dot))
+    semver = SemVer(
+        scm=Git(),
+        main_branches=setting_to_array("main_branches"),
+        major_branches=setting_to_array("major_branches"),
+        minor_branches=setting_to_array("minor_branches"),
+        patch_branches=setting_to_array("patch_branches"),
+    )
 
-if __name__ == '__main__':
-    try: main()
-    except: raise
+    print(semver.get_version(args.build_number, args.format, args.dot))
 
+
+if __name__ == "__main__":
+    try:
+        main()
+    except Exception as e:
+        raise e