jvcli 2.0.13__tar.gz → 2.0.15__tar.gz

{jvcli-2.0.13/jvcli.egg-info → jvcli-2.0.15}/PKG-INFO

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

{jvcli-2.0.13 → jvcli-2.0.15}/jvcli/__init__.py

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

jvcli-2.0.15/jvcli/templates/2.0.0/project/env.example

@@ -0,0 +1,37 @@
+# JIVAS/Jaclang configuration
+JIVAS_ENVIRONMENT=development
+
+JIVAS_USER=admin@jivas.com
+JIVAS_PASSWORD=password
+JIVAS_PORT=8000
+JIVAS_DESCRIPTOR_ROOT_PATH=".jvdata"
+JIVAS_ACTIONS_ROOT_PATH="actions"
+JIVAS_DAF_ROOT_PATH="daf"
+JIVAS_BASE_URL=http://127.0.0.1:8000
+JIVAS_STUDIO_URL=http://127.0.0.1:8989
+JACPATH="./"
+
+# JIVAS Files Serving Config
+JIVAS_FILE_INTERFACE="local"
+JIVAS_FILES_ROOT_PATH=".files"
+JIVAS_FILES_URL=http://127.0.0.1:9000/files
+# S3 Config
+# JIVAS_S3_ENDPOINT=access_key_id # optional
+# JIVAS_S3_ACCESS_KEY_ID=access_key_id
+# JIVAS_S3_SECRET_ACCESS_KEY=secret_access_key
+# JIVAS_S3_REGION=us-east-1
+# JIVAS_S3_BUCKET_NAME=my-bucket
+
+# Secrets Config
+JIVAS_WEBHOOK_SECRET_KEY="ABCDEFGHIJK"
+TOKEN_SECRET=s3cr3t
+
+# MongoDB Config
+# DATABASE_HOST=mongodb://localhost:27017/?replicaSet=my-rs
+
+# Typesense Config
+# TYPESENSE_HOST=localhost
+# TYPESENSE_PORT=8108
+# TYPESENSE_PROTOCOL=http
+# TYPESENSE_API_KEY=abcd
+# TYPESENSE_CONNECTION_TIMEOUT_SECONDS=2

{jvcli-2.0.13 → jvcli-2.0.15}/jvcli/utils.py

@@ -6,8 +6,8 @@ import tarfile
 
 import click
 import yaml
-from packaging.specifiers import SpecifierSet
-from packaging.version import parse as parse_version
+from packaging.specifiers import InvalidSpecifier, SpecifierSet
+from packaging.version import InvalidVersion, Version
 
 from jvcli import __supported__jivas__versions__
 from jvcli.api import RegistryAPI
@@ -92,61 +92,56 @@ def validate_package_name(name: str) -> None:
 
 def is_version_compatible(version: str, specifiers: str) -> bool:
     """
-    Compares the provided version to a given set of specifications/modifiers or exact version match.
+    Determines if the provided version satisfies the given specifiers or exact version match.
 
     Args:
-    - version (str): The version to be compared. E.g., "2.1.0".
-    - specifiers (str): The version specifier set or exact version. E.g., "2.1.0" or ">=0.2,<0.3" or "0.0.1" or "^2.0.0"
+    - version (str): The version to be checked. E.g., "2.1.0".
+    - specifiers (str): The version specifier set or exact version. E.g., "2.1.0", ">=0.2,<0.3", or "^2.0.0".
 
     Returns:
     - bool: True if the version satisfies the specifier set or exact match, False otherwise.
     """
     try:
-        # Parse the version to check
-        version = parse_version(version)
-
-        # Check if specifiers is a simple exact version match
-        try:
-            exact_version = parse_version(specifiers)
-            return version == exact_version
-        except Exception:
-            # If parsing fails, treat it as a specifier set
-            pass
-
-        # Handle "~" shorthand by translating it to a compatible range
+        # Handle edge cases for empty strings or None inputs
+        if not version or not specifiers:
+            return False
+
+        # Handle exact version equality when no special characters present
+        if all(c not in specifiers for c in "<>!=~^*,"):
+            return Version(version) == Version(specifiers)
+
+        # Handle tilde (~) syntax, as in npm semver, if used
         if specifiers.startswith("~"):
