Merge remote-tracking branch 'origin/main' into nuget-versions

Author: pombredanne

CHANGELOG.rst

@@ -2,6 +2,19 @@ Changelog
 =========
 
 
+Version v30.7.0
+----------------
+
+- Add composer and golang versions and also support gitlab native ranges for them
+
+
+Version v30.6.0
+----------------
+
+- Add support for gitlab in pypi, npm, gem version ranges
+- Subclass semver for nginx
+
+
 Version v30.5.1
 ----------------
 

src/univers/version_range.py

@@ -233,6 +233,7 @@ class NpmVersionRange(VersionRange):
         ">=": ">=",
         "<": "<",
         ">": ">",
+        "=": "=",  # This is not a native node-semver comparator, but is used in the gitlab version range for npm packages.
     }
 
     @classmethod
@@ -663,7 +664,16 @@ class ComposerVersionRange(VersionRange):
     # TODO composer may need its own scheme see https//github.com/nexB/univers/issues/5
     # and https//getcomposer.org/doc/articles/versions.md
     scheme = "composer"
-    version_class = versions.SemverVersion
+    version_class = versions.ComposerVersion
+
+    vers_by_native_comparators = {
+        "==": "=",
+        "<=": "<=",
+        ">=": ">=",
+        "<": "<",
+        ">": ">",
+        "=": "=",  # This is not a native composer-semver comparator, but is used in the gitlab version range for composer packages.
+    }
 
 
 class RpmVersionRange(VersionRange):
@@ -756,7 +766,16 @@ class GolangVersionRange(VersionRange):
     """
 
     scheme = "golang"
-    version_class = versions.SemverVersion
+    version_class = versions.GolangVersion
+
+    vers_by_native_comparators = {
+        "==": "=",
+        "<=": "<=",
+        ">=": ">=",
+        "<": "<",
+        ">": ">",
+        "=": "=",  # This is not a native golang-semver comparator, but is used in the gitlab version range for go packages.
+    }
 
 
 class GenericVersionRange(VersionRange):
@@ -857,7 +876,7 @@ class NginxVersionRange(VersionRange):
     """
 
     scheme = "nginx"
