This commit is contained in:
Wolfgang Hottgenroth 2020-08-26 18:33:57 +02:00
parent 495ff5c51e
commit 051cbfecfb
Signed by: wn
GPG Key ID: 6C1E5E531E0D5D7F

View File

@ -6,28 +6,28 @@ import sys
parser = argparse.ArgumentParser(description='Semantic Version Validator')
parser.add_argument('--versionToValidate', '-V',
help='The version to validate against the semantic versioning rules',
help='The version to validate against the semantic versioning rules',
required=True)
parser.add_argument('--messageToValidate', '-M',
help='A message to validate, means: it must not be empty',
help='A message to validate, means: it must not be empty',
default='',
required=False)
parser.add_argument('--validateMessage', '-m',
help='Consider -M',
help='Consider -M',
required=False,
action='store_true',
default=False)
parser.add_argument('--printExports', '-e',
help='Print exports',
help='Print exports',
action='store_true',
default=False,
required=False)
parser.add_argument('--exportFormat', '-f',
help='Print exports in >bash< or >powershell< format, to be used in backticks or with Invoke-Expression',
help='Print exports in >bash< or >powershell< format, to be used in backticks or with Invoke-Expression',
default='bash',
required=False)
parser.add_argument('--verbose', '-v',
help='Verbose output, overrides -q',
help='Verbose output, overrides -q',
required=False,
action='store_true',
default=False)
@ -40,7 +40,7 @@ validateMessage = args.validateMessage
printExports = args.printExports
exportFormat = args.exportFormat
r = re.compile('^(?P<major>0|[1-9]\d*)\.(?P<minor>0|[1-9]\d*)\.(?P<patch>0|[1-9]\d*)(?:-(?P<prerelease>(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+(?P<buildmetadata>[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$')
r = re.compile(r'^(?P<major>0|[1-9]\d*)\.(?P<minor>0|[1-9]\d*)\.(?P<patch>0|[1-9]\d*)(?:-(?P<prerelease>(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+(?P<buildmetadata>[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$')
# r = re.compile('^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$')
if verbose: