Add Nuget versions tests

src/univers/nuget.py

@@ -1,16 +1,10 @@
+# SPDX-License-Identifier: Apache-2.0
+# Nuget version utility originally from:
+# https://raw.githubusercontent.com/google/osv/f5647ad2f746685b08debfba0293e442f2fb9945/lib/osv/nuget.py
 # Copyright 2022 Google LLC
+# modified by nexB and others for integration in the Univers library
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# Visit https://aboutcode.org and https://github.com/nexB/univers for support and download.
 
 import functools
 import re
@@ -129,8 +123,13 @@ def normalize(version):
 
 
 def _extract_revision(str_version):
-    """Extract revision (4th component) from version number (if any)."""
+    """
+    Extract revision from ``str_version`` and return a tuple of:
+        (dotted version string without revision, revision integer).
+    The revision is the 4th numeric dotted component of a NuGet version.
+    """
     # e.g. '1.0.0.0-prerelease'
+    # note: each match group contains its leading dot.
     pattern = re.compile(r"^(\d+)(\.\d+)(\.\d+)(\.\d+)(.*)")
     match = pattern.match(str_version)
     if not match:
@@ -142,20 +141,32 @@ def _extract_revision(str_version):
     )
 
 
+class InvalidNuGetVersion(Exception):
+    pass
+
+
 @functools.total_ordering
 class Version:
     """NuGet version."""
 
-    def __init__(self, base_semver, revision):
+    def __init__(self, base_semver, revision=0):
         self._base_semver = base_semver
         if self._base_semver.prerelease:
+            # TODO: why lowercasing this and not the build and why here and now?
             self._base_semver = self._base_semver.replace(prerelease=base_semver.prerelease.lower())
-        self._revision = revision
+        self._revision = revision or 0
+        self._original_version = None
 
     def __eq__(self, other):
-        return self._base_semver == other._base_semver and self._revision == other._revision
+        return (
+            isinstance(other, Version)
+            and self._base_semver == other._base_semver
+            and self._revision == other._revision
+        )
 
     def __lt__(self, other):
+        if not isinstance(other, Version):
+            return NotImplemented
         if self._base_semver.replace(prerelease="") == other._base_semver.replace(prerelease=""):
             # If the first three components are the same, compare the revision.
             if self._revision != other._revision:
@@ -166,6 +177,82 @@ def __lt__(self, other):
 
     @classmethod
     def from_string(cls, str_version):
+        if not str_version:
+            return
+
+        str_version = str_version.strip()
+        if " " in str_version:
+            raise InvalidNuGetVersion(f"version cannot contain spaces: {str_version}")
+
+        if not any(c.isdigit() for c in str_version):
+            raise InvalidNuGetVersion(f"version does not contain any digit: {str_version}")
+
+        original = str_version
         str_version = coerce(str_version)
         str_version, revision = _extract_revision(str_version)
-        return Version(parse(str_version), revision)
+        vers = Version(base_semver=parse(str_version), revision=revision)
+        vers._original_version = original
+        return vers
+
+    def __repr__(self):
+        return f"Version<{self.to_string()}>"
+
+    def to_string(self, with_empty_revision=False, include_prerelease=True, include_build=True):
+        major = self.major or "0"
+        minor = self.minor or "0"
+        patch = self.patch or "0"
+
+        if with_empty_revision:
+            revision = self.revision and f".{self.revision}" or ".0"
+        else:
+            revision = self.revision and f".{self.revision}" or ""
+
+        if include_prerelease:
+            prerelease = self.prerelease and f"-{self.prerelease}" or ""
+        else:
+            prerelease = ""
+        if include_build:
+            build = self.build and f"+{self.build}" or ""
+        else:
+            build = ""
+
+        return f"{major}.{minor}.{patch}{revision}{prerelease}{build}"
+
+    def __str__(self):
+        return self.to_string(
+            with_empty_revision=False, include_prerelease=True, include_build=True
+        )
+
+    @property
+    def base_version(self):
+        """
+        Return the base version dotted string composed of the four numerical
+        segments including revision and ignoring prerelease and build.
+        """
+        return self.to_string(
+            with_empty_revision=True, include_prerelease=False, include_build=False
+        )
+
+    @property
+    def major(self):
+        return self._base_semver.major
+
+    @property
+    def minor(self):
+        return self._base_semver.minor
+
+    @property
+    def patch(self):
+        return self._base_semver.patch
+
+    @property
+    def revision(self):
+        return self._revision
+
+    @property
+    def prerelease(self):
+        return self._base_semver.prerelease and self._base_semver.prerelease or ""
+
+    @property
+    def build(self):
+        return self._base_semver.build and self._base_semver.build or ""

src/univers/nuget.py.ABOUT

@@ -1,6 +1,6 @@
 about_resource: nuget.py
 package_url: pkg:github/google/osv@0.0.14#lib/osv/nuget.py
-copyright: Copyright 2022 Google LLC
+copyright: Copyright 2022 Google LLC and others
 download_url: https://raw.githubusercontent.com/google/osv/f5647ad2f746685b08debfba0293e442f2fb9945/lib/osv/nuget.py
 license_expression: apache-2.0
 homepage_url: https://github.com/google/osv/

tests/data/apache-2.0.LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.