cloudsmith-cli 1.9.2__py2.py3-none-any.whl → 1.9.4__py2.py3-none-any.whl

cloudsmith_cli/cli/commands/dependencies.py

@@ -42,7 +42,7 @@ def list_dependencies(ctx, opts, owner_repo_package):
     for the package format yet.
 
     - OWNER/REPO/PACKAGE: Specify the OWNER namespace (i.e. user or org), the
-    REPO name where the package is stored, and the PACKAGE name (identifier) of the
+    REPO name where the package is stored, and the PACKAGE name (identifier/slug) of the
     package itself. All separated by a slash.
 
     Example: 'your-org/awesome-repo/better-pkg'.

cloudsmith_cli/cli/commands/list_.py

@@ -7,6 +7,7 @@ import click
 
 from ...core.api.distros import list_distros
 from ...core.api.packages import get_package_format_names_with_distros, list_packages
+from ...core.pagination import paginate_results
 from .. import command, decorators, utils, validators
 from ..exceptions import handle_api_exceptions
 from ..utils import maybe_spinner
@@ -156,7 +157,7 @@ def entitlements_(*args, **kwargs):  # pylint: disable=missing-docstring
     help=("Sort packages by field. Prefix with '-' for descending order."),
 )
 @click.pass_context
-def packages(ctx, opts, owner_repo, page, page_size, query, sort):
+def packages(ctx, opts, owner_repo, page, page_size, query, sort, show_all):
     """
     List packages for a repository.
 
@@ -217,11 +218,13 @@ def packages(ctx, opts, owner_repo, page, page_size, query, sort):
     context_msg = "Failed to get list of packages!"
     with handle_api_exceptions(ctx, opts=opts, context_msg=context_msg):
         with maybe_spinner(opts):
-            packages_, page_info = list_packages(
-                owner=owner,
-                repo=repo,
+            packages_, page_info = paginate_results(
+                list_packages,
+                show_all=show_all,
                 page=page,
                 page_size=page_size,
+                owner=owner,
+                repo=repo,
                 query=query,
                 sort=sort,
             )
@@ -256,9 +259,12 @@ def packages(ctx, opts, owner_repo, page, page_size, query, sort):
     click.echo()
 
     num_results = len(packages_)
-    list_suffix = "package%s visible" % ("s" if num_results != 1 else "")
+    list_suffix = "package%s" % ("s" if num_results != 1 else "")
     utils.pretty_print_list_info(
-        num_results=num_results, page_info=page_info, suffix=list_suffix
+        num_results=num_results,
+        page_info=None if show_all else page_info,
+        suffix=f"{list_suffix} retrieved" if show_all else f"{list_suffix} visible",
+        show_all=show_all,
     )
 
 
@@ -276,7 +282,7 @@ def packages(ctx, opts, owner_repo, page, page_size, query, sort):
     required=False,
 )
 @click.pass_context
-def repos(ctx, opts, owner_repo, page, page_size):
+def repos(ctx, opts, owner_repo, page, page_size, show_all):
     """
     List repositories for a namespace (owner).
 

cloudsmith_cli/cli/commands/policy/license.py

@@ -5,6 +5,7 @@ import json
 import click
 
 from ....core.api import orgs as api
