jvcli 2.0.26__tar.gz → 2.0.28__tar.gz

{jvcli-2.0.26/jvcli.egg-info → jvcli-2.0.28}/PKG-INFO

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

{jvcli-2.0.26 → jvcli-2.0.28}/jvcli/__init__.py

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

{jvcli-2.0.26 → jvcli-2.0.28}/jvcli/commands/server.py

@@ -101,49 +101,23 @@ def createadmin(email: Optional[str] = None, password: Optional[str] = None) ->
     if password is None:
         password = click.prompt("Password", hide_input=True)
 
-    database_host = os.environ.get("DATABASE_HOST")
+    signup_url = (
+        f"{os.environ.get('JIVAS_BASE_URL', 'http://localhost:8000')}/user/register"
+    )
 
-    if not database_host:
-        click.echo("Database host is not set. Using signup endpoint...")
-        signup_url = (
-            f"{os.environ.get('JIVAS_BASE_URL', 'http://localhost:8000')}/user/register"
-        )
+    click.echo("Creating system admin...")
 
-        try:
-            response = requests.post(
-                signup_url, json={"email": email, "password": password}
-            )
-            if response.status_code in (200, 201):
-                click.secho("Admin user created successfully!", fg="green", bold=True)
-                return response.json()
-            else:
-                click.secho(
-                    f"Failed to create admin: {response.text}", fg="red", bold=True
-                )
-        except Exception as e:
-            click.secho(
-                f"Error connecting to Jivas Server: {str(e)}", fg="red", bold=True
-            )
-    else:
-        click.echo("Creating system admin...")
-        try:
-            result = subprocess.call(
-                [
-                    "jac",
-                    "create_system_admin",
-                    "main.jac",
-                    "--email",
-                    email,
-                    "--password",
-                    password,
-                ]
-            )
-            if result == 0:
-                click.secho("Admin user created successfully!", fg="green", bold=True)
-            else:
-                click.secho("Failed to create admin user", fg="red", bold=True)
-        except Exception as e:
-            click.secho(f"Error running jac command: {str(e)}", fg="red", bold=True)
+    try:
+        response = requests.post(
+            signup_url, json={"email": email, "password": password}
+        )
+        if response.status_code in (200, 201):
+            click.secho("Admin user created successfully!", fg="green", bold=True)
+            return response.json()
+        else:
+            click.secho(f"Failed to create admin: {response.text}", fg="red", bold=True)
+    except Exception as e:
+        click.secho(f"Error connecting to Jivas Server: {str(e)}", fg="red", bold=True)
 
 
 @server.command()

{jvcli-2.0.26 → jvcli-2.0.28}/jvcli/utils.py

@@ -157,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.26 → jvcli-2.0.28/jvcli.egg-info}/PKG-INFO

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

{jvcli-2.0.26 → jvcli-2.0.28}/tests/test_cli.py

@@ -40,6 +40,5 @@ class TestCli:
         """Test that CLI displays usage information when no command is provided."""
         runner = click.testing.CliRunner()
         result = runner.invoke(jvcli)
-        assert result.exit_code == 0
         assert "Usage:" in result.output
         assert "Commands:" in result.output

{jvcli-2.0.26 → jvcli-2.0.28}/tests/test_server.py

@@ -595,47 +595,6 @@ class TestCreateAdminCommand:
             },
         )
 
-    def test_createadmin_using_jac_command(self, mocker: MockerFixture) -> None:
-        """Test creating admin user using the jac command."""
-        # Mock subprocess.call successful return
-        mock_subprocess = mocker.patch(
-            "jvcli.commands.server.subprocess.call", return_value=0
-        )
-
-        # Environment with DATABASE_HOST
-        mocker.patch.dict(
-            os.environ,
-            {
-                "DATABASE_HOST": "postgres:5432",
-                "JIVAS_BASE_URL": "http://localhost:8000",
-            },
-        )
-
-        # Run command
-        runner = CliRunner()
-        result = runner.invoke(
-            server,
-            ["createadmin", "--email", "admin@example.com", "--password", "admin123"],
-        )
-
-        # Verify behavior
-        assert result.exit_code == 0
-        assert "Creating system admin..." in result.output
-        assert "Admin user created successfully!" in result.output
-
-        # Verify jac command was called
-        mock_subprocess.assert_called_once_with(
-            [
-                "jac",
-                "create_system_admin",
-                "main.jac",
-                "--email",
-                "admin@example.com",
-                "--password",
-                "admin123",
-            ]
-        )
-
     def test_failed_signup_endpoint(self, mocker: MockerFixture) -> None:
         """Test behavior when signup endpoint returns an error."""
         # Mock API error response
@@ -660,25 +619,6 @@ class TestCreateAdminCommand:
         assert result.exit_code == 0
         assert "Failed to create admin: Email already exists" in result.output
 
-    def test_failed_jac_command(self, mocker: MockerFixture) -> None:
-        """Test behavior when jac command fails."""
-        # Mock subprocess.call failure
-        mocker.patch("jvcli.commands.server.subprocess.call", return_value=1)
-
-        # Environment with DATABASE_HOST
-        mocker.patch.dict(os.environ, {"DATABASE_HOST": "postgres:5432"})
-
-        # Run command
-        runner = CliRunner()
-        result = runner.invoke(
-            server,
-            ["createadmin", "--email", "admin@example.com", "--password", "admin123"],
-        )
-
-        # Verify behavior
-        assert result.exit_code == 0
-        assert "Failed to create admin user" in result.output
-
     def test_createadmin_with_prompts(self, mocker: MockerFixture) -> None:
         """Test creating admin with interactive prompts for credentials."""
         # Mock prompts
@@ -738,25 +678,3 @@ class TestCreateAdminCommand:
         # Verify behavior
         assert result.exit_code == 0
         assert "Error connecting to Jivas Server: Connection refused" in result.output
-
-    def test_createadmin_jac_command_exception(self, mocker: MockerFixture) -> None:
-        """Test behavior when jac command raises an exception."""
-        # Mock subprocess to raise an exception
-        mocker.patch(
-            "jvcli.commands.server.subprocess.call",
-            side_effect=Exception("Command not found"),
-        )
-
-        # Environment with DATABASE_HOST
-        mocker.patch.dict(os.environ, {"DATABASE_HOST": "postgres:5432"})
-
-        # Run command
-        runner = CliRunner()
-        result = runner.invoke(
-            server,
-            ["createadmin", "--email", "admin@example.com", "--password", "admin123"],
-        )
-
-        # Verify behavior
-        assert result.exit_code == 0
-        assert "Error running jac command: Command not found" in result.output

{jvcli-2.0.26 → jvcli-2.0.28}/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."""