cloudsmith-cli 1.11.1__py2.py3-none-any.whl → 1.12.0__py2.py3-none-any.whl

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/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/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/cli/commands/upstream.py

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

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/cli/tests/commands/test_main.py

@@ -1,3 +1,5 @@
+import json
+
 import pytest
 
 from ....core.api.version import get_version as get_api_version
@@ -17,6 +19,32 @@ class TestMainCommand:
             "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`."""

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/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/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/data/VERSION

@@ -1 +1 @@
-1.11.1
+1.12.0

{cloudsmith_cli-1.11.1.dist-info → cloudsmith_cli-1.12.0.dist-info}/METADATA

@@ -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.dist-info → cloudsmith_cli-1.12.0.dist-info}/RECORD

@@ -2,7 +2,7 @@ cloudsmith_cli/__init__.py,sha256=os5rpSQxihzAz72UaZugFVGTE1MOaB2-ocgwVUStcRY,24
 cloudsmith_cli/__main__.py,sha256=sWZCxOvdsp_Op1y4A7cyFVo-5fgQ667grmiy8FKX-5w,219
 cloudsmith_cli/cli/__init__.py,sha256=GK3VaqGyKB8vkN501vzSah_cirIorR5qQpVMry5wv7Y,34
 cloudsmith_cli/cli/command.py,sha256=K374dd1eDLTdQyRdqHE7PSKqhh4PbcrDxoUDVr_s23U,4816
-cloudsmith_cli/cli/config.py,sha256=CuDlEQ7NHWP3kABeLrE_MZcPeCvwz5o58s8w9yRjv98,13131
+cloudsmith_cli/cli/config.py,sha256=qCVH03dVS58ISLSm9jKloOtixIslNP7ZbZhlkwipmpQ,13132
 cloudsmith_cli/cli/decorators.py,sha256=KMc9jv1jxc9nRMGIliDm6KUtdFKcPxiR1Q0rltA83t0,10885
 cloudsmith_cli/cli/exceptions.py,sha256=NjtRnF0cSzRIf6B2xuSxz3PdghGn0LPnnlsHUewA7Pc,6762
 cloudsmith_cli/cli/saml.py,sha256=VluL-oM4mReXi0ycdFUQJQisNKo9limAiIjSVzGRBnM,3202
@@ -23,7 +23,7 @@ cloudsmith_cli/cli/commands/entitlements.py,sha256=qDod53h3tWoAHpDa8qOzVpo7Nowwz
 cloudsmith_cli/cli/commands/help_.py,sha256=--_NwWZBZWfEnG6MzteaZO6u3IIlh3wufvGbh8JcSv4,226
 cloudsmith_cli/cli/commands/list_.py,sha256=GtlYAtMOlcmYQBzFG5NrZl4mQX0juN-3HLqZZkCNQNA,10039
 cloudsmith_cli/cli/commands/login.py,sha256=seIutJQhu4Gk7tLTGWiSVHs53eiLr_zydEfvuuWJUFo,3486
-cloudsmith_cli/cli/commands/main.py,sha256=3KRh_uwdBxKfBSZugQ9y7LbZb3D0EtiB6PmYFCqeDG4,1896
+cloudsmith_cli/cli/commands/main.py,sha256=GHT2mdzCfI1Rlh0JVu5Q3CrorHNSy57sSAUXhs0gZvw,2188
 cloudsmith_cli/cli/commands/move.py,sha256=7jGyWvYed-B_i522MRR1h3EVvx-Uy8zdgDKnYCFHkQQ,3120
 cloudsmith_cli/cli/commands/push.py,sha256=fH9uYJ4sOslvSOchBzd1yRjVPc0x07RGsPITOMQpqiw,22256
 cloudsmith_cli/cli/commands/quarantine.py,sha256=NNWoCk5njAvbTpsed0ElR2LEPWSfXwyWbeC7HCRqbf4,4593
@@ -32,12 +32,12 @@ cloudsmith_cli/cli/commands/resync.py,sha256=jELS9Ok1vltvuRlVhlr2EQENSYr6HnFJHbo
 cloudsmith_cli/cli/commands/status.py,sha256=cmzZTmzj67qyf4Cob_Cd1abxVpxHOHbTDH2RxvGQzUQ,2504
 cloudsmith_cli/cli/commands/tags.py,sha256=K7B_OYGnDfQbAMc_Rcj6Xx-rS4dNzUqJEhVwuVlZG-0,11668
 cloudsmith_cli/cli/commands/tokens.py,sha256=FLlQDF-qzFeBlnUIhoDwjNMUv03dbV-MZR8wFHiuw5k,8147
-cloudsmith_cli/cli/commands/upstream.py,sha256=UmWM6BKQC0H8Kk1w6oM_hVBB6xHnYqWZqpYGPuCLJbk,15863
+cloudsmith_cli/cli/commands/upstream.py,sha256=Rfh3bTAyo49SraKQr2PAnSLM7rqnAl4_ta69IgX7DZY,15878
 cloudsmith_cli/cli/commands/whoami.py,sha256=0rpXnXmii3viDSsmoXC__DsyY8X0mGi4Wxi_hKEjhTI,1680
 cloudsmith_cli/cli/commands/metrics/__init__.py,sha256=w-FjDvifPvTgf1nwGpTuhzk5mLkqmfvA9utrPqSUSdM,98
 cloudsmith_cli/cli/commands/metrics/command.py,sha256=-4ykfBJ8Ss6w8QoCqL0AZdhcF7ZmmahtvQ_5YTYif5c,510
