Skip to content
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

chore: extract logic for defaulting to run into helper #10011

Merged
merged 2 commits into from
Feb 21, 2025
Merged

chore: extract logic for defaulting to run into helper #10011

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6a97bd
chore: extract logic for defaulting to run into helper
erikareads Feb 19, 2025
368f25c
chore: fix clippy suggestion
erikareads Feb 19, 2025
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
56 changes: 32 additions & 24 deletions crates/turborepo-lib/src/cli/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1191,6 +1191,37 @@ fn should_print_version() -> bool {
print_version_state == PrintVersionState::Enabled && ci_state == CIState::Outside
}

fn default_to_run_command(cli_args: &Args) -> Result<Command, Error> {
let run_args = cli_args.run_args.clone().unwrap_or_default();
let execution_args = cli_args
.execution_args
// We clone instead of take as take would leave the command base a copy of cli_args
// missing any execution args.
.clone()
.ok_or_else(|| Error::NoCommand(Backtrace::capture()))?;

if execution_args.tasks.is_empty() {
let mut cmd = <Args as CommandFactory>::command();
let _ = cmd.print_help();
process::exit(1);
}

Ok(Command::Run {
run_args: Box::new(run_args),
execution_args: Box::new(execution_args),
})
}

fn get_command(cli_args: &mut Args) -> Result<Command, Error> {
if let Some(command) = mem::take(&mut cli_args.command) {
Ok(command)
} else {
// If there is no command, we set the command to `Command::Run` with
// `self.parsed_args.run_args` as arguments.
default_to_run_command(cli_args)
}
}

/// Runs the CLI by parsing arguments with clap, then either calling Rust code
/// directly or returning a payload for the Go code to use.
///
Expand Down Expand Up @@ -1227,30 +1258,7 @@ pub async fn run(
eprintln!("{}\n", GREY.apply_to(format!("turbo {}", get_version())));
}

// If there is no command, we set the command to `Command::Run` with
// `self.parsed_args.run_args` as arguments.
let mut command = if let Some(command) = mem::take(&mut cli_args.command) {
command
} else {
let run_args = cli_args.run_args.clone().unwrap_or_default();
let execution_args = cli_args
.execution_args
// We clone instead of take as take would leave the command base a copy of cli_args
// missing any execution args.
.clone()
.ok_or_else(|| Error::NoCommand(Backtrace::capture()))?;

if execution_args.tasks.is_empty() {
let mut cmd = <Args as CommandFactory>::command();
let _ = cmd.print_help();
process::exit(1);
}

Command::Run {
run_args: Box::new(run_args),
execution_args: Box::new(execution_args),
}
};
let mut command = get_command(&mut cli_args)?;

// Set some run flags if we have the data and are executing a Run
match &mut command {
Expand Down
Loading