feat: add yoi ticket CLI
This commit is contained in:
parent
d725fb81d6
commit
4d5068ba3b
1
Cargo.lock
generated
1
Cargo.lock
generated
|
|
@ -4778,6 +4778,7 @@ dependencies = [
|
|||
"serde_json",
|
||||
"session-store",
|
||||
"tempfile",
|
||||
"ticket",
|
||||
"tokio",
|
||||
"tui",
|
||||
]
|
||||
|
|
|
|||
|
|
@ -514,6 +514,14 @@ impl TicketDoctorReport {
|
|||
path,
|
||||
});
|
||||
}
|
||||
|
||||
pub fn push_warning(&mut self, message: impl Into<String>, path: Option<PathBuf>) {
|
||||
self.diagnostics.push(TicketDoctorDiagnostic {
|
||||
severity: TicketDoctorSeverity::Warning,
|
||||
message: message.into(),
|
||||
path,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
pub trait TicketBackend {
|
||||
|
|
@ -1010,15 +1018,13 @@ impl TicketBackend for LocalTicketBackend {
|
|||
);
|
||||
}
|
||||
if status == TicketStatus::Closed && !dir.join("resolution.md").is_file() {
|
||||
report.push_error(
|
||||
format!("missing resolution.md for closed ticket: {}", dir.display()),
|
||||
report.push_warning(
|
||||
format!("closed ticket missing resolution.md: {}", dir.display()),
|
||||
Some(dir.join("resolution.md")),
|
||||
);
|
||||
}
|
||||
if thread.exists() {
|
||||
for diagnostic in doctor_thread_events(&thread)? {
|
||||
report.push_error(diagnostic, Some(thread.clone()));
|
||||
}
|
||||
doctor_thread_events(&thread, &mut report)?;
|
||||
}
|
||||
if artifacts.exists() {
|
||||
doctor_artifacts(&artifacts, &mut report)?;
|
||||
|
|
@ -1339,17 +1345,19 @@ fn parse_event_comment(comment: &str) -> BTreeMap<String, String> {
|
|||
attrs
|
||||
}
|
||||
|
||||
fn doctor_thread_events(path: &Path) -> Result<Vec<String>> {
|
||||
fn doctor_thread_events(path: &Path, report: &mut TicketDoctorReport) -> Result<()> {
|
||||
let content = fs::read_to_string(path).map_err(|e| io_err(path, e))?;
|
||||
let mut diagnostics = Vec::new();
|
||||
for (line_no, line) in content.lines().enumerate() {
|
||||
let trimmed = line.trim();
|
||||
if trimmed.starts_with("<!-- event:") && !trimmed.ends_with("-->") {
|
||||
diagnostics.push(format!(
|
||||
"malformed thread event comment at {}:{}",
|
||||
path.display(),
|
||||
line_no + 1
|
||||
));
|
||||
report.push_error(
|
||||
format!(
|
||||
"malformed thread event comment at {}:{}",
|
||||
path.display(),
|
||||
line_no + 1
|
||||
),
|
||||
Some(path.to_path_buf()),
|
||||
);
|
||||
}
|
||||
if let Some(comment) = trimmed
|
||||
.strip_prefix("<!-- ")
|
||||
|
|
@ -1357,25 +1365,31 @@ fn doctor_thread_events(path: &Path) -> Result<Vec<String>> {
|
|||
{
|
||||
let attrs = parse_event_comment(comment);
|
||||
if attrs.contains_key("event") && attrs.get("at").is_none() {
|
||||
diagnostics.push(format!(
|
||||
"thread event missing at: {}:{}",
|
||||
path.display(),
|
||||
line_no + 1
|
||||
));
|
||||
report.push_error(
|
||||
format!(
|
||||
"thread event missing at: {}:{}",
|
||||
path.display(),
|
||||
line_no + 1
|
||||
),
|
||||
Some(path.to_path_buf()),
|
||||
);
|
||||
}
|
||||
if attrs.get("event").map(String::as_str) == Some("review") {
|
||||
match attrs.get("status").map(String::as_str) {
|
||||
Some("approve" | "request_changes") => {}
|
||||
_ => diagnostics.push(format!(
|
||||
"review event missing valid status at {}:{}",
|
||||
path.display(),
|
||||
line_no + 1
|
||||
)),
|
||||
_ => report.push_warning(
|
||||
format!(
|
||||
"legacy review event missing valid status at {}:{}",
|
||||
path.display(),
|
||||
line_no + 1
|
||||
),
|
||||
Some(path.to_path_buf()),
|
||||
),
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Ok(diagnostics)
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn collect_artifacts(dir: &Path) -> Result<Vec<TicketArtifactRef>> {
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ memory = { workspace = true }
|
|||
manifest = { workspace = true }
|
||||
pod = { workspace = true }
|
||||
session-store = { workspace = true }
|
||||
ticket = { workspace = true }
|
||||
tui = { workspace = true }
|
||||
serde = { workspace = true, features = ["derive"] }
|
||||
serde_json = { workspace = true }
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
mod memory_lint;
|
||||
mod ticket_cli;
|
||||
|
||||
use std::fmt;
|
||||
use std::path::PathBuf;
|
||||
|
|
@ -14,6 +15,7 @@ enum Mode {
|
|||
Help,
|
||||
MemoryLintHelp,
|
||||
MemoryLint(LintCliOptions),
|
||||
Ticket(ticket_cli::TicketCli),
|
||||
PodRuntime(Vec<String>),
|
||||
Keys,
|
||||
Tui(LaunchMode),
|
||||
|
|
@ -58,6 +60,19 @@ async fn main() -> ExitCode {
|
|||
ExitCode::FAILURE
|
||||
}
|
||||
},
|
||||
Mode::Ticket(cli) => match ticket_cli::run(cli) {
|
||||
Ok(output) => {
|
||||
print!("{}", output.stdout);
|
||||
match output.status {
|
||||
ticket_cli::TicketCliStatus::Success => ExitCode::SUCCESS,
|
||||
ticket_cli::TicketCliStatus::Failure => ExitCode::FAILURE,
|
||||
}
|
||||
}
|
||||
Err(e) => {
|
||||
eprintln!("yoi ticket: {e}");
|
||||
ExitCode::FAILURE
|
||||
}
|
||||
},
|
||||
Mode::PodRuntime(args) => pod::entrypoint::run_cli_from("yoi pod", args).await,
|
||||
Mode::Keys => tui::keys::launch().await,
|
||||
Mode::Tui(mode) => {
|
||||
|
|
@ -98,6 +113,11 @@ fn parse_args_slice(args: &[String]) -> Result<Mode, ParseError> {
|
|||
match args[0].as_str() {
|
||||
"--help" | "-h" => return Ok(Mode::Help),
|
||||
"pod" => return Ok(Mode::PodRuntime(args[1..].to_vec())),
|
||||
"ticket" => {
|
||||
let ticket_cli =
|
||||
ticket_cli::parse_ticket_args(&args[1..]).map_err(|e| ParseError(e.to_string()))?;
|
||||
return Ok(Mode::Ticket(ticket_cli));
|
||||
}
|
||||
"keys" => {
|
||||
if args.len() != 1 {
|
||||
return Err(ParseError("yoi keys does not accept arguments".into()));
|
||||
|
|
@ -322,7 +342,7 @@ fn parse_session_id(value: &str) -> Result<SegmentId, ParseError> {
|
|||
|
||||
fn print_help() {
|
||||
println!(
|
||||
"yoi\n\nUsage:\n yoi [OPTIONS] [POD_NAME]\n yoi keys\n yoi pod [POD_OPTIONS]\n yoi memory lint [OPTIONS]\n\nOptions:\n -r, --resume Open the Pod picker and resume/attach a Pod\n --multi Open the multi-Pod dashboard\n --pod <NAME> Attach/restore/create a Pod by name\n --socket <PATH> Attach to a specific Pod socket with --pod\n --session <UUID> Resume a specific session segment\n --profile <REF> Start a fresh Pod from a profile\n -h, --help Print help\n"
|
||||
"yoi\n\nUsage:\n yoi [OPTIONS] [POD_NAME]\n yoi keys\n yoi pod [POD_OPTIONS]\n yoi ticket <COMMAND> [OPTIONS]\n yoi memory lint [OPTIONS]\n\nOptions:\n -r, --resume Open the Pod picker and resume/attach a Pod\n --multi Open the multi-Pod dashboard\n --pod <NAME> Attach/restore/create a Pod by name\n --socket <PATH> Attach to a specific Pod socket with --pod\n --session <UUID> Resume a specific session segment\n --profile <REF> Start a fresh Pod from a profile\n -h, --help Print help\n"
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -386,6 +406,22 @@ mod tests {
|
|||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn parse_ticket_subcommand_uses_ticket_mode() {
|
||||
match parse_args_from(["ticket", "doctor"]).unwrap() {
|
||||
Mode::Ticket(ticket_cli::TicketCli::Command(ticket_cli::TicketCommand::Doctor)) => {}
|
||||
_ => panic!("expected Ticket doctor mode"),
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn parse_ticket_help_uses_ticket_mode() {
|
||||
match parse_args_from(["ticket", "--help"]).unwrap() {
|
||||
Mode::Ticket(ticket_cli::TicketCli::Help) => {}
|
||||
_ => panic!("expected Ticket help mode"),
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn parse_keys_subcommand() {
|
||||
match parse_args_from(["keys"]).unwrap() {
|
||||
|
|
|
|||
946
crates/yoi/src/ticket_cli.rs
Normal file
946
crates/yoi/src/ticket_cli.rs
Normal file
|
|
@ -0,0 +1,946 @@
|
|||
use std::fmt;
|
||||
use std::fs;
|
||||
use std::path::{Path, PathBuf};
|
||||
|
||||
use ticket::config::TicketConfig;
|
||||
use ticket::{
|
||||
LocalTicketBackend, MarkdownText, NewTicket, NewTicketEvent, TicketBackend,
|
||||
TicketDoctorSeverity, TicketEventKind, TicketFilter, TicketIdOrSlug, TicketReview,
|
||||
TicketReviewResult, TicketStatus,
|
||||
};
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||
pub enum TicketCli {
|
||||
Help,
|
||||
Command(TicketCommand),
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||
pub enum TicketCommand {
|
||||
Create(CreateOptions),
|
||||
List(ListOptions),
|
||||
Show { query: String },
|
||||
Comment(CommentOptions),
|
||||
Review(ReviewOptions),
|
||||
Status(StatusOptions),
|
||||
Close(CloseOptions),
|
||||
Doctor,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||
pub struct CreateOptions {
|
||||
pub title: String,
|
||||
pub slug: Option<String>,
|
||||
pub kind: String,
|
||||
pub priority: String,
|
||||
pub labels: Vec<String>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||
pub enum ListStatus {
|
||||
Open,
|
||||
Pending,
|
||||
Closed,
|
||||
All,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||
pub struct ListOptions {
|
||||
pub status: ListStatus,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||
pub struct CommentOptions {
|
||||
pub query: String,
|
||||
pub role: TicketEventKind,
|
||||
pub body: BodySource,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||
pub struct ReviewOptions {
|
||||
pub query: String,
|
||||
pub result: TicketReviewResult,
|
||||
pub body: BodySource,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||
pub enum StatusTarget {
|
||||
Open,
|
||||
Pending,
|
||||
Closed,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||
pub struct StatusOptions {
|
||||
pub query: String,
|
||||
pub status: StatusTarget,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||
pub struct CloseOptions {
|
||||
pub query: String,
|
||||
pub resolution: BodySource,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||
pub enum BodySource {
|
||||
Message(String),
|
||||
File(PathBuf),
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||
pub enum TicketCliStatus {
|
||||
Success,
|
||||
Failure,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||
pub struct TicketCliOutput {
|
||||
pub status: TicketCliStatus,
|
||||
pub stdout: String,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||
pub struct TicketCliError(String);
|
||||
|
||||
impl TicketCliError {
|
||||
fn new(message: impl Into<String>) -> Self {
|
||||
Self(message.into())
|
||||
}
|
||||
}
|
||||
|
||||
impl fmt::Display for TicketCliError {
|
||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||
f.write_str(&self.0)
|
||||
}
|
||||
}
|
||||
|
||||
impl std::error::Error for TicketCliError {}
|
||||
|
||||
impl From<ticket::TicketError> for TicketCliError {
|
||||
fn from(error: ticket::TicketError) -> Self {
|
||||
Self::new(error.to_string())
|
||||
}
|
||||
}
|
||||
|
||||
impl From<ticket::config::TicketConfigError> for TicketCliError {
|
||||
fn from(error: ticket::config::TicketConfigError) -> Self {
|
||||
Self::new(error.to_string())
|
||||
}
|
||||
}
|
||||
|
||||
pub fn parse_ticket_args(args: &[String]) -> Result<TicketCli, TicketCliError> {
|
||||
if args.is_empty() || args.iter().any(|arg| arg == "--help" || arg == "-h") {
|
||||
return Ok(TicketCli::Help);
|
||||
}
|
||||
|
||||
let command = match args[0].as_str() {
|
||||
"create" => TicketCommand::Create(parse_create(&args[1..])?),
|
||||
"list" => TicketCommand::List(parse_list(&args[1..])?),
|
||||
"show" => TicketCommand::Show {
|
||||
query: parse_one_positional("show", &args[1..])?,
|
||||
},
|
||||
"comment" => TicketCommand::Comment(parse_comment(&args[1..])?),
|
||||
"review" => TicketCommand::Review(parse_review(&args[1..])?),
|
||||
"status" => TicketCommand::Status(parse_status(&args[1..])?),
|
||||
"close" => TicketCommand::Close(parse_close(&args[1..])?),
|
||||
"doctor" => {
|
||||
if args.len() != 1 {
|
||||
return Err(TicketCliError::new("ticket doctor takes no arguments"));
|
||||
}
|
||||
TicketCommand::Doctor
|
||||
}
|
||||
"help" => return Ok(TicketCli::Help),
|
||||
other => {
|
||||
return Err(TicketCliError::new(format!(
|
||||
"unknown ticket command: {other}"
|
||||
)));
|
||||
}
|
||||
};
|
||||
|
||||
Ok(TicketCli::Command(command))
|
||||
}
|
||||
|
||||
pub fn run(cli: TicketCli) -> Result<TicketCliOutput, TicketCliError> {
|
||||
let workspace = std::env::current_dir().map_err(|error| {
|
||||
TicketCliError::new(format!("failed to resolve current directory: {error}"))
|
||||
})?;
|
||||
run_in_workspace(cli, &workspace)
|
||||
}
|
||||
|
||||
pub fn run_in_workspace(
|
||||
cli: TicketCli,
|
||||
workspace: &Path,
|
||||
) -> Result<TicketCliOutput, TicketCliError> {
|
||||
match cli {
|
||||
TicketCli::Help => Ok(TicketCliOutput {
|
||||
status: TicketCliStatus::Success,
|
||||
stdout: help_text().to_string(),
|
||||
}),
|
||||
TicketCli::Command(command) => run_command(command, workspace),
|
||||
}
|
||||
}
|
||||
|
||||
fn run_command(
|
||||
command: TicketCommand,
|
||||
workspace: &Path,
|
||||
) -> Result<TicketCliOutput, TicketCliError> {
|
||||
let backend = backend_for_workspace(workspace)?;
|
||||
match command {
|
||||
TicketCommand::Create(options) => create(&backend, options),
|
||||
TicketCommand::List(options) => list(&backend, options),
|
||||
TicketCommand::Show { query } => show(&backend, query),
|
||||
TicketCommand::Comment(options) => comment(&backend, options),
|
||||
TicketCommand::Review(options) => review(&backend, options),
|
||||
TicketCommand::Status(options) => status(&backend, options),
|
||||
TicketCommand::Close(options) => close(&backend, options),
|
||||
TicketCommand::Doctor => doctor(&backend),
|
||||
}
|
||||
}
|
||||
|
||||
fn backend_for_workspace(workspace: &Path) -> Result<LocalTicketBackend, TicketCliError> {
|
||||
let config = TicketConfig::load_workspace(workspace)?;
|
||||
Ok(LocalTicketBackend::new(config.backend_root().to_path_buf()))
|
||||
}
|
||||
|
||||
fn create(
|
||||
backend: &LocalTicketBackend,
|
||||
options: CreateOptions,
|
||||
) -> Result<TicketCliOutput, TicketCliError> {
|
||||
let mut input = NewTicket::new(options.title);
|
||||
input.slug = options.slug;
|
||||
input.kind = options.kind;
|
||||
input.priority = options.priority;
|
||||
input.labels = options.labels;
|
||||
input.author = Some("yoi ticket".to_string());
|
||||
|
||||
let created = backend.create(input)?;
|
||||
Ok(success(format!(
|
||||
"created\t{}\t{}\t{}\n",
|
||||
created.id,
|
||||
created.slug,
|
||||
created.status.as_str()
|
||||
)))
|
||||
}
|
||||
|
||||
fn list(
|
||||
backend: &LocalTicketBackend,
|
||||
options: ListOptions,
|
||||
) -> Result<TicketCliOutput, TicketCliError> {
|
||||
let filter = match options.status {
|
||||
ListStatus::Open => TicketFilter::status(TicketStatus::Open),
|
||||
ListStatus::Pending => TicketFilter::status(TicketStatus::Pending),
|
||||
ListStatus::Closed => TicketFilter::status(TicketStatus::Closed),
|
||||
ListStatus::All => TicketFilter::all(),
|
||||
};
|
||||
let tickets = backend.list(filter)?;
|
||||
let mut stdout = String::from("status\tid\tslug\ttitle\tkind\tpriority\tupdated_at\n");
|
||||
for ticket in tickets {
|
||||
stdout.push_str(&format!(
|
||||
"{}\t{}\t{}\t{}\t{}\t{}\t{}\n",
|
||||
ticket.status.as_str(),
|
||||
ticket.id,
|
||||
ticket.slug,
|
||||
ticket.title,
|
||||
ticket.kind,
|
||||
ticket.priority,
|
||||
ticket.updated_at.unwrap_or_default()
|
||||
));
|
||||
}
|
||||
Ok(success(stdout))
|
||||
}
|
||||
|
||||
fn show(backend: &LocalTicketBackend, query: String) -> Result<TicketCliOutput, TicketCliError> {
|
||||
let ticket = backend.show(TicketIdOrSlug::Query(query))?;
|
||||
let mut stdout = String::new();
|
||||
stdout.push_str(&format!("# {}\n\n", ticket.meta.title));
|
||||
stdout.push_str(&format!("Status: {}\n", ticket.meta.status.as_str()));
|
||||
stdout.push_str(&format!("ID: {}\n", ticket.meta.id));
|
||||
stdout.push_str(&format!("Slug: {}\n", ticket.meta.slug));
|
||||
stdout.push_str(&format!("Kind: {}\n", ticket.meta.kind));
|
||||
stdout.push_str(&format!("Priority: {}\n", ticket.meta.priority));
|
||||
stdout.push_str(&format!("Labels: {}\n", ticket.meta.labels.join(", ")));
|
||||
if let Some(updated_at) = &ticket.meta.updated_at {
|
||||
stdout.push_str(&format!("Updated: {updated_at}\n"));
|
||||
}
|
||||
|
||||
stdout.push_str("\n## item.md\n\n---\n");
|
||||
for (key, value) in &ticket.document.raw_frontmatter {
|
||||
stdout.push_str(&format!("{key}: {value}\n"));
|
||||
}
|
||||
stdout.push_str("---\n\n");
|
||||
stdout.push_str(ticket.document.body.as_str());
|
||||
if !stdout.ends_with('\n') {
|
||||
stdout.push('\n');
|
||||
}
|
||||
|
||||
stdout.push_str("\n## thread.md\n\n");
|
||||
if ticket.events.is_empty() {
|
||||
stdout.push_str("(no events)\n");
|
||||
} else {
|
||||
for event in &ticket.events {
|
||||
stdout.push_str(&format!(
|
||||
"- {}{}{}{}\n",
|
||||
event.kind.as_str(),
|
||||
event
|
||||
.status
|
||||
.as_ref()
|
||||
.map(|status| format!(" [{status}]"))
|
||||
.unwrap_or_default(),
|
||||
event
|
||||
.author
|
||||
.as_ref()
|
||||
.map(|author| format!(" by {author}"))
|
||||
.unwrap_or_default(),
|
||||
event
|
||||
.at
|
||||
.as_ref()
|
||||
.map(|at| format!(" at {at}"))
|
||||
.unwrap_or_default()
|
||||
));
|
||||
if let Some(heading) = &event.heading {
|
||||
stdout.push_str(&format!(" ## {heading}\n"));
|
||||
}
|
||||
if !event.body.as_str().is_empty() {
|
||||
stdout.push_str(event.body.as_str());
|
||||
if !stdout.ends_with('\n') {
|
||||
stdout.push('\n');
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if !ticket.artifacts.is_empty() {
|
||||
stdout.push_str("\n## artifacts\n\n");
|
||||
for artifact in &ticket.artifacts {
|
||||
stdout.push_str(&format!("- {}\n", artifact.relative_path.display()));
|
||||
}
|
||||
}
|
||||
|
||||
if let Some(resolution) = &ticket.resolution {
|
||||
stdout.push_str("\n## resolution.md\n\n");
|
||||
stdout.push_str(resolution.as_str());
|
||||
if !stdout.ends_with('\n') {
|
||||
stdout.push('\n');
|
||||
}
|
||||
}
|
||||
|
||||
Ok(success(stdout))
|
||||
}
|
||||
|
||||
fn comment(
|
||||
backend: &LocalTicketBackend,
|
||||
options: CommentOptions,
|
||||
) -> Result<TicketCliOutput, TicketCliError> {
|
||||
let role = options.role.as_str().to_string();
|
||||
let mut event = NewTicketEvent::new(options.role, read_body_source(&options.body)?);
|
||||
event.author = Some(default_author());
|
||||
backend.add_event(TicketIdOrSlug::Query(options.query.clone()), event)?;
|
||||
Ok(success(format!("appended\t{}\t{}\n", options.query, role)))
|
||||
}
|
||||
|
||||
fn review(
|
||||
backend: &LocalTicketBackend,
|
||||
options: ReviewOptions,
|
||||
) -> Result<TicketCliOutput, TicketCliError> {
|
||||
let result = options.result.as_str().to_string();
|
||||
let review = TicketReview {
|
||||
result: options.result,
|
||||
author: Some(default_author()),
|
||||
body: MarkdownText::new(read_body_source(&options.body)?),
|
||||
};
|
||||
backend.review(TicketIdOrSlug::Query(options.query.clone()), review)?;
|
||||
Ok(success(format!(
|
||||
"reviewed\t{}\t{}\n",
|
||||
options.query, result
|
||||
)))
|
||||
}
|
||||
|
||||
fn status(
|
||||
backend: &LocalTicketBackend,
|
||||
options: StatusOptions,
|
||||
) -> Result<TicketCliOutput, TicketCliError> {
|
||||
let status = match options.status {
|
||||
StatusTarget::Open => TicketStatus::Open,
|
||||
StatusTarget::Pending => TicketStatus::Pending,
|
||||
StatusTarget::Closed => {
|
||||
return Err(TicketCliError::new(
|
||||
"yoi ticket status <ticket> closed cannot write resolution.md; use `yoi ticket close <ticket> --resolution <text>` instead",
|
||||
));
|
||||
}
|
||||
};
|
||||
backend.set_status(TicketIdOrSlug::Query(options.query.clone()), status)?;
|
||||
Ok(success(format!(
|
||||
"status\t{}\t{}\n",
|
||||
options.query,
|
||||
status.as_str()
|
||||
)))
|
||||
}
|
||||
|
||||
fn close(
|
||||
backend: &LocalTicketBackend,
|
||||
options: CloseOptions,
|
||||
) -> Result<TicketCliOutput, TicketCliError> {
|
||||
backend.close(
|
||||
TicketIdOrSlug::Query(options.query.clone()),
|
||||
MarkdownText::new(read_body_source(&options.resolution)?),
|
||||
)?;
|
||||
Ok(success(format!("closed\t{}\n", options.query)))
|
||||
}
|
||||
|
||||
fn doctor(backend: &LocalTicketBackend) -> Result<TicketCliOutput, TicketCliError> {
|
||||
let report = backend.doctor()?;
|
||||
let mut stdout = String::new();
|
||||
if report.is_ok() {
|
||||
stdout.push_str("doctor: ok\n");
|
||||
return Ok(success(stdout));
|
||||
}
|
||||
|
||||
for diagnostic in &report.diagnostics {
|
||||
let severity = match diagnostic.severity {
|
||||
TicketDoctorSeverity::Error => "error",
|
||||
TicketDoctorSeverity::Warning => "warning",
|
||||
};
|
||||
stdout.push_str(&format!("doctor: {severity}: {}", diagnostic.message));
|
||||
if let Some(path) = &diagnostic.path {
|
||||
stdout.push_str(&format!(" ({})", path.display()));
|
||||
}
|
||||
stdout.push('\n');
|
||||
}
|
||||
stdout.push_str(&format!("doctor: {} error(s)\n", report.error_count()));
|
||||
Ok(TicketCliOutput {
|
||||
status: TicketCliStatus::Failure,
|
||||
stdout,
|
||||
})
|
||||
}
|
||||
|
||||
fn success(stdout: String) -> TicketCliOutput {
|
||||
TicketCliOutput {
|
||||
status: TicketCliStatus::Success,
|
||||
stdout,
|
||||
}
|
||||
}
|
||||
|
||||
fn parse_create(args: &[String]) -> Result<CreateOptions, TicketCliError> {
|
||||
let mut title = None;
|
||||
let mut slug = None;
|
||||
let mut kind = "task".to_string();
|
||||
let mut priority = "P2".to_string();
|
||||
let mut labels = Vec::new();
|
||||
let mut i = 0;
|
||||
while i < args.len() {
|
||||
match option_with_value(args, &mut i)? {
|
||||
Some(("--title", value)) => title = Some(value),
|
||||
Some(("--slug", value)) => slug = Some(value),
|
||||
Some(("--kind", value)) => kind = value,
|
||||
Some(("--priority", value)) => priority = value,
|
||||
Some(("--label", value)) => labels.extend(parse_labels(&value)),
|
||||
Some((name, _)) => {
|
||||
return Err(TicketCliError::new(format!(
|
||||
"unknown create argument: {name}"
|
||||
)));
|
||||
}
|
||||
None => {
|
||||
return Err(TicketCliError::new(format!(
|
||||
"unknown create argument: {}",
|
||||
args[i]
|
||||
)));
|
||||
}
|
||||
}
|
||||
}
|
||||
let title = title.ok_or_else(|| TicketCliError::new("create requires --title"))?;
|
||||
if title.trim().is_empty() {
|
||||
return Err(TicketCliError::new("create --title must not be empty"));
|
||||
}
|
||||
Ok(CreateOptions {
|
||||
title,
|
||||
slug,
|
||||
kind,
|
||||
priority,
|
||||
labels,
|
||||
})
|
||||
}
|
||||
|
||||
fn parse_list(args: &[String]) -> Result<ListOptions, TicketCliError> {
|
||||
let mut status = ListStatus::Open;
|
||||
let mut i = 0;
|
||||
while i < args.len() {
|
||||
match option_with_value(args, &mut i)? {
|
||||
Some(("--status", value)) => status = parse_list_status(&value)?,
|
||||
Some((name, _)) => {
|
||||
return Err(TicketCliError::new(format!(
|
||||
"unknown list argument: {name}"
|
||||
)));
|
||||
}
|
||||
None => {
|
||||
return Err(TicketCliError::new(format!(
|
||||
"unknown list argument: {}",
|
||||
args[i]
|
||||
)));
|
||||
}
|
||||
}
|
||||
}
|
||||
Ok(ListOptions { status })
|
||||
}
|
||||
|
||||
fn parse_comment(args: &[String]) -> Result<CommentOptions, TicketCliError> {
|
||||
if args.is_empty() || args[0].starts_with('-') {
|
||||
return Err(TicketCliError::new("comment requires <id-or-slug>"));
|
||||
}
|
||||
let query = args[0].clone();
|
||||
let mut role = TicketEventKind::Comment;
|
||||
let mut file = None;
|
||||
let mut message = None;
|
||||
let mut i = 1;
|
||||
while i < args.len() {
|
||||
match option_with_value(args, &mut i)? {
|
||||
Some(("--role", value)) => role = parse_comment_role(&value)?,
|
||||
Some(("--file", value)) => file = Some(PathBuf::from(value)),
|
||||
Some(("--message", value)) => message = Some(value),
|
||||
Some((name, _)) => {
|
||||
return Err(TicketCliError::new(format!(
|
||||
"unknown comment argument: {name}"
|
||||
)));
|
||||
}
|
||||
None => {
|
||||
return Err(TicketCliError::new(format!(
|
||||
"unknown comment argument: {}",
|
||||
args[i]
|
||||
)));
|
||||
}
|
||||
}
|
||||
}
|
||||
Ok(CommentOptions {
|
||||
query,
|
||||
role,
|
||||
body: exactly_one_body("comment", file, message)?,
|
||||
})
|
||||
}
|
||||
|
||||
fn parse_review(args: &[String]) -> Result<ReviewOptions, TicketCliError> {
|
||||
if args.is_empty() || args[0].starts_with('-') {
|
||||
return Err(TicketCliError::new("review requires <id-or-slug>"));
|
||||
}
|
||||
let query = args[0].clone();
|
||||
let mut approve = false;
|
||||
let mut request_changes = false;
|
||||
let mut file = None;
|
||||
let mut message = None;
|
||||
let mut i = 1;
|
||||
while i < args.len() {
|
||||
match args[i].as_str() {
|
||||
"--approve" => {
|
||||
approve = true;
|
||||
i += 1;
|
||||
}
|
||||
"--request-changes" => {
|
||||
request_changes = true;
|
||||
i += 1;
|
||||
}
|
||||
_ => match option_with_value(args, &mut i)? {
|
||||
Some(("--file", value)) => file = Some(PathBuf::from(value)),
|
||||
Some(("--message", value)) => message = Some(value),
|
||||
Some((name, _)) => {
|
||||
return Err(TicketCliError::new(format!(
|
||||
"unknown review argument: {name}"
|
||||
)));
|
||||
}
|
||||
None => {
|
||||
return Err(TicketCliError::new(format!(
|
||||
"unknown review argument: {}",
|
||||
args[i]
|
||||
)));
|
||||
}
|
||||
},
|
||||
}
|
||||
}
|
||||
let result = match (approve, request_changes) {
|
||||
(true, false) => TicketReviewResult::Approve,
|
||||
(false, true) => TicketReviewResult::RequestChanges,
|
||||
(false, false) => {
|
||||
return Err(TicketCliError::new(
|
||||
"review requires exactly one of --approve or --request-changes",
|
||||
));
|
||||
}
|
||||
(true, true) => {
|
||||
return Err(TicketCliError::new(
|
||||
"review accepts exactly one of --approve or --request-changes",
|
||||
));
|
||||
}
|
||||
};
|
||||
Ok(ReviewOptions {
|
||||
query,
|
||||
result,
|
||||
body: exactly_one_body("review", file, message)?,
|
||||
})
|
||||
}
|
||||
|
||||
fn parse_status(args: &[String]) -> Result<StatusOptions, TicketCliError> {
|
||||
if args.len() != 2 {
|
||||
return Err(TicketCliError::new(
|
||||
"status requires <id-or-slug> <open|pending|closed>",
|
||||
));
|
||||
}
|
||||
Ok(StatusOptions {
|
||||
query: args[0].clone(),
|
||||
status: parse_status_target(&args[1])?,
|
||||
})
|
||||
}
|
||||
|
||||
fn parse_close(args: &[String]) -> Result<CloseOptions, TicketCliError> {
|
||||
if args.is_empty() || args[0].starts_with('-') {
|
||||
return Err(TicketCliError::new("close requires <id-or-slug>"));
|
||||
}
|
||||
let query = args[0].clone();
|
||||
let mut file = None;
|
||||
let mut resolution = None;
|
||||
let mut i = 1;
|
||||
while i < args.len() {
|
||||
match option_with_value(args, &mut i)? {
|
||||
Some(("--resolution", value)) => resolution = Some(value),
|
||||
Some(("--file", value)) => file = Some(PathBuf::from(value)),
|
||||
Some((name, _)) => {
|
||||
return Err(TicketCliError::new(format!(
|
||||
"unknown close argument: {name}"
|
||||
)));
|
||||
}
|
||||
None => {
|
||||
return Err(TicketCliError::new(format!(
|
||||
"unknown close argument: {}",
|
||||
args[i]
|
||||
)));
|
||||
}
|
||||
}
|
||||
}
|
||||
Ok(CloseOptions {
|
||||
query,
|
||||
resolution: exactly_one_body("close", file, resolution)?,
|
||||
})
|
||||
}
|
||||
|
||||
fn parse_one_positional(command: &str, args: &[String]) -> Result<String, TicketCliError> {
|
||||
if args.len() != 1 || args[0].starts_with('-') {
|
||||
Err(TicketCliError::new(format!(
|
||||
"{command} requires <id-or-slug>"
|
||||
)))
|
||||
} else {
|
||||
Ok(args[0].clone())
|
||||
}
|
||||
}
|
||||
|
||||
fn option_with_value(
|
||||
args: &[String],
|
||||
i: &mut usize,
|
||||
) -> Result<Option<(&'static str, String)>, TicketCliError> {
|
||||
let arg = &args[*i];
|
||||
for name in [
|
||||
"--title",
|
||||
"--slug",
|
||||
"--kind",
|
||||
"--priority",
|
||||
"--label",
|
||||
"--status",
|
||||
"--role",
|
||||
"--file",
|
||||
"--message",
|
||||
"--resolution",
|
||||
] {
|
||||
if arg == name {
|
||||
let value = args
|
||||
.get(*i + 1)
|
||||
.ok_or_else(|| TicketCliError::new(format!("{name} requires a value")))?;
|
||||
if value.starts_with('-') {
|
||||
return Err(TicketCliError::new(format!("{name} requires a value")));
|
||||
}
|
||||
*i += 2;
|
||||
return Ok(Some((name, value.clone())));
|
||||
}
|
||||
if let Some(value) = arg.strip_prefix(&format!("{name}=")) {
|
||||
if value.is_empty() {
|
||||
return Err(TicketCliError::new(format!("{name} requires a value")));
|
||||
}
|
||||
*i += 1;
|
||||
return Ok(Some((name, value.to_string())));
|
||||
}
|
||||
}
|
||||
Ok(None)
|
||||
}
|
||||
|
||||
fn parse_labels(value: &str) -> impl Iterator<Item = String> + '_ {
|
||||
value
|
||||
.split(',')
|
||||
.map(str::trim)
|
||||
.filter(|label| !label.is_empty())
|
||||
.map(ToOwned::to_owned)
|
||||
}
|
||||
|
||||
fn parse_list_status(value: &str) -> Result<ListStatus, TicketCliError> {
|
||||
match value {
|
||||
"open" => Ok(ListStatus::Open),
|
||||
"pending" => Ok(ListStatus::Pending),
|
||||
"closed" => Ok(ListStatus::Closed),
|
||||
"all" => Ok(ListStatus::All),
|
||||
_ => Err(TicketCliError::new(format!("invalid status: {value}"))),
|
||||
}
|
||||
}
|
||||
|
||||
fn parse_status_target(value: &str) -> Result<StatusTarget, TicketCliError> {
|
||||
match value {
|
||||
"open" => Ok(StatusTarget::Open),
|
||||
"pending" => Ok(StatusTarget::Pending),
|
||||
"closed" => Ok(StatusTarget::Closed),
|
||||
_ => Err(TicketCliError::new(format!("invalid status: {value}"))),
|
||||
}
|
||||
}
|
||||
|
||||
fn parse_comment_role(value: &str) -> Result<TicketEventKind, TicketCliError> {
|
||||
match value {
|
||||
"comment" => Ok(TicketEventKind::Comment),
|
||||
"plan" => Ok(TicketEventKind::Plan),
|
||||
"decision" => Ok(TicketEventKind::Decision),
|
||||
"implementation_report" => Ok(TicketEventKind::ImplementationReport),
|
||||
_ => Err(TicketCliError::new(format!(
|
||||
"invalid comment role: {value}"
|
||||
))),
|
||||
}
|
||||
}
|
||||
|
||||
fn exactly_one_body(
|
||||
command: &str,
|
||||
file: Option<PathBuf>,
|
||||
message: Option<String>,
|
||||
) -> Result<BodySource, TicketCliError> {
|
||||
match (file, message) {
|
||||
(Some(_), Some(_)) => Err(TicketCliError::new(format!(
|
||||
"{command} accepts exactly one of --file or --message/--resolution"
|
||||
))),
|
||||
(Some(path), None) => Ok(BodySource::File(path)),
|
||||
(None, Some(message)) => Ok(BodySource::Message(ensure_trailing_newline(message))),
|
||||
(None, None) => Err(TicketCliError::new(format!(
|
||||
"{command} requires --file or --message/--resolution"
|
||||
))),
|
||||
}
|
||||
}
|
||||
|
||||
fn read_body_source(source: &BodySource) -> Result<String, TicketCliError> {
|
||||
match source {
|
||||
BodySource::Message(message) => Ok(message.clone()),
|
||||
BodySource::File(path) => fs::read_to_string(path)
|
||||
.map(ensure_trailing_newline)
|
||||
.map_err(|error| {
|
||||
TicketCliError::new(format!("failed to read {}: {error}", path.display()))
|
||||
}),
|
||||
}
|
||||
}
|
||||
|
||||
fn ensure_trailing_newline(mut value: String) -> String {
|
||||
if !value.ends_with('\n') {
|
||||
value.push('\n');
|
||||
}
|
||||
value
|
||||
}
|
||||
|
||||
fn default_author() -> String {
|
||||
std::env::var("USER").unwrap_or_else(|_| "unknown".to_string())
|
||||
}
|
||||
|
||||
fn help_text() -> &'static str {
|
||||
"yoi ticket\n\nUsage:\n yoi ticket create --title <title> [--slug <slug>] [--kind <kind>] [--priority P2] [--label a,b]\n yoi ticket list [--status open|pending|closed|all]\n yoi ticket show <id-or-slug>\n yoi ticket comment <id-or-slug> [--role comment|plan|decision|implementation_report] (--file <path>|--message <text>)\n yoi ticket review <id-or-slug> (--approve|--request-changes) (--file <path>|--message <text>)\n yoi ticket status <id-or-slug> <open|pending|closed>\n yoi ticket close <id-or-slug> (--resolution <text>|--file <path>)\n yoi ticket doctor\n\nOptions:\n -h, --help Print help\n\nBackend:\n Uses the workspace Ticket config at .yoi/ticket.config.toml when present.\n Without config, the local backend root is <cwd>/work-items.\n"
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use tempfile::TempDir;
|
||||
use ticket::TicketEventKind;
|
||||
|
||||
fn args(items: &[&str]) -> Vec<String> {
|
||||
items.iter().map(|item| item.to_string()).collect()
|
||||
}
|
||||
|
||||
fn run(temp: &TempDir, items: &[&str]) -> TicketCliOutput {
|
||||
let cli = parse_ticket_args(&args(items)).unwrap();
|
||||
run_in_workspace(cli, temp.path()).unwrap()
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn ticket_cli_create_list_show_comment_review_status_close_and_doctor() {
|
||||
let temp = TempDir::new().unwrap();
|
||||
|
||||
let created = run(
|
||||
&temp,
|
||||
&[
|
||||
"create",
|
||||
"--title",
|
||||
"CLI Created",
|
||||
"--slug",
|
||||
"cli-created",
|
||||
"--kind",
|
||||
"task",
|
||||
"--priority",
|
||||
"P1",
|
||||
"--label",
|
||||
"ticket,cli",
|
||||
],
|
||||
);
|
||||
assert_eq!(created.status, TicketCliStatus::Success);
|
||||
assert!(created.stdout.contains("created\t"));
|
||||
assert!(created.stdout.contains("\tcli-created\topen"));
|
||||
|
||||
let listed = run(&temp, &["list", "--status", "open"]);
|
||||
assert!(listed.stdout.contains("status\tid\tslug"));
|
||||
assert!(listed.stdout.contains("CLI Created"));
|
||||
|
||||
let shown = run(&temp, &["show", "cli-created"]);
|
||||
assert!(shown.stdout.contains("# CLI Created"));
|
||||
assert!(shown.stdout.contains("Labels: ticket, cli"));
|
||||
|
||||
let commented = run(
|
||||
&temp,
|
||||
&[
|
||||
"comment",
|
||||
"cli-created",
|
||||
"--role",
|
||||
"implementation_report",
|
||||
"--message",
|
||||
"Implemented.",
|
||||
],
|
||||
);
|
||||
assert!(
|
||||
commented
|
||||
.stdout
|
||||
.contains("appended\tcli-created\timplementation_report")
|
||||
);
|
||||
|
||||
let reviewed = run(
|
||||
&temp,
|
||||
&[
|
||||
"review",
|
||||
"cli-created",
|
||||
"--approve",
|
||||
"--message",
|
||||
"Looks good.",
|
||||
],
|
||||
);
|
||||
assert!(reviewed.stdout.contains("reviewed\tcli-created\tapprove"));
|
||||
|
||||
let pending = run(&temp, &["status", "cli-created", "pending"]);
|
||||
assert!(pending.stdout.contains("status\tcli-created\tpending"));
|
||||
|
||||
let closed = run(
|
||||
&temp,
|
||||
&[
|
||||
"close",
|
||||
"cli-created",
|
||||
"--resolution",
|
||||
"Done via yoi ticket.",
|
||||
],
|
||||
);
|
||||
assert!(closed.stdout.contains("closed\tcli-created"));
|
||||
|
||||
let doctor = run(&temp, &["doctor"]);
|
||||
assert_eq!(doctor.status, TicketCliStatus::Success);
|
||||
assert_eq!(doctor.stdout, "doctor: ok\n");
|
||||
|
||||
let backend = LocalTicketBackend::new(temp.path().join("work-items"));
|
||||
let ticket = backend
|
||||
.show(TicketIdOrSlug::Query("cli-created".to_string()))
|
||||
.unwrap();
|
||||
assert!(ticket.resolution.is_some());
|
||||
assert!(
|
||||
ticket
|
||||
.events
|
||||
.iter()
|
||||
.any(|event| event.kind == TicketEventKind::ImplementationReport)
|
||||
);
|
||||
assert!(
|
||||
ticket
|
||||
.events
|
||||
.iter()
|
||||
.any(|event| event.kind == TicketEventKind::Review)
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn ticket_cli_uses_configured_backend_root() {
|
||||
let temp = TempDir::new().unwrap();
|
||||
fs::create_dir_all(temp.path().join(".yoi")).unwrap();
|
||||
fs::write(
|
||||
temp.path().join(".yoi/ticket.config.toml"),
|
||||
"[backend]\nroot = \"custom-work-items\"\n",
|
||||
)
|
||||
.unwrap();
|
||||
|
||||
run(
|
||||
&temp,
|
||||
&[
|
||||
"create",
|
||||
"--title",
|
||||
"Configured Root",
|
||||
"--slug",
|
||||
"configured-root",
|
||||
],
|
||||
);
|
||||
|
||||
assert!(
|
||||
temp.path()
|
||||
.join("custom-work-items/open")
|
||||
.read_dir()
|
||||
.unwrap()
|
||||
.any(|entry| entry
|
||||
.unwrap()
|
||||
.file_name()
|
||||
.to_string_lossy()
|
||||
.contains("configured-root"))
|
||||
);
|
||||
assert!(!temp.path().join("work-items").exists());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn ticket_cli_rejects_ambiguous_body_sources() {
|
||||
let err = parse_ticket_args(&args(&[
|
||||
"comment",
|
||||
"ticket",
|
||||
"--file",
|
||||
"body.md",
|
||||
"--message",
|
||||
"body",
|
||||
]))
|
||||
.unwrap_err();
|
||||
assert!(err.to_string().contains("exactly one"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn ticket_cli_rejects_ambiguous_review_result() {
|
||||
let err = parse_ticket_args(&args(&[
|
||||
"review",
|
||||
"ticket",
|
||||
"--approve",
|
||||
"--request-changes",
|
||||
"--message",
|
||||
"body",
|
||||
]))
|
||||
.unwrap_err();
|
||||
assert!(err.to_string().contains("exactly one"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn ticket_cli_status_closed_requires_close_command() {
|
||||
let temp = TempDir::new().unwrap();
|
||||
run(
|
||||
&temp,
|
||||
&["create", "--title", "Close Me", "--slug", "close-me"],
|
||||
);
|
||||
let cli = parse_ticket_args(&args(&["status", "close-me", "closed"])).unwrap();
|
||||
let err = run_in_workspace(cli, temp.path()).unwrap_err();
|
||||
assert!(err.to_string().contains("use `yoi ticket close"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn ticket_cli_help_lists_required_commands() {
|
||||
let help = parse_ticket_args(&args(&["--help"])).unwrap();
|
||||
let output = run_in_workspace(help, Path::new(".")).unwrap();
|
||||
assert!(output.stdout.contains("yoi ticket create"));
|
||||
assert!(output.stdout.contains("yoi ticket doctor"));
|
||||
}
|
||||
}
|
||||
|
|
@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec {
|
|||
filter = sourceFilter;
|
||||
};
|
||||
|
||||
cargoHash = "sha256-yk3cLEqIfLfjRpLM3Iaa7jJyV4inigD994QdUn/3iXY=";
|
||||
cargoHash = "sha256-+eIKCBT0NR8OJn8IxuJl2nc7M6OxlPQ+9RHncSz9K2M=";
|
||||
|
||||
depsExtraArgs = {
|
||||
# Older fetchCargoVendor utilities used crates.io's API download endpoint,
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user