ecosyste-ms-cli 1.3.2__tar.gz → 1.4.1__tar.gz

ecosyste_ms_cli-1.4.1/CHANGELOG.md

@@ -0,0 +1,11 @@
+# Changelog for v1.4.1
+
+## Changes since v1.4.0
+
+- fix: corrections and docs for purl usage (07698f5)
+- fix: more inconsitent apis (7028846)
+- fix: parameter precendence consistent \ \ * check for invalid purls \ * small errors corrected (b112cff)
+- feature: purl parameter for features (b9fd27c)
+- feature: purl for all repos commands (8a064b5)
+- feature: dependabot api receives --purl parameter (10f3feb)
+- feature: --purl parameter (0beb032)

{ecosyste_ms_cli-1.3.2/ecosyste_ms_cli.egg-info → ecosyste_ms_cli-1.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ecosyste_ms_cli
-Version: 1.3.2
+Version: 1.4.1
 Summary: CLI for ecosyste.ms API
 Author-email: Sebastian Schürmann <sebs@2xs.org>
 License-Expression: MIT
@@ -22,10 +22,10 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: click~=8.3.1
-Requires-Dist: requests~=2.32.5
+Requires-Dist: requests~=2.33.1
 Requires-Dist: pyyaml~=6.0.3
-Requires-Dist: rich~=14.3.3
-Requires-Dist: mcp~=1.26.0
+Requires-Dist: rich~=15.0.0
+Requires-Dist: mcp~=1.27.0
 Requires-Dist: openapi-core~=0.23.0
 Requires-Dist: packageurl-python~=0.17.6
 Requires-Dist: importlib-resources; python_version < "3.9"
@@ -36,7 +36,7 @@ Requires-Dist: black~=26.3.1; extra == "dev"
 Requires-Dist: isort~=8.0.1; extra == "dev"
 Requires-Dist: flake8~=7.3.0; extra == "dev"
 Requires-Dist: bandit~=1.9.4; extra == "dev"
-Requires-Dist: complexipy~=5.2.0; extra == "dev"
+Requires-Dist: complexipy~=5.3.0; extra == "dev"
 Requires-Dist: tomli~=2.3.0; python_version < "3.11" and extra == "dev"
 Dynamic: license-file
 

{ecosyste_ms_cli-1.3.2 → ecosyste_ms_cli-1.4.1/ecosyste_ms_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ecosyste_ms_cli
-Version: 1.3.2
+Version: 1.4.1
 Summary: CLI for ecosyste.ms API
 Author-email: Sebastian Schürmann <sebs@2xs.org>
 License-Expression: MIT
@@ -22,10 +22,10 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: click~=8.3.1
-Requires-Dist: requests~=2.32.5
+Requires-Dist: requests~=2.33.1
 Requires-Dist: pyyaml~=6.0.3
-Requires-Dist: rich~=14.3.3
-Requires-Dist: mcp~=1.26.0
+Requires-Dist: rich~=15.0.0
+Requires-Dist: mcp~=1.27.0
 Requires-Dist: openapi-core~=0.23.0
 Requires-Dist: packageurl-python~=0.17.6
 Requires-Dist: importlib-resources; python_version < "3.9"
@@ -36,7 +36,7 @@ Requires-Dist: black~=26.3.1; extra == "dev"
 Requires-Dist: isort~=8.0.1; extra == "dev"
 Requires-Dist: flake8~=7.3.0; extra == "dev"
 Requires-Dist: bandit~=1.9.4; extra == "dev"
-Requires-Dist: complexipy~=5.2.0; extra == "dev"
+Requires-Dist: complexipy~=5.3.0; extra == "dev"
 Requires-Dist: tomli~=2.3.0; python_version < "3.11" and extra == "dev"
 Dynamic: license-file
 

{ecosyste_ms_cli-1.3.2 → ecosyste_ms_cli-1.4.1}/ecosyste_ms_cli.egg-info/requires.txt

@@ -1,8 +1,8 @@
 click~=8.3.1
-requests~=2.32.5
+requests~=2.33.1
 pyyaml~=6.0.3
-rich~=14.3.3
-mcp~=1.26.0
+rich~=15.0.0
+mcp~=1.27.0
 openapi-core~=0.23.0
 packageurl-python~=0.17.6
 
@@ -16,7 +16,7 @@ black~=26.3.1
 isort~=8.0.1
 flake8~=7.3.0
 bandit~=1.9.4
-complexipy~=5.2.0
+complexipy~=5.3.0
 
 [dev:python_version < "3.11"]
 tomli~=2.3.0

{ecosyste_ms_cli-1.3.2 → ecosyste_ms_cli-1.4.1}/ecosystems_cli/__init__.py

@@ -1,3 +1,3 @@
 """Ecosystems CLI tool for interacting with ecosyste.ms APIs."""
 
-__version__ = "1.3.2"
+__version__ = "1.4.1"

{ecosyste_ms_cli-1.3.2 → ecosyste_ms_cli-1.4.1}/ecosystems_cli/cli.py

@@ -7,6 +7,7 @@ import click
 from rich.console import Console
 from rich.panel import Panel
 
+from ecosystems_cli import __version__
 from ecosystems_cli.commands.advisories import advisories
 from ecosystems_cli.commands.archives import archives
 from ecosystems_cli.commands.commits import commits
@@ -139,6 +140,12 @@ main.add_command(mcp)
 # Dynamic op commands have been removed
 
 
+@main.command(name="version", help="Show the ecosystems CLI version and exit.")
+def version():
+    """Print the installed ecosystems CLI version."""
+    click.echo(__version__)
+
+
 def _parse_json_param(param: Optional[str]) -> Optional[Dict]:
     """Parse JSON parameter if provided."""
     if not param:

{ecosyste_ms_cli-1.3.2 → ecosyste_ms_cli-1.4.1}/ecosystems_cli/commands/advisories.py

@@ -73,12 +73,14 @@ def get_advisories(
     """
     update_context(ctx, timeout, format, domain, mailto)
 
-    # If PURL is provided, parse it and override ecosystem/package_name
+    # If PURL is provided, decompose it; explicit flags win over PURL-derived values.
     if purl:
         parsed_ecosystem, parsed_package_name = parse_purl(purl)
-        if parsed_ecosystem:
+        if not parsed_ecosystem and not parsed_package_name:
+            raise click.UsageError(f"Invalid PURL: {purl!r}. Expected format: pkg:type/name (e.g. pkg:npm/axios).")
+        if parsed_ecosystem and not ecosystem:
             ecosystem = parsed_ecosystem
-        if parsed_package_name:
+        if parsed_package_name and not package_name:
             package_name = parsed_package_name
 
     # Build kwargs for the API call

ecosyste_ms_cli-1.4.1/ecosystems_cli/commands/dependabot.py

@@ -0,0 +1,39 @@
+"""Commands for the dependabot API."""
+
+import click
+
+from ecosystems_cli.commands.generator import APICommandGenerator
+from ecosystems_cli.helpers.purl_parser import parse_purl
+
+dependabot = APICommandGenerator.create_api_group("dependabot")
+
+
+# Attach --purl as an optional parameter to the auto-generated get_advisories
+# command. When provided, its type/name decompose into --ecosystem/--package-name,
+# letting users pass a single PURL instead of two flags.
+if "get_advisories" in dependabot.commands:
+    _get_advisories_cmd = dependabot.commands["get_advisories"]
+    _get_advisories_cmd.params.insert(
+        0,
+        click.Option(
+            ["--purl"],
+            type=str,
+            default=None,
+            help="Package URL (PURL). Example: pkg:npm/fsa. Decomposes into --ecosystem and --package-name.",
+        ),
+    )
+    _original_get_advisories_callback = _get_advisories_cmd.callback
+
+    def _get_advisories_with_purl(*args, **kwargs):
+        purl = kwargs.pop("purl", None)
+        if purl:
+            parsed_ecosystem, parsed_package_name = parse_purl(purl)
+            if not parsed_ecosystem and not parsed_package_name:
+                raise click.UsageError(f"Invalid PURL: {purl!r}. Expected format: pkg:type/name (e.g. pkg:npm/axios).")
+            if parsed_ecosystem and not kwargs.get("ecosystem"):
+                kwargs["ecosystem"] = parsed_ecosystem
+            if parsed_package_name and not kwargs.get("package_name"):
+                kwargs["package_name"] = parsed_package_name
+        return _original_get_advisories_callback(*args, **kwargs)
+
+    _get_advisories_cmd.callback = _get_advisories_with_purl

{ecosyste_ms_cli-1.3.2 → ecosyste_ms_cli-1.4.1}/ecosystems_cli/commands/packages.py

@@ -12,6 +12,92 @@ from ecosystems_cli.helpers.purl_parser import parse_purl_with_version, purl_typ
 packages = APICommandGenerator.create_api_group("packages")
 
 
+# Attach --purl as an optional parameter to the auto-generated get_dependencies
+# command. When provided, its type/name decompose into --ecosystem/--package-name,
+# letting users pass a single PURL instead of multiple flags.
+if "get_dependencies" in packages.commands:
+    _get_dependencies_cmd = packages.commands["get_dependencies"]
+    _get_dependencies_cmd.params.insert(
+        0,
+        click.Option(
+            ["--purl"],
+            type=str,
+            default=None,
+            help="Package URL (PURL). Example: pkg:npm/axios@1.7.9. Decomposes into --ecosystem and --package-name.",
+        ),
+    )
+    _original_get_dependencies_callback = _get_dependencies_cmd.callback
+
+    def _get_dependencies_with_purl(*args, **kwargs):
+        purl = kwargs.pop("purl", None)
+        if purl:
+            parsed_ecosystem, parsed_package_name, _ = parse_purl_with_version(purl)
+            if not parsed_ecosystem and not parsed_package_name:
+                raise click.UsageError(f"Invalid PURL: {purl!r}. Expected format: pkg:type/name (e.g. pkg:npm/axios).")
+            if parsed_ecosystem and not kwargs.get("ecosystem"):
+                # getDependencies filters by ecosystem name (e.g. "npm"), not the
+                # registry name ("npmjs.org"), so pass the raw PURL type through.
+                kwargs["ecosystem"] = parsed_ecosystem
+            if parsed_package_name and not kwargs.get("package_name"):
+                kwargs["package_name"] = parsed_package_name
+        return _original_get_dependencies_callback(*args, **kwargs)
+
+    _get_dependencies_cmd.callback = _get_dependencies_with_purl
+
+
+def _add_purl_to_registry_package_command(command_name: str) -> None:
+    """Attach --purl to a command whose path args are registryName + packageName.
+
+    Makes the positional REGISTRY_NAME and PACKAGE_NAME args optional, injects
+    --purl, and wraps the callback so a PURL decomposes into those two args.
+    Purl type is mapped to a registry name (e.g. 'npm' -> 'npmjs.org').
+    Positional args still win over a PURL when both are passed.
+    """
+    if command_name not in packages.commands:
+        return
+
+    cmd = packages.commands[command_name]
+
+    for param in cmd.params:
+        if isinstance(param, click.Argument) and param.name in ("registryname", "packagename"):
+            param.required = False
+
+    cmd.params.insert(
+        0,
+        click.Option(
+            ["--purl"],
+            type=str,
+            default=None,
+            help="Package URL (PURL). Example: pkg:npm/lodash. Decomposes into REGISTRY_NAME and PACKAGE_NAME.",
+        ),
+    )
+    original_callback = cmd.callback
+
+    def wrapped_callback(*args, **kwargs):
+        purl = kwargs.pop("purl", None)
+        if purl:
+            parsed_ecosystem, parsed_package_name, _ = parse_purl_with_version(purl)
+            if not parsed_ecosystem and not parsed_package_name:
+                raise click.UsageError(f"Invalid PURL: {purl!r}. Expected format: pkg:type/name (e.g. pkg:npm/lodash).")
+            if parsed_ecosystem and not kwargs.get("registryname"):
+                kwargs["registryname"] = purl_type_to_registry(parsed_ecosystem)
+            if parsed_package_name and not kwargs.get("packagename"):
+                kwargs["packagename"] = parsed_package_name
+        if not kwargs.get("registryname") or not kwargs.get("packagename"):
+            raise click.UsageError("Either --purl or both REGISTRY_NAME and PACKAGE_NAME arguments are required")
+        return original_callback(*args, **kwargs)
+
+    cmd.callback = wrapped_callback
+
+
+for _op in (
+    "get_registry_package_dependent_packages",
+    "get_registry_package_versions",
+    "get_registry_package_version_numbers",
+):
+    _add_purl_to_registry_package_command(_op)
+
+
 # Remove auto-generated commands to replace with custom implementations
 if "get_registry_package" in packages.commands:
     del packages.commands["get_registry_package"]
@@ -55,13 +141,14 @@ def get_registry_package(
     """
     update_context(ctx, timeout, format, domain, mailto)
 
-    # If PURL is provided, parse it and override registry_name/package_name
+    # If PURL is provided, decompose it; explicit positional args win over PURL-derived values.
     if purl:
         parsed_ecosystem, parsed_package_name, _ = parse_purl_with_version(purl)
-        if parsed_ecosystem:
-            # Convert purl type to registry name (e.g., 'npm' -> 'npmjs.org')
+        if not parsed_ecosystem and not parsed_package_name:
+            raise click.UsageError(f"Invalid PURL: {purl!r}. Expected format: pkg:type/name (e.g. pkg:npm/lodash).")
+        if parsed_ecosystem and not registry_name:
             registry_name = purl_type_to_registry(parsed_ecosystem)
-        if parsed_package_name:
+        if parsed_package_name and not package_name:
             package_name = parsed_package_name
 
     # Validate that we have the required parameters
@@ -120,15 +207,18 @@ def get_registry_package_version(
     """
     update_context(ctx, timeout, format, domain, mailto)
 
-    # If PURL is provided, parse it and override registry_name/package_name/version_number
+    # If PURL is provided, decompose it; explicit positional args win over PURL-derived values.
     if purl:
         parsed_ecosystem, parsed_package_name, parsed_version = parse_purl_with_version(purl)
-        if parsed_ecosystem:
-            # Convert purl type to registry name (e.g., 'npm' -> 'npmjs.org')
+        if not parsed_ecosystem and not parsed_package_name:
+            raise click.UsageError(
+                f"Invalid PURL: {purl!r}. Expected format: pkg:type/name@version (e.g. pkg:npm/lodash@4.17.21)."
+            )
+        if parsed_ecosystem and not registry_name:
             registry_name = purl_type_to_registry(parsed_ecosystem)
-        if parsed_package_name:
+        if parsed_package_name and not package_name:
             package_name = parsed_package_name
-        if parsed_version:
+        if parsed_version and not version_number:
             version_number = parsed_version
 
     # Validate that we have the required parameters

ecosyste_ms_cli-1.4.1/ecosystems_cli/commands/repos.py

@@ -0,0 +1,56 @@
+"""Commands for the repos API."""
+
+import click
+
+from ecosystems_cli.commands.generator import APICommandGenerator
+from ecosystems_cli.helpers.purl_parser import parse_purl
+
+repos = APICommandGenerator.create_api_group("repos")
+
+
+def _add_purl_to_ecosystem_package_command(command_name: str) -> None:
+    """Attach --purl to a command whose first two path args are ecosystem + package.
+
+    Makes the positional ECOSYSTEM and PACKAGE args optional, injects --purl, and
+    wraps the callback so a PURL decomposes into those two args when provided.
+    Positional args still win over a PURL when both are passed.
+    """
+    if command_name not in repos.commands:
+        return
+
+    cmd = repos.commands[command_name]
+
+    for param in cmd.params:
+        if isinstance(param, click.Argument) and param.name in ("ecosystem", "package"):
+            param.required = False
+
+    cmd.params.insert(
+        0,
+        click.Option(
+            ["--purl"],
+            type=str,
+            default=None,
+            help="Package URL (PURL). Example: pkg:npm/lodash. Decomposes into ECOSYSTEM and PACKAGE.",
+        ),
+    )
+    original_callback = cmd.callback
+
+    def wrapped_callback(*args, **kwargs):
+        purl = kwargs.pop("purl", None)
+        if purl:
+            parsed_ecosystem, parsed_package = parse_purl(purl)
+            if not parsed_ecosystem and not parsed_package:
+                raise click.UsageError(f"Invalid PURL: {purl!r}. Expected format: pkg:type/name (e.g. pkg:npm/lodash).")
+            if parsed_ecosystem and not kwargs.get("ecosystem"):
+                kwargs["ecosystem"] = parsed_ecosystem
+            if parsed_package and not kwargs.get("package"):
+                kwargs["package"] = parsed_package
+        if not kwargs.get("ecosystem") or not kwargs.get("package"):
+            raise click.UsageError("Either --purl or both ECOSYSTEM and PACKAGE arguments are required")
+        return original_callback(*args, **kwargs)
+
+    cmd.callback = wrapped_callback
+
+
+for _op in ("usage_package", "usage_package_dependencies", "usage_package_dependent_repositories"):
+    _add_purl_to_ecosystem_package_command(_op)

{ecosyste_ms_cli-1.3.2 → ecosyste_ms_cli-1.4.1}/pyproject.toml

@@ -52,7 +52,7 @@ exclude = ["tests*"]
 
 [project]
 name = "ecosyste_ms_cli"
-version = "1.3.2"
+version = "1.4.1"
 description = "CLI for ecosyste.ms API"
 authors = [
     {name = "Sebastian Schürmann", email = "sebs@2xs.org"}
@@ -76,10 +76,10 @@ classifiers = [
 ]
 dependencies = [
     "click~=8.3.1",
-    "requests~=2.32.5",
+    "requests~=2.33.1",
     "pyyaml~=6.0.3",
-    "rich~=14.3.3",
-    "mcp~=1.26.0",
+    "rich~=15.0.0",
+    "mcp~=1.27.0",
     "openapi-core~=0.23.0",
     "packageurl-python~=0.17.6",
     "importlib-resources; python_version < '3.9'",
@@ -93,7 +93,7 @@ dev = [
     "isort~=8.0.1",
     "flake8~=7.3.0",
     "bandit~=1.9.4",
-    "complexipy~=5.2.0",
+    "complexipy~=5.3.0",
     "tomli~=2.3.0; python_version < '3.11'"
 ]
 

{ecosyste_ms_cli-1.3.2 → ecosyste_ms_cli-1.4.1}/tests/test_cli.py

@@ -6,6 +6,7 @@ from unittest import mock
 import pytest
 from click.testing import CliRunner
 
+from ecosystems_cli import __version__
 from ecosystems_cli.cli import main
 
 
@@ -24,6 +25,16 @@ def mock_api_client():
         yield mock_factory
 
 
+class TestVersionCommand:
+    """Test the version subcommand."""
+
+    def test_version_prints_package_version(self, runner):
+        """Version output must match __version__ so semantic-release stays the source of truth."""
+        result = runner.invoke(main, ["version"])
+        assert result.exit_code == 0
+        assert result.output.strip() == __version__
+
+
 class TestAdvisoriesCommands:
     """Test the advisories commands."""
 

ecosyste_ms_cli-1.3.2/CHANGELOG.md

@@ -1,6 +0,0 @@
-# Changelog for v1.3.2
-
-## Changes since v1.3.1
-
-- fix: name change for pypi (05932a1)
-- chore: set verbose (3197d06)

ecosyste_ms_cli-1.3.2/ecosystems_cli/commands/dependabot.py

@@ -1,5 +0,0 @@
-"""Commands for the dependabot API."""
-
-from ecosystems_cli.commands.generator import APICommandGenerator
-
-dependabot = APICommandGenerator.create_api_group("dependabot")

ecosyste_ms_cli-1.3.2/ecosystems_cli/commands/repos.py

@@ -1,5 +0,0 @@
-"""Commands for the repos API."""
-
-from ecosystems_cli.commands.generator import APICommandGenerator
-
-repos = APICommandGenerator.create_api_group("repos")