layla/auto-semver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add docker format support

Browse Source
This commit is contained in:
Derek DeJonghe 2020-06-16 15:20:41 -04:00
parent 2664efea0b
commit 20cf9b2b01
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
semver/get_version.py
View File

@ -31,7 +31,7 @@ def get_version(build=0,version_format=None,dot=False):
bump_output = p.stdout.read().decode('utf-8').rstrip() bump_output = p.stdout.read().decode('utf-8').rstrip()
next_version = re.search("new_version=([0-9]*.[0-9]*.[0-9]*)", bump_output).group(1) next_version = re.search("new_version=([0-9]*.[0-9]*.[0-9]*)", bump_output).group(1)
if version_format == 'npm': if version_format is 'npm' or 'docker':
return "{}-{}.{}".format(next_version,branch.replace('/','-'),build) return "{}-{}.{}".format(next_version,branch.replace('/','-'),build)
if version_format == 'maven': if version_format == 'maven':
qualifier = 'SNAPSHOT' if build == 0 else build qualifier = 'SNAPSHOT' if build == 0 else build
@ -46,7 +46,7 @@ def main():
parser = argparse.ArgumentParser(description='Get Version or Branch.') 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', '--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('-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'], default=None) 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.add_argument('-b', '--build-number', help='Build number, used in pre-releases', default=0)
args = parser.parse_args() args = parser.parse_args()

5
semver/tests.py
View File

@ -66,6 +66,11 @@ class TestGetVersion(unittest.TestCase):
subprocess.call(['git', 'checkout', '-b', 'patch/branch']) subprocess.call(['git', 'checkout', '-b', 'patch/branch'])
branch = get_version.get_version(version_format='npm') branch = get_version.get_version(version_format='npm')
self.assertEqual(branch, "0.0.1-patch-branch.0") self.assertEqual(branch, "0.0.1-patch-branch.0")
def test_branch_docker_pre_release(self):
create_git_environment()
subprocess.call(['git', 'checkout', '-b', 'patch/branch'])
branch = get_version.get_version(build=2,version_format='npm')
self.assertEqual(branch, "0.0.1-patch-branch.2")
def test_branch_maven_pre_release(self): def test_branch_maven_pre_release(self):
create_git_environment() create_git_environment()
subprocess.call(['git', 'checkout', '-b', 'minor/branch']) subprocess.call(['git', 'checkout', '-b', 'minor/branch'])