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

{cloudsmith_cli-1.11.1/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.1
+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
@@ -24,14 +23,14 @@ Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Internet
 Classifier: Topic :: System :: Systems Administration
 Classifier: Topic :: Utilities
-Requires-Python: >=3.9.0
+Requires-Python: >=3.10.0
 Description-Content-Type: text/markdown
 License-File: LICENSE
 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: requests>=2.18.4
 Requires-Dist: requests_toolbelt>=1.0.0
@@ -56,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.1 → 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.1 → 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.1 → 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.1 → 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.1 → 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.1 → cloudsmith_cli-1.12.0}/cloudsmith_cli/cli/config.py

@@ -95,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:

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.1 → 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.1 → 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.1 → 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.1 → 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.1
+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
@@ -24,14 +23,14 @@ Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Internet
 Classifier: Topic :: System :: Systems Administration
 Classifier: Topic :: Utilities
-Requires-Python: >=3.9.0
+Requires-Python: >=3.10.0
 Description-Content-Type: text/markdown
 License-File: LICENSE
 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: requests>=2.18.4
 Requires-Dist: requests_toolbelt>=1.0.0
@@ -56,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.1 → cloudsmith_cli-1.12.0}/cloudsmith_cli.egg-info/requires.txt

@@ -2,7 +2,7 @@ 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
 requests>=2.18.4
 requests_toolbelt>=1.0.0

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

@@ -47,13 +47,13 @@ setup(
     include_package_data=True,
     zip_safe=False,
     platforms=["any"],
-    python_requires=">=3.9.0",
+    python_requires=">=3.10.0",
     install_requires=[
         "click>=8.1.8,!=8.3.0",
         "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",
         "requests>=2.18.4",
         "requests_toolbelt>=1.0.0",
@@ -79,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",

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

@@ -1,26 +0,0 @@
-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", ["-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.1/cloudsmith_cli/data/VERSION

@@ -1 +0,0 @@
-1.11.1