jvcli 2.0.25__tar.gz → 2.0.27__tar.gz

{jvcli-2.0.25/jvcli.egg-info → jvcli-2.0.27}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jvcli
-Version: 2.0.25
+Version: 2.0.27
 Summary: CLI tool for Jivas Package Repository
 Home-page: https://github.com/TrueSelph/jvcli
 Author: TrueSelph Inc.

{jvcli-2.0.25 → jvcli-2.0.27}/jvcli/__init__.py

@@ -4,5 +4,5 @@ jvcli package initialization.
 This package provides the CLI tool for Jivas Package Repository.
 """
 
-__version__ = "2.0.25"
+__version__ = "2.0.27"
 __supported__jivas__versions__ = ["2.0.0"]

{jvcli-2.0.25 → jvcli-2.0.27}/jvcli/utils.py

@@ -96,27 +96,24 @@ def is_version_compatible(
     version: str, specifiers: str, allow_prerelease: bool = True
 ) -> bool:
     """
-    Determines if the provided version satisfies the given specifiers or exact version match,
-    with an option to consider prerelease versions.
-
-    - Converts comma-separated specifiers to space-separated (Node-style).
+    Determines if the provided version satisfies the given specifiers, with strict
+    prerelease checks when `allow_prerelease` is True.
     """
     if not version or not specifiers:
         return False
 
-    # Replace comma(s) and optional surrounding spaces with one space
+    # Normalize specifiers to Node.js format
     specifiers = re.sub(r"\s*,\s*", " ", specifiers.strip())
 
     try:
-        # For nodesemver
-        return nodesemver.satisfies(
+        # Check using nodesemver
+        result = nodesemver.satisfies(
             version, specifiers, include_prerelease=allow_prerelease
         )
     except ImportError:
         try:
-            # For python-semver >=3.0.0
-            # semver>=3.0.0 supports allow_prerelease
-            return semver.satisfies(
+            # Fallback to python-semver
+            result = semver.satisfies(
                 version, specifiers, allow_prerelease=allow_prerelease
             )
         except Exception:
@@ -124,6 +121,31 @@ def is_version_compatible(
     except Exception:
         return False
 
+    # Additional scrutiny for prerelease logic
+    if allow_prerelease and result:
+        try:
+            version_info = semver.VersionInfo.parse(version)
+            # Extract base version from specifier (e.g., "^2.0.0-alpha.44" → "2.0.0-alpha.44")
+            base_version_match = re.search(
+                r"[\^~>=<]*(?P<version>\d+\.\d+\.\d+(-[a-zA-Z0-9\.]+)?)", specifiers
+            )
+            if base_version_match:
+                base_version_str = base_version_match.group("version")
+                base_version_info = semver.VersionInfo.parse(base_version_str)
+
+                # Case 1: Specifier is a prerelease
+                if base_version_info.prerelease:
+                    # Reject stable versions or prereleases lower than the base prerelease
+                    if (not version_info.prerelease) or (
+                        version_info < base_version_info
+                    ):
+                        return False
+
+        except (ValueError, TypeError):
+            pass  # Fallback to original result if parsing fails
+
+    return result
+
 
 def validate_dependencies(dependencies: dict, token: Optional[str] = None) -> None:
     """Ensure all dependencies exist in the registry."""
@@ -135,7 +157,9 @@ def validate_dependencies(dependencies: dict, token: Optional[str] = None) -> No
             # Check if the version is in list of supported versions
             def supported(spec: str) -> bool:
                 return any(
-                    is_version_compatible(version, spec)
+                    is_version_compatible(
+                        version, spec, False
+                    )  # ignore prerelase specs for this validation
                     for version in __supported__jivas__versions__
                 )
 

{jvcli-2.0.25 → jvcli-2.0.27/jvcli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jvcli
-Version: 2.0.25
+Version: 2.0.27
 Summary: CLI tool for Jivas Package Repository
 Home-page: https://github.com/TrueSelph/jvcli
 Author: TrueSelph Inc.

{jvcli-2.0.25 → jvcli-2.0.27}/tests/test_utils.py

@@ -344,9 +344,11 @@ class TestUtilsFullCoverage:
         mock_api = mocker.patch(
             "jvcli.api.RegistryAPI.download_package", return_value={"file": 1}
         )
-        dependencies = {"actions": {"a": "^1.0.0", "b": ">=2.0.0"}}
+        dependencies = {
+            "actions": {"a": "^1.0.0", "b": ">=2.0.0", "c": "^2.0.0-alpha.44"}
+        }
         validate_dependencies(dependencies)
-        assert mock_api.call_count == 2
+        assert mock_api.call_count == 3
 
     def test_validate_dependencies_actions_missing(self, mocker: MockerFixture) -> None:
         """Test validate_dependencies for missing action."""