-            base_version = specifiers[1:]
-            parsed_base = parse_version(base_version)
-            major = parsed_base.major
-            minor = parsed_base.minor
-            # Assuming the next release constraint is on minor bump
-            upper_bound = f"<{major}.{minor + 1}"
-            specifiers = f">={base_version},{upper_bound}"
-
-        # Handle "^" shorthand to translate to a compatible range
-        if specifiers.startswith("^"):
-            base_version = specifiers[1:]
-            parsed_base = parse_version(base_version)
-            major = parsed_base.major
-            minor = parsed_base.minor
-            patch = parsed_base.micro
+            base_version = Version(specifiers[1:])
+            if base_version.release is None or len(base_version.release) < 2:
+                raise InvalidSpecifier(f"Invalid tilde specifier: '{specifiers}'")
+            next_minor = base_version.minor + 1
+            specifiers = f">={base_version},<{base_version.major}.{next_minor}.0"
+
+        # Explicitly handle caret (^) syntax (npm semver style)
+        elif specifiers.startswith("^"):
+            base_version = Version(specifiers[1:])
+            major, minor, patch = (
+                base_version.major,
+                base_version.minor,
+                base_version.micro,
+            )
+
             if major > 0:
-                upper_bound = f"<{major + 1}.0.0"
-            elif minor > 0:
-                upper_bound = f"<0.{minor + 1}.0"
-            else:
-                upper_bound = f"<0.0.{patch + 1}"
-            specifiers = f">={base_version},{upper_bound}"
-
-        # Create a SpecifierSet with the given specifiers
-        spec_set = SpecifierSet(specifiers)
-
-        # Check if the version matches the specifier set
-        return version in spec_set
-
-    except Exception as e:
-        # Handle exceptions if the inputs are malformed or invalid
-        click.secho(f"Error comparing versions: {e}", fg="red")
+                specifiers = f">={base_version},<{major + 1}.0.0"
+            elif major == 0 and minor > 0:
+                specifiers = f">={base_version},<0.{minor + 1}.0"
+            else:  # major == 0 and minor == 0
+                specifiers = f">={base_version},<0.0.{patch + 1}"
+
+        # Finally check using the SpecifierSet
+        specifier_set = SpecifierSet(specifiers)
+        parsed_version = Version(version)
+
+        return parsed_version in specifier_set
+
+    except (InvalidVersion, InvalidSpecifier, TypeError) as e:
+        print(f"Version parsing error: {e}")
         return False
 
 

{jvcli-2.0.13 → jvcli-2.0.15/jvcli.egg-info}/PKG-INFO

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

{jvcli-2.0.13 → jvcli-2.0.15}/tests/test_utils.py

@@ -67,12 +67,6 @@ class TestUtils:
 
         validate_package_name("test-ns/package-name")
 
-    def test_is_version_compatible_with_exact_match(self) -> None:
-        """is_version_compatible correctly handles exact version matches and version ranges."""
-        assert is_version_compatible("1.0.0", "1.0.0") is True
-        assert is_version_compatible("2.1.0", ">=2.0.0,<3.0.0") is True
-        assert is_version_compatible("1.0.0", "^1.0.0") is True
-
     def test_validate_snake_case_rejects_invalid_strings(self) -> None:
         """validate_snake_case rejects strings with uppercase letters or special characters."""
         ctx = click.Context(click.Command("test"))
@@ -130,6 +124,57 @@ class TestUtils:
         assert is_version_compatible("1.0.0", "invalid") is False
         assert is_version_compatible("1.0", ">=invalid") is False
 
