cloudsmith-cli 1.11.0__tar.gz → 1.12.0__tar.gz

{cloudsmith_cli-1.11.0/cloudsmith_cli.egg-info → cloudsmith_cli-1.12.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudsmith-cli
-Version: 1.11.0
+Version: 1.12.0
 Summary: Cloudsmith Command-Line Interface (CLI)
 Home-page: https://github.com/cloudsmith-io/cloudsmith-cli
 Author: Cloudsmith Ltd
@@ -15,7 +15,6 @@ Classifier: Intended Audience :: System Administrators
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
@@ -31,10 +30,8 @@ Requires-Dist: click!=8.3.0,>=8.1.8
 Requires-Dist: click-configfile>=0.2.3
 Requires-Dist: click-didyoumean>=0.0.3
 Requires-Dist: click-spinner>=0.1.7
-Requires-Dist: cloudsmith-api<3.0,>=2.0.22
+Requires-Dist: cloudsmith-api<3.0,>=2.0.24
 Requires-Dist: keyring>=25.4.1
-Requires-Dist: mcp==1.9.1
-Requires-Dist: toon-python==0.1.2
 Requires-Dist: requests>=2.18.4
 Requires-Dist: requests_toolbelt>=1.0.0
 Requires-Dist: semver>=2.7.9
@@ -58,7 +55,7 @@ Dynamic: summary
 [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/badges/version/cloudsmith/cli/python/cloudsmith-cli/latest/xf=bdist_wheel;xn=cloudsmith-cli;xv=py2.py3/?render=true)](https://cloudsmith.io/~cloudsmith/repos/cli/packages/detail/python/cloudsmith-cli/latest/xf=bdist_wheel;xn=cloudsmith-cli;xv=py2.py3/)
 [![Python Versions](https://img.shields.io/pypi/pyversions/cloudsmith-cli.svg)](https://pypi.python.org/pypi/cloudsmith-cli)
 [![PyPI Version](https://img.shields.io/pypi/v/cloudsmith-cli.svg)](https://pypi.python.org/pypi/cloudsmith-cli)
-[![CircleCI](https://circleci.com/gh/cloudsmith-io/cloudsmith-cli.svg?style=svg)](https://circleci.com/gh/cloudsmith-io/cloudsmith-cli)
+[![GitHub Actions](https://github.com/cloudsmith-io/cloudsmith-cli/actions/workflows/test.yml/badge.svg)](https://github.com/cloudsmith-io/cloudsmith-cli/actions/workflows/test.yml)
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/ambv/black)
 
 

{cloudsmith_cli-1.11.0 → cloudsmith_cli-1.12.0}/README.md

@@ -3,7 +3,7 @@
 [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/badges/version/cloudsmith/cli/python/cloudsmith-cli/latest/xf=bdist_wheel;xn=cloudsmith-cli;xv=py2.py3/?render=true)](https://cloudsmith.io/~cloudsmith/repos/cli/packages/detail/python/cloudsmith-cli/latest/xf=bdist_wheel;xn=cloudsmith-cli;xv=py2.py3/)
 [![Python Versions](https://img.shields.io/pypi/pyversions/cloudsmith-cli.svg)](https://pypi.python.org/pypi/cloudsmith-cli)
 [![PyPI Version](https://img.shields.io/pypi/v/cloudsmith-cli.svg)](https://pypi.python.org/pypi/cloudsmith-cli)
-[![CircleCI](https://circleci.com/gh/cloudsmith-io/cloudsmith-cli.svg?style=svg)](https://circleci.com/gh/cloudsmith-io/cloudsmith-cli)
+[![GitHub Actions](https://github.com/cloudsmith-io/cloudsmith-cli/actions/workflows/test.yml/badge.svg)](https://github.com/cloudsmith-io/cloudsmith-cli/actions/workflows/test.yml)
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/ambv/black)
 
 

{cloudsmith_cli-1.11.0 → cloudsmith_cli-1.12.0}/cloudsmith_cli/cli/commands/__init__.py

@@ -12,7 +12,6 @@ from . import (
     help_,
     list_,
     login,
-    mcp,
     metrics,
     move,
     policy,

{cloudsmith_cli-1.11.0 → cloudsmith_cli-1.12.0}/cloudsmith_cli/cli/commands/main.py

@@ -5,22 +5,31 @@ import click
 from ...core.api.version import get_version as get_api_version
 from ...core.utils import get_github_website, get_help_website
 from ...core.version import get_version as get_cli_version
-from .. import command, decorators
+from .. import command, decorators, utils
 
 CONTEXT_SETTINGS = dict(help_option_names=["-h", "--help"])
 
 
-def print_version():
+def print_version(opts):
     """Print the environment versions."""
-    click.echo("Versions:")
-    click.secho(
-        "CLI Package Version: %(version)s"
-        % {"version": click.style(get_cli_version(), bold=True)}
-    )
-    click.secho(
-        "API Package Version: %(version)s"
-        % {"version": click.style(get_api_version(), bold=True)}
-    )
+    cli_version = get_cli_version()
+    api_version = get_api_version()
+
+    data = {
+        "cli_version": cli_version,
+        "api_version": api_version,
+    }
+
+    if not utils.maybe_print_as_json(opts, data):
+        click.echo("Versions:")
+        click.secho(
+            "CLI Package Version: %(version)s"
+            % {"version": click.style(cli_version, bold=True)}
+        )
+        click.secho(
+            "API Package Version: %(version)s"
+            % {"version": click.style(api_version, bold=True)}
+        )
 
 
 @click.group(
@@ -52,12 +61,13 @@ For issues/contributing: %(github_website)s
     is_eager=True,
 )
 @decorators.common_cli_config_options
+@decorators.common_cli_output_options
 @click.pass_context
 def main(ctx, opts, version):
     """Handle entrypoint to CLI."""
     # pylint: disable=unused-argument
 
     if version:
-        print_version()
+        print_version(opts)
     elif ctx.invoked_subcommand is None:
         click.echo(ctx.get_help())

{cloudsmith_cli-1.11.0 → cloudsmith_cli-1.12.0}/cloudsmith_cli/cli/commands/metrics/entitlements.py

@@ -75,7 +75,7 @@ def _print_metrics_table(opts, data):
     type=str,
     required=False,
     help=(
-        "A comma seperated list of entitlement token identifiers (i.e. slug_perm) or "
+        "A comma separated list of entitlement token identifiers (i.e. slug_perm) or "
         "token secrets. If a list is not specified then all entitlement tokens will "
         "be included for a given namespace or repository."
     ),

{cloudsmith_cli-1.11.0 → cloudsmith_cli-1.12.0}/cloudsmith_cli/cli/commands/metrics/packages.py

@@ -74,7 +74,7 @@ def _print_metrics_table(opts, data):
     type=str,
     required=False,
     help=(
-        "A comma seperated list of package identifiers (i.e. slug_perm). "
+        "A comma separated list of package identifiers (i.e. slug_perm). "
         "If a list is not specified then all package will be included for "
         "a given repository."
     ),

{cloudsmith_cli-1.11.0 → cloudsmith_cli-1.12.0}/cloudsmith_cli/cli/commands/upstream.py

@@ -24,6 +24,7 @@ UPSTREAM_FORMATS = [
     "dart",
     "deb",
     "docker",
+    "generic",
     "go",
     "helm",
     "hex",

{cloudsmith_cli-1.11.0 → cloudsmith_cli-1.12.0}/cloudsmith_cli/cli/config.py

@@ -64,8 +64,6 @@ class ConfigSchema:
         api_proxy = ConfigParam(name="api_proxy", type=str)
         api_ssl_verify = ConfigParam(name="api_ssl_verify", type=bool, default=True)
         api_user_agent = ConfigParam(name="api_user_agent", type=str)
-        mcp_allowed_tools = ConfigParam(name="mcp_allowed_tools", type=str)
-        mcp_allowed_tool_groups = ConfigParam(name="mcp_allowed_tool_groups", type=str)
 
     @matches_section("profile:*")
     class Profile(Default):
@@ -97,7 +95,7 @@ class ConfigReader(ConfigFileReader):
 
     @classmethod
     def get_default_filepath(cls):
-        """Get the default filepath for the configuratin file."""
+        """Get the default filepath for the configuration file."""
         if not cls.config_files:
             return None
         if not cls.config_searchpath:
@@ -350,35 +348,6 @@ class Options:
         """Set value for debug flag."""
         self._set_option("debug", bool(value))
 
-    @property
-    def mcp_allowed_tools(self):
-        """Get value for Allowed MCP Tools."""
-        return self._get_option("mcp_allowed_tools")
-
-    @mcp_allowed_tools.setter
-    def mcp_allowed_tools(self, value):
-        """Set value for Allowed MCP Tools."""
-
-        if not value:
-            return
-        tools = value.split(",")
-
-        self._set_option("mcp_allowed_tools", tools)
-
-    @property
-    def mcp_allowed_tool_groups(self):
-        """Get value for Allowed MCP Tool Groups."""
-        return self._get_option("mcp_allowed_tool_groups")
-
-    @mcp_allowed_tool_groups.setter
-    def mcp_allowed_tool_groups(self, value):
-        """Set value for Allowed MCP Tool Groups."""
-        if not value:
-            return
-        tool_groups = value.split(",")
-
-        self._set_option("mcp_allowed_tool_groups", tool_groups)
-
     @property
     def output(self):
         """Get value for output format."""

{cloudsmith_cli-1.11.0 → cloudsmith_cli-1.12.0}/cloudsmith_cli/cli/decorators.py

@@ -7,7 +7,6 @@ import click
 from cloudsmith_cli.cli import validators
 
 from ..core.api.init import initialise_api as _initialise_api
-from ..core.mcp import server
 from . import config, utils
 
 
@@ -94,15 +93,9 @@ def common_cli_config_options(f):
     def wrapper(ctx, *args, **kwargs):
         # pylint: disable=missing-docstring
         opts = config.get_or_create_options(ctx)
-        profile = kwargs.pop("profile") or ctx.meta.get("profile")
-        config_file = kwargs.pop("config_file") or ctx.meta.get("config_file")
-        creds_file = kwargs.pop("credentials_file") or ctx.meta.get("creds_file")
-
-        # Store in context for subcommands to inherit
-        ctx.meta["profile"] = profile
-        ctx.meta["config_file"] = config_file
-        ctx.meta["creds_file"] = creds_file
-
+        profile = kwargs.pop("profile")
+        config_file = kwargs.pop("config_file")
+        creds_file = kwargs.pop("credentials_file")
         opts.load_config_file(path=config_file, profile=profile)
         opts.load_creds_file(path=creds_file, profile=profile)
         kwargs["opts"] = opts
@@ -337,40 +330,3 @@ def initialise_api(f):
         return ctx.invoke(f, *args, **kwargs)
 
     return wrapper
-
-
-def initialise_mcp(f):
-    @click.option(
-        "-a",
-        "--all-tools",
-        default=False,
-        is_flag=True,
-        help="Show all tools",
-    )
-    @click.option(
-        "-d",
-        "--allow-destructive-tools",
-        default=False,
-        is_flag=True,
-        help="Allow destructive tools to be used",
-    )
-    @click.pass_context
-    @functools.wraps(f)
-    def wrapper(ctx, *args, **kwargs):
-        opts = kwargs.get("opts")
-
-        all_tools = kwargs.pop("all_tools")
-        allow_destructive_tools = kwargs.pop("allow_destructive_tools")
-
-        mcp_server = server.DynamicMCPServer(
-            api_config=opts.api_config,
-            debug_mode=opts.debug,
-            allow_destructive_tools=allow_destructive_tools,
-            allowed_tool_groups=opts.mcp_allowed_tool_groups,
-            allowed_tools=opts.mcp_allowed_tools,
-            force_all_tools=all_tools,
-        )
-        kwargs["mcp_server"] = mcp_server
-        return ctx.invoke(f, *args, **kwargs)
-
-    return wrapper

cloudsmith_cli-1.12.0/cloudsmith_cli/cli/tests/commands/test_main.py

@@ -0,0 +1,54 @@
+import json
+
+import pytest
+
+from ....core.api.version import get_version as get_api_version
+from ....core.version import get_version
+from ...commands.main import main
+
+
+class TestMainCommand:
+    @pytest.mark.parametrize("option", ["-V", "--version"])
+    def test_main_version(self, runner, option):
+        """Test the output of `cloudsmith --version`."""
+        result = runner.invoke(main, [option])
+        assert result.exit_code == 0
+        assert (
+            result.output == "Versions:\n"
+            "CLI Package Version: " + get_version() + "\n"
+            "API Package Version: " + get_api_version() + "\n"
+        )
+
+    @pytest.mark.parametrize("option", ["-V", "--version"])
+    @pytest.mark.parametrize(
+        "format_option,format_value",
+        [("-F", "json"), ("--output-format", "json")],
+    )
+    def test_main_version_json(self, runner, option, format_option, format_value):
+        """Test the JSON output of `cloudsmith --version --output-format json`."""
+        result = runner.invoke(main, [option, format_option, format_value])
+        assert result.exit_code == 0
+        output = json.loads(result.output)
+        assert "data" in output
+        assert output["data"]["cli_version"] == get_version()
+        assert output["data"]["api_version"] == get_api_version()
+
+    @pytest.mark.parametrize("option", ["-V", "--version"])
+    def test_main_version_pretty_json(self, runner, option):
+        """Test the pretty JSON output of `cloudsmith --version --output-format pretty_json`."""
+        result = runner.invoke(main, [option, "--output-format", "pretty_json"])
+        assert result.exit_code == 0
+        output = json.loads(result.output)
+        assert "data" in output
+        assert output["data"]["cli_version"] == get_version()
+        assert output["data"]["api_version"] == get_api_version()
+        # Verify it's formatted with indentation
+        assert "    " in result.output
+
+    @pytest.mark.parametrize("option", ["-h", "--help"])
+    def test_main_help(self, runner, option):
+        """Test the output of `cloudsmith --help`."""
+        result = runner.invoke(main, [option])
+        assert result.exit_code == 0
+        # TODO: assert something specific about output
+        assert result.output

{cloudsmith_cli-1.11.0 → cloudsmith_cli-1.12.0}/cloudsmith_cli/cli/tests/commands/test_repos.py

@@ -35,13 +35,13 @@ def parse_table(output):
         Results: 1 repository visible
     ```
     """
-    seperator = "|"
+    separator = "|"
     column_headers = []
     row_values = []
 
     for line in output.split("\n"):
-        if seperator in line:
-            raw_values = [raw_value.strip() for raw_value in line.split(seperator)]
+        if separator in line:
+            raw_values = [raw_value.strip() for raw_value in line.split(separator)]
             if not column_headers:
                 # If we don't have keys yet, then this must be the column headers
                 column_headers = raw_values

{cloudsmith_cli-1.11.0 → cloudsmith_cli-1.12.0}/cloudsmith_cli/core/ratelimits.py

@@ -40,7 +40,7 @@ class RateLimitsInfo:
             info.remaining = int(data["remaining"])
         if "reset" in data:
             info.reset = datetime.datetime.utcfromtimestamp(int(data["reset"]))
-        if "throtted" in data:
+        if "throttled" in data:
             info.throttled = bool(data["throttled"])
         else:
             info.throttled = info.remaining == 0

{cloudsmith_cli-1.11.0 → cloudsmith_cli-1.12.0}/cloudsmith_cli/core/tests/test_init.py

@@ -58,7 +58,7 @@ def mocked_update_refresh_attempted_at():
 
 class TestInitialiseApi:
     def setup_class(cls):  # pylint: disable=no-self-argument
-        # For the purposes of these tests, we need to explcitly call set_default(None) at the
+        # For the purposes of these tests, we need to explicitly call set_default(None) at the
         # outset because other tests in the suite may have called initialise_api() already.
         # Resetting Configuration._default to None here effectively reverts the
         # Configuration class to its vanilla, unmodified behaviour/state.

cloudsmith_cli-1.12.0/cloudsmith_cli/data/VERSION

@@ -0,0 +1 @@
+1.12.0

{cloudsmith_cli-1.11.0 → cloudsmith_cli-1.12.0/cloudsmith_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudsmith-cli
-Version: 1.11.0
+Version: 1.12.0
 Summary: Cloudsmith Command-Line Interface (CLI)
 Home-page: https://github.com/cloudsmith-io/cloudsmith-cli
 Author: Cloudsmith Ltd
@@ -15,7 +15,6 @@ Classifier: Intended Audience :: System Administrators
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
@@ -31,10 +30,8 @@ Requires-Dist: click!=8.3.0,>=8.1.8
 Requires-Dist: click-configfile>=0.2.3
 Requires-Dist: click-didyoumean>=0.0.3
 Requires-Dist: click-spinner>=0.1.7
-Requires-Dist: cloudsmith-api<3.0,>=2.0.22
+Requires-Dist: cloudsmith-api<3.0,>=2.0.24
 Requires-Dist: keyring>=25.4.1
-Requires-Dist: mcp==1.9.1
-Requires-Dist: toon-python==0.1.2
 Requires-Dist: requests>=2.18.4
 Requires-Dist: requests_toolbelt>=1.0.0
 Requires-Dist: semver>=2.7.9
@@ -58,7 +55,7 @@ Dynamic: summary
 [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/badges/version/cloudsmith/cli/python/cloudsmith-cli/latest/xf=bdist_wheel;xn=cloudsmith-cli;xv=py2.py3/?render=true)](https://cloudsmith.io/~cloudsmith/repos/cli/packages/detail/python/cloudsmith-cli/latest/xf=bdist_wheel;xn=cloudsmith-cli;xv=py2.py3/)
 [![Python Versions](https://img.shields.io/pypi/pyversions/cloudsmith-cli.svg)](https://pypi.python.org/pypi/cloudsmith-cli)
 [![PyPI Version](https://img.shields.io/pypi/v/cloudsmith-cli.svg)](https://pypi.python.org/pypi/cloudsmith-cli)
-[![CircleCI](https://circleci.com/gh/cloudsmith-io/cloudsmith-cli.svg?style=svg)](https://circleci.com/gh/cloudsmith-io/cloudsmith-cli)
+[![GitHub Actions](https://github.com/cloudsmith-io/cloudsmith-cli/actions/workflows/test.yml/badge.svg)](https://github.com/cloudsmith-io/cloudsmith-cli/actions/workflows/test.yml)
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/ambv/black)
 
 

{cloudsmith_cli-1.11.0 → cloudsmith_cli-1.12.0}/cloudsmith_cli.egg-info/SOURCES.txt

@@ -36,7 +36,6 @@ cloudsmith_cli/cli/commands/help_.py
 cloudsmith_cli/cli/commands/list_.py
 cloudsmith_cli/cli/commands/login.py
 cloudsmith_cli/cli/commands/main.py
-cloudsmith_cli/cli/commands/mcp.py
 cloudsmith_cli/cli/commands/move.py
 cloudsmith_cli/cli/commands/push.py
 cloudsmith_cli/cli/commands/quarantine.py
@@ -72,7 +71,6 @@ cloudsmith_cli/cli/tests/commands/test_download.py
 cloudsmith_cli/cli/tests/commands/test_entitlements.py
 cloudsmith_cli/cli/tests/commands/test_login.py
 cloudsmith_cli/cli/tests/commands/test_main.py
-cloudsmith_cli/cli/tests/commands/test_mcp.py
 cloudsmith_cli/cli/tests/commands/test_package_commands.py
 cloudsmith_cli/cli/tests/commands/test_repos.py
 cloudsmith_cli/cli/tests/commands/test_tokens.py
@@ -106,9 +104,6 @@ cloudsmith_cli/core/api/status.py
 cloudsmith_cli/core/api/upstreams.py
 cloudsmith_cli/core/api/user.py
 cloudsmith_cli/core/api/version.py
-cloudsmith_cli/core/mcp/__init__.py
-cloudsmith_cli/core/mcp/data.py
-cloudsmith_cli/core/mcp/server.py
 cloudsmith_cli/core/tests/__init__.py
 cloudsmith_cli/core/tests/test_download.py
 cloudsmith_cli/core/tests/test_init.py

{cloudsmith_cli-1.11.0 → cloudsmith_cli-1.12.0}/cloudsmith_cli.egg-info/requires.txt

@@ -2,10 +2,8 @@ click!=8.3.0,>=8.1.8
 click-configfile>=0.2.3
 click-didyoumean>=0.0.3
 click-spinner>=0.1.7
-cloudsmith-api<3.0,>=2.0.22
+cloudsmith-api<3.0,>=2.0.24
 keyring>=25.4.1
-mcp==1.9.1
-toon-python==0.1.2
 requests>=2.18.4
 requests_toolbelt>=1.0.0
 semver>=2.7.9

{cloudsmith_cli-1.11.0 → cloudsmith_cli-1.12.0}/setup.py

@@ -53,10 +53,8 @@ setup(
         "click-configfile>=0.2.3",
         "click-didyoumean>=0.0.3",
         "click-spinner>=0.1.7",
-        "cloudsmith-api>=2.0.22,<3.0",  # Compatible upto (but excluding) 3.0+
+        "cloudsmith-api>=2.0.24,<3.0",  # Compatible upto (but excluding) 3.0+
         "keyring>=25.4.1",
-        "mcp==1.9.1",
-        "toon-python==0.1.2",
         "requests>=2.18.4",
         "requests_toolbelt>=1.0.0",
         "semver>=2.7.9",
@@ -81,7 +79,6 @@ setup(
         "License :: OSI Approved :: Apache Software License",
         "Operating System :: POSIX :: Linux",
         "Programming Language :: Python",
-        "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",