From 7d401599594d3ee9b40a787a7dab0ac12a3e3d03 Mon Sep 17 00:00:00 2001 From: Ansho Rei Date: Thu, 14 May 2026 22:28:00 +0200 Subject: [PATCH] (e97d55) Add show command --- src/command.rs | 7 +- src/main.rs | 98 +++++++++- tests/{cmd_init.rs => cmd_add.rs} | 0 tests/cmd_ls.rs | 1 + tests/cmd_show.rs | 300 ++++++++++++++++++++++++++++++ 5 files changed, 398 insertions(+), 8 deletions(-) rename tests/{cmd_init.rs => cmd_add.rs} (100%) create mode 100644 tests/cmd_show.rs diff --git a/src/command.rs b/src/command.rs index a8780a1..463e61a 100644 --- a/src/command.rs +++ b/src/command.rs @@ -1,4 +1,3 @@ - use clap::Parser; #[derive(Parser)] @@ -51,4 +50,10 @@ pub enum Command { #[arg(long)] status: Option, }, + + /// Show a ticket by UUID or title + Show { + /// Ticket UUID or title to search for + id: String, + }, } diff --git a/src/main.rs b/src/main.rs index f105afd..7d0979b 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,4 +1,4 @@ -use anyhow::{anyhow, Result}; +use anyhow::{Result, anyhow}; use clap::Parser; use std::fs; use std::path::Path; @@ -40,7 +40,10 @@ fn cmd_init(start: &Path) -> Result<()> { let worklane_dir = dir.join(".worklane"); if worklane_dir.exists() { - println!("worklane already initialized in: {}", worklane_dir.display()); + println!( + "worklane already initialized in: {}", + worklane_dir.display() + ); return Ok(()); } @@ -61,7 +64,12 @@ fn parse_ticket_field(content: &str, field: &str) -> String { .lines() .find(|line| line.contains(&pattern)) .map(|line| { - line.split(':').nth(1).unwrap_or("").trim().trim_matches('_').trim() + line.split(':') + .nth(1) + .unwrap_or("") + .trim() + .trim_matches('_') + .trim() }) .unwrap_or("_Not set_") .to_string() @@ -81,9 +89,7 @@ fn cmd_ls(status_filter: &Option, worklane_dir: &Path) -> Result<()> { )); } - let entries: Vec<_> = fs::read_dir(&status_path)? - .filter_map(|e| e.ok()) - .collect(); + let entries: Vec<_> = fs::read_dir(&status_path)?.filter_map(|e| e.ok()).collect(); if entries.is_empty() { println!("No tickets in '{}' status.", status); @@ -253,6 +259,73 @@ fn cmd_add( Ok(()) } +fn cmd_show(search: &str, worklane_dir: &Path) -> Result<()> { + let statuses = status_dirs(); + let mut matches: Vec<(String, String, String)> = Vec::new(); + + for status in &statuses { + let status_path = worklane_dir.join(status); + if !status_path.exists() { + continue; + } + let entries = fs::read_dir(&status_path)?; + for entry in entries.filter_map(|e| e.ok()) { + let path = entry.path(); + if !path.extension().map_or(false, |e| e == "md") { + continue; + } + let content = match fs::read_to_string(&path) { + Ok(c) => c, + Err(_) => continue, + }; + let title = content + .lines() + .find(|l| l.starts_with("# ")) + .map(|l| l[2..].trim()) + .unwrap_or("") + .to_string(); + let filename = path + .file_stem() + .map(|s| s.to_string_lossy().to_string()) + .unwrap_or_default(); + let id = filename.split('_').next().unwrap_or(""); + + let search_lower = search.to_lowercase(); + let title_lower = title.to_lowercase(); + let filename_lower = filename.to_lowercase(); + + let id_match = id.to_lowercase().starts_with(&search_lower) && id.len() >= 8; + let title_match = title_lower.contains(&search_lower); + let filename_match = filename_lower.contains(&search_lower); + + if id_match || title_match || filename_match { + matches.push((status.to_string(), title, content)); + } + } + } + + if matches.is_empty() { + return Err(anyhow!("No ticket found matching '{}'", search)); + } + + if matches.len() > 1 { + println!("Multiple tickets found matching '{}':", search); + for (i, (status, title, _)) in matches.iter().enumerate() { + println!(" {}. {} ({})", i + 1, title, status); + } + println!("\nTry a more specific search term."); + std::process::exit(1); + } + + let (_status, title, content) = matches.remove(0); + + println!("{}\n", title); + println!("{} ", "─".repeat(title.len())); + println!("\n{}", content.trim()); + + Ok(()) +} + fn main() -> Result<()> { let cli = Cli::parse(); @@ -269,11 +342,22 @@ fn main() -> Result<()> { due, owner, } => cmd_add( - &title, &description, &acceptance, &plan, &tags, &due, &owner, &start, + &title, + &description, + &acceptance, + &plan, + &tags, + &due, + &owner, + &start, ), Command::Ls { status } => { let worklane_dir = find_worklane_dir(&start)?; cmd_ls(&status, &worklane_dir) } + Command::Show { id } => { + let worklane_dir = find_worklane_dir(&start)?; + cmd_show(&id, &worklane_dir) + } } } diff --git a/tests/cmd_init.rs b/tests/cmd_add.rs similarity index 100% rename from tests/cmd_init.rs rename to tests/cmd_add.rs diff --git a/tests/cmd_ls.rs b/tests/cmd_ls.rs index 39d570f..69fc3cb 100644 --- a/tests/cmd_ls.rs +++ b/tests/cmd_ls.rs @@ -144,6 +144,7 @@ fn ls_listed_tickets_sorted_alphabetically() { #[test] fn ls_empty_status_shows_message() { let temp = TempDir::new().unwrap(); + let worklane = setup_worklane(&temp); // Intentionally leave "done" empty let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); diff --git a/tests/cmd_show.rs b/tests/cmd_show.rs new file mode 100644 index 0000000..3ec0f1f --- /dev/null +++ b/tests/cmd_show.rs @@ -0,0 +1,300 @@ +use assert_cmd::Command; +use assert_fs::TempDir; +use assert_fs::fixture::{PathChild, PathCreateDir}; +use std::fs; + +const BIN_NAME: &str = env!("CARGO_BIN_EXE_worklane"); + +fn setup_worklane(temp: &TempDir) -> std::path::PathBuf { + let worklane = temp.child(".worklane"); + worklane.create_dir_all().unwrap(); + + for dir in ["backlog", "committed", "reviewing", "done"] { + worklane.child(dir).create_dir_all().unwrap(); + } + + worklane.path().to_path_buf() +} + +fn create_ticket( + worklane_dir: &std::path::PathBuf, + status: &str, + title: &str, + description: &str, + id: &str, + owner: &str, + due: &str, + tags: &str, +) -> String { + let slug = title + .to_lowercase() + .chars() + .filter(|c| c.is_alphanumeric() || *c == ' ' || *c == '-' || *c == '_') + .map(|c| if c == ' ' { '-' } else { c }) + .collect::(); + let filename = format!("{}_{}.md", id, slug); + let ticket_body = format!( + "# {}\n\ + \n\ + ## Description\n\ + {}\n\ + \n\ + ## Acceptance Criteria\n\ + - [ ] test\n\ + \n\ + ## Implementation Plan\n\ + - test\n\ + \n\ + ## Metadata\n\ + \n\ + - **ID**: {}\n\ + - **Tags**: {}\n\ + - **Due**: {}\n\ + - **Owner**: {}\n\ + - **Status**: {}\n\ + ", + title, description, id, tags, due, owner, status + ); + fs::write(worklane_dir.join(status).join(&filename), ticket_body).unwrap(); + filename +} + +fn get_stdout(cmd: &mut Command) -> String { + let assert = cmd.assert(); + String::from_utf8(assert.get_output().stdout.clone()).unwrap() +} + +fn get_stderr(cmd: &mut Command) -> String { + let assert = cmd.assert(); + String::from_utf8(assert.get_output().stderr.clone()).unwrap() +} + +#[test] +fn show_displays_ticket_by_full_uuid() { + let temp = TempDir::new().unwrap(); + let worklane = setup_worklane(&temp); + + let _filename = create_ticket( + &worklane, + "backlog", + "Test Ticket", + "This is a test ticket description.", + "abc123def456789012345678901234567890", + "alice", + "2026-12-31", + "test", + ); + + let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); + cmd.current_dir(&temp.path()) + .arg("show") + .arg("abc123def456789012345678901234567890") + .assert() + .success(); + + let stdout = get_stdout(&mut cmd); + assert!(stdout.contains("Test Ticket")); + assert!(stdout.contains("This is a test ticket description.")); + assert!(stdout.contains("alice")); + assert!(stdout.contains("2026-12-31")); + assert!(stdout.contains("test")); +} + +#[test] +fn show_displays_ticket_by_partial_uuid() { + let temp = TempDir::new().unwrap(); + let worklane = setup_worklane(&temp); + + let uuid = "abc123def456789012345678901234567890"; + create_ticket( + &worklane, + "backlog", + "Test Ticket", + "This is a test ticket description.", + uuid, + "alice", + "2026-12-31", + "test", + ); + + let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); + cmd.current_dir(&temp.path()) + .arg("show") + .arg("abc123def4567890") + .assert() + .success(); + + let stdout = get_stdout(&mut cmd); + assert!(stdout.contains("Test Ticket")); + assert!(stdout.contains("This is a test ticket description.")); +} + +#[test] +fn show_displays_ticket_by_title() { + let temp = TempDir::new().unwrap(); + let worklane = setup_worklane(&temp); + + let uuid = "abc123def456789012345678901234567890"; + create_ticket( + &worklane, + "backlog", + "Fix Login Bug", + "Users cannot log in.", + uuid, + "bob", + "2026-11-15", + "bug,frontend", + ); + + let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); + cmd.current_dir(&temp.path()) + .arg("show") + .arg("login") + .assert() + .success(); + + let stdout = get_stdout(&mut cmd); + assert!(stdout.contains("Fix Login Bug")); + assert!(stdout.contains("Users cannot log in.")); + assert!(stdout.contains("bob")); + assert!(stdout.contains("2026-11-15")); +} + +#[test] +fn show_displays_ticket_by_partial_title() { + let temp = TempDir::new().unwrap(); + let worklane = setup_worklane(&temp); + + let uuid = "abc123def456789012345678901234567890"; + create_ticket( + &worklane, + "backlog", + "Fix Login Bug", + "Users cannot log in.", + uuid, + "bob", + "2026-11-15", + "bug,frontend", + ); + + let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); + cmd.current_dir(&temp.path()) + .arg("show") + .arg("fix") + .assert() + .success(); + + let stdout = get_stdout(&mut cmd); + assert!(stdout.contains("Fix Login Bug")); +} + +#[test] +fn show_shows_both_uuid_and_title_in_output() { + let temp = TempDir::new().unwrap(); + let worklane = setup_worklane(&temp); + + let uuid = "abc123def456789012345678901234567890"; + create_ticket( + &worklane, + "backlog", + "Test Ticket", + "Description here.", + uuid, + "charlie", + "2026-09-01", + "test", + ); + + let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); + cmd.current_dir(&temp.path()) + .arg("show") + .arg("test") + .assert() + .success(); + + let stdout = get_stdout(&mut cmd); + assert!(stdout.contains("abc123def456789012345678901234567890")); +} + +#[test] +fn show_fails_for_nonexistent_ticket() { + let temp = TempDir::new().unwrap(); + setup_worklane(&temp); + + let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); + cmd.current_dir(&temp.path()) + .arg("show") + .arg("nonexistent") + .assert() + .failure(); +} + +#[test] +fn show_asks_for_disambiguation_when_multiple_matches() { + let temp = TempDir::new().unwrap(); + let worklane = setup_worklane(&temp); + + let uuid1 = "abc123def456789012345678901234567890"; + create_ticket( + &worklane, + "backlog", + "Test Ticket A", + "First test ticket.", + uuid1, + "alice", + "2026-12-31", + "test", + ); + + let uuid2 = "fedcba0987654321fedcba09876543210987654321"; + create_ticket( + &worklane, + "backlog", + "Test Ticket B", + "Second test ticket.", + uuid2, + "bob", + "2026-10-15", + "test", + ); + + let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); + cmd.current_dir(&temp.path()).arg("show").arg("est"); + + cmd.assert().failure(); + + let stderr = get_stderr(&mut cmd); + assert!(stderr.contains("Multiple tickets found")); + assert!(stderr.contains("Test Ticket A")); + assert!(stderr.contains("Test Ticket B")); +} + +#[test] +fn show_searches_across_all_statuses() { + let temp = TempDir::new().unwrap(); + let worklane = setup_worklane(&temp); + + // Create ticket in committed status + let uuid = "abc123def456789012345678901234567890"; + create_ticket( + &worklane, + "committed", + "Committed Task", + "This is in committed.", + uuid, + "charlie", + "2026-08-01", + "task", + ); + + let mut cmd = Command::cargo_bin(BIN_NAME).unwrap(); + cmd.current_dir(&temp.path()) + .arg("show") + .arg("committed") + .assert() + .success(); + + let stdout = get_stdout(&mut cmd); + assert!(stdout.contains("Committed Task")); + assert!(stdout.contains("This is in committed.")); +}