-    version_class = versions.SemverVersion
+    version_class = versions.NginxVersion
 
     vers_by_native_comparators = {
         "==": "=",
@@ -919,12 +938,10 @@ def from_native(cls, string):
                 # suffixed version
                 vs = clauses.rstrip("+")
                 version = cls.version_class(vs)
-                is_stable = is_even(version.value.minor)
-
-                if is_stable:
+                if version.is_stable:
                     # we have a start and end in stable ranges
                     start_version = cls.version_class(vs)
-                    end_version = cls.version_class(str(start_version.value.next_minor()))
+                    end_version = cls.version_class(str(start_version.next_minor()))
                     vstart = VersionConstraint(comparator=">=", version=start_version)
                     vend = VersionConstraint(comparator="<", version=end_version)
                     constraints.extend([vstart, vend])
@@ -974,6 +991,49 @@ def from_native(cls, string):
         return cls(constraints=constraints)
 
 
+def from_gitlab_native(gitlab_scheme, string):
+    purl_scheme = PURL_TYPE_BY_GITLAB_SCHEME[gitlab_scheme]
+    vrc = RANGE_CLASS_BY_SCHEMES[purl_scheme]
+    constraint_items = []
+    constraints = []
+    split = " "
+    split_by_comma_schemes = ["pypi", "composer"]
+    if purl_scheme in split_by_comma_schemes:
+        split = ","
+    pipe_separated_constraints = string.split("||")
+    for pipe_separated_constraint in pipe_separated_constraints:
+        space_seperated_constraints = pipe_separated_constraint.split(split)
+        constraint_items.extend(space_seperated_constraints)
+    comparator = ""
+    # A constraint item can be a comparator or a version or a version with comparator
+    # If it's empty continue
+    # If it's in `vers_by_native_comparators`, append it with the comparator and continue
+    # If it's a version, make version constraint from the version and use the comparator from the previous item and make comparator empty
+    # If it's a version with comparator, use split_req to get version and comparator to form constraint and make comparator empty
+    for constraint_item in constraint_items:
+        if not constraint_item:
+            continue
+        if "".join([comparator, constraint_item]) in vrc.vers_by_native_comparators:
+            comparator = "".join([comparator, constraint_item])
+            comparator = vrc.vers_by_native_comparators[comparator]
+            continue
+        if comparator:
+            constraints.append(
+                VersionConstraint(comparator=comparator, version=vrc.version_class(constraint_item))
+            )
+        else:
+            comparator, version_constraint = split_req(
+                constraint_item, vrc.vers_by_native_comparators, default="="
+            )
+            constraints.append(
+                VersionConstraint(
+                    comparator=comparator, version=vrc.version_class(version_constraint)
+                )
+            )
+        comparator = ""
+    return vrc(constraints=constraints)
+
+
 vers_by_github_native_comparators = {
     "=": "=",
     "!=": "!=",
@@ -1036,21 +1096,6 @@ def build_range_from_github_advisory_constraint(scheme: str, string: str):
     return vrc(constraints=constraints)
 
 
-def is_even(s):
-    """
-    Return True if the string "s" is an even number and False if this is an odd
-    number. For example:
-
-    >>> is_even(4)
-    True
-    >>> is_even(123)
-    False
-    >>> is_even(0)
-    True
-    """
-    return (int(s) % 2) == 0
-
-
 RANGE_CLASS_BY_SCHEMES = {
     "npm": NpmVersionRange,
     "deb": DebianVersionRange,
@@ -1072,3 +1117,13 @@ def is_even(s):
     "nginx": NginxVersionRange,
     "openssl": OpensslVersionRange,
 }
+
+PURL_TYPE_BY_GITLAB_SCHEME = {
+    "gem": "gem",
+    "go": "golang",
+    "maven": "maven",
+    "npm": "npm",
+    "nuget": "nuget",
+    "pypi": "pypi",
+    "packagist": "composer",
+}

src/univers/versions.py

@@ -219,6 +219,64 @@ def is_valid(cls, string):
         except ValueError:
             return False
 
+    @property
+    def major(self):
+        return self.value and self.value.major
+
+    @property
+    def minor(self):
+        return self.value and self.value.minor
+
+    @property
+    def patch(self):
+        return self.value and self.value.patch
+
+    @property
+    def prerelease(self):
+        return self.value and self.value.prerelease
+
+    @property
+    def build(self):
+        return self.value and self.value.build
+
+    def next_major(self):
+        return self.value and self.value.next_major()
+
+    def next_minor(self):
+        return self.value and self.value.next_minor()
+
+    def next_patch(self):
+        return self.value and self.value.next_patch()
+
+
+def is_even(s):
+    """
+    Return True if the string "s" is an even number and False if this is an odd
+    number. For example:
+
+    >>> is_even(4)
+    True
+    >>> is_even(123)
+    False
+    >>> is_even(0)
+    True
+    """
+    return (int(s) % 2) == 0
+
+
+@attr.s(frozen=True, order=False, eq=False, hash=True)
+class NginxVersion(SemverVersion):
+    """
+    Semver with 3 segments and extra attribute for stable vs. unstable branches
+    """
+
+    @property
+    def is_stable(self):
+        """
+        True if this is a "stable "version
+        """
+        return is_even(self.minor)
+
 
 @attr.s(frozen=True, order=False, eq=False, hash=True)
 class RubygemsVersion(Version):
@@ -369,6 +427,20 @@ def __gt__(self, other):
         return gentoo.vercmp(self.value, other.value) > 0
 
 
+@attr.s(frozen=True, order=False, eq=False, hash=True)
+class ComposerVersion(SemverVersion):
+    @classmethod
+    def build_value(cls, string):
+        return semantic_version.Version.coerce(string.lstrip("vV"))
+
+
+@attr.s(frozen=True, order=False, eq=False, hash=True)
+class GolangVersion(SemverVersion):
+    @classmethod
+    def build_value(cls, string):
+        return semantic_version.Version.coerce(string.lstrip("vV"))
+
+
 @attr.s(frozen=True, order=False, eq=False, hash=True)
 class LegacyOpensslVersion(Version):
     """