+from ....core.pagination import paginate_results
 from ... import command, decorators, utils, validators
 from ...exceptions import handle_api_exceptions
 from ...utils import (
@@ -19,7 +20,6 @@ from .command import policy
 
 def print_license_policies(policies):
     """Print license policies as a table or output in another format."""
-
     headers = [
         "Name",
         "Description",
@@ -57,10 +57,6 @@ def print_license_policies(policies):
     utils.pretty_print_table(headers, rows)
     click.echo()
 
-    num_results = len(rows)
-    list_suffix = "license polic%s" % ("y" if num_results == 1 else "ies")
-    utils.pretty_print_list_info(num_results=num_results, suffix=list_suffix)
-
 
 @policy.group(cls=command.AliasGroup, name="license", aliases=[])
 @decorators.common_cli_config_options
@@ -86,7 +82,7 @@ def licence(*args, **kwargs):
     "owner", metavar="OWNER", callback=validators.validate_owner, required=True
 )
 @click.pass_context
-def ls(ctx, opts, owner, page, page_size):
+def ls(ctx, opts, owner, page, page_size, show_all):
     """
     List license policies.
 
@@ -111,8 +107,8 @@ def ls(ctx, opts, owner, page, page_size):
     context_msg = "Failed to get license policies!"
     with handle_api_exceptions(ctx, opts=opts, context_msg=context_msg):
         with maybe_spinner(opts):
-            policies, page_info = api.list_license_policies(
-                owner=owner, page=page, page_size=page_size
+            policies, page_info = paginate_results(
+                api.list_license_policies, show_all, page, page_size, owner=owner
             )
 
     click.secho("OK", fg="green", err=use_stderr)
@@ -122,6 +118,17 @@ def ls(ctx, opts, owner, page, page_size):
 
     print_license_policies(policies)
 
+    click.echo()
+
+    num_results = len(policies)
+    list_suffix = "license polic%s" % ("y" if num_results == 1 else "ies")
+    utils.pretty_print_list_info(
+        num_results=num_results,
+        page_info=None if show_all else page_info,
+        suffix=list_suffix,
+        show_all=show_all,
+    )
+
 
 @licence.command(aliases=["new"])
 @decorators.common_cli_config_options

cloudsmith_cli/cli/commands/policy/vulnerability.py

@@ -5,6 +5,7 @@ import json
 import click
 
 from ....core.api import orgs as api
+from ....core.pagination import paginate_results
 from ... import command, decorators, utils, validators
 from ...exceptions import handle_api_exceptions
 from ...utils import fmt_bool, fmt_datetime, maybe_spinner, maybe_truncate_string
@@ -46,10 +47,6 @@ def print_vulnerability_policies(policies):
     utils.pretty_print_table(headers, rows, title="Vulnerability Policies")
     click.echo()
 
-    num_results = len(rows)
-    list_suffix = "vulnerability polic%s" % ("y" if num_results == 1 else "ies")
-    utils.pretty_print_list_info(num_results=num_results, suffix=list_suffix)
-
 
 @policy.group(cls=command.AliasGroup, name="vulnerability", aliases=[])
 @decorators.common_cli_config_options
@@ -75,7 +72,7 @@ def vulnerability(*args, **kwargs):
     "owner", metavar="OWNER", callback=validators.validate_owner, required=True
 )
 @click.pass_context
-def ls(ctx, opts, owner, page, page_size):
+def ls(ctx, opts, owner, page, page_size, show_all):
     """
     List vulnerability policies.
 
@@ -100,8 +97,8 @@ def ls(ctx, opts, owner, page, page_size):
     context_msg = "Failed to get package vulnerability policies!"
     with handle_api_exceptions(ctx, opts=opts, context_msg=context_msg):
         with maybe_spinner(opts):
-            policies, page_info = api.list_vulnerability_policies(
-                owner=owner, page=page, page_size=page_size
+            policies, page_info = paginate_results(
+                api.list_vulnerability_policies, show_all, page, page_size, owner=owner
             )
 
     click.secho("OK", fg="green", err=use_stderr)
@@ -111,6 +108,17 @@ def ls(ctx, opts, owner, page, page_size):
 
     print_vulnerability_policies(policies)
 
+    click.echo()
+
+    num_results = len(policies)
+    list_suffix = "vulnerability polic%s" % ("y" if num_results == 1 else "ies")
+    utils.pretty_print_list_info(
+        num_results=num_results,
+        page_info=None if show_all else page_info,
+        suffix=list_suffix,
+        show_all=show_all,
+    )
+
 
 @vulnerability.command(aliases=["new"])
 @decorators.common_cli_config_options

cloudsmith_cli/cli/commands/repos.py

@@ -6,13 +6,14 @@ from operator import itemgetter
 import click
 
 from ...core.api import repos as api
+from ...core.pagination import paginate_results
 from .. import command, decorators, utils, validators
 from ..exceptions import handle_api_exceptions
 from ..utils import maybe_spinner
 from .main import main
 
 
-def print_repositories(opts, data, page_info=None, show_list_info=True):
+def print_repositories(opts, data, page_info=None, show_list_info=True, show_all=False):
     """Print repositories as a table or output in another format."""
     headers = [
         "Name",
@@ -48,10 +49,16 @@ def print_repositories(opts, data, page_info=None, show_list_info=True):
 
     click.echo()
 
+    if not show_list_info:
+        return
+
     num_results = len(data)
-    list_suffix = "repositor%s visible" % ("ies" if num_results != 1 else "y")
+    list_suffix = "repositor%s" % ("ies" if num_results != 1 else "y")
     utils.pretty_print_list_info(
-        num_results=num_results, page_info=page_info, suffix=list_suffix
+        num_results=num_results,
+        page_info=None if show_all else page_info,
+        suffix=f"{list_suffix} retrieved" if show_all else f"{list_suffix} visible",
+        show_all=show_all,
     )
 
 
@@ -83,7 +90,7 @@ def repositories(ctx, opts):  # pylink: disable=unused-argument
     required=False,
 )
 @click.pass_context
-def get(ctx, opts, owner_repo, page, page_size):
+def get(ctx, opts, owner_repo, page, page_size, show_all):
     """
     List repositories for a namespace (owner).
 
@@ -96,30 +103,34 @@ def get(ctx, opts, owner_repo, page, page_size):
     If OWNER isn't specified it'll default to the currently authenticated user
     (if any). If you're unauthenticated, no results will be returned.
     """
-    # Use stderr for messages if the output is something else (e.g.  # JSON)
+    # Use stderr for messages if the output is something else (e.g. JSON)
     use_stderr = opts.output != "pretty"
 
-    click.echo("Getting list of repositories ... ", nl=False, err=use_stderr)
-
     if isinstance(owner_repo, list):
         if len(owner_repo) == 1:
             owner = owner_repo[0]
             repo = None
         else:
             owner, repo = owner_repo
-    if isinstance(owner_repo, str):
+    elif isinstance(owner_repo, str):
+        repo = None
+        owner = owner_repo or None
+    else:
+        owner = None
         repo = None
 
-        if owner_repo:
-            owner = owner_repo
-        else:
-            owner = None
+    if show_all and repo:
+        raise click.UsageError(
+            "The --show-all option cannot be used when specifying a single repository (OWNER/REPO). Omit the repository slug or remove --show-all."
+        )
+
+    click.echo("Getting list of repositories ... ", nl=False, err=use_stderr)
 
     context_msg = "Failed to get list of repositories!"
     with handle_api_exceptions(ctx, opts=opts, context_msg=context_msg):
         with maybe_spinner(opts):
-            repos_, page_info = api.list_repos(
-                owner=owner, repo=repo, page=page, page_size=page_size
+            repos_, page_info = paginate_results(
+                api.list_repos, show_all, page, page_size, owner=owner, repo=repo
             )
 
     click.secho("OK", fg="green", err=use_stderr)
@@ -128,7 +139,11 @@ def get(ctx, opts, owner_repo, page, page_size):
         return
 
     print_repositories(
-        opts=opts, data=repos_, show_list_info=False, page_info=page_info
+        opts=opts,
+        data=repos_,
+        show_list_info=True,
+        page_info=page_info,
+        show_all=show_all,
     )
 
 
@@ -192,7 +207,10 @@ def create(ctx, opts, owner, repo_config_file):
 
     click.secho("OK", fg="green", err=use_stderr)
 
-    print_repositories(opts=opts, data=[repository], show_list_info=False)
+    if utils.maybe_print_as_json(opts, [repository]):
+        return
+
+    print_repositories(opts=opts, data=[repository], show_list_info=True)
 
 
 @repositories.command()
@@ -252,7 +270,10 @@ def update(ctx, opts, owner_repo, repo_config_file):
 
     click.secho("OK", fg="green", err=use_stderr)
 
-    print_repositories(opts=opts, data=[repository], show_list_info=False)
+    if utils.maybe_print_as_json(opts, [repository]):
+        return
+
+    print_repositories(opts=opts, data=[repository], show_list_info=True)
 
 
 @repositories.command(aliases=["rm"])

cloudsmith_cli/cli/commands/upstream.py

@@ -5,6 +5,7 @@ import json
 import click
 
 from ...core.api import upstreams as api
+from ...core.pagination import paginate_results
 from .. import command, decorators, utils, validators
 from ..exceptions import handle_api_exceptions
 from ..utils import (
@@ -37,7 +38,7 @@ UPSTREAM_FORMATS = [
 ]
 
 
-def print_upstreams(upstreams, upstream_fmt):
+def print_upstreams(upstreams, upstream_fmt, page_info=None, show_all=False):
     """Print upstreams as a table or output in another format."""
 
     def build_row(u):
@@ -115,9 +116,14 @@ def print_upstreams(upstreams, upstream_fmt):
     utils.pretty_print_table(headers, rows)
     click.echo()
 
-    num_results = len(rows)
+    num_results = len(upstreams)
     list_suffix = "upstream%s" % ("" if num_results == 1 else "s")
-    utils.pretty_print_list_info(num_results=num_results, suffix=list_suffix)
+    utils.pretty_print_list_info(
+        num_results=num_results,
+        page_info=None if show_all else page_info,
+        suffix=list_suffix,
+        show_all=show_all,
+    )
 
 
 @main.group(cls=command.AliasGroup, name="upstream", aliases=[])
@@ -164,7 +170,7 @@ def build_upstream_list_command(upstream_fmt):
         "owner_repo", metavar="OWNER/REPO", callback=validators.validate_owner_repo
     )
     @click.pass_context
-    def func(ctx, opts, owner_repo, page, page_size):
+    def func(ctx, opts, owner_repo, page, page_size, show_all):
         owner, repo = owner_repo
 
         # Use stderr for messages if the output is something else (e.g.  # JSON)
@@ -176,12 +182,14 @@ def build_upstream_list_command(upstream_fmt):
         context_msg = "Failed to get upstreams!"
         with handle_api_exceptions(ctx, opts=opts, context_msg=context_msg):
             with maybe_spinner(opts):
-                upstreams, page_info = api.list_upstreams(
+                upstreams, page_info = paginate_results(
+                    api.list_upstreams,
+                    show_all,
+                    page,
+                    page_size,
                     owner=owner,
                     repo=repo,
                     upstream_format=upstream_fmt,
-                    page=page,
-                    page_size=page_size,
                 )
 
         if not use_stderr:
@@ -190,7 +198,7 @@ def build_upstream_list_command(upstream_fmt):
         if utils.maybe_print_as_json(opts, upstreams, page_info):
             return
 
-        print_upstreams(upstreams, upstream_fmt)
+        print_upstreams(upstreams, upstream_fmt, page_info, show_all)
 
     func.__doc__ = f"""
         List {upstream_fmt} upstreams for a repository.

cloudsmith_cli/cli/decorators.py

@@ -4,8 +4,10 @@ import functools
 
 import click
 
+from cloudsmith_cli.cli import validators
+
 from ..core.api.init import initialise_api as _initialise_api
-from . import config, utils, validators
+from . import config, utils
 
 
 def report_retry(seconds, context=None):
@@ -144,6 +146,14 @@ def common_cli_output_options(f):
 def common_cli_list_options(f):
     """Add common list options to commands."""
 
+    @click.option(
+        "-l",
+        "--page-size",
+        default=30,
+        type=int,
+        help="The amount of items to view per page for lists.",
+        callback=validators.validate_page_size,
+    )
     @click.option(
         "-p",
         "--page",
@@ -153,18 +163,20 @@ def common_cli_list_options(f):
         callback=validators.validate_page,
     )
     @click.option(
-        "-l",
-        "--page-size",
-        default=30,
-        type=int,
-        help="The amount of items to view per page for lists.",
-        callback=validators.validate_page_size,
-    )
+        "--show-all",
+        default=False,
+        is_flag=True,
+        help="Show all results. Cannot be used with --page (-p) or --page-size (-l).",
+    )  # Validation performed post-parse for order-independence.
     @click.pass_context
     @functools.wraps(f)
     def wrapper(ctx, *args, **kwargs):
         # pylint: disable=missing-docstring
         opts = config.get_or_create_options(ctx)
+        # Order-independent validation: perform after all options parsed.
+        show_all = kwargs.get("show_all")
+        if show_all:
+            validators.enforce_show_all_exclusive(ctx)
         kwargs["opts"] = opts
         return ctx.invoke(f, *args, **kwargs)
 

cloudsmith_cli/cli/tests/commands/policy/test_licence.py

@@ -125,6 +125,22 @@ def test_license_policy_commands(runner, organization, tmp_path):
     assert "Getting license policies ... OK" in result.output
     assert_output_matches_policy_config(result.output, policy_config_file_path)
 
+    # Minimal show-all success
+    result = runner.invoke(
+        ls, args=[organization, "--show-all"], catch_exceptions=False
+    )
+    assert result.exit_code == 0
+    assert "Getting license policies" in result.output
+    assert "Invalid value for '--show-all'" not in result.output
+
+    # Conflict: show-all with explicit page
+    conflict = runner.invoke(
+        ls, args=[organization, "--page", "1", "--show-all"], catch_exceptions=False
+    )
+    assert conflict.exit_code != 0
+    assert "Invalid value for '--show-all'" in conflict.output
+    assert "Cannot be used with --page (-p) or --page-size (-l)." in conflict.output
+
     # Change the values in the config file
     policy_config_file_path = create_license_policy_config_file(
         directory=tmp_path,

cloudsmith_cli/cli/tests/commands/policy/test_vulnerability.py

@@ -127,6 +127,24 @@ def test_vulnerability_policy_commands(runner, organization, tmp_path):
     assert "Getting vulnerability policies ... OK" in result.output
     assert_output_matches_policy_config(result.output, policy_config_file_path)
 
+    # Minimal show-all success (no pagination args besides flag)
+    result = runner.invoke(
+        ls, args=[organization, "--show-all"], catch_exceptions=False
+    )
+    assert result.exit_code == 0
+    assert "Getting vulnerability policies" in result.output
+    assert "Invalid value for '--show-all'" not in result.output
+
+    # Conflict: show-all with explicit page
+    conflict = runner.invoke(
+        ls,
+        args=[organization, "--show-all", "--page-size", "2"],
+        catch_exceptions=False,
+    )
+    assert conflict.exit_code != 0
+    assert "Invalid value for '--show-all'" in conflict.output
+    assert "Cannot be used with --page (-p) or --page-size (-l)." in conflict.output
+
     # Change the values in the config file
     policy_config_file_path = create_vulnerability_policy_config_file(
         directory=tmp_path,

cloudsmith_cli/cli/tests/commands/test_package_commands.py

@@ -50,6 +50,13 @@ def test_push_and_delete_raw_package(
     small_file_data = data[0]
     assert small_file_data["filename"] == pkg_file.name
 
+    # List packages with --show-all flag
+    result = runner.invoke(
+        list_, args=["pkgs", org_repo, "--show-all"], catch_exceptions=False
+    )
+    assert "Getting list of packages ... OK" in result.output
+    assert "Results: 1 package retrieved" in result.output
+
     # Wait for the package to sync.
     org_repo_package = f"{org_repo}/{small_file_data['slug']}"
     for _ in range(10):

cloudsmith_cli/cli/tests/commands/test_repos.py

@@ -2,6 +2,7 @@ import json
 
 import pytest
 
+from ...commands.list_ import repos as list_repos
 from ...commands.repos import create, delete, get, update
 from ..utils import random_str
 
@@ -119,6 +120,21 @@ def test_repos_commands(runner, organization, tmp_path):
         result.output, organization, repo_config_file_path
     )
 
+    # Demonstrate list repos with --show-all succeeds (no pagination args).
+    result = runner.invoke(
+        list_repos, [organization, "--show-all"], catch_exceptions=False
+    )
+    assert result.exit_code == 0
+    assert "Getting list of repositories ... OK" in result.output
+
+    # Show that --show-all with an explicit page conflicts.
+    conflict = runner.invoke(
+        list_repos, [organization, "--show-all", "--page", "2"], catch_exceptions=False
+    )
+    assert conflict.exit_code != 0
+    assert "Invalid value for '--show-all'" in conflict.output
+    assert "Cannot be used with --page (-p) or --page-size (-l)." in conflict.output
+
     # Change the repository description in the repo config file.
     repository_description = random_str()
     repo_config_file_path = create_repo_config_file(
@@ -134,6 +150,14 @@ def test_repos_commands(runner, organization, tmp_path):
         update, [owner_slash_repo, str(repo_config_file_path)], catch_exceptions=False
     )
     assert result.exit_code == 0
+    assert (
+        "Updating "
+        + repository_slug
+        + " repository in the "
+        + organization
+        + " namespace ...OK"
+        in result.output
+    )
     assert "Results: 1 repository visible" in result.output
     assert_output_is_equal_to_repo_config(
         result.output, organization, repo_config_file_path

cloudsmith_cli/cli/tests/commands/test_upstream.py

@@ -71,6 +71,36 @@ def test_upstream_commands(
     assert result_data["name"] == upstream_config["name"]
     assert result_data["upstream_url"] == upstream_config["upstream_url"]
 
+    # Minimal show-all success (no pagination args besides flag)
+    show_all = runner.invoke(
+        upstream,
+        args=[upstream_format, "ls", org_repo, "--show-all", "-F", "json"],
+        catch_exceptions=False,
+    )
+    assert show_all.exit_code == 0
+    show_all_data = json.loads(show_all.output)["data"]
+    assert len(show_all_data) == 1  # Should return the same single upstream
+    assert "Invalid value for '--show-all'" not in show_all.output
+
+    # Conflict: show-all with explicit page number
+    conflict = runner.invoke(
+        upstream,
+        args=[
+            upstream_format,
+            "ls",
+            org_repo,
+            "--show-all",
+            "--page",
+            "1",
+            "-F",
+            "json",
+        ],
+        catch_exceptions=False,
+    )
+    assert conflict.exit_code != 0
+    assert "Invalid value for '--show-all'" in conflict.output
+    assert "Cannot be used with --page (-p) or --page-size (-l)." in conflict.output
+
     slug_perm = result_data["slug_perm"]
     assert slug_perm
     org_repo_slug_perm = f"{org_repo}/{slug_perm}"

cloudsmith_cli/cli/utils.py

@@ -19,32 +19,38 @@ def make_user_agent(prefix=None):
     return f"cloudsmith-cli/{prefix} cli:{get_cli_version()} api:{get_api_version()}"
 
 
-def pretty_print_list_info(num_results, page_info=None, suffix=None):
-    """Pretty print list info, with pagination, for user display."""
-    num_results_fg = "green" if num_results else "red"
-    num_results_text = click.style(str(num_results), fg=num_results_fg)
-
-    if page_info and page_info.is_valid:
-        page_range = page_info.calculate_range(num_results)
-        page_info_text = f"page: {click.style(str(page_info.page), bold=True)}/{click.style(str(page_info.page_total), bold=True)}, page size: {click.style(str(page_info.page_size), bold=True)}"
-        range_results_text = "%(from)s-%(to)s (%(num_results)s) of %(total)s" % {
-            "num_results": num_results_text,
-            "from": click.style(str(page_range[0]), fg=num_results_fg),
-            "to": click.style(str(page_range[1]), fg=num_results_fg),
-            "total": click.style(str(page_info.count), fg=num_results_fg),
-        }
+def pretty_print_list_info(num_results, page_info=None, suffix="", show_all=False):
+    """Print information about list results."""
+    if show_all:
+        click.echo(
+            "Results: %(num_results)d %(suffix)s"
+            % {
+                "num_results": num_results,
+                "suffix": suffix,
+            }
+        )
+    elif page_info and page_info.page is not None and page_info.page_size is not None:
+        start = (page_info.page - 1) * page_info.page_size + 1
+        end = min(start + num_results - 1, page_info.count or 0)
+        click.echo(
+            "Results: %(start)d-%(end)d (%(count)d) of %(total)d %(suffix)s "
+            "(page: %(page)d/%(pages)d, page size: %(page_size)d)"
+            % {
+                "start": start,
+                "end": end,
+                "count": num_results,
+                "total": page_info.count or 0,
+                "suffix": suffix,
+                "page": page_info.page,
+                "pages": page_info.page_total or 1,
+                "page_size": page_info.page_size,
+            }
+        )
     else:
-        page_info_text = ""
-        range_results_text = num_results_text
-
-    click.secho(
-        "Results: %(range_results)s %(suffix)s%(page_info)s"
-        % {
-            "range_results": range_results_text,
-            "page_info": " (%s)" % page_info_text if page_info_text else "",
-            "suffix": suffix or "item(s)",
-        }
-    )
+        click.echo(
+            "Results: %(num_results)d %(suffix)s"
+            % {"num_results": num_results, "suffix": suffix}
+        )
 
 
 def fmt_datetime(value):

cloudsmith_cli/cli/validators.py

@@ -4,6 +4,7 @@ import base64
 from datetime import datetime
 
 import click
+from click.core import ParameterSource
 
 from .types import ExpandPath
 
@@ -157,6 +158,40 @@ def validate_page_size(ctx, param, value):
     return value
 
 
+def enforce_show_all_exclusive(ctx):
+    """Order-independent mutual exclusivity check for pagination options.
+
+    Raises click.BadParameter bound to the --show-all option if it was used
+    together with explicit --page or --page-size. "Explicit" means supplied
+    via command line, environment variable, or prompt (Click ParameterSource).
+    """
+    show_all = ctx.params.get("show_all")
+    if not show_all:
+        return
+
+    explicit_sources = {
+        src
+        for src in (
+            ParameterSource.COMMANDLINE,
+            ParameterSource.ENVIRONMENT,
+            getattr(ParameterSource, "PROMPT", None),
+        )
+        if src is not None
+    }
+
+    page_explicit = ctx.get_parameter_source("page") in explicit_sources
+    size_explicit = ctx.get_parameter_source("page_size") in explicit_sources
+
+    if page_explicit or size_explicit:
+        show_all_param = next(
+            (p for p in ctx.command.params if p.name == "show_all"), None
+        )
+        raise click.BadParameter(
+            "Cannot be used with --page (-p) or --page-size (-l).",
+            param=show_all_param,
+        )
+
+
 def validate_optional_timestamp(ctx, param, value):
     """Ensure that a valid value for a timestamp is used."""
 

cloudsmith_cli/core/pagination.py

@@ -1,5 +1,9 @@
 """Core pagination utilities."""
 
+from typing import Any, Callable, List, Optional, Sequence, Tuple
+
+MAX_PAGE_SIZE = 1000
+
 
 class PageInfo:
     """Data for pagination results."""
@@ -73,3 +77,54 @@ class PageInfo:
             info.page_total = int(headers["X-Pagination-PageTotal"])
 
         return info
+
+
+def paginate_results(
+    api_function: Callable[..., Tuple[Sequence[Any], PageInfo]],
+    show_all: bool,
+    page: int,
+    page_size: int = MAX_PAGE_SIZE,
+    **kwargs: Any,
+) -> Tuple[List[Any], PageInfo]:
+    """Retrieve paginated results.
+
+    Behaviour:
+    - If ``show_all`` is False: perform a single paged request and return the
+      results plus the (possibly invalid) ``PageInfo``. Single-resource API
+      endpoints frequently omit pagination headers; we tolerate that here.
+    - If ``show_all`` is True: iterate all pages requesting ``MAX_PAGE_SIZE``.
+      Missing pagination headers during aggregation are treated as a user
+      misuse (e.g. attempting ``--show-all`` against a single-resource
+      endpoint) and raise a ``click.ClickException`` for consistent UX.
+
+    Raises:
+        click.ClickException: If pagination headers are absent while trying to
+            aggregate multiple pages with ``show_all``.
+    """
+    if not show_all:
+        results, page_info = api_function(page=page, page_size=page_size, **kwargs)
+        # For single resource endpoints (e.g. repos_read) pagination headers may be absent.
+        # In that case we return the results with potentially invalid page_info (empty when serialized)
+        # rather than raising. Downstream pretty printers handle an invalid page_info gracefully.
+        return list(results), page_info
+
+    all_results: List[Any] = []
+    current_page = 1
+    last_page_info: Optional[PageInfo] = None
+    while True:
+        page_results, last_page_info = api_function(
+            page=current_page, page_size=MAX_PAGE_SIZE, **kwargs
+        )
+        if not last_page_info.is_valid:
+            # No pagination headers (single-resource endpoint). Treat as single page.
+            # Return accumulated results without raising; command-level validators
+            # handle misuse of --show-all with single-resource endpoints.
+            all_results.extend(page_results)
+            return all_results, last_page_info
+        all_results.extend(page_results)
+
+        if current_page >= last_page_info.page_total:
+            break
+        current_page += 1
+
+    return all_results, last_page_info

cloudsmith_cli/data/VERSION

@@ -1 +1 @@
-1.9.2
+1.9.4

{cloudsmith_cli-1.9.2.dist-info → cloudsmith_cli-1.9.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudsmith-cli
-Version: 1.9.2
+Version: 1.9.4
 Summary: Cloudsmith Command-Line Interface (CLI)
 Home-page: https://github.com/cloudsmith-io/cloudsmith-cli
 Author: Cloudsmith Ltd

{cloudsmith_cli-1.9.2.dist-info → cloudsmith_cli-1.9.4.dist-info}/RECORD

@@ -3,36 +3,36 @@ cloudsmith_cli/__main__.py,sha256=sWZCxOvdsp_Op1y4A7cyFVo-5fgQ667grmiy8FKX-5w,21
 cloudsmith_cli/cli/__init__.py,sha256=GK3VaqGyKB8vkN501vzSah_cirIorR5qQpVMry5wv7Y,34
 cloudsmith_cli/cli/command.py,sha256=CeIb75Vvv8GfQH5aDPq7znSWir5A6J1ZsyAQgToZWa4,2806
 cloudsmith_cli/cli/config.py,sha256=CuDlEQ7NHWP3kABeLrE_MZcPeCvwz5o58s8w9yRjv98,13131
-cloudsmith_cli/cli/decorators.py,sha256=y0RVM-4fGFE8q98hbKQVONqCs1gFgOPp_6oGCpVKqLU,10026
+cloudsmith_cli/cli/decorators.py,sha256=XPVWrxKXDyV0cbJpd48fv69oTKbLo-UcXpcpClQmes0,10487
 cloudsmith_cli/cli/exceptions.py,sha256=OIDqBCOLutPxkG9VVx-Vhumj8pTxUdq1ITuWm1fcpP4,5382
 cloudsmith_cli/cli/saml.py,sha256=VluL-oM4mReXi0ycdFUQJQisNKo9limAiIjSVzGRBnM,3202
 cloudsmith_cli/cli/table.py,sha256=S03d5izcsz8keKYP3Ep1C4i3sEwYigjUUCSkBKPskHw,1530
 cloudsmith_cli/cli/types.py,sha256=89hPhNtUS1E6GnUxm_Lv_cj9OfNqI6G5s5gD-uRz1Dw,410
-cloudsmith_cli/cli/utils.py,sha256=aYeqovNZqNtYSrSrGRBs3hSyvZXvRTGxTtUQnHpZnxk,5861
-cloudsmith_cli/cli/validators.py,sha256=0x0zhnxo1GCLOp-A0Ys_QC0M1Sh-pMlAQWbIWHltHBM,7571
+cloudsmith_cli/cli/utils.py,sha256=P-N08IBpmPO4SvMCAqGkoNCfjzOrqimVlvLAxEso6vM,5813
+cloudsmith_cli/cli/validators.py,sha256=Ji6mygGSHxCrF9neo4PNzGnfXLXN9EUhNBEuTogE5xA,8732
 cloudsmith_cli/cli/webserver.py,sha256=okb3HgG4p83DW3qK3uWw6ph1hTBTLkaBeaBhCoAQEZw,8069
 cloudsmith_cli/cli/commands/__init__.py,sha256=vW6LrMnln5s0-fmsX-RVlcnUVl0ioSRaC8GP-fQAFsQ,352
 cloudsmith_cli/cli/commands/auth.py,sha256=mObKZWklR00aBwPfrTsDOecAS1IrpS9rty1V6rMi16k,2942
 cloudsmith_cli/cli/commands/check.py,sha256=greRcyhlNc6LWKh1SRjxJPiXa6X2GfMRynN9mNhRTfo,3704
 cloudsmith_cli/cli/commands/copy.py,sha256=kSQZZIW48fO6vS0hrve4wn0Pb0VvnllnI1MvW8Tvs8A,2525
 cloudsmith_cli/cli/commands/delete.py,sha256=8WGf8bKBidQu9HeAM3FrUFxXKouhNhjzlEN6IpRKTdg,1817
-cloudsmith_cli/cli/commands/dependencies.py,sha256=hwCVpJQak_AuLmtwvk1ZED-E8a0ZevnreG6RWG9UFy8,3409
+cloudsmith_cli/cli/commands/dependencies.py,sha256=1IFMlFysWwm-S2R4GaBAlLJZMdoVJWJcxgT58MZ2Qww,3414
 cloudsmith_cli/cli/commands/docs.py,sha256=dBdYuR9hI8oxZ4B1Ax6Cqt2QWUe0llUDFmKZqFndP0Q,376
 cloudsmith_cli/cli/commands/download.py,sha256=GHF3slyJK3PRqbiGXdCwSGN4TOmKF5r9JRhydZZ4uMw,12292
 cloudsmith_cli/cli/commands/entitlements.py,sha256=d636rO_u1nRvpw12zsoDL8sKZZbT7Qzd65Pby4W5Iuc,27173
 cloudsmith_cli/cli/commands/help_.py,sha256=--_NwWZBZWfEnG6MzteaZO6u3IIlh3wufvGbh8JcSv4,226
-cloudsmith_cli/cli/commands/list_.py,sha256=CS8SeJ53BSo3PZKS0qiNJ0Md5jICqvjt56gUEGwT7o8,9775
+cloudsmith_cli/cli/commands/list_.py,sha256=Rl8PKBFoJn2af9Y_kVWGoOW-R5gQU-fdx3NVCl7hoQE,10027
 cloudsmith_cli/cli/commands/login.py,sha256=i2a7kPsq1dUkY8ud6hTMFurV6bkYmxnDEJiXPD-_gXI,3101
 cloudsmith_cli/cli/commands/main.py,sha256=3KRh_uwdBxKfBSZugQ9y7LbZb3D0EtiB6PmYFCqeDG4,1896
 cloudsmith_cli/cli/commands/move.py,sha256=FqGZlGRKaK4SfVMhNEiW7xNOw0TEp9g0dj5fSU4tUjE,2850
 cloudsmith_cli/cli/commands/push.py,sha256=G0C_SEI8WHV2-Cpna0Bal7ISBYuPvq6DFXkSVDMJ8Xg,19157
 cloudsmith_cli/cli/commands/quarantine.py,sha256=i4ah9q7AsSJFlD-PKOguFOKlL4-v0WEPPWSAij2cujY,4485
-cloudsmith_cli/cli/commands/repos.py,sha256=YsBNVJOi3hy7a2_RPxTbHySD_zsyxgAxsfpMpeEFXyI,9284
+cloudsmith_cli/cli/commands/repos.py,sha256=UIZcoMbWgaoOqs857d4a3ozvdsXFW8zaDCYyk7owW5o,9926
 cloudsmith_cli/cli/commands/resync.py,sha256=D14N5PXsYF0_y6DX65kqHj2jIXZ2QCfP_Su2eBRVZ0Q,2231
 cloudsmith_cli/cli/commands/status.py,sha256=tT4p1Swc5C7hs0yyHhjOwBdvoh0e-LzGqRaADECiecU,2090
 cloudsmith_cli/cli/commands/tags.py,sha256=n2huKp6smIBmO4VjQh-RzICRvE9oZCZIqjtTxvr9LMU,11228
 cloudsmith_cli/cli/commands/tokens.py,sha256=GFR2j3VsQez5Q8IinohSDUiB_TlMxkpfZKSviMAFLiQ,7565
-cloudsmith_cli/cli/commands/upstream.py,sha256=TgXKzhkNrkVqqXX1NKpkI3Uy84W0kA8v93lAIB11KOc,15652
+cloudsmith_cli/cli/commands/upstream.py,sha256=WUPpMvYauXzh8MgMn9L4tHlTBi0UU_Gq4ZR_QDxTDdY,15922
 cloudsmith_cli/cli/commands/whoami.py,sha256=s9m7qucUlCtufaWeoYtIVTogRP3N5Jm7LPUxC1VZaSg,1725
 cloudsmith_cli/cli/commands/metrics/__init__.py,sha256=w-FjDvifPvTgf1nwGpTuhzk5mLkqmfvA9utrPqSUSdM,98
 cloudsmith_cli/cli/commands/metrics/command.py,sha256=-4ykfBJ8Ss6w8QoCqL0AZdhcF7ZmmahtvQ_5YTYif5c,510
@@ -40,8 +40,8 @@ cloudsmith_cli/cli/commands/metrics/entitlements.py,sha256=DROmuxR-YgJ8txe_q7yrW
 cloudsmith_cli/cli/commands/metrics/packages.py,sha256=HBpmSrDP-_VGN_NZl_SLQPYktr2yDwVTb_mCNgFH0Tc,3906
 cloudsmith_cli/cli/commands/policy/__init__.py,sha256=0LwfPbtEFbTuWE3kpvP4SI2AClXfZixAcOI6UhTtEbU,112
 cloudsmith_cli/cli/commands/policy/command.py,sha256=crZQiXhT7w19h9Z8IFFhM3NyGCTHZ8tL4vpHR430fLo,527
-cloudsmith_cli/cli/commands/policy/license.py,sha256=0L7fIEM45FsPX2izQqHMYFXA98O1ILBXrzF6J_HmmLE,9903
-cloudsmith_cli/cli/commands/policy/vulnerability.py,sha256=q9V2QppJIXqHSXW10qqQuZq3weKyUH9eRTt-kCz79PA,9781
+cloudsmith_cli/cli/commands/policy/license.py,sha256=FKUdhWPlFC6Se43tSZRQhQ-JADeh_Niwo2mjyQwuFJU,10097
+cloudsmith_cli/cli/commands/policy/vulnerability.py,sha256=DYLmKjebwZGvjGd6afb19EMdmG2ks5MEmNEOxEEfiCw,9976
 cloudsmith_cli/cli/commands/quota/__init__.py,sha256=FRRXCFTiSw3e0rUNpxxUiN0vznXQbHt45e0cj9zgz30,84
 cloudsmith_cli/cli/commands/quota/command.py,sha256=-oxLY33lqrW7PliafhsmnEtVdcrWUzRSxyjfto7R4MA,541
 cloudsmith_cli/cli/commands/quota/history.py,sha256=CklnmemvccVz6z1Kqt_IYtTB0ofBzFHwYk7VUAPUGxk,3696
@@ -57,18 +57,18 @@ 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_login.py,sha256=RlvPMaS2rTLah2dVF3Yt8gjG1HWEkD6zP_exzUvc1U0,1309
 cloudsmith_cli/cli/tests/commands/test_main.py,sha256=JmtJQ455OcqqEi0ostP8nMs0S4oXs4dkEFzPCGliqg8,947
-cloudsmith_cli/cli/tests/commands/test_package_commands.py,sha256=3wEyA2CLvWhMcUa8HzZLN-mmN3Bn0oYDJ5OpO_VK7kE,5669
-cloudsmith_cli/cli/tests/commands/test_repos.py,sha256=Uk0bIhcFI6n-3hzugeAcNxuLHqQZ-X1tSG_2rYutM0c,5851
+cloudsmith_cli/cli/tests/commands/test_package_commands.py,sha256=tfB7hjivOTYOhCqYmd7IJ9dI6oNvhK2vIGCyFDbOjWI,5943
+cloudsmith_cli/cli/tests/commands/test_repos.py,sha256=30sgokDrnQiEJJa6lUTDG2iryuO6OyNa0a9EVEmkjko,6726
 cloudsmith_cli/cli/tests/commands/test_tokens.py,sha256=BnTBS5ChIvgb9-HSkxOdzVIo81C6QA8xhJ7vGposow8,4931
-cloudsmith_cli/cli/tests/commands/test_upstream.py,sha256=D_tOKiLJ0_E-0cxBQpmtNjZXlxCmycLfT46sifRXVMc,4453
+cloudsmith_cli/cli/tests/commands/test_upstream.py,sha256=Xicig-bqhknjnlSIw3DtZqlgM09T498ikE6taFC8jb0,5435
 cloudsmith_cli/cli/tests/commands/policy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cloudsmith_cli/cli/tests/commands/policy/test_licence.py,sha256=T5EKhOS8BImHx3kVLQjbjQ5UWOACrtaDfjuECSkUOeo,5866
-cloudsmith_cli/cli/tests/commands/policy/test_vulnerability.py,sha256=YoqKx-lNrnBnQ7Yq1iZ-7FQqBACVUlgerqf-FJu6oZ4,5960
+cloudsmith_cli/cli/tests/commands/policy/test_licence.py,sha256=NFHYk-pbxde7NB8cYYQzhRRTtLpNfYhFCdkGXn0nV8o,6504
+cloudsmith_cli/cli/tests/commands/policy/test_vulnerability.py,sha256=uyreq39HYusY9k7lGnEKqFX2XgPRNA0hHEFiSoHeeDA,6660
 cloudsmith_cli/core/__init__.py,sha256=cTUzgNOgQKqQP8AKPNHgfkHpBhLggQ2V03IMitOLKiA,29
 cloudsmith_cli/core/config.py,sha256=eFA92QQBhccF0SdRtBwG7nrFuU2AK_yWzA9e0TUcNfE,3700
 cloudsmith_cli/core/download.py,sha256=WFlTpyAR_L6Z5GXBaiA3QZ4ABLO2GS42rduSBn2JcUg,15153
 cloudsmith_cli/core/keyring.py,sha256=v57SoE-5TaHsaMw7oCwM7ZuOVGPK1vAA2YsmWK35UAM,2310
-cloudsmith_cli/core/pagination.py,sha256=zQPSvjfAcQyRGEbX_3gh1Ni21l90-TP_UvPWwMpqLSw,2282
+cloudsmith_cli/core/pagination.py,sha256=votPN7v6yGWxf2GnQ8oVoqq5SIsl8OiPJ0mEOd8eoYM,4553
 cloudsmith_cli/core/ratelimits.py,sha256=nJkLQNT5CBIk_Jy3mWH5trIaQyj8x6SEo95BwKUxNuw,2534
 cloudsmith_cli/core/rest.py,sha256=J0MLzIzw9NkJ66CdyweX48fsejKY7TbR7JOHVGyNjyY,8062
 cloudsmith_cli/core/utils.py,sha256=L3fUMKX-8XtNlXK51EOLfF4wGq45uoQMY74ZGedNu4A,2213
@@ -95,15 +95,15 @@ cloudsmith_cli/core/tests/test_init.py,sha256=CDdCI-ko09I3ltBeFNACGrfNFDNT8zhXUE
 cloudsmith_cli/core/tests/test_keyring.py,sha256=cLmZjhj21gm2fdi-l95yOxQPWuq_XVVNeY3s9QSNvYc,7076
 cloudsmith_cli/core/tests/test_rest.py,sha256=5reu5mNHCXgnkLCcDxTp8Kd82YodSoSX2pvYOj_kHOs,1360
 cloudsmith_cli/core/tests/test_version.py,sha256=k9QAjOKJ7Q5mfGSahRvtpPN0XDaGOhbbpHngqAIuM34,552
-cloudsmith_cli/data/VERSION,sha256=u1mRkBjudkgsI_HORCGc5MnGOTxl7w3a5A0y151BO7U,6
+cloudsmith_cli/data/VERSION,sha256=25nNqvvJOfKXCRz2V3znOh-OBBeSsy2G4E6wfJVjcms,6
 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.9.2.dist-info/licenses/LICENSE,sha256=eEz1wEWbBZFlc_n_P_55i4CCYgWgHYVJpQjnc6qbXOQ,11344
-cloudsmith_cli-1.9.2.dist-info/METADATA,sha256=kygqX2OAYbFIT43VnFx2ykO5ekkfnQzN88FeW6z5Nwc,15738
-cloudsmith_cli-1.9.2.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
-cloudsmith_cli-1.9.2.dist-info/entry_points.txt,sha256=lQfpZ8eDB4ye9iK_TRpGnABwkcUgKIS-sGlCjbI1j9s,69
-cloudsmith_cli-1.9.2.dist-info/top_level.txt,sha256=9P2AQ4lqblgMVHk2VHuvZKH92H0o19w-qhr_x-5ifIQ,15
-cloudsmith_cli-1.9.2.dist-info/RECORD,,
+cloudsmith_cli-1.9.4.dist-info/licenses/LICENSE,sha256=eEz1wEWbBZFlc_n_P_55i4CCYgWgHYVJpQjnc6qbXOQ,11344
+cloudsmith_cli-1.9.4.dist-info/METADATA,sha256=55JCO3KnPnJR2bxpPDSALeE0K1S4_lQpK3Y3hGPwJDM,15738
+cloudsmith_cli-1.9.4.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
+cloudsmith_cli-1.9.4.dist-info/entry_points.txt,sha256=lQfpZ8eDB4ye9iK_TRpGnABwkcUgKIS-sGlCjbI1j9s,69
+cloudsmith_cli-1.9.4.dist-info/top_level.txt,sha256=9P2AQ4lqblgMVHk2VHuvZKH92H0o19w-qhr_x-5ifIQ,15
+cloudsmith_cli-1.9.4.dist-info/RECORD,,