+    def test_is_version_compatible_with_exact_match(self) -> None:
+        """is_version_compatible correctly handles exact version matches and version ranges."""
+        assert is_version_compatible("1.0.0", "1.0.0") is True
+        assert is_version_compatible("2.1.0", ">=2.0.0,<3.0.0") is True
+        assert is_version_compatible("1.0.0", "^1.0.0") is True
+
+    def test_is_version_compatible_with_incompatible_versions(self) -> None:
+        """is_version_compatible returns False for incompatible versions."""
+        assert is_version_compatible("1.0.0", "2.0.0") is False
+        assert is_version_compatible("1.0.0", ">=2.0.0,<3.0.0") is False
+        assert is_version_compatible("1.0.0", "^2.0.0") is False
+
+    def test_is_version_compatible_with_invalid_version(self) -> None:
+        """is_version_compatible handles invalid version inputs gracefully."""
+        assert is_version_compatible("invalid_version", "1.0.0") is False
+        assert is_version_compatible("1.0.0", "invalid_specifier") is False
+        assert is_version_compatible("invalid_version", "invalid_specifier") is False
+
+    def test_is_version_compatible_with_shorthand_tilde(self) -> None:
+        """is_version_compatible correctly handles shorthand '~' specifier."""
+        assert is_version_compatible("1.2.3", "~1.2.0") is True
+        assert is_version_compatible("1.3.0", "~1.2.0") is False
+        assert is_version_compatible("1.2.0", "~1.2.0") is True
+
+    def test_is_version_compatible_with_shorthand_caret(self) -> None:
+        """is_version_compatible correctly handles shorthand '^' specifier."""
+        assert is_version_compatible("1.2.3", "^1.2.0") is True
+        assert is_version_compatible("2.0.0", "^1.2.0") is False
+        assert is_version_compatible("0.2.3", "^0.2.0") is True
+        assert is_version_compatible("0.3.0", "^0.2.0") is False
+
+    def test_is_version_compatible_with_edge_cases(self) -> None:
+        """is_version_compatible handles edge cases like empty strings and None."""
+        assert is_version_compatible("", "1.0.0") is False
+        assert is_version_compatible("1.0.0", "") is False
+        assert is_version_compatible("", "") is False
+        assert is_version_compatible(None, "1.0.0") is False  # type: ignore
+        assert is_version_compatible("1.0.0", None) is False  # type: ignore
+        assert is_version_compatible(None, None) is False  # type: ignore
+
+    def test_is_version_compatible_with_pre_release_versions(self) -> None:
+        """is_version_compatible correctly handles pre-release versions."""
+        assert is_version_compatible("1.0.0-alpha", ">=1.0.0-alpha,<2.0.0") is True
+        assert is_version_compatible("1.0.0-alpha", ">=1.0.0,<2.0.0") is False
+        assert is_version_compatible("1.0.0-beta", "^1.0.0-alpha") is True
+
+    def test_is_version_compatible_with_exact_pre_release(self) -> None:
+        """is_version_compatible correctly matches exact pre-release versions."""
+        assert is_version_compatible("1.0.0-alpha", "1.0.0-alpha") is True
+        assert is_version_compatible("1.0.0-alpha", "1.0.0-beta") is False
+
     def test_compress_package_to_tgz(self) -> None:
         """Test that compress_package_to_tgz correctly creates a .tgz archive, excluding unwanted folders."""
 
@@ -167,20 +212,6 @@ class TestUtils:
             assert "__jac_gen__" not in archive_files
             assert "__pycache__" not in archive_files
 
-    def test_is_version_compatible_with_tilde_and_caret_specifiers(self) -> None:
-        """is_version_compatible processes tilde (~) and caret (^) version specifiers."""
-        # Test cases for tilde (~) specifier
-        assert is_version_compatible("2.1.0", "~2.1.0") is True
-        assert is_version_compatible("2.1.5", "~2.1.0") is True
-        assert is_version_compatible("2.2.0", "~2.1.0") is False
-
-        # Test cases for caret (^) specifier
-        assert is_version_compatible("2.1.0", "^2.0.0") is True
-        assert is_version_compatible("3.0.0", "^2.0.0") is False
-        assert is_version_compatible("0.2.5", "^0.2.0") is True
-        assert is_version_compatible("0.3.0", "^0.2.0") is False
-        assert is_version_compatible("0.0.6", "^0.0.4") is False
-
     def test_compress_package_to_tgz_preserves_structure_and_permissions(
         self, mocker: MockerFixture
     ) -> None:

jvcli-2.0.13/jvcli/templates/2.0.0/project/env.example

@@ -1,13 +0,0 @@
-JIVAS_USER=admin@jivas.com
-JIVAS_PASSWORD=password
-JIVAS_PORT=8000
-JIVAS_BASE_URL=http://localhost:8000
-JIVAS_STUDIO_URL=http://localhost:8989
-JIVAS_FILES_URL=http://localhost:9000/files
-JIVAS_DESCRIPTOR_ROOT_PATH=".jvdata"
-JIVAS_ACTIONS_ROOT_PATH="actions"
-JIVAS_DAF_ROOT_PATH="daf"
-JIVAS_FILES_ROOT_PATH=".files"
-JIVAS_WEBHOOK_SECRET_KEY="ABCDEFGHIJK"
-JIVAS_ENVIRONMENT=development
-JACPATH="./"