finish up

ofek · ofek · commit 5d88053177b2 · 2017-08-24T22:44:25.000-04:00
diff --git a/semver.py b/semver.py
@@ -331,13 +331,14 @@ def bump_patch(version):
 def bump_prerelease(version, token='rc'):
     """Raise the prerelease part of the version
 
-    :param: version string
+    :param version: version string
+    :param token: defaults to 'rc'
     :return: the raised version string
     :rtype: str
     """
     verinfo = parse(version)
     verinfo['prerelease'] = _increment_string(
-        verinfo['prerelease'] or token + '.0'
+        verinfo['prerelease'] or (token or 'rc') + '.0'
     )
     return format_version(verinfo['major'], verinfo['minor'], verinfo['patch'],
                           verinfo['prerelease'])
@@ -346,11 +347,14 @@ def bump_prerelease(version, token='rc'):
 def bump_build(version, token='build'):
     """Raise the build part of the version
 
-    :param: version string
+    :param version: version string
+    :param token: defaults to 'build'
     :return: the raised version string
     :rtype: str
     """
     verinfo = parse(version)
-    verinfo['build'] = _increment_string(verinfo['build'] or token + '.0')
+    verinfo['build'] = _increment_string(
+        verinfo['build'] or (token or 'build') + '.0'
+    )
     return format_version(verinfo['major'], verinfo['minor'], verinfo['patch'],
                           verinfo['prerelease'], verinfo['build'])
diff --git a/tests.py b/tests.py
@@ -261,6 +261,7 @@ def test_should_bump_prerelease():
     assert bump_prerelease('3.4.5-rc.9') == '3.4.5-rc.10'
     assert bump_prerelease('3.4.5') == '3.4.5-rc.1'
     assert bump_prerelease('3.4.5', 'dev') == '3.4.5-dev.1'
+    assert bump_prerelease('3.4.5', '') == '3.4.5-rc.1'
 
 
 def test_should_ignore_build_on_prerelease_bump():
@@ -273,6 +274,7 @@ def test_should_bump_build():
     assert bump_build('3.4.5-rc.1') == '3.4.5-rc.1+build.1'
     assert bump_build('3.4.5') == '3.4.5+build.1'
     assert bump_build('3.4.5', 'nightly') == '3.4.5+nightly.1'
+    assert bump_build('3.4.5', '') == '3.4.5+build.1'
 
 
 def test_should_compare_version_info_objects():
