Move _increment_string into VersionInfo class

tomschr · tomschr · commit 1d8c4154b3ba · 2020-04-11T00:07:42.000+02:00
Makes removing deprecating functions easier as, for example,
bump_prerelease is no longer dependant from an "external"
function.

* Adapt test cases
* Move _LAST_NUMBER regex into VersionInfo class
* Implement _increment_string as a staticmethod
diff --git a/semver.py b/semver.py
@@ -17,8 +17,6 @@
 __maintainer_email__ = "s.celles@gmail.com"
 
 
-_LAST_NUMBER = re.compile(r"(?:[^\d]*(\d+)[^\d]*)+")
-
 #: Contains the implemented semver.org version of the spec
 SEMVER_SPEC_VERSION = "2.0.0"
 
@@ -141,6 +139,7 @@ class VersionInfo(object):
     """
 
     __slots__ = ("_major", "_minor", "_patch", "_prerelease", "_build")
+    _LAST_NUMBER = re.compile(r"(?:[^\d]*(\d+)[^\d]*)+")
     _REGEX = re.compile(
         r"""
             ^
@@ -268,6 +267,24 @@ def __iter__(self):
         for v in self.to_tuple():
             yield v
 
+    @staticmethod
+    def _increment_string(string):
+        """
+        Look for the last sequence of number(s) in a string and increment.
+
+        :param str string: the string to search for.
+        :return: the incremented string
+
+        Source:
+        http://code.activestate.com/recipes/442460-increment-numbers-in-a-string/#c1
+        """
+        match = VersionInfo._LAST_NUMBER.search(string)
+        if match:
+            next_ = str(int(match.group(1)) + 1)
+            start, end = match.span(1)
+            string = string[: max(end - len(next_), start)] + next_ + string[end:]
+        return string
+
     def bump_major(self):
         """
         Raise the major part of the version, return a new object but leave self
@@ -328,7 +345,7 @@ def bump_prerelease(self, token="rc"):
 build=None)
         """
         cls = type(self)
-        prerelease = _increment_string(self._prerelease or (token or "rc") + ".0")
+        prerelease = cls._increment_string(self._prerelease or (token or "rc") + ".0")
         return cls(self._major, self._minor, self._patch, prerelease)
 
     def bump_build(self, token="build"):
@@ -346,7 +363,7 @@ def bump_build(self, token="build"):
 build='build.10')
         """
         cls = type(self)
-        build = _increment_string(self._build or (token or "build") + ".0")
+        build = cls._increment_string(self._build or (token or "build") + ".0")
         return cls(self._major, self._minor, self._patch, self._prerelease, build)
 
     @comparator
@@ -692,20 +709,6 @@ def format_version(major, minor, patch, prerelease=None, build=None):
     return str(VersionInfo(major, minor, patch, prerelease, build))
 
 
-def _increment_string(string):
-    """
-    Look for the last sequence of number(s) in a string and increment, from:
-
-    http://code.activestate.com/recipes/442460-increment-numbers-in-a-string/#c1
-    """
-    match = _LAST_NUMBER.search(string)
-    if match:
-        next_ = str(int(match.group(1)) + 1)
-        start, end = match.span(1)
-        string = string[: max(end - len(next_), start)] + next_ + string[end:]
-    return string
-
-
 @deprecated(version="2.9.2")
 def bump_major(version):
     """
diff --git a/test_semver.py b/test_semver.py
@@ -54,9 +54,9 @@ def does_not_raise(item):
     "string,expected", [("rc", "rc"), ("rc.1", "rc.2"), ("2x", "3x")]
 )
 def test_should_private_increment_string(string, expected):
-    from semver import _increment_string
+    # from semver import _increment_string
 
-    assert _increment_string(string) == expected
+    assert VersionInfo._increment_string(string) == expected
 
 
 @pytest.fixture

Original file line number	Diff line number	Diff line change
`@@ -54,9 +54,9 @@ def does_not_raise(item):`
`54`	`54`	`"string,expected", [("rc", "rc"), ("rc.1", "rc.2"), ("2x", "3x")]`
`55`	`55`	`)`
`56`	`56`	`def test_should_private_increment_string(string, expected):`
`57`		`- from semver import _increment_string`
	`57`	`+ # from semver import _increment_string`
`58`	`58`
`59`		`- assert _increment_string(string) == expected`
	`59`	`+ assert VersionInfo._increment_string(string) == expected`
`60`	`60`
`61`	`61`
`62`	`62`	`@pytest.fixture`