-cloudsmith_cli/cli/commands/metrics/entitlements.py,sha256=OhxkKYrs1jaYDsJ-fIeB-enr04B9G9XWVrDKt25b2bk,4337
-cloudsmith_cli/cli/commands/metrics/packages.py,sha256=zv9T2_UxGiXkAtUYN-iIb0fTOhE4_9mSNsh4t5B-tPc,3912
+cloudsmith_cli/cli/commands/metrics/entitlements.py,sha256=RfME-Ovgu7-Pk3MOliq0y5fuq8obGrNOeE-4Ol5hPIY,4337
+cloudsmith_cli/cli/commands/metrics/packages.py,sha256=rEU_MfYhshQsp499LoBizxDkOJBuzOkxLrQk5EhfiBM,3912
 cloudsmith_cli/cli/commands/policy/__init__.py,sha256=vWUlqzuIZisbaLdQM4Gx7aCAM2RKPUIHEC5_XTRY-oY,157
 cloudsmith_cli/cli/commands/policy/command.py,sha256=crZQiXhT7w19h9Z8IFFhM3NyGCTHZ8tL4vpHR430fLo,527
 cloudsmith_cli/cli/commands/policy/deny.py,sha256=Nb2rTfropRiK5-zvsxLQsTjlr1HpJkhlqD5_jG17ogk,7703
@@ -58,9 +58,9 @@ cloudsmith_cli/cli/tests/commands/test_check.py,sha256=_CJaDQjhXnDQimzLkhBS8wL6V
 cloudsmith_cli/cli/tests/commands/test_download.py,sha256=VpD-T0GkqHzDZDGYwpN1tyCq6mgTkfdOmXQBfWdAm6E,12268
 cloudsmith_cli/cli/tests/commands/test_entitlements.py,sha256=Xd-sRdQPMccqlSiPBp7fGeyUCBuYGLCD-3zeVPD3Mxw,737
 cloudsmith_cli/cli/tests/commands/test_login.py,sha256=RlvPMaS2rTLah2dVF3Yt8gjG1HWEkD6zP_exzUvc1U0,1309
-cloudsmith_cli/cli/tests/commands/test_main.py,sha256=JmtJQ455OcqqEi0ostP8nMs0S4oXs4dkEFzPCGliqg8,947
+cloudsmith_cli/cli/tests/commands/test_main.py,sha256=HxSDfsbYU7Tmk_sGE2yuc_7hNrDQhR-f2TgA7Ez3O68,2260
 cloudsmith_cli/cli/tests/commands/test_package_commands.py,sha256=vpp8TN4cbATxPEPY5GSEvHzZxdp-BaxHmcxflz-Bp6o,5943
-cloudsmith_cli/cli/tests/commands/test_repos.py,sha256=z0SsWzeBJ8K-y0fYjXvP9vnE-hfBFllql-5RiAYy7Ks,6738
+cloudsmith_cli/cli/tests/commands/test_repos.py,sha256=xA8tiZon1i6JnNOsPZO96K0wpFuTStOR4sMegGEKG_s,6738
 cloudsmith_cli/cli/tests/commands/test_tokens.py,sha256=BnTBS5ChIvgb9-HSkxOdzVIo81C6QA8xhJ7vGposow8,4931
 cloudsmith_cli/cli/tests/commands/test_upstream.py,sha256=AxlcRSf_ZAGBXbAu8t9LHoftTwFstSzyKN5rAEo0VoA,5435
 cloudsmith_cli/cli/tests/commands/policy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -72,7 +72,7 @@ cloudsmith_cli/core/config.py,sha256=eFA92QQBhccF0SdRtBwG7nrFuU2AK_yWzA9e0TUcNfE
 cloudsmith_cli/core/download.py,sha256=WFlTpyAR_L6Z5GXBaiA3QZ4ABLO2GS42rduSBn2JcUg,15153
 cloudsmith_cli/core/keyring.py,sha256=v57SoE-5TaHsaMw7oCwM7ZuOVGPK1vAA2YsmWK35UAM,2310
 cloudsmith_cli/core/pagination.py,sha256=acJgAumVoe-ef-Ie5m55z0VOn_xZagcHwSYsDLLbhtw,4553
-cloudsmith_cli/core/ratelimits.py,sha256=nJkLQNT5CBIk_Jy3mWH5trIaQyj8x6SEo95BwKUxNuw,2534
+cloudsmith_cli/core/ratelimits.py,sha256=5FfMO9tRFDmsPXtotJ-qftNK1qCwUXZs0j5T354TadQ,2535
 cloudsmith_cli/core/rest.py,sha256=T9SjVwly2I0IzTwBTUtj5c-Yc6I2nnsmUQpuztsuVnw,8061
 cloudsmith_cli/core/utils.py,sha256=L3fUMKX-8XtNlXK51EOLfF4wGq45uoQMY74ZGedNu4A,2213
 cloudsmith_cli/core/version.py,sha256=DB62XmdfzQ23EpsdcTMqSA4fCBVV2r7eRhloMqxr4KM,488
