Skip to content

feat(ENG-14143): adding colour suppression to the CLI via environment variables #404

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cloudsmith-iduffy merged 5 commits into from
Sep 8, 2026
Merged

feat(ENG-14143): adding colour suppression to the CLI via environment variables #404

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c0a75ce
feat(ENG-14143): adding checks for colour and interactivity suppression
coillteoir Sep 3, 2026
58ba377
feat(ENG-14143): adding colour suppression to the CLI via environment…
coillteoir Sep 3, 2026
46e28f1
refactor: use click envvar options instead of raw os.environ for colo…
Copilot Sep 8, 2026
b0b93e1
Merge branch 'master' into pr404
cloudsmith-iduffy Sep 8, 2026
47eec75
Merge branch 'master' into pr404
cloudsmith-iduffy Sep 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 38 additions & 0 deletions cloudsmith_cli/cli/decorators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@
import functools
import logging
import os
import sys

import click
from click.core import ParameterSource

from cloudsmith_cli.cli import validators
from cloudsmith_cli.core.utils import ColorMode, TTYMode, color_enabled

from ..core.credentials.chain import CredentialProviderChain
from ..core.credentials.models import CredentialContext
Expand Down Expand Up @@ -151,6 +153,31 @@ def wrapper(ctx, *args, **kwargs):
def common_cli_output_options(f):
"""Add common CLI output options to commands."""

@click.option(
"--color",
envvar="CLOUDSMITH_COLOR",
default="auto",
type=click.Choice(ColorMode, case_sensitive=False),
Comment thread
cloudsmith-iduffy marked this conversation as resolved.
help="Control whether ANSI colour output is used: auto, always or never.",
)
@click.option(
"--no-color-env",
envvar="NO_COLOR",
default=None,
hidden=True,
)
@click.option(
"--force-color-env",
envvar="CLOUDSMITH_FORCE_COLOR",
default=None,
hidden=True,
)
@click.option(
"--term-env",
envvar="TERM",
default=None,
hidden=True,
)
@click.option(
"-d",
"--debug",
Expand Down Expand Up @@ -178,6 +205,17 @@ def common_cli_output_options(f):
def wrapper(ctx, *args, **kwargs):
# pylint: disable=missing-docstring
opts = config.get_or_create_options(ctx)

ctx.color = color_enabled(
{
"NO_COLOR": kwargs.pop("no_color_env"),
"CLOUDSMITH_FORCE_COLOR": kwargs.pop("force_color_env"),
"TERM": kwargs.pop("term_env"),
},
kwargs.pop("color"),
TTYMode.ENABLED if sys.stdout.isatty() else TTYMode.DISABLED,
)

opts.debug = kwargs.pop("debug") or opts.debug
_configure_debug_logging(opts.debug)
opts.output = kwargs.pop("output_format")
Expand Down
Loading