Skip to content

fix(cli): accept --format after a subcommand #6464

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

Open
sanjay3290 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(cli): accept --format after a subcommand #6464

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
43 changes: 41 additions & 2 deletions crates/buzz-cli/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ struct Cli {
auth_tag: Option<String>,

/// Output format: 'json' (default, full fields) or 'compact' (reduced fields).
#[arg(long, value_enum, default_value = "json")]
#[arg(long, value_enum, default_value = "json", global = true)]
format: OutputFormat,

#[command(subcommand)]
Expand Down Expand Up @@ -161,7 +161,7 @@ impl std::fmt::Display for PresenceStatus {
}

/// Output format for read commands.
#[derive(Clone, clap::ValueEnum, Default)]
#[derive(Clone, Debug, PartialEq, clap::ValueEnum, Default)]
pub enum OutputFormat {
/// Full normalized JSON (default)
#[default]
Expand Down Expand Up @@ -2126,6 +2126,45 @@ mod tests {
Cli::command().debug_assert();
}

#[test]
fn format_after_subcommand_parses() {
let uuid = "123e4567-e89b-12d3-a456-426614174000";
let cli = Cli::try_parse_from([
"buzz",
"messages",
"get",
"--format",
"compact",
"--channel",
uuid,
])
.unwrap();
assert_eq!(cli.format, OutputFormat::Compact);
}

#[test]
fn format_before_subcommand_parses() {
let uuid = "123e4567-e89b-12d3-a456-426614174000";
let cli = Cli::try_parse_from([
"buzz",
"--format",
"compact",
"messages",
"get",
"--channel",
uuid,
])
.unwrap();
assert_eq!(cli.format, OutputFormat::Compact);
}

#[test]
fn format_defaults_to_json() {
let uuid = "123e4567-e89b-12d3-a456-426614174000";
let cli = Cli::try_parse_from(["buzz", "messages", "get", "--channel", uuid]).unwrap();
assert_eq!(cli.format, OutputFormat::Json);
}

#[test]
fn messages_thread_accepts_link_or_explicit_identifiers() {
let channel = "123e4567-e89b-12d3-a456-426614174000";
Expand Down