@@ -94,19 +94,19 @@ cloudsmith_cli/core/api/user.py,sha256=wZCHInqTx0TQv2_uteMFHSByn3QP5gWU-4DXtFgI7
 cloudsmith_cli/core/api/version.py,sha256=zgmmTSfD3TDX_QHhuU4GyqaZvrSzpqhwTbuBfrlUYj8,342
 cloudsmith_cli/core/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloudsmith_cli/core/tests/test_download.py,sha256=hGVVMf6IO4UCWwkTPc2JROedQXhzphs5OD0lDhM7SXo,15784
-cloudsmith_cli/core/tests/test_init.py,sha256=CDdCI-ko09I3ltBeFNACGrfNFDNT8zhXUE9J9jYbBbg,7183
+cloudsmith_cli/core/tests/test_init.py,sha256=UMYCD22-lezdMZpq30bXbvJilhzhq9EdagH8OQPkwS4,7184
 cloudsmith_cli/core/tests/test_keyring.py,sha256=cLmZjhj21gm2fdi-l95yOxQPWuq_XVVNeY3s9QSNvYc,7076
 cloudsmith_cli/core/tests/test_rest.py,sha256=SXOZfz_YLrxtuE8I07MUWVUYxyz79VHfpYzc18QQM4s,2563
 cloudsmith_cli/core/tests/test_version.py,sha256=k9QAjOKJ7Q5mfGSahRvtpPN0XDaGOhbbpHngqAIuM34,552
-cloudsmith_cli/data/VERSION,sha256=T5QW1lC9KDQyRLho3-vbEecNezJCNTbLh7jDH95i-ZM,7
+cloudsmith_cli/data/VERSION,sha256=yS32vd4zC-IZ1i9I7GSQsBiJQ28vWQJ6qyAOdN5hkWg,7
 cloudsmith_cli/data/config.ini,sha256=nD39yE9-GyKSxJ5Us5V_bRjAsdhDbD5HnwRNDKeMfR4,737
 cloudsmith_cli/data/credentials.ini,sha256=UTgXGXigPdlWUQxhQnalSJ18cLswQv6l26y7ZlYstCU,500
 cloudsmith_cli/templates/__init__.py,sha256=00xHj3iW0vXmI5rzjbryJllE1VHhg6Dxf7uqo9dIyvo,53
 cloudsmith_cli/templates/auth_error.html,sha256=qBdZ0TE88IFaVk0NIpSPZudDDf0PxAJnnqAyPz5KODo,1290
 cloudsmith_cli/templates/auth_success.html,sha256=UA629tjTJmIQ_y9eJ-a5Wfp0ilo8cgSsUqjHiCzEhq0,1056
-cloudsmith_cli-1.11.1.dist-info/licenses/LICENSE,sha256=eEz1wEWbBZFlc_n_P_55i4CCYgWgHYVJpQjnc6qbXOQ,11344
-cloudsmith_cli-1.11.1.dist-info/METADATA,sha256=iYTAPfy1wu3vKqC6lCj_EkP3xTB3MJ8eTe7US7qQAak,15810
-cloudsmith_cli-1.11.1.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
-cloudsmith_cli-1.11.1.dist-info/entry_points.txt,sha256=lQfpZ8eDB4ye9iK_TRpGnABwkcUgKIS-sGlCjbI1j9s,69
-cloudsmith_cli-1.11.1.dist-info/top_level.txt,sha256=9P2AQ4lqblgMVHk2VHuvZKH92H0o19w-qhr_x-5ifIQ,15
-cloudsmith_cli-1.11.1.dist-info/RECORD,,
+cloudsmith_cli-1.12.0.dist-info/licenses/LICENSE,sha256=eEz1wEWbBZFlc_n_P_55i4CCYgWgHYVJpQjnc6qbXOQ,11344
+cloudsmith_cli-1.12.0.dist-info/METADATA,sha256=x7yY9aMim3LWaYEk3rWpiGjb2eWZod7InaETozfrbc4,15807
+cloudsmith_cli-1.12.0.dist-info/WHEEL,sha256=AeO2BvogYWm3eGaHCvhzmUYt8ia7KfURiHzO_1atlys,109
+cloudsmith_cli-1.12.0.dist-info/entry_points.txt,sha256=lQfpZ8eDB4ye9iK_TRpGnABwkcUgKIS-sGlCjbI1j9s,69
+cloudsmith_cli-1.12.0.dist-info/top_level.txt,sha256=9P2AQ4lqblgMVHk2VHuvZKH92H0o19w-qhr_x-5ifIQ,15
+cloudsmith_cli-1.12.0.dist-info/RECORD,,

{cloudsmith_cli-1.11.1.dist-info → cloudsmith_cli-1.12.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (79.0.1)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any