Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6a800fb385 | ||
|
|
4ae7ef03ff | ||
|
|
73ffcad733 | ||
|
|
964ca342d8 |
@@ -0,0 +1,8 @@
|
|||||||
|
# Revisions that changed layout and nothing else. Teach git to look through them:
|
||||||
|
#
|
||||||
|
# git config blame.ignoreRevsFile .git-blame-ignore-revs
|
||||||
|
#
|
||||||
|
# Only a commit whose diff is pure formatting belongs here.
|
||||||
|
|
||||||
|
# Reformat with cargo fmt, and nothing else
|
||||||
|
73ffcad73314621e299dc06ee688db9b4c4d6b29
|
||||||
@@ -42,6 +42,20 @@ and this file is for what someone changing worklane's own code needs.
|
|||||||
- `setup_worklane()` creates temp `.worklane/` with all four status folders pre-created, plus `campaigns/` in `cmd_campaign.rs`, which is also where the on-demand creation is tested from a board without it
|
- `setup_worklane()` creates temp `.worklane/` with all four status folders pre-created, plus `campaigns/` in `cmd_campaign.rs`, which is also where the on-demand creation is tested from a board without it
|
||||||
- `create_ticket()` writes fully-formed markdown files directly (no `--` separator for positional args in test commands)
|
- `create_ticket()` writes fully-formed markdown files directly (no `--` separator for positional args in test commands)
|
||||||
- **`cargo clippy --all-targets` is clean. Keep it clean**, and do not silence a lint that is pointing at something real. The only two `allow`s in the tree sit on the `create_ticket` fixtures in `cmd_mv.rs` and `cmd_show.rs`, each carrying the reason and what would replace it
|
- **`cargo clippy --all-targets` is clean. Keep it clean**, and do not silence a lint that is pointing at something real. The only two `allow`s in the tree sit on the `create_ticket` fixtures in `cmd_mv.rs` and `cmd_show.rs`, each carrying the reason and what would replace it
|
||||||
|
- **`cargo fmt --check` is clean too, and `rustfmt.toml` is what makes that affordable.** rustfmt is the formatter here, run it. The config is four stable width settings and nothing else:
|
||||||
|
|
||||||
|
| setting | value | why |
|
||||||
|
|---|---|---|
|
||||||
|
| `max_width` | 100 | The tree's own habit, and the measured optimum: 90 costs 268 hunks and 120 costs 194, against 161 at 100 |
|
||||||
|
| `fn_call_width` | 75 | A call stays whole if it fits in three quarters of the line. rustfmt's default of 60 is what expanded 276 of the 305 hunks the default config wanted |
|
||||||
|
| `chain_width` | 65 | The same for a method chain |
|
||||||
|
| `struct_lit_width` | 30 | A small struct literal stays whole, so `Size { width: 120, height: 20 }` is not six lines |
|
||||||
|
|
||||||
|
**The numbers were measured, not chosen.** Default rustfmt wanted 305 hunks and would have added 1418 lines of pure layout, because its sub-widths sit far below the 100 columns this tree is written to. `use_small_heuristics = "Max"` went the other way, 308 hunks and 796 lines *removed*, one-lining `if`/`else` and collapsing struct literals that were split on purpose. Coordinate descent over the stable width knobs landed here, at 161 hunks, and 98 of those are rustfmt *joining* calls that fit rather than breaking them. Sweeping any one of these four in either direction makes the diff bigger, so do not adjust one by eye; measure it the same way, with `cargo fmt --check | grep -c '^Diff in'`
|
||||||
|
- What this does not buy: rustfmt has no rule for "keep parallel arms parallel", so a match whose arms are one line and four lines depending on the length of their contents is what it produces, and that is accepted. Reach for `#[rustfmt::skip]` only where the layout carries meaning a reader needs, not to win an argument about density
|
||||||
|
- Do not add an unstable option. `cargo fmt` on stable ignores them with a warning, so the tree would format differently for whoever ran nightly
|
||||||
|
- **Sixteen lines still run past 100 columns and every one of them is a single string literal**, a test fixture or an error message rustfmt cannot break. `format_strings` is deliberately left at its default: turning it on would let the formatter rewrite message text, and a message is prose. So `max_width` is where rustfmt breaks lines, not a limit the tree keeps
|
||||||
|
- The reformat is `73ffcad`, and `.git-blame-ignore-revs` names it so `git blame` looks through it. Turn that on once per clone with `git config blame.ignoreRevsFile .git-blame-ignore-revs`. A commit belongs in that file only if its diff is pure layout
|
||||||
|
|
||||||
## Coding Guidelines
|
## Coding Guidelines
|
||||||
|
|
||||||
@@ -336,7 +350,9 @@ and this file is for what someone changing worklane's own code needs.
|
|||||||
- The UUID tier applies from `MIN_ID_SEARCH` (4) characters up. Not 8: `ls` prints `SHORT_ID_WIDTH` (7) characters, so a longer minimum would drop the printed id out of the UUID tier and let any title quoting it win instead. Below the minimum the search is text, so `show 641` is a title search
|
- The UUID tier applies from `MIN_ID_SEARCH` (4) characters up. Not 8: `ls` prints `SHORT_ID_WIDTH` (7) characters, so a longer minimum would drop the printed id out of the UUID tier and let any title quoting it win instead. Below the minimum the search is text, so `show 641` is a title search
|
||||||
- The filename tier earns its place by reaching the middle of a UUID, which the prefix tier cannot. It is also why a short UUID search still resolves under a longer minimum, just at the wrong precedence, so a test for the minimum needs a decoy title to be meaningful
|
- The filename tier earns its place by reaching the middle of a UUID, which the prefix tier cannot. It is also why a short UUID search still resolves under a longer minimum, just at the wrong precedence, so a test for the minimum needs a decoy title to be meaningful
|
||||||
- Ambiguous matches (multiple results) print options and exit(1)
|
- Ambiguous matches (multiple results) print options and exit(1)
|
||||||
- Never return empty strings for required fields — use the `NOT_SET` and `NONE` constants in `util.rs`, which are what `add` writes and what `--clear` puts back. `is_unknown_value` reads both, plus the two hyphenated spellings an earlier version wrote
|
- Never return empty strings for required fields — use the `NOT_SET` and `NONE` constants in `util.rs`, which are what `add` writes and what `--clear` puts back. `is_unknown_value` reads those two and nothing else
|
||||||
|
- **`-None-` and `-Not set-` are not unset, and re-adding them would be a mistake with a plausible story behind it.** They were accepted by `is_unknown_value` from the day it was written, by analogy with the `**-Status**` field name the `mv` splicing bug really did produce, c230d2c. But no version of this tool ever wrote a hyphenated *value*: `git log -S` finds both spellings in exactly one commit, the one that added them to the check. Dead from birth, and dropped by bdddc09. `a_hyphenated_marker_is_not_unset` is what stops the analogy being drawn a second time
|
||||||
|
- **The `**-Status**` repair in `is_status_line` is the opposite case and stays.** That corruption was real, `mv` wrote it, and the repair is what fixes a damaged ticket as it moves. Do not tidy the two away together on the grounds that they look alike
|
||||||
|
|
||||||
### Git Workflow
|
### Git Workflow
|
||||||
- Commit format: `([ticketID]) [short description]`
|
- Commit format: `([ticketID]) [short description]`
|
||||||
|
|||||||
Generated
+1
-1
@@ -1503,7 +1503,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "worklane"
|
name = "worklane"
|
||||||
version = "0.18.0"
|
version = "0.18.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"assert_cmd",
|
"assert_cmd",
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "worklane"
|
name = "worklane"
|
||||||
version = "0.18.0"
|
version = "0.18.1"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
|||||||
@@ -24,9 +24,9 @@ fn git_sha() -> String {
|
|||||||
.output();
|
.output();
|
||||||
|
|
||||||
let sha = match output {
|
let sha = match output {
|
||||||
Ok(output) if output.status.success() => String::from_utf8_lossy(&output.stdout)
|
Ok(output) if output.status.success() => {
|
||||||
.trim()
|
String::from_utf8_lossy(&output.stdout).trim().to_string()
|
||||||
.to_string(),
|
}
|
||||||
_ => String::new(),
|
_ => String::new(),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,22 @@
|
|||||||
|
# rustfmt is the formatter for this tree, and these four widths are what make it agree
|
||||||
|
# with how the tree is already written. Measured, not chosen: the default config wanted
|
||||||
|
# 305 hunks and +1418 lines of layout, `use_small_heuristics = "Max"` wanted 308 the
|
||||||
|
# other way, and this lands at 161. The reasoning is in AGENTS.md beside the clippy rule.
|
||||||
|
#
|
||||||
|
# Sweeping any one of these in either direction makes the diff bigger. Measure before
|
||||||
|
# changing one: `cargo fmt --check | grep -c '^Diff in'`.
|
||||||
|
|
||||||
|
# The habit the tree is written to, and the measured optimum: 90 costs 268 hunks, 120
|
||||||
|
# costs 194.
|
||||||
|
max_width = 100
|
||||||
|
|
||||||
|
# A call stays whole if it fits in three quarters of the line. rustfmt's default of 60
|
||||||
|
# is what expands 276 of the 305 hunks the default config wants.
|
||||||
|
fn_call_width = 75
|
||||||
|
|
||||||
|
# The same for a method chain.
|
||||||
|
chain_width = 65
|
||||||
|
|
||||||
|
# A small struct literal stays whole, so `Size { width: 120, height: 20 }` is not six
|
||||||
|
# lines. Above the default of 18, which is what explodes it.
|
||||||
|
struct_lit_width = 30
|
||||||
+2
-7
@@ -32,8 +32,7 @@ pub fn campaigns_dir(worklane_dir: &Path) -> PathBuf {
|
|||||||
pub fn ensure_campaigns_dir(worklane_dir: &Path) -> Result<PathBuf> {
|
pub fn ensure_campaigns_dir(worklane_dir: &Path) -> Result<PathBuf> {
|
||||||
let dir = campaigns_dir(worklane_dir);
|
let dir = campaigns_dir(worklane_dir);
|
||||||
|
|
||||||
fs::create_dir_all(&dir)
|
fs::create_dir_all(&dir).map_err(|e| anyhow!("Could not create {}: {}", dir.display(), e))?;
|
||||||
.map_err(|e| anyhow!("Could not create {}: {}", dir.display(), e))?;
|
|
||||||
|
|
||||||
Ok(dir)
|
Ok(dir)
|
||||||
}
|
}
|
||||||
@@ -166,11 +165,7 @@ pub fn campaign_cell(content: &str, index: &CampaignIndex, colored: bool) -> Str
|
|||||||
return String::new();
|
return String::new();
|
||||||
};
|
};
|
||||||
|
|
||||||
reference_cell(
|
reference_cell(&uuid, index.get(&uuid).map(|campaign| campaign.title.as_str()), colored)
|
||||||
&uuid,
|
|
||||||
index.get(&uuid).map(|campaign| campaign.title.as_str()),
|
|
||||||
colored,
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// The parts [`content_trim`] cannot render from the ticket file alone.
|
/// The parts [`content_trim`] cannot render from the ticket file alone.
|
||||||
|
|||||||
+1
-5
@@ -475,11 +475,7 @@ impl ChownArgs {
|
|||||||
/// error at the call site rather than a panic, so loosening one of them costs a
|
/// error at the call site rather than a panic, so loosening one of them costs a
|
||||||
/// message instead of a crash.
|
/// message instead of a crash.
|
||||||
pub fn target(&self) -> Option<(&str, Option<&str>)> {
|
pub fn target(&self) -> Option<(&str, Option<&str>)> {
|
||||||
match (
|
match (self.clear.as_deref(), self.user.as_deref(), self.ticket.as_deref()) {
|
||||||
self.clear.as_deref(),
|
|
||||||
self.user.as_deref(),
|
|
||||||
self.ticket.as_deref(),
|
|
||||||
) {
|
|
||||||
(Some(ticket), None, None) => Some((ticket, None)),
|
(Some(ticket), None, None) => Some((ticket, None)),
|
||||||
(None, Some(user), Some(ticket)) => Some((ticket, Some(user))),
|
(None, Some(user), Some(ticket)) => Some((ticket, Some(user))),
|
||||||
_ => None,
|
_ => None,
|
||||||
|
|||||||
+1
-4
@@ -238,10 +238,7 @@ mod tests {
|
|||||||
.filter_map(|arg| arg.get_long().map(str::to_string))
|
.filter_map(|arg| arg.get_long().map(str::to_string))
|
||||||
.collect();
|
.collect();
|
||||||
for flag in TICKET_FLAGS {
|
for flag in TICKET_FLAGS {
|
||||||
assert!(
|
assert!(known.contains(&flag.to_string()), "`relate` has no --{flag}");
|
||||||
known.contains(&flag.to_string()),
|
|
||||||
"`relate` has no --{flag}"
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+15
-66
@@ -16,10 +16,7 @@ pub fn cmd_init(start: &Path) -> Result<()> {
|
|||||||
let worklane_dir = dir.join(".worklane");
|
let worklane_dir = dir.join(".worklane");
|
||||||
|
|
||||||
if worklane_dir.exists() {
|
if worklane_dir.exists() {
|
||||||
println!(
|
println!("worklane already initialized in: {}", worklane_dir.display());
|
||||||
"worklane already initialized in: {}",
|
|
||||||
worklane_dir.display()
|
|
||||||
);
|
|
||||||
return Ok(());
|
return Ok(());
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -179,10 +176,7 @@ fn filtered(
|
|||||||
campaign: Option<&str>,
|
campaign: Option<&str>,
|
||||||
tag: Option<&str>,
|
tag: Option<&str>,
|
||||||
) -> Vec<TicketItem> {
|
) -> Vec<TicketItem> {
|
||||||
filter_by_tag(
|
filter_by_tag(filter_by_campaign(filter_by_priority(items, level), campaign), tag)
|
||||||
filter_by_campaign(filter_by_priority(items, level), campaign),
|
|
||||||
tag,
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Keep only the tickets carrying `tag`, or everything when none was asked for.
|
/// Keep only the tickets carrying `tag`, or everything when none was asked for.
|
||||||
@@ -246,9 +240,7 @@ pub fn cmd_add(args: &AddArgs, start: &Path) -> Result<()> {
|
|||||||
let backlog_dir = worklane_dir.join("backlog");
|
let backlog_dir = worklane_dir.join("backlog");
|
||||||
|
|
||||||
if !backlog_dir.exists() {
|
if !backlog_dir.exists() {
|
||||||
return Err(anyhow!(
|
return Err(anyhow!("Backlog directory not found. Run `worklane init` first."));
|
||||||
"Backlog directory not found. Run `worklane init` first."
|
|
||||||
));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
let id = uuid::Uuid::new_v4();
|
let id = uuid::Uuid::new_v4();
|
||||||
@@ -331,12 +323,7 @@ pub fn cmd_add(args: &AddArgs, start: &Path) -> Result<()> {
|
|||||||
// the write's own failure, named with the ticket and the path the way the other
|
// the write's own failure, named with the ticket and the path the way the other
|
||||||
// writes in the tree name them.
|
// writes in the tree name them.
|
||||||
fs::write(&filepath, body).map_err(|e| {
|
fs::write(&filepath, body).map_err(|e| {
|
||||||
anyhow!(
|
anyhow!("Could not write ticket '{}' at {}: {}", title, filepath.display(), e)
|
||||||
"Could not write ticket '{}' at {}: {}",
|
|
||||||
title,
|
|
||||||
filepath.display(),
|
|
||||||
e
|
|
||||||
)
|
|
||||||
})?;
|
})?;
|
||||||
|
|
||||||
println!("Created ticket: {}", filename);
|
println!("Created ticket: {}", filename);
|
||||||
@@ -482,12 +469,7 @@ fn write_then_replace(
|
|||||||
|
|
||||||
if let Err(e) = fs::rename(&temp, path) {
|
if let Err(e) = fs::rename(&temp, path) {
|
||||||
let _ = fs::remove_file(&temp);
|
let _ = fs::remove_file(&temp);
|
||||||
return Err(anyhow!(
|
return Err(anyhow!("Could not write ticket '{}' at {}: {}", title, path.display(), e));
|
||||||
"Could not write ticket '{}' at {}: {}",
|
|
||||||
title,
|
|
||||||
path.display(),
|
|
||||||
e
|
|
||||||
));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
@@ -558,14 +540,8 @@ fn move_ticket_file(
|
|||||||
|
|
||||||
// The content is correct and in one place by now, so a failure here leaves the
|
// The content is correct and in one place by now, so a failure here leaves the
|
||||||
// ticket where it started rather than half moved.
|
// ticket where it started rather than half moved.
|
||||||
fs::rename(&source, &dest).map_err(|e| {
|
fs::rename(&source, &dest)
|
||||||
anyhow!(
|
.map_err(|e| anyhow!("Could not move ticket '{}' to {}: {}", title, dest.display(), e))
|
||||||
"Could not move ticket '{}' to {}: {}",
|
|
||||||
title,
|
|
||||||
dest.display(),
|
|
||||||
e
|
|
||||||
)
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Refuse a move while a ticket it is `blocked by` is not done.
|
/// Refuse a move while a ticket it is `blocked by` is not done.
|
||||||
@@ -824,12 +800,7 @@ fn report(fields: &[&str], title: &str, verb: &str) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
println!(
|
println!("{} {} on '{}'", verb, fields.join(", "), color_text(title, Color::Green));
|
||||||
"{} {} on '{}'",
|
|
||||||
verb,
|
|
||||||
fields.join(", "),
|
|
||||||
color_text(title, Color::Green)
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn cmd_set(args: &SetArgs, start: &Path) -> Result<()> {
|
pub fn cmd_set(args: &SetArgs, start: &Path) -> Result<()> {
|
||||||
@@ -1030,10 +1001,7 @@ pub fn cmd_relate(args: &RelateArgs, start: &Path) -> Result<()> {
|
|||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
let relation = Relation {
|
let relation = Relation { kind, target: target_uuid };
|
||||||
kind,
|
|
||||||
target: target_uuid,
|
|
||||||
};
|
|
||||||
|
|
||||||
// Already held, either in the file or earlier in this call. Recording it
|
// Already held, either in the file or earlier in this call. Recording it
|
||||||
// twice would read as two dependencies on one ticket.
|
// twice would read as two dependencies on one ticket.
|
||||||
@@ -1068,11 +1036,7 @@ pub fn cmd_relate(args: &RelateArgs, start: &Path) -> Result<()> {
|
|||||||
/// half-written campaign behind. `cmd_add` predates that primitive and still uses the
|
/// half-written campaign behind. `cmd_add` predates that primitive and still uses the
|
||||||
/// plain write; the difference is noted on the ticket rather than fixed here.
|
/// plain write; the difference is noted on the ticket rather than fixed here.
|
||||||
pub fn cmd_campaign_add(args: &CampaignAddArgs, start: &Path) -> Result<()> {
|
pub fn cmd_campaign_add(args: &CampaignAddArgs, start: &Path) -> Result<()> {
|
||||||
let CampaignAddArgs {
|
let CampaignAddArgs { title, description, owner } = args;
|
||||||
title,
|
|
||||||
description,
|
|
||||||
owner,
|
|
||||||
} = args;
|
|
||||||
|
|
||||||
let worklane_dir = find_worklane_dir(start)?;
|
let worklane_dir = find_worklane_dir(start)?;
|
||||||
let dir = ensure_campaigns_dir(&worklane_dir)?;
|
let dir = ensure_campaigns_dir(&worklane_dir)?;
|
||||||
@@ -1148,10 +1112,7 @@ pub fn cmd_campaign_show(search: &str, worklane_dir: &Path) -> Result<()> {
|
|||||||
println!("{}", "─".repeat(campaign.title.chars().count()));
|
println!("{}", "─".repeat(campaign.title.chars().count()));
|
||||||
// No relations and no campaign of its own: a campaign is not a ticket, and neither
|
// No relations and no campaign of its own: a campaign is not a ticket, and neither
|
||||||
// belongs to one.
|
// belongs to one.
|
||||||
println!(
|
println!("\n{}", content_trim_colored(&campaign.content, &Resolved::default()));
|
||||||
"\n{}",
|
|
||||||
content_trim_colored(&campaign.content, &Resolved::default())
|
|
||||||
);
|
|
||||||
|
|
||||||
let grouped = members(worklane_dir, &campaign.uuid)?;
|
let grouped = members(worklane_dir, &campaign.uuid)?;
|
||||||
let standing = Standing::of(&grouped);
|
let standing = Standing::of(&grouped);
|
||||||
@@ -1164,10 +1125,7 @@ pub fn cmd_campaign_show(search: &str, worklane_dir: &Path) -> Result<()> {
|
|||||||
if items.is_empty() {
|
if items.is_empty() {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
println!(
|
println!("\n{}", color_text(&format!("[{}]", status.to_uppercase()), Color::Orange));
|
||||||
"\n{}",
|
|
||||||
color_text(&format!("[{}]", status.to_uppercase()), Color::Orange)
|
|
||||||
);
|
|
||||||
display_ticket_items(items);
|
display_ticket_items(items);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1188,8 +1146,7 @@ pub fn cmd_assign(campaign_search: &str, ticket_id: &str, start: &Path) -> Resul
|
|||||||
let (status, title, original) = resolve_ticket(ticket_id, &worklane_dir)?;
|
let (status, title, original) = resolve_ticket(ticket_id, &worklane_dir)?;
|
||||||
let uuid = parse_ticket_field(&original, "ID");
|
let uuid = parse_ticket_field(&original, "ID");
|
||||||
|
|
||||||
let content =
|
let content = set_or_insert_metadata_field(&original, CAMPAIGN_FIELD, &campaign.uuid, &title)?;
|
||||||
set_or_insert_metadata_field(&original, CAMPAIGN_FIELD, &campaign.uuid, &title)?;
|
|
||||||
|
|
||||||
if content == original {
|
if content == original {
|
||||||
println!(
|
println!(
|
||||||
@@ -1341,10 +1298,7 @@ pub fn cmd_check(args: &CheckArgs, checked: bool, start: &Path) -> Result<()> {
|
|||||||
.collect();
|
.collect();
|
||||||
|
|
||||||
if !changing.is_empty() {
|
if !changing.is_empty() {
|
||||||
let lines: Vec<usize> = changing
|
let lines: Vec<usize> = changing.iter().map(|offset| criteria[*offset].line).collect();
|
||||||
.iter()
|
|
||||||
.map(|offset| criteria[*offset].line)
|
|
||||||
.collect();
|
|
||||||
let updated = set_criteria(&content, &lines, checked);
|
let updated = set_criteria(&content, &lines, checked);
|
||||||
let uuid = parse_ticket_field(&content, "ID");
|
let uuid = parse_ticket_field(&content, "ID");
|
||||||
save_ticket(&worklane_dir, &status, &uuid, &title, None, &updated)?;
|
save_ticket(&worklane_dir, &status, &uuid, &title, None, &updated)?;
|
||||||
@@ -1363,12 +1317,7 @@ pub fn cmd_check(args: &CheckArgs, checked: bool, start: &Path) -> Result<()> {
|
|||||||
past.to_string()
|
past.to_string()
|
||||||
};
|
};
|
||||||
|
|
||||||
println!(
|
println!("{} {}: {}", state, offset + 1, color_text(&criterion.text, Color::Green));
|
||||||
"{} {}: {}",
|
|
||||||
state,
|
|
||||||
offset + 1,
|
|
||||||
color_text(&criterion.text, Color::Green)
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
|
|||||||
+14
-18
@@ -75,9 +75,10 @@ pub static SKILLS: [Asset; 3] = [SKILL, REVIEW_SKILL, PLAN_SKILL];
|
|||||||
|
|
||||||
/// The skill a name on the command line asks for.
|
/// The skill a name on the command line asks for.
|
||||||
pub fn skill_named(name: &str) -> Result<&'static Asset> {
|
pub fn skill_named(name: &str) -> Result<&'static Asset> {
|
||||||
SKILLS.iter().find(|asset| asset.name == name).ok_or_else(|| {
|
SKILLS
|
||||||
anyhow!("no skill named {name:?}. This binary ships {}", skill_names())
|
.iter()
|
||||||
})
|
.find(|asset| asset.name == name)
|
||||||
|
.ok_or_else(|| anyhow!("no skill named {name:?}. This binary ships {}", skill_names()))
|
||||||
}
|
}
|
||||||
|
|
||||||
/// The names, for the errors that have to say what there is to choose from.
|
/// The names, for the errors that have to say what there is to choose from.
|
||||||
@@ -173,10 +174,7 @@ mod tests {
|
|||||||
let root = root();
|
let root = root();
|
||||||
let path = SKILL.path(root.path());
|
let path = SKILL.path(root.path());
|
||||||
|
|
||||||
assert_eq!(
|
assert_eq!(SKILL.install(root.path(), false).unwrap(), Outcome::Written(path.clone()));
|
||||||
SKILL.install(root.path(), false).unwrap(),
|
|
||||||
Outcome::Written(path.clone())
|
|
||||||
);
|
|
||||||
assert_eq!(std::fs::read_to_string(&path).unwrap(), SKILL.content);
|
assert_eq!(std::fs::read_to_string(&path).unwrap(), SKILL.content);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -201,16 +199,10 @@ mod tests {
|
|||||||
SKILL.install(root.path(), false).unwrap();
|
SKILL.install(root.path(), false).unwrap();
|
||||||
std::fs::write(&path, "hand written\n").unwrap();
|
std::fs::write(&path, "hand written\n").unwrap();
|
||||||
|
|
||||||
assert_eq!(
|
assert_eq!(SKILL.install(root.path(), false).unwrap(), Outcome::Refused(path.clone()));
|
||||||
SKILL.install(root.path(), false).unwrap(),
|
|
||||||
Outcome::Refused(path.clone())
|
|
||||||
);
|
|
||||||
assert_eq!(std::fs::read_to_string(&path).unwrap(), "hand written\n");
|
assert_eq!(std::fs::read_to_string(&path).unwrap(), "hand written\n");
|
||||||
|
|
||||||
assert_eq!(
|
assert_eq!(SKILL.install(root.path(), true).unwrap(), Outcome::Written(path.clone()));
|
||||||
SKILL.install(root.path(), true).unwrap(),
|
|
||||||
Outcome::Written(path.clone())
|
|
||||||
);
|
|
||||||
assert_eq!(std::fs::read_to_string(&path).unwrap(), SKILL.content);
|
assert_eq!(std::fs::read_to_string(&path).unwrap(), SKILL.content);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -254,8 +246,10 @@ mod tests {
|
|||||||
"the frontmatter name has to match the directory it installs into"
|
"the frontmatter name has to match the directory it installs into"
|
||||||
);
|
);
|
||||||
|
|
||||||
let description = frontmatter_field(asset.content, "description")
|
let description =
|
||||||
.unwrap_or_else(|| panic!("{} ships without a description to trigger on", asset.name));
|
frontmatter_field(asset.content, "description").unwrap_or_else(|| {
|
||||||
|
panic!("{} ships without a description to trigger on", asset.name)
|
||||||
|
});
|
||||||
assert!(
|
assert!(
|
||||||
description.len() > 80,
|
description.len() > 80,
|
||||||
"{}: the description is what decides whether the skill loads at all",
|
"{}: the description is what decides whether the skill loads at all",
|
||||||
@@ -311,7 +305,9 @@ mod tests {
|
|||||||
if words.next() != Some("worklane") {
|
if words.next() != Some("worklane") {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
let Some(candidate) = words.next() else { continue };
|
let Some(candidate) = words.next() else {
|
||||||
|
continue;
|
||||||
|
};
|
||||||
// A flag before the subcommand, as in the `mv -- -leading-title` example.
|
// A flag before the subcommand, as in the `mv -- -leading-title` example.
|
||||||
if candidate.starts_with("--") && !known.iter().any(|k| k == candidate) {
|
if candidate.starts_with("--") && !known.iter().any(|k| k == candidate) {
|
||||||
continue;
|
continue;
|
||||||
|
|||||||
+5
-14
@@ -55,22 +55,16 @@ fn main() -> Result<()> {
|
|||||||
let worklane_dir = find_worklane_dir(&start)?;
|
let worklane_dir = find_worklane_dir(&start)?;
|
||||||
cmd_show(&id, &worklane_dir)
|
cmd_show(&id, &worklane_dir)
|
||||||
}
|
}
|
||||||
Some(Command::Mv {
|
Some(Command::Mv { ticket, status, force }) => cmd_mv(&ticket, status, force, &start),
|
||||||
ticket,
|
|
||||||
status,
|
|
||||||
force,
|
|
||||||
}) => cmd_mv(&ticket, status, force, &start),
|
|
||||||
Some(Command::Set(args)) => cmd_set(&args, &start),
|
Some(Command::Set(args)) => cmd_set(&args, &start),
|
||||||
Some(Command::Append(args)) => cmd_append(&args, &start),
|
Some(Command::Append(args)) => cmd_append(&args, &start),
|
||||||
Some(Command::Relate(args)) => cmd_relate(&args, &start),
|
Some(Command::Relate(args)) => cmd_relate(&args, &start),
|
||||||
Some(Command::Chown(args)) => cmd_chown(&args, &start),
|
Some(Command::Chown(args)) => cmd_chown(&args, &start),
|
||||||
Some(Command::Check(args)) => cmd_check(&args, true, &start),
|
Some(Command::Check(args)) => cmd_check(&args, true, &start),
|
||||||
Some(Command::Uncheck(args)) => cmd_check(&args, false, &start),
|
Some(Command::Uncheck(args)) => cmd_check(&args, false, &start),
|
||||||
Some(Command::Comment {
|
Some(Command::Comment { ticket, body, owner }) => {
|
||||||
ticket,
|
cmd_comment(&ticket, &body, &owner, &start)
|
||||||
body,
|
}
|
||||||
owner,
|
|
||||||
}) => cmd_comment(&ticket, &body, &owner, &start),
|
|
||||||
Some(Command::Campaign { command }) => match command {
|
Some(Command::Campaign { command }) => match command {
|
||||||
CampaignCommand::Add(args) => cmd_campaign_add(&args, &start),
|
CampaignCommand::Add(args) => cmd_campaign_add(&args, &start),
|
||||||
CampaignCommand::Ls => {
|
CampaignCommand::Ls => {
|
||||||
@@ -112,10 +106,7 @@ fn install_panic_hook() {
|
|||||||
|
|
||||||
fn restore_terminal() -> std::io::Result<()> {
|
fn restore_terminal() -> std::io::Result<()> {
|
||||||
crossterm::terminal::disable_raw_mode()?;
|
crossterm::terminal::disable_raw_mode()?;
|
||||||
crossterm::execute!(
|
crossterm::execute!(std::io::stdout(), crossterm::terminal::LeaveAlternateScreen)
|
||||||
std::io::stdout(),
|
|
||||||
crossterm::terminal::LeaveAlternateScreen
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn run_tui(paths: &[std::path::PathBuf], start: &std::path::Path) -> Result<()> {
|
fn run_tui(paths: &[std::path::PathBuf], start: &std::path::Path) -> Result<()> {
|
||||||
|
|||||||
+76
-110
@@ -6,19 +6,19 @@
|
|||||||
//!
|
//!
|
||||||
//! **Read only.** Moving a card by keypress is a follow-up. Everything here observes.
|
//! **Read only.** Moving a card by keypress is a follow-up. Everything here observes.
|
||||||
|
|
||||||
use std::collections::hash_map::DefaultHasher;
|
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
|
use std::collections::hash_map::DefaultHasher;
|
||||||
use std::hash::{Hash, Hasher};
|
use std::hash::{Hash, Hasher};
|
||||||
use std::path::{Path, PathBuf};
|
use std::path::{Path, PathBuf};
|
||||||
use std::time::{Duration, SystemTime};
|
use std::time::{Duration, SystemTime};
|
||||||
|
|
||||||
use anyhow::{Context, Result};
|
use anyhow::{Context, Result};
|
||||||
use crossterm::event::{KeyCode, KeyEvent, KeyModifiers};
|
use crossterm::event::{KeyCode, KeyEvent, KeyModifiers};
|
||||||
|
use ratatui::Frame;
|
||||||
use ratatui::layout::{Constraint, Direction, Layout, Margin, Rect, Size};
|
use ratatui::layout::{Constraint, Direction, Layout, Margin, Rect, Size};
|
||||||
use ratatui::style::{Modifier, Style};
|
use ratatui::style::{Modifier, Style};
|
||||||
use ratatui::text::{Line, Span, Text};
|
use ratatui::text::{Line, Span, Text};
|
||||||
use ratatui::widgets::{Block, Borders, Clear, Paragraph, Tabs, Wrap};
|
use ratatui::widgets::{Block, Borders, Clear, Paragraph, Tabs, Wrap};
|
||||||
use ratatui::Frame;
|
|
||||||
|
|
||||||
use crate::handlers::read_comments;
|
use crate::handlers::read_comments;
|
||||||
use crate::util::*;
|
use crate::util::*;
|
||||||
@@ -71,10 +71,7 @@ pub fn projects(paths: &[PathBuf], start: &Path) -> Result<Vec<Project>> {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
projects.push(Project {
|
projects.push(Project { name: project_name(&dir), dir });
|
||||||
name: project_name(&dir),
|
|
||||||
dir,
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(projects)
|
Ok(projects)
|
||||||
@@ -315,11 +312,7 @@ impl Board {
|
|||||||
if projects.len() > 1 {
|
if projects.len() > 1 {
|
||||||
tabs.push(Tab::new(ALL.to_string()));
|
tabs.push(Tab::new(ALL.to_string()));
|
||||||
}
|
}
|
||||||
tabs.extend(
|
tabs.extend(projects.iter().map(|project| Tab::new(project.name.clone())));
|
||||||
projects
|
|
||||||
.iter()
|
|
||||||
.map(|project| Tab::new(project.name.clone())),
|
|
||||||
);
|
|
||||||
|
|
||||||
let mut board = Board {
|
let mut board = Board {
|
||||||
tabs,
|
tabs,
|
||||||
@@ -775,10 +768,7 @@ fn detail_of(card: &Card) -> Detail {
|
|||||||
// Colour off for the text, which is what keeps escapes out of the paragraph, and the
|
// Colour off for the text, which is what keeps escapes out of the paragraph, and the
|
||||||
// relations arrive as rows so the board can style them itself.
|
// relations arrive as rows so the board can style them itself.
|
||||||
let mut parts = content_parts(&content, false, &resolved);
|
let mut parts = content_parts(&content, false, &resolved);
|
||||||
parts.push(BodyPart::Text(format!(
|
parts.push(BodyPart::Text(format!("\n{}", format_comments_with(&comments, false))));
|
||||||
"\n{}",
|
|
||||||
format_comments_with(&comments, false)
|
|
||||||
)));
|
|
||||||
|
|
||||||
Detail {
|
Detail {
|
||||||
title: ticket.title.clone(),
|
title: ticket.title.clone(),
|
||||||
@@ -1136,12 +1126,7 @@ fn draw_columns(frame: &mut Frame, board: &Board, area: Rect) {
|
|||||||
};
|
};
|
||||||
|
|
||||||
// An empty status is an empty column, not a column that is not there.
|
// An empty status is an empty column, not a column that is not there.
|
||||||
frame.render_widget(
|
frame.render_widget(Paragraph::new(lines).block(block).scroll((offset, 0)), areas[index]);
|
||||||
Paragraph::new(lines)
|
|
||||||
.block(block)
|
|
||||||
.scroll((offset, 0)),
|
|
||||||
areas[index],
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1285,12 +1270,11 @@ fn card_lines(card: &Card, selected: bool, width: u16) -> Vec<Line<'static>> {
|
|||||||
|
|
||||||
let mut lines = vec![corner_line(left, due_span(&ticket.due), width)];
|
let mut lines = vec![corner_line(left, due_span(&ticket.due), width)];
|
||||||
|
|
||||||
lines.extend(title_lines(&ticket.title, width).into_iter().map(|line| {
|
lines.extend(
|
||||||
Line::from(Span::styled(
|
title_lines(&ticket.title, width)
|
||||||
line,
|
.into_iter()
|
||||||
Style::default().add_modifier(emphasis),
|
.map(|line| Line::from(Span::styled(line, Style::default().add_modifier(emphasis)))),
|
||||||
))
|
);
|
||||||
}));
|
|
||||||
|
|
||||||
if let Some(row) = tags_line(&ticket.tags, width) {
|
if let Some(row) = tags_line(&ticket.tags, width) {
|
||||||
lines.push(row);
|
lines.push(row);
|
||||||
@@ -1352,10 +1336,7 @@ fn tags_line(tags: &[String], width: u16) -> Option<Line<'static>> {
|
|||||||
if index > 0 {
|
if index > 0 {
|
||||||
spans.push(Span::raw(" "));
|
spans.push(Span::raw(" "));
|
||||||
}
|
}
|
||||||
spans.push(Span::styled(
|
spans.push(Span::styled(format!("#{tag}"), Style::default().fg(tag_color(tag).into())));
|
||||||
format!("#{tag}"),
|
|
||||||
Style::default().fg(tag_color(tag).into()),
|
|
||||||
));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Some(Line::from(spans))
|
Some(Line::from(spans))
|
||||||
@@ -1399,10 +1380,7 @@ fn due_span(due: &str) -> Option<Span<'static>> {
|
|||||||
false => Color::Cyan,
|
false => Color::Cyan,
|
||||||
};
|
};
|
||||||
|
|
||||||
Some(Span::styled(
|
Some(Span::styled(due_date(due).to_string(), Style::default().fg(colour.into())))
|
||||||
due_date(due).to_string(),
|
|
||||||
Style::default().fg(colour.into()),
|
|
||||||
))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// `left` at the left, `right` at the right, with the gap between them.
|
/// `left` at the left, `right` at the right, with the gap between them.
|
||||||
@@ -1490,10 +1468,7 @@ fn title_lines(title: &str, width: u16) -> Vec<String> {
|
|||||||
|
|
||||||
fn chars_in_chunks(word: &str, width: usize) -> Vec<String> {
|
fn chars_in_chunks(word: &str, width: usize) -> Vec<String> {
|
||||||
let chars: Vec<char> = word.chars().collect();
|
let chars: Vec<char> = word.chars().collect();
|
||||||
chars
|
chars.chunks(width).map(|chunk| chunk.iter().collect()).collect()
|
||||||
.chunks(width)
|
|
||||||
.map(|chunk| chunk.iter().collect())
|
|
||||||
.collect()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// The row with an ellipsis on the end, making room for it if the row is full.
|
/// The row with an ellipsis on the end, making room for it if the row is full.
|
||||||
@@ -1574,10 +1549,7 @@ fn draw_notice(frame: &mut Frame, notice: &Notice, area: Rect) {
|
|||||||
false => Style::default(),
|
false => Style::default(),
|
||||||
};
|
};
|
||||||
|
|
||||||
frame.render_widget(
|
frame.render_widget(Paragraph::new(Span::styled(format!(" {}", notice.text), style)), area);
|
||||||
Paragraph::new(Span::styled(format!(" {}", notice.text), style)),
|
|
||||||
area,
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// The prompt, in place of the key list it would otherwise describe wrongly.
|
/// The prompt, in place of the key list it would otherwise describe wrongly.
|
||||||
@@ -1595,10 +1567,7 @@ fn draw_search(frame: &mut Frame, search: &Search, area: Rect) {
|
|||||||
let mut spans = vec![Span::raw(prompt.clone())];
|
let mut spans = vec![Span::raw(prompt.clone())];
|
||||||
|
|
||||||
if search.missed {
|
if search.missed {
|
||||||
spans.push(Span::styled(
|
spans.push(Span::styled(" no match", Style::default().fg(Color::BrightRed.into())));
|
||||||
" no match",
|
|
||||||
Style::default().fg(Color::BrightRed.into()),
|
|
||||||
));
|
|
||||||
}
|
}
|
||||||
spans.push(Span::styled(
|
spans.push(Span::styled(
|
||||||
" enter jump esc cancel ",
|
" enter jump esc cancel ",
|
||||||
@@ -1737,10 +1706,7 @@ fn draw_detail(frame: &mut Frame, detail: &Detail, offset: u16, area: Rect) {
|
|||||||
// keys and a rendered checkbox take, and does not compete with the orange title.
|
// keys and a rendered checkbox take, and does not compete with the orange title.
|
||||||
if let Some(indicator) = page_indicator(offset, last, text.height, overlay.width) {
|
if let Some(indicator) = page_indicator(offset, last, text.height, overlay.width) {
|
||||||
block = block.title_bottom(
|
block = block.title_bottom(
|
||||||
Line::from(Span::styled(
|
Line::from(Span::styled(indicator, Style::default().fg(Color::Grey.into())))
|
||||||
indicator,
|
|
||||||
Style::default().fg(Color::Grey.into()),
|
|
||||||
))
|
|
||||||
.right_aligned(),
|
.right_aligned(),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -1865,10 +1831,7 @@ mod tests {
|
|||||||
|
|
||||||
/// The screen the scrolling tests draw on, so the keypress and the draw measure the
|
/// The screen the scrolling tests draw on, so the keypress and the draw measure the
|
||||||
/// same overlay.
|
/// same overlay.
|
||||||
const SCREEN: Size = Size {
|
const SCREEN: Size = Size { width: 120, height: 20 };
|
||||||
width: 120,
|
|
||||||
height: 20,
|
|
||||||
};
|
|
||||||
|
|
||||||
/// The rendered buffer as lines of text, escapes and styling dropped.
|
/// The rendered buffer as lines of text, escapes and styling dropped.
|
||||||
fn render(board: &Board, width: u16, height: u16) -> Vec<String> {
|
fn render(board: &Board, width: u16, height: u16) -> Vec<String> {
|
||||||
@@ -2191,7 +2154,8 @@ mod tests {
|
|||||||
/// it drops styling on the way out of the buffer.
|
/// it drops styling on the way out of the buffer.
|
||||||
fn card_colour(dir: &Path, width: u16, needle: &str) -> Option<ratatui::style::Color> {
|
fn card_colour(dir: &Path, width: u16, needle: &str) -> Option<ratatui::style::Color> {
|
||||||
let board = one_board(dir);
|
let board = one_board(dir);
|
||||||
let inner = card_width(Size { width, height: 20 }, board.tabbed(), board.visible().len(), 0);
|
let inner =
|
||||||
|
card_width(Size { width, height: 20 }, board.tabbed(), board.visible().len(), 0);
|
||||||
let ticket = board.selected().expect("no card");
|
let ticket = board.selected().expect("no card");
|
||||||
|
|
||||||
card_lines(ticket, false, inner)
|
card_lines(ticket, false, inner)
|
||||||
@@ -2432,7 +2396,8 @@ mod tests {
|
|||||||
let dir = board_dir();
|
let dir = board_dir();
|
||||||
let before = digest(&dir);
|
let before = digest(&dir);
|
||||||
|
|
||||||
let path = write_ticket(&dir, "backlog", "11111111-0000-4000-8000-000000000000", "First one", "");
|
let path =
|
||||||
|
write_ticket(&dir, "backlog", "11111111-0000-4000-8000-000000000000", "First one", "");
|
||||||
let created = digest(&dir);
|
let created = digest(&dir);
|
||||||
assert_ne!(before, created, "a new ticket went unnoticed");
|
assert_ne!(before, created, "a new ticket went unnoticed");
|
||||||
|
|
||||||
@@ -2448,7 +2413,8 @@ mod tests {
|
|||||||
#[test]
|
#[test]
|
||||||
fn the_digest_moves_when_a_ticket_is_edited_in_place() {
|
fn the_digest_moves_when_a_ticket_is_edited_in_place() {
|
||||||
let dir = board_dir();
|
let dir = board_dir();
|
||||||
let path = write_ticket(&dir, "backlog", "11111111-0000-4000-8000-000000000000", "First one", "");
|
let path =
|
||||||
|
write_ticket(&dir, "backlog", "11111111-0000-4000-8000-000000000000", "First one", "");
|
||||||
let before = digest(&dir);
|
let before = digest(&dir);
|
||||||
|
|
||||||
let content = std::fs::read_to_string(&path).unwrap();
|
let content = std::fs::read_to_string(&path).unwrap();
|
||||||
@@ -2462,7 +2428,8 @@ mod tests {
|
|||||||
#[test]
|
#[test]
|
||||||
fn the_digest_moves_on_an_edit_of_the_same_length() {
|
fn the_digest_moves_on_an_edit_of_the_same_length() {
|
||||||
let dir = board_dir();
|
let dir = board_dir();
|
||||||
let path = write_ticket(&dir, "backlog", "11111111-0000-4000-8000-000000000000", "First one", "");
|
let path =
|
||||||
|
write_ticket(&dir, "backlog", "11111111-0000-4000-8000-000000000000", "First one", "");
|
||||||
|
|
||||||
let content = std::fs::read_to_string(&path).unwrap();
|
let content = std::fs::read_to_string(&path).unwrap();
|
||||||
let same_length = content.replace("A description.", "A descriptionA");
|
let same_length = content.replace("A description.", "A descriptionA");
|
||||||
@@ -2534,7 +2501,11 @@ mod tests {
|
|||||||
#[test]
|
#[test]
|
||||||
fn the_card_index_is_clamped_when_the_column_is_shorter() {
|
fn the_card_index_is_clamped_when_the_column_is_shorter() {
|
||||||
let dir = board_dir();
|
let dir = board_dir();
|
||||||
for (n, title) in [("11111111", "Alpha"), ("22222222", "Beta"), ("33333333", "Gamma")] {
|
for (n, title) in [
|
||||||
|
("11111111", "Alpha"),
|
||||||
|
("22222222", "Beta"),
|
||||||
|
("33333333", "Gamma"),
|
||||||
|
] {
|
||||||
write_ticket(&dir, "backlog", &format!("{n}-0000-4000-8000-000000000000"), title, "");
|
write_ticket(&dir, "backlog", &format!("{n}-0000-4000-8000-000000000000"), title, "");
|
||||||
}
|
}
|
||||||
write_ticket(&dir, "committed", "44444444-0000-4000-8000-000000000000", "Delta", "");
|
write_ticket(&dir, "committed", "44444444-0000-4000-8000-000000000000", "Delta", "");
|
||||||
@@ -2572,10 +2543,7 @@ mod tests {
|
|||||||
|
|
||||||
let top = render(&board, SCREEN.width, SCREEN.height).join("\n");
|
let top = render(&board, SCREEN.width, SCREEN.height).join("\n");
|
||||||
assert!(top.contains("Ticket 01"), "{top}");
|
assert!(top.contains("Ticket 01"), "{top}");
|
||||||
assert!(
|
assert!(!top.contains("Ticket 12"), "the fixture fits without scrolling:\n{top}");
|
||||||
!top.contains("Ticket 12"),
|
|
||||||
"the fixture fits without scrolling:\n{top}"
|
|
||||||
);
|
|
||||||
|
|
||||||
board.select_card(11, SCREEN);
|
board.select_card(11, SCREEN);
|
||||||
|
|
||||||
@@ -2693,10 +2661,7 @@ mod tests {
|
|||||||
// holding a scroll position for a highlight it no longer has.
|
// holding a scroll position for a highlight it no longer has.
|
||||||
assert_eq!(board.current().card, 2);
|
assert_eq!(board.current().card, 2);
|
||||||
let back = render(&board, SCREEN.width, SCREEN.height).join("\n");
|
let back = render(&board, SCREEN.width, SCREEN.height).join("\n");
|
||||||
assert!(
|
assert!(back.contains("Ticket 03"), "returning lost the selection:\n{back}");
|
||||||
back.contains("Ticket 03"),
|
|
||||||
"returning lost the selection:\n{back}"
|
|
||||||
);
|
|
||||||
assert!(!back.contains("Ticket 12"), "{back}");
|
assert!(!back.contains("Ticket 12"), "{back}");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2708,10 +2673,7 @@ mod tests {
|
|||||||
fill_column(&dir, "backlog", 12);
|
fill_column(&dir, "backlog", 12);
|
||||||
|
|
||||||
// Tall enough that every card fits, so the keypress stores no scroll at all.
|
// Tall enough that every card fits, so the keypress stores no scroll at all.
|
||||||
let roomy = Size {
|
let roomy = Size { width: 120, height: 60 };
|
||||||
width: 120,
|
|
||||||
height: 60,
|
|
||||||
};
|
|
||||||
|
|
||||||
let mut board = one_board(&dir);
|
let mut board = one_board(&dir);
|
||||||
board.select_card(11, roomy);
|
board.select_card(11, roomy);
|
||||||
@@ -2804,7 +2766,11 @@ mod tests {
|
|||||||
}
|
}
|
||||||
|
|
||||||
let screen = render(&board, SCREEN.width, SCREEN.height);
|
let screen = render(&board, SCREEN.width, SCREEN.height);
|
||||||
assert!(screen.join("\n").contains("Line 060"), "nothing scrolled:\n{}", screen.join("\n"));
|
assert!(
|
||||||
|
screen.join("\n").contains("Line 060"),
|
||||||
|
"nothing scrolled:\n{}",
|
||||||
|
screen.join("\n")
|
||||||
|
);
|
||||||
|
|
||||||
let row = overlay_title_row(&screen, SCREEN.width, SCREEN.height);
|
let row = overlay_title_row(&screen, SCREEN.width, SCREEN.height);
|
||||||
assert!(row.contains("(1111111)"), "the id scrolled away:\n{row}");
|
assert!(row.contains("(1111111)"), "the id scrolled away:\n{row}");
|
||||||
@@ -2956,10 +2922,7 @@ mod tests {
|
|||||||
write_ticket(&dir, "backlog", "11111111-0000-4000-8000-000000000000", "First one", "");
|
write_ticket(&dir, "backlog", "11111111-0000-4000-8000-000000000000", "First one", "");
|
||||||
|
|
||||||
// Tall enough that the whole ticket is on screen at once.
|
// Tall enough that the whole ticket is on screen at once.
|
||||||
let roomy = Size {
|
let roomy = Size { width: 120, height: 60 };
|
||||||
width: 120,
|
|
||||||
height: 60,
|
|
||||||
};
|
|
||||||
|
|
||||||
let mut board = one_board(&dir);
|
let mut board = one_board(&dir);
|
||||||
board.toggle_detail();
|
board.toggle_detail();
|
||||||
@@ -3203,7 +3166,13 @@ mod tests {
|
|||||||
let dir = board_dir();
|
let dir = board_dir();
|
||||||
write_ticket(&dir, "backlog", "11111111-0000-4000-8000-000000000000", "Alpha first", "");
|
write_ticket(&dir, "backlog", "11111111-0000-4000-8000-000000000000", "Alpha first", "");
|
||||||
write_ticket(&dir, "backlog", "22222222-0000-4000-8000-000000000000", "Beta second", "");
|
write_ticket(&dir, "backlog", "22222222-0000-4000-8000-000000000000", "Beta second", "");
|
||||||
write_ticket(&dir, "committed", "33333333-0000-4000-8000-000000000000", "Gamma third", "");
|
write_ticket(
|
||||||
|
&dir,
|
||||||
|
"committed",
|
||||||
|
"33333333-0000-4000-8000-000000000000",
|
||||||
|
"Gamma third",
|
||||||
|
"",
|
||||||
|
);
|
||||||
write_ticket(&dir, "done", "44444444-0000-4000-8000-000000000000", "Delta finished", "");
|
write_ticket(&dir, "done", "44444444-0000-4000-8000-000000000000", "Delta finished", "");
|
||||||
dir
|
dir
|
||||||
}
|
}
|
||||||
@@ -3522,8 +3491,7 @@ mod tests {
|
|||||||
board.open_search();
|
board.open_search();
|
||||||
type_query(&mut board, "gam");
|
type_query(&mut board, "gam");
|
||||||
|
|
||||||
let mut terminal =
|
let mut terminal = Terminal::new(TestBackend::new(SCREEN.width, SCREEN.height)).unwrap();
|
||||||
Terminal::new(TestBackend::new(SCREEN.width, SCREEN.height)).unwrap();
|
|
||||||
terminal.draw(|frame| draw(frame, &board)).unwrap();
|
terminal.draw(|frame| draw(frame, &board)).unwrap();
|
||||||
|
|
||||||
let at = terminal.get_cursor_position().unwrap();
|
let at = terminal.get_cursor_position().unwrap();
|
||||||
@@ -3696,9 +3664,9 @@ mod tests {
|
|||||||
the OSC 52 write is named"
|
the OSC 52 write is named"
|
||||||
);
|
);
|
||||||
|
|
||||||
let cleared = source.find("board.clear_notice();").expect(
|
let cleared = source
|
||||||
"a notice that nothing clears sits in the footer for the rest of the session",
|
.find("board.clear_notice();")
|
||||||
);
|
.expect("a notice that nothing clears sits in the footer for the rest of the session");
|
||||||
let prompt = source.find("if board.search_key(key, screen)").unwrap();
|
let prompt = source.find("if board.search_key(key, screen)").unwrap();
|
||||||
assert!(
|
assert!(
|
||||||
cleared < prompt,
|
cleared < prompt,
|
||||||
@@ -3883,10 +3851,7 @@ mod tests {
|
|||||||
|
|
||||||
assert_eq!(project_label("alpha", 38, IDENTITY).as_deref(), Some("alpha"));
|
assert_eq!(project_label("alpha", 38, IDENTITY).as_deref(), Some("alpha"));
|
||||||
// Room for three characters of a longer name, the last of them the ellipsis.
|
// Room for three characters of a longer name, the last of them the ellipsis.
|
||||||
assert_eq!(
|
assert_eq!(project_label("factry-core", 16, IDENTITY).as_deref(), Some("fa…"));
|
||||||
project_label("factry-core", 16, IDENTITY).as_deref(),
|
|
||||||
Some("fa…")
|
|
||||||
);
|
|
||||||
assert_eq!(project_label("factry-core", 13, IDENTITY), None);
|
assert_eq!(project_label("factry-core", 13, IDENTITY), None);
|
||||||
assert_eq!(project_label("alpha", 4, IDENTITY), None);
|
assert_eq!(project_label("alpha", 4, IDENTITY), None);
|
||||||
}
|
}
|
||||||
@@ -3984,10 +3949,7 @@ mod tests {
|
|||||||
assert!(!marked_blocked(&board, "The waiter"));
|
assert!(!marked_blocked(&board, "The waiter"));
|
||||||
|
|
||||||
let screen = render(&board, 120, 20).join("\n");
|
let screen = render(&board, 120, 20).join("\n");
|
||||||
assert!(
|
assert!(!screen.contains(BLOCKED_MARK), "a cleared blocker still marked:\n{screen}");
|
||||||
!screen.contains(BLOCKED_MARK),
|
|
||||||
"a cleared blocker still marked:\n{screen}"
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// One open blocker out of two is still a reason not to start, the rule `mv` applies
|
/// One open blocker out of two is still a reason not to start, the rule `mv` applies
|
||||||
@@ -4056,7 +4018,11 @@ mod tests {
|
|||||||
assert!(wide[0].contains(BLOCKED_MARK), "no mark with room for it: {:?}", wide[0]);
|
assert!(wide[0].contains(BLOCKED_MARK), "no mark with room for it: {:?}", wide[0]);
|
||||||
|
|
||||||
let narrow = card_rows(&board, "The waiter", identity);
|
let narrow = card_rows(&board, "The waiter", identity);
|
||||||
assert!(!narrow[0].contains(BLOCKED_MARK), "mark kept over the column: {:?}", narrow[0]);
|
assert!(
|
||||||
|
!narrow[0].contains(BLOCKED_MARK),
|
||||||
|
"mark kept over the column: {:?}",
|
||||||
|
narrow[0]
|
||||||
|
);
|
||||||
assert!(narrow[0].contains(&id), "the identity gave way instead: {:?}", narrow[0]);
|
assert!(narrow[0].contains(&id), "the identity gave way instead: {:?}", narrow[0]);
|
||||||
assert!(narrow[0].chars().count() <= identity as usize, "row over the column");
|
assert!(narrow[0].chars().count() <= identity as usize, "row over the column");
|
||||||
}
|
}
|
||||||
@@ -4209,8 +4175,6 @@ mod tests {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/// The style of the first cell drawing `symbol`, so a test can ask what colour a
|
/// The style of the first cell drawing `symbol`, so a test can ask what colour a
|
||||||
/// glyph actually reached the screen in rather than trusting the span it was built
|
/// glyph actually reached the screen in rather than trusting the span it was built
|
||||||
/// from.
|
/// from.
|
||||||
@@ -4291,16 +4255,20 @@ mod tests {
|
|||||||
let mut board = one_board(&dir);
|
let mut board = one_board(&dir);
|
||||||
board.toggle_detail();
|
board.toggle_detail();
|
||||||
|
|
||||||
let content = std::fs::read_to_string(
|
let content =
|
||||||
board.selected().expect("no selection").ticket.path.clone(),
|
std::fs::read_to_string(board.selected().expect("no selection").ticket.path.clone())
|
||||||
)
|
|
||||||
.unwrap();
|
.unwrap();
|
||||||
let rows = relations_for(&content, &dir).unwrap();
|
let rows = relations_for(&content, &dir).unwrap();
|
||||||
let printed = render_relations(&rows, false);
|
let printed = render_relations(&rows, false);
|
||||||
|
|
||||||
assert!(!printed.is_empty(), "the fixture has no relations");
|
assert!(!printed.is_empty(), "the fixture has no relations");
|
||||||
assert!(
|
assert!(
|
||||||
board.detail.as_ref().unwrap().plain().contains(printed.trim_end()),
|
board
|
||||||
|
.detail
|
||||||
|
.as_ref()
|
||||||
|
.unwrap()
|
||||||
|
.plain()
|
||||||
|
.contains(printed.trim_end()),
|
||||||
"the overlay drew a different block than the listing prints: {printed:?}"
|
"the overlay drew a different block than the listing prints: {printed:?}"
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -4467,7 +4435,10 @@ mod tests {
|
|||||||
let text = &board.detail.as_ref().expect("no detail").plain();
|
let text = &board.detail.as_ref().expect("no detail").plain();
|
||||||
// Marked for its kind, and the mark sits ahead of the id.
|
// Marked for its kind, and the mark sits ahead of the id.
|
||||||
assert!(
|
assert!(
|
||||||
text.contains(&format!("blocked by {BLOCKED_MARK} {} (2222222) The target", status_mark(Some("backlog")).0)),
|
text.contains(&format!(
|
||||||
|
"blocked by {BLOCKED_MARK} {} (2222222) The target",
|
||||||
|
status_mark(Some("backlog")).0
|
||||||
|
)),
|
||||||
"{text:?}"
|
"{text:?}"
|
||||||
);
|
);
|
||||||
assert!(!text.contains(target), "the bare uuid was drawn: {text:?}");
|
assert!(!text.contains(target), "the bare uuid was drawn: {text:?}");
|
||||||
@@ -4494,7 +4465,10 @@ mod tests {
|
|||||||
|
|
||||||
let text = &board.detail.as_ref().expect("no detail").plain();
|
let text = &board.detail.as_ref().expect("no detail").plain();
|
||||||
assert!(
|
assert!(
|
||||||
text.contains(&format!("blocks {BLOCKED_MARK} {} (1111111) A holder", status_mark(Some("backlog")).0)),
|
text.contains(&format!(
|
||||||
|
"blocks {BLOCKED_MARK} {} (1111111) A holder",
|
||||||
|
status_mark(Some("backlog")).0
|
||||||
|
)),
|
||||||
"{text:?}"
|
"{text:?}"
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -4741,11 +4715,7 @@ mod tests {
|
|||||||
/// Located on the bottom border row rather than by searching the buffer for a glyph:
|
/// Located on the bottom border row rather than by searching the buffer for a glyph:
|
||||||
/// `p` and `g` are all over the board, and `drawn_color` would answer about whichever
|
/// `p` and `g` are all over the board, and `drawn_color` would answer about whichever
|
||||||
/// card holds the first one.
|
/// card holds the first one.
|
||||||
fn indicator_color(
|
fn indicator_color(board: &Board, width: u16, height: u16) -> Option<ratatui::style::Color> {
|
||||||
board: &Board,
|
|
||||||
width: u16,
|
|
||||||
height: u16,
|
|
||||||
) -> Option<ratatui::style::Color> {
|
|
||||||
let mut terminal = Terminal::new(TestBackend::new(width, height)).unwrap();
|
let mut terminal = Terminal::new(TestBackend::new(width, height)).unwrap();
|
||||||
terminal.draw(|frame| draw(frame, board)).unwrap();
|
terminal.draw(|frame| draw(frame, board)).unwrap();
|
||||||
let buffer = terminal.backend().buffer().clone();
|
let buffer = terminal.backend().buffer().clone();
|
||||||
@@ -4754,9 +4724,7 @@ mod tests {
|
|||||||
let row = overlay.y + overlay.height - 1;
|
let row = overlay.y + overlay.height - 1;
|
||||||
|
|
||||||
(overlay.x..overlay.x + overlay.width - 1)
|
(overlay.x..overlay.x + overlay.width - 1)
|
||||||
.find(|x| {
|
.find(|x| buffer[(*x, row)].symbol() == "p" && buffer[(x + 1, row)].symbol() == "g")
|
||||||
buffer[(*x, row)].symbol() == "p" && buffer[(x + 1, row)].symbol() == "g"
|
|
||||||
})
|
|
||||||
.map(|x| buffer[(x, row)].fg)
|
.map(|x| buffer[(x, row)].fg)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4783,6 +4751,4 @@ mod tests {
|
|||||||
|
|
||||||
std::fs::remove_dir_all(&dir).ok();
|
std::fs::remove_dir_all(&dir).ok();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+161
-124
@@ -44,11 +44,7 @@ pub fn should_use_colors() -> bool {
|
|||||||
let no_color = std::env::var("NO_COLOR").ok();
|
let no_color = std::env::var("NO_COLOR").ok();
|
||||||
let term = std::env::var("TERM").ok();
|
let term = std::env::var("TERM").ok();
|
||||||
|
|
||||||
colors_wanted(
|
colors_wanted(std::io::stdout().is_terminal(), no_color.as_deref(), term.as_deref())
|
||||||
std::io::stdout().is_terminal(),
|
|
||||||
no_color.as_deref(),
|
|
||||||
term.as_deref(),
|
|
||||||
)
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -272,9 +268,7 @@ pub fn find_worklane_dir(start: &Path) -> Result<std::path::PathBuf> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Err(anyhow!(
|
Err(anyhow!("No .worklane directory found. Run `worklane init` first."))
|
||||||
"No .worklane directory found. Run `worklane init` first."
|
|
||||||
))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Width of the abbreviated id shown by `ls` and by the disambiguation list.
|
/// Width of the abbreviated id shown by `ls` and by the disambiguation list.
|
||||||
@@ -728,11 +722,7 @@ pub fn content_parts(content: &str, colored: bool, resolved: &Resolved) -> Vec<B
|
|||||||
criterion += 1;
|
criterion += 1;
|
||||||
result.push_str(&paint(&format!("{}.", criterion), Color::Cyan, colored));
|
result.push_str(&paint(&format!("{}.", criterion), Color::Cyan, colored));
|
||||||
result.push(' ');
|
result.push(' ');
|
||||||
result.push_str(&paint(
|
result.push_str(&paint(if checked { "[x]" } else { "[ ]" }, Color::Grey, colored));
|
||||||
if checked { "[x]" } else { "[ ]" },
|
|
||||||
Color::Grey,
|
|
||||||
colored,
|
|
||||||
));
|
|
||||||
result.push(' ');
|
result.push(' ');
|
||||||
result.push_str(&colorize_bold(text, colored));
|
result.push_str(&colorize_bold(text, colored));
|
||||||
result.push('\n');
|
result.push('\n');
|
||||||
@@ -949,9 +939,18 @@ pub const NOT_SET: &str = "_Not set_";
|
|||||||
/// distinction `add` already makes and clearing has to keep.
|
/// distinction `add` already makes and clearing has to keep.
|
||||||
pub const NONE: &str = "_None_";
|
pub const NONE: &str = "_None_";
|
||||||
|
|
||||||
|
/// Whether a field holds one of the two markers that mean it holds nothing.
|
||||||
|
///
|
||||||
|
/// The two constants and nothing else. `-None-` and `-Not set-` were accepted here from
|
||||||
|
/// the day the function was written, by analogy with the `**-Status**` field name the
|
||||||
|
/// `mv` splicing bug really did produce, c230d2c. But no version of this tool ever wrote
|
||||||
|
/// a hyphenated *value*: `git log -S` finds the two spellings in exactly one commit, the
|
||||||
|
/// one that added them to this line. They were dead from birth, and a ticket that somehow
|
||||||
|
/// holds one now reads as the text it is rather than being quietly taken for unset, which
|
||||||
|
/// is the right way round for corruption nobody can produce.
|
||||||
pub fn is_unknown_value(value: &str) -> bool {
|
pub fn is_unknown_value(value: &str) -> bool {
|
||||||
let trimmed = value.trim();
|
let trimmed = value.trim();
|
||||||
trimmed == NONE || trimmed == NOT_SET || trimmed == "-None-" || trimmed == "-Not set-"
|
trimmed == NONE || trimmed == NOT_SET
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Replace `**bold**` with colour, or leave the line exactly as it is.
|
/// Replace `**bold**` with colour, or leave the line exactly as it is.
|
||||||
@@ -1107,12 +1106,8 @@ fn remove_metadata_line(content: &str, field: &str) -> Option<String> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn set_status_field(content: &str, target_status: &str, title: &str) -> Result<String> {
|
pub fn set_status_field(content: &str, target_status: &str, title: &str) -> Result<String> {
|
||||||
set_metadata_line(content, "Status", target_status, is_status_line).ok_or_else(|| {
|
set_metadata_line(content, "Status", target_status, is_status_line)
|
||||||
anyhow!(
|
.ok_or_else(|| anyhow!("Ticket '{}' has no Status field in its Metadata section", title))
|
||||||
"Ticket '{}' has no Status field in its Metadata section",
|
|
||||||
title
|
|
||||||
)
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Rewrite a metadata field other than Status.
|
/// Rewrite a metadata field other than Status.
|
||||||
@@ -1127,13 +1122,7 @@ pub fn set_metadata_field(content: &str, field: &str, value: &str, title: &str)
|
|||||||
set_metadata_line(content, field, value, |line| {
|
set_metadata_line(content, field, value, |line| {
|
||||||
metadata_field_body(line).starts_with(&prefix)
|
metadata_field_body(line).starts_with(&prefix)
|
||||||
})
|
})
|
||||||
.ok_or_else(|| {
|
.ok_or_else(|| anyhow!("Ticket '{}' has no {} field in its Metadata section", title, field))
|
||||||
anyhow!(
|
|
||||||
"Ticket '{}' has no {} field in its Metadata section",
|
|
||||||
title,
|
|
||||||
field
|
|
||||||
)
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// The metadata field naming the campaign a ticket belongs to.
|
/// The metadata field naming the campaign a ticket belongs to.
|
||||||
@@ -1521,10 +1510,7 @@ impl Clearable {
|
|||||||
field: "Due",
|
field: "Due",
|
||||||
sentinel: NOT_SET,
|
sentinel: NOT_SET,
|
||||||
},
|
},
|
||||||
Clearable::Tags => Unset::Field {
|
Clearable::Tags => Unset::Field { field: "Tags", sentinel: NONE },
|
||||||
field: "Tags",
|
|
||||||
sentinel: NONE,
|
|
||||||
},
|
|
||||||
Clearable::Priority => Unset::Field {
|
Clearable::Priority => Unset::Field {
|
||||||
field: "Priority",
|
field: "Priority",
|
||||||
sentinel: NOT_SET,
|
sentinel: NOT_SET,
|
||||||
@@ -2083,10 +2069,7 @@ pub struct Cell {
|
|||||||
|
|
||||||
impl Cell {
|
impl Cell {
|
||||||
fn plain(text: impl Into<String>) -> Self {
|
fn plain(text: impl Into<String>) -> Self {
|
||||||
Cell {
|
Cell { text: text.into(), color: None }
|
||||||
text: text.into(),
|
|
||||||
color: None,
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn colored(text: impl Into<String>, color: Color) -> Self {
|
fn colored(text: impl Into<String>, color: Color) -> Self {
|
||||||
@@ -2124,14 +2107,17 @@ pub fn relation_rows(stored: &[Relation], index: &RelationIndex, uuid: &str) ->
|
|||||||
})
|
})
|
||||||
.collect();
|
.collect();
|
||||||
|
|
||||||
rows.extend(index.inbound(uuid).into_iter().map(|(kind, holder)| {
|
rows.extend(
|
||||||
RelationRow {
|
index
|
||||||
|
.inbound(uuid)
|
||||||
|
.into_iter()
|
||||||
|
.map(|(kind, holder)| RelationRow {
|
||||||
kind,
|
kind,
|
||||||
label: kind.inverse_label(),
|
label: kind.inverse_label(),
|
||||||
uuid: holder.uuid.clone(),
|
uuid: holder.uuid.clone(),
|
||||||
target: target_of(Some(holder)),
|
target: target_of(Some(holder)),
|
||||||
}
|
}),
|
||||||
}));
|
);
|
||||||
|
|
||||||
rows
|
rows
|
||||||
}
|
}
|
||||||
@@ -2199,11 +2185,7 @@ pub fn relations_for(content: &str, worklane_dir: &Path) -> Result<Vec<RelationR
|
|||||||
let stored = parse_relations(content, &title)?;
|
let stored = parse_relations(content, &title)?;
|
||||||
let index = RelationIndex::load(worklane_dir)?;
|
let index = RelationIndex::load(worklane_dir)?;
|
||||||
|
|
||||||
Ok(relation_rows(
|
Ok(relation_rows(&stored, &index, &parse_ticket_field(content, "ID")))
|
||||||
&stored,
|
|
||||||
&index,
|
|
||||||
&parse_ticket_field(content, "ID"),
|
|
||||||
))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// One acceptance criterion as it sits in the file.
|
/// One acceptance criterion as it sits in the file.
|
||||||
@@ -2274,11 +2256,7 @@ pub fn numbered_criteria(criteria: &[Criterion], shown: &[usize]) -> String {
|
|||||||
format!(
|
format!(
|
||||||
" {} {} {}",
|
" {} {} {}",
|
||||||
paint(&format!("{}.", offset + 1), Color::Cyan, colored),
|
paint(&format!("{}.", offset + 1), Color::Cyan, colored),
|
||||||
paint(
|
paint(if criterion.checked { "[x]" } else { "[ ]" }, Color::Grey, colored),
|
||||||
if criterion.checked { "[x]" } else { "[ ]" },
|
|
||||||
Color::Grey,
|
|
||||||
colored
|
|
||||||
),
|
|
||||||
criterion.text
|
criterion.text
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
@@ -2660,10 +2638,7 @@ pub fn display_ticket_items(items: &[TicketItem]) {
|
|||||||
let priority = show_priority(item.priority, colored);
|
let priority = show_priority(item.priority, colored);
|
||||||
|
|
||||||
if item.created.is_empty() {
|
if item.created.is_empty() {
|
||||||
println!(
|
println!(" {} ({}) {} | Owner: {} | Due: {}", priority, id, item.title, owner, due);
|
||||||
" {} ({}) {} | Owner: {} | Due: {}",
|
|
||||||
priority, id, item.title, owner, due
|
|
||||||
);
|
|
||||||
} else {
|
} else {
|
||||||
let created = paint(&item.created, Color::Cyan, colored);
|
let created = paint(&item.created, Color::Cyan, colored);
|
||||||
println!(
|
println!(
|
||||||
@@ -2798,6 +2773,21 @@ mod tests {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// The hyphenated spellings are values like any other, and this is what says so.
|
||||||
|
///
|
||||||
|
/// They were accepted as unset for months without any version of the tool ever
|
||||||
|
/// writing one, so the risk this pins is somebody re-adding them by analogy with the
|
||||||
|
/// `**-Status**` repair in `is_status_line`, which guards a corruption that was real.
|
||||||
|
#[test]
|
||||||
|
fn a_hyphenated_marker_is_not_unset() {
|
||||||
|
for legacy in ["-None-", "-Not set-", "-Nothing-"] {
|
||||||
|
assert!(
|
||||||
|
!is_unknown_value(legacy),
|
||||||
|
"{legacy} is read as unset, so a corrupted field would pass for an empty one"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fn ticket_with_priority(raw: &str) -> String {
|
fn ticket_with_priority(raw: &str) -> String {
|
||||||
format!("# T\n\n## Metadata\n\n- **Priority**: {}\n", raw)
|
format!("# T\n\n## Metadata\n\n- **Priority**: {}\n", raw)
|
||||||
}
|
}
|
||||||
@@ -2831,17 +2821,15 @@ mod tests {
|
|||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn a_field_only_mentioned_in_prose_reads_as_unset() {
|
fn a_field_only_mentioned_in_prose_reads_as_unset() {
|
||||||
let content = "# T\n\n## Description\n- **Due**: 2026-12-31\n\n## Metadata\n\n- **ID**: x\n";
|
let content =
|
||||||
|
"# T\n\n## Description\n- **Due**: 2026-12-31\n\n## Metadata\n\n- **ID**: x\n";
|
||||||
assert_eq!(parse_ticket_field(content, "Due"), "_Not set_");
|
assert_eq!(parse_ticket_field(content, "Due"), "_Not set_");
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn a_field_lookup_needs_the_metadata_heading() {
|
fn a_field_lookup_needs_the_metadata_heading() {
|
||||||
// No section, no fields: there is nothing to anchor to.
|
// No section, no fields: there is nothing to anchor to.
|
||||||
assert_eq!(
|
assert_eq!(parse_ticket_field("# T\n\n- **Owner**: alice\n", "Owner"), "_Not set_");
|
||||||
parse_ticket_field("# T\n\n- **Owner**: alice\n", "Owner"),
|
|
||||||
"_Not set_"
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
@@ -2876,7 +2864,8 @@ mod tests {
|
|||||||
#[test]
|
#[test]
|
||||||
fn setting_the_status_needs_the_field_in_the_metadata_section() {
|
fn setting_the_status_needs_the_field_in_the_metadata_section() {
|
||||||
// A Status line above the section is prose, so this is a ticket without the field.
|
// A Status line above the section is prose, so this is a ticket without the field.
|
||||||
let content = "# T\n\n## Description\n- **Status**: backlog\n\n## Metadata\n\n- **ID**: x\n";
|
let content =
|
||||||
|
"# T\n\n## Description\n- **Status**: backlog\n\n## Metadata\n\n- **ID**: x\n";
|
||||||
assert!(set_status_field(content, "committed", "T").is_err());
|
assert!(set_status_field(content, "committed", "T").is_err());
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2988,8 +2977,7 @@ mod tests {
|
|||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn a_line_that_is_not_a_field_is_carried_through() {
|
fn a_line_that_is_not_a_field_is_carried_through() {
|
||||||
let rendered =
|
let rendered = render_metadata_table(&["- **ID**: abc", "a hand written note"], false, "");
|
||||||
render_metadata_table(&["- **ID**: abc", "a hand written note"], false, "");
|
|
||||||
|
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
rendered,
|
rendered,
|
||||||
@@ -3134,7 +3122,10 @@ mod tests {
|
|||||||
let counted: Vec<Option<Progress>> = items.iter().map(|item| item.criteria).collect();
|
let counted: Vec<Option<Progress>> = items.iter().map(|item| item.criteria).collect();
|
||||||
|
|
||||||
assert!(counted.contains(&Some(Progress { met: 1, total: 2 })), "{counted:?}");
|
assert!(counted.contains(&Some(Progress { met: 1, total: 2 })), "{counted:?}");
|
||||||
assert!(counted.contains(&None), "a ticket with no criteria got a count: {counted:?}");
|
assert!(
|
||||||
|
counted.contains(&None),
|
||||||
|
"a ticket with no criteria got a count: {counted:?}"
|
||||||
|
);
|
||||||
|
|
||||||
fs::remove_dir_all(&dir).unwrap();
|
fs::remove_dir_all(&dir).unwrap();
|
||||||
}
|
}
|
||||||
@@ -3188,9 +3179,15 @@ mod tests {
|
|||||||
/// Absent, unset and empty are one answer: no tags.
|
/// Absent, unset and empty are one answer: no tags.
|
||||||
#[test]
|
#[test]
|
||||||
fn parse_tags_reads_an_unset_or_missing_field_as_none() {
|
fn parse_tags_reads_an_unset_or_missing_field_as_none() {
|
||||||
assert_eq!(parse_tags("# T\n\n## Metadata\n\n- **Tags**: _None_\n"), Vec::<String>::new());
|
assert_eq!(
|
||||||
|
parse_tags("# T\n\n## Metadata\n\n- **Tags**: _None_\n"),
|
||||||
|
Vec::<String>::new()
|
||||||
|
);
|
||||||
assert_eq!(parse_tags("# T\n\n## Metadata\n\n- **Tags**:\n"), Vec::<String>::new());
|
assert_eq!(parse_tags("# T\n\n## Metadata\n\n- **Tags**:\n"), Vec::<String>::new());
|
||||||
assert_eq!(parse_tags("# T\n\n## Metadata\n\n- **Owner**: alice\n"), Vec::<String>::new());
|
assert_eq!(
|
||||||
|
parse_tags("# T\n\n## Metadata\n\n- **Owner**: alice\n"),
|
||||||
|
Vec::<String>::new()
|
||||||
|
);
|
||||||
assert_eq!(parse_tags("# T\n\n## Metadata\n\n- **Tags**: , ,\n"), Vec::<String>::new());
|
assert_eq!(parse_tags("# T\n\n## Metadata\n\n- **Tags**: , ,\n"), Vec::<String>::new());
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -3247,9 +3244,7 @@ mod tests {
|
|||||||
set_or_insert_metadata_field(&content, CAMPAIGN_FIELD, "c-uuid", "T").unwrap();
|
set_or_insert_metadata_field(&content, CAMPAIGN_FIELD, "c-uuid", "T").unwrap();
|
||||||
|
|
||||||
assert!(
|
assert!(
|
||||||
updated.contains(
|
updated.contains("- **Owner**: alice\n- **Campaign**: c-uuid\n\n## Notes\nAfter.\n"),
|
||||||
"- **Owner**: alice\n- **Campaign**: c-uuid\n\n## Notes\nAfter.\n"
|
|
||||||
),
|
|
||||||
"{updated}"
|
"{updated}"
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -3258,9 +3253,8 @@ mod tests {
|
|||||||
/// most one campaign.
|
/// most one campaign.
|
||||||
#[test]
|
#[test]
|
||||||
fn a_field_already_there_is_rewritten_rather_than_added() {
|
fn a_field_already_there_is_rewritten_rather_than_added() {
|
||||||
let content = with_metadata(
|
let content =
|
||||||
"- **ID**: abc\n- **Campaign**: first\n- **Status**: backlog\n",
|
with_metadata("- **ID**: abc\n- **Campaign**: first\n- **Status**: backlog\n");
|
||||||
);
|
|
||||||
|
|
||||||
let updated =
|
let updated =
|
||||||
set_or_insert_metadata_field(&content, CAMPAIGN_FIELD, "second", "T").unwrap();
|
set_or_insert_metadata_field(&content, CAMPAIGN_FIELD, "second", "T").unwrap();
|
||||||
@@ -3276,8 +3270,7 @@ mod tests {
|
|||||||
let content = "# T\n\n## Description\n- **Campaign**: not a field\n\n\
|
let content = "# T\n\n## Description\n- **Campaign**: not a field\n\n\
|
||||||
## Metadata\n\n- **ID**: abc\n- **Status**: backlog\n";
|
## Metadata\n\n- **ID**: abc\n- **Status**: backlog\n";
|
||||||
|
|
||||||
let updated =
|
let updated = set_or_insert_metadata_field(content, CAMPAIGN_FIELD, "c-uuid", "T").unwrap();
|
||||||
set_or_insert_metadata_field(content, CAMPAIGN_FIELD, "c-uuid", "T").unwrap();
|
|
||||||
|
|
||||||
assert!(updated.contains("- **Campaign**: not a field"), "{updated}");
|
assert!(updated.contains("- **Campaign**: not a field"), "{updated}");
|
||||||
assert!(
|
assert!(
|
||||||
@@ -3310,10 +3303,7 @@ mod tests {
|
|||||||
let updated =
|
let updated =
|
||||||
set_status_stamp(&content, Status::Reviewing, "2026-08-22 10:11:12", "T").unwrap();
|
set_status_stamp(&content, Status::Reviewing, "2026-08-22 10:11:12", "T").unwrap();
|
||||||
|
|
||||||
assert!(
|
assert!(updated.contains("- **Submitted On**: 2026-08-22 10:11:12"), "{updated}");
|
||||||
updated.contains("- **Submitted On**: 2026-08-22 10:11:12"),
|
|
||||||
"{updated}"
|
|
||||||
);
|
|
||||||
assert!(!updated.contains("**Committed On**"), "{updated}");
|
assert!(!updated.contains("**Committed On**"), "{updated}");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -3358,8 +3348,7 @@ mod tests {
|
|||||||
- **Status**: reviewing\n",
|
- **Status**: reviewing\n",
|
||||||
);
|
);
|
||||||
|
|
||||||
let updated =
|
let updated = set_status_stamp(&content, Status::Done, "2026-08-22 10:11:12", "T").unwrap();
|
||||||
set_status_stamp(&content, Status::Done, "2026-08-22 10:11:12", "T").unwrap();
|
|
||||||
|
|
||||||
assert!(
|
assert!(
|
||||||
updated.contains(
|
updated.contains(
|
||||||
@@ -3402,10 +3391,7 @@ mod tests {
|
|||||||
#[test]
|
#[test]
|
||||||
fn a_campaign_field_that_is_unset_or_absent_reads_as_no_campaign() {
|
fn a_campaign_field_that_is_unset_or_absent_reads_as_no_campaign() {
|
||||||
assert_eq!(parse_campaign(&with_metadata("- **ID**: abc\n")), None);
|
assert_eq!(parse_campaign(&with_metadata("- **ID**: abc\n")), None);
|
||||||
assert_eq!(
|
assert_eq!(parse_campaign(&with_metadata("- **Campaign**: _Not set_\n")), None);
|
||||||
parse_campaign(&with_metadata("- **Campaign**: _Not set_\n")),
|
|
||||||
None
|
|
||||||
);
|
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
parse_campaign(&with_metadata("- **Campaign**: c-uuid\n")),
|
parse_campaign(&with_metadata("- **Campaign**: c-uuid\n")),
|
||||||
Some("c-uuid".to_string())
|
Some("c-uuid".to_string())
|
||||||
@@ -3438,10 +3424,7 @@ mod tests {
|
|||||||
let rendered = content_trim_colored("# T\n\n## Description\nbody\n", &Resolved::default());
|
let rendered = content_trim_colored("# T\n\n## Description\nbody\n", &Resolved::default());
|
||||||
|
|
||||||
// Eleven characters, not fourteen: the rule used to span "## Description"
|
// Eleven characters, not fourteen: the rule used to span "## Description"
|
||||||
assert!(
|
assert!(rendered.starts_with("Description\n───────────\n"), "{rendered:?}");
|
||||||
rendered.starts_with("Description\n───────────\n"),
|
|
||||||
"{rendered:?}"
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
@@ -3453,7 +3436,8 @@ mod tests {
|
|||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn the_body_leaves_the_title_to_cmd_show() {
|
fn the_body_leaves_the_title_to_cmd_show() {
|
||||||
let rendered = content_trim_colored("# Only Once\n\n## Description\nbody\n", &Resolved::default());
|
let rendered =
|
||||||
|
content_trim_colored("# Only Once\n\n## Description\nbody\n", &Resolved::default());
|
||||||
|
|
||||||
assert!(!rendered.contains("Only Once"), "{rendered:?}");
|
assert!(!rendered.contains("Only Once"), "{rendered:?}");
|
||||||
// And no gap where it was
|
// And no gap where it was
|
||||||
@@ -3480,9 +3464,8 @@ mod tests {
|
|||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn blank_values_are_trimmed_from_the_ends_but_kept_inside() {
|
fn blank_values_are_trimmed_from_the_ends_but_kept_inside() {
|
||||||
let owned = |values: &[&str]| -> Vec<String> {
|
let owned =
|
||||||
values.iter().map(|v| v.to_string()).collect()
|
|values: &[&str]| -> Vec<String> { values.iter().map(|v| v.to_string()).collect() };
|
||||||
};
|
|
||||||
|
|
||||||
// A break between paragraphs is content
|
// A break between paragraphs is content
|
||||||
let two_paragraphs = owned(&["First.", "", "Second."]);
|
let two_paragraphs = owned(&["First.", "", "Second."]);
|
||||||
@@ -3535,7 +3518,12 @@ mod tests {
|
|||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn levels_sort_ahead_of_invalid_which_sorts_ahead_of_unset() {
|
fn levels_sort_ahead_of_invalid_which_sorts_ahead_of_unset() {
|
||||||
let mut ranks = [Priority::Unset, Priority::Level(5), Priority::Invalid, Priority::Level(1)]
|
let mut ranks = [
|
||||||
|
Priority::Unset,
|
||||||
|
Priority::Level(5),
|
||||||
|
Priority::Invalid,
|
||||||
|
Priority::Level(1),
|
||||||
|
]
|
||||||
.map(|p| p.rank());
|
.map(|p| p.rank());
|
||||||
ranks.sort();
|
ranks.sort();
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
@@ -3567,7 +3555,10 @@ mod tests {
|
|||||||
#[test]
|
#[test]
|
||||||
fn the_glyph_alone_distinguishes_every_state() {
|
fn the_glyph_alone_distinguishes_every_state() {
|
||||||
let mut seen = std::collections::HashSet::new();
|
let mut seen = std::collections::HashSet::new();
|
||||||
for state in PRIORITY_RANGE.map(Priority::Level).chain([Priority::Unset, Priority::Invalid]) {
|
for state in PRIORITY_RANGE
|
||||||
|
.map(Priority::Level)
|
||||||
|
.chain([Priority::Unset, Priority::Invalid])
|
||||||
|
{
|
||||||
let (glyph, _) = priority_mark(state);
|
let (glyph, _) = priority_mark(state);
|
||||||
assert!(seen.insert(glyph), "{glyph} is used for more than one state");
|
assert!(seen.insert(glyph), "{glyph} is used for more than one state");
|
||||||
}
|
}
|
||||||
@@ -3630,10 +3621,7 @@ mod tests {
|
|||||||
#[test]
|
#[test]
|
||||||
fn an_invalid_level_is_marked_wrong_not_unset() {
|
fn an_invalid_level_is_marked_wrong_not_unset() {
|
||||||
assert_eq!(priority_mark(Priority::Invalid).0, "??");
|
assert_eq!(priority_mark(Priority::Invalid).0, "??");
|
||||||
assert_ne!(
|
assert_ne!(priority_mark(Priority::Invalid), priority_mark(Priority::Unset));
|
||||||
priority_mark(Priority::Invalid),
|
|
||||||
priority_mark(Priority::Unset)
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
@@ -3664,11 +3652,11 @@ mod tests {
|
|||||||
|
|
||||||
for colour in Color::ALL {
|
for colour in Color::ALL {
|
||||||
assert!(!colour.ansi().is_empty(), "{colour:?} has no escape");
|
assert!(!colour.ansi().is_empty(), "{colour:?} has no escape");
|
||||||
|
assert!(colour.ansi().starts_with("\x1b["), "{colour:?} is not an SGR sequence");
|
||||||
assert!(
|
assert!(
|
||||||
colour.ansi().starts_with("\x1b["),
|
seen.insert(ratatui::style::Color::from(colour)),
|
||||||
"{colour:?} is not an SGR sequence"
|
"{colour:?} shares its ratatui colour"
|
||||||
);
|
);
|
||||||
assert!(seen.insert(ratatui::style::Color::from(colour)), "{colour:?} shares its ratatui colour");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
assert_eq!(seen.len(), Color::ALL.len());
|
assert_eq!(seen.len(), Color::ALL.len());
|
||||||
@@ -3695,8 +3683,9 @@ mod tests {
|
|||||||
assert_eq!(tag_color("bug"), tag_color("bug"));
|
assert_eq!(tag_color("bug"), tag_color("bug"));
|
||||||
assert_eq!(tag_color("frontend"), tag_color("frontend"));
|
assert_eq!(tag_color("frontend"), tag_color("frontend"));
|
||||||
|
|
||||||
let spread: std::collections::HashSet<Color> =
|
let spread: std::collections::HashSet<Color> = [
|
||||||
["bug", "feature", "cli", "tui", "docs", "chore", "output", "skills"]
|
"bug", "feature", "cli", "tui", "docs", "chore", "output", "skills",
|
||||||
|
]
|
||||||
.iter()
|
.iter()
|
||||||
.map(|tag| tag_color(tag))
|
.map(|tag| tag_color(tag))
|
||||||
.collect();
|
.collect();
|
||||||
@@ -3773,7 +3762,10 @@ mod tests {
|
|||||||
// The separator the file holds comes back as it went in, spacing and all.
|
// The separator the file holds comes back as it went in, spacing and all.
|
||||||
assert_eq!(strip_escapes(&painted), "bug, cli");
|
assert_eq!(strip_escapes(&painted), "bug, cli");
|
||||||
assert_eq!(strip_escapes(&metadata_value_cell("Tags", "bug,cli", true, "")), "bug,cli");
|
assert_eq!(strip_escapes(&metadata_value_cell("Tags", "bug,cli", true, "")), "bug,cli");
|
||||||
assert_eq!(strip_escapes(&metadata_value_cell("Tags", " bug , cli ", true, "")), " bug , cli ");
|
assert_eq!(
|
||||||
|
strip_escapes(&metadata_value_cell("Tags", " bug , cli ", true, "")),
|
||||||
|
" bug , cli "
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// An unset value stays grey, since the Tags branch sits behind the unknown check.
|
/// An unset value stays grey, since the Tags branch sits behind the unknown check.
|
||||||
@@ -3850,7 +3842,13 @@ mod tests {
|
|||||||
/// Every one of these reached the old byte offsets from an unvalidated file.
|
/// Every one of these reached the old byte offsets from an unvalidated file.
|
||||||
#[test]
|
#[test]
|
||||||
fn unparseable_created_at_drops_the_column() {
|
fn unparseable_created_at_drops_the_column() {
|
||||||
for value in ["_Not set_", "", "2026-08-20", "日本語日本語日本語", "not a date at all"] {
|
for value in [
|
||||||
|
"_Not set_",
|
||||||
|
"",
|
||||||
|
"2026-08-20",
|
||||||
|
"日本語日本語日本語",
|
||||||
|
"not a date at all",
|
||||||
|
] {
|
||||||
assert_eq!(format_created_at(value), "", "for {value:?}");
|
assert_eq!(format_created_at(value), "", "for {value:?}");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -3933,7 +3931,12 @@ mod tests {
|
|||||||
assert!(error.contains("is not a relation"), "{error}");
|
assert!(error.contains("is not a relation"), "{error}");
|
||||||
assert!(error.contains("blocked by"), "{error}");
|
assert!(error.contains("blocked by"), "{error}");
|
||||||
|
|
||||||
assert!(parse_relation("- blocked by").unwrap_err().to_string().contains("no target"));
|
assert!(
|
||||||
|
parse_relation("- blocked by")
|
||||||
|
.unwrap_err()
|
||||||
|
.to_string()
|
||||||
|
.contains("no target")
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// The two directions of the pairing have to agree, or `--clear acceptance` would
|
/// The two directions of the pairing have to agree, or `--clear acceptance` would
|
||||||
@@ -3985,7 +3988,8 @@ mod tests {
|
|||||||
/// `render` it would read `- [ ] _No acceptance criteria provided._`.
|
/// `render` it would read `- [ ] _No acceptance criteria provided._`.
|
||||||
#[test]
|
#[test]
|
||||||
fn clearing_a_section_writes_the_bare_placeholder() {
|
fn clearing_a_section_writes_the_bare_placeholder() {
|
||||||
let content = "# T\n\n## Acceptance Criteria\n- [x] Done\n- [ ] Not\n\n## Metadata\n\n- **ID**: x\n";
|
let content =
|
||||||
|
"# T\n\n## Acceptance Criteria\n- [x] Done\n- [ ] Not\n\n## Metadata\n\n- **ID**: x\n";
|
||||||
let cleared = clear_section_body(content, &ACCEPTANCE).unwrap();
|
let cleared = clear_section_body(content, &ACCEPTANCE).unwrap();
|
||||||
assert!(
|
assert!(
|
||||||
cleared.contains(&format!("## Acceptance Criteria\n{}\n", ACCEPTANCE.placeholder)),
|
cleared.contains(&format!("## Acceptance Criteria\n{}\n", ACCEPTANCE.placeholder)),
|
||||||
@@ -4184,11 +4188,7 @@ mod tests {
|
|||||||
let (mark, colour) = relation_mark(kind);
|
let (mark, colour) = relation_mark(kind);
|
||||||
assert!(!mark.is_empty(), "{kind:?} has no mark");
|
assert!(!mark.is_empty(), "{kind:?} has no mark");
|
||||||
assert!(seen.insert(mark), "{kind:?} shares its mark with another kind");
|
assert!(seen.insert(mark), "{kind:?} shares its mark with another kind");
|
||||||
assert_ne!(
|
assert_ne!(colour, Color::Green, "{kind:?} is drawn in the colour that means a title");
|
||||||
colour,
|
|
||||||
Color::Green,
|
|
||||||
"{kind:?} is drawn in the colour that means a title"
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
assert_eq!(seen.len(), 3, "{seen:?}");
|
assert_eq!(seen.len(), 3, "{seen:?}");
|
||||||
@@ -4255,10 +4255,7 @@ mod tests {
|
|||||||
// status mark cannot: `?` holds the column so the id does not move, and
|
// status mark cannot: `?` holds the column so the id does not move, and
|
||||||
// `_missing_` is what says the target is gone.
|
// `_missing_` is what says the target is gone.
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
render_relations(
|
render_relations(&relation_rows(&stored, &RelationIndex::new(Vec::new()), SELF), false),
|
||||||
&relation_rows(&stored, &RelationIndex::new(Vec::new()), SELF),
|
|
||||||
false
|
|
||||||
),
|
|
||||||
format!("blocked by {BLOCKED_MARK} ? (b1b2c3d) _missing_\n")
|
format!("blocked by {BLOCKED_MARK} ? (b1b2c3d) _missing_\n")
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -4266,10 +4263,7 @@ mod tests {
|
|||||||
#[test]
|
#[test]
|
||||||
fn a_ticket_with_no_relations_at_either_end_renders_no_block() {
|
fn a_ticket_with_no_relations_at_either_end_renders_no_block() {
|
||||||
let index = RelationIndex::new(vec![related(TARGET, "Elsewhere", "backlog", Vec::new())]);
|
let index = RelationIndex::new(vec![related(TARGET, "Elsewhere", "backlog", Vec::new())]);
|
||||||
assert_eq!(
|
assert_eq!(render_relations(&relation_rows(&[], &index, SELF), false), "");
|
||||||
render_relations(&relation_rows(&[], &index, SELF), false),
|
|
||||||
""
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Without the guard every ticket with no ID field relates to every other one that
|
/// Without the guard every ticket with no ID field relates to every other one that
|
||||||
@@ -4295,7 +4289,20 @@ mod tests {
|
|||||||
"# T\n\n## Relations\n- blocked by {}\n\n## Metadata\n\n- **ID**: {}\n",
|
"# T\n\n## Relations\n- blocked by {}\n\n## Metadata\n\n- **ID**: {}\n",
|
||||||
TARGET, SELF
|
TARGET, SELF
|
||||||
);
|
);
|
||||||
let rendered = content_trim(&content, false, &Resolved { relations: vec![row(RelationKind::BlockedBy, "blocked by", TARGET, "The blocker", "backlog")], ..Default::default() });
|
let rendered = content_trim(
|
||||||
|
&content,
|
||||||
|
false,
|
||||||
|
&Resolved {
|
||||||
|
relations: vec![row(
|
||||||
|
RelationKind::BlockedBy,
|
||||||
|
"blocked by",
|
||||||
|
TARGET,
|
||||||
|
"The blocker",
|
||||||
|
"backlog",
|
||||||
|
)],
|
||||||
|
..Default::default()
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
assert!(
|
assert!(
|
||||||
rendered.contains(&format!("Relations\n─────────\n\nblocked by {BLOCKED_MARK} {} (b1b2c3d) The blocker\n\nMetadata", smark("backlog"))),
|
rendered.contains(&format!("Relations\n─────────\n\nblocked by {BLOCKED_MARK} {} (b1b2c3d) The blocker\n\nMetadata", smark("backlog"))),
|
||||||
@@ -4309,8 +4316,22 @@ mod tests {
|
|||||||
/// have kept it, ahead of the metadata.
|
/// have kept it, ahead of the metadata.
|
||||||
#[test]
|
#[test]
|
||||||
fn the_body_injects_the_block_when_the_file_has_no_section() {
|
fn the_body_injects_the_block_when_the_file_has_no_section() {
|
||||||
let content = format!("# T\n\n## Description\nBody.\n\n## Metadata\n\n- **ID**: {}\n", SELF);
|
let content =
|
||||||
let rendered = content_trim(&content, false, &Resolved { relations: vec![row(RelationKind::BlockedBy, "blocks", SELF, "The gated one", "committed")], ..Default::default() });
|
format!("# T\n\n## Description\nBody.\n\n## Metadata\n\n- **ID**: {}\n", SELF);
|
||||||
|
let rendered = content_trim(
|
||||||
|
&content,
|
||||||
|
false,
|
||||||
|
&Resolved {
|
||||||
|
relations: vec![row(
|
||||||
|
RelationKind::BlockedBy,
|
||||||
|
"blocks",
|
||||||
|
SELF,
|
||||||
|
"The gated one",
|
||||||
|
"committed",
|
||||||
|
)],
|
||||||
|
..Default::default()
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
assert!(
|
assert!(
|
||||||
rendered.contains(&format!("Body.\n\nRelations\n─────────\n\nblocks {BLOCKED_MARK} {} (641e3d5) The gated one\n\nMetadata", smark("committed"))),
|
rendered.contains(&format!("Body.\n\nRelations\n─────────\n\nblocks {BLOCKED_MARK} {} (641e3d5) The gated one\n\nMetadata", smark("committed"))),
|
||||||
@@ -4322,9 +4343,22 @@ mod tests {
|
|||||||
/// worth more at the end than dropped.
|
/// worth more at the end than dropped.
|
||||||
#[test]
|
#[test]
|
||||||
fn the_body_appends_the_block_when_there_is_no_metadata() {
|
fn the_body_appends_the_block_when_there_is_no_metadata() {
|
||||||
let rendered = content_trim("# T\n\n## Description\nBody.\n", false, &Resolved { relations: vec![row(RelationKind::BlockedBy, "blocks", SELF, "X", "done")], ..Default::default() });
|
let rendered = content_trim(
|
||||||
|
"# T\n\n## Description\nBody.\n",
|
||||||
|
false,
|
||||||
|
&Resolved {
|
||||||
|
relations: vec![row(RelationKind::BlockedBy, "blocks", SELF, "X", "done")],
|
||||||
|
..Default::default()
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
assert!(rendered.ends_with(&format!("Relations\n─────────\n\nblocks {BLOCKED_MARK} {} (641e3d5) X\n", smark("done"))), "{rendered:?}");
|
assert!(
|
||||||
|
rendered.ends_with(&format!(
|
||||||
|
"Relations\n─────────\n\nblocks {BLOCKED_MARK} {} (641e3d5) X\n",
|
||||||
|
smark("done")
|
||||||
|
)),
|
||||||
|
"{rendered:?}"
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// No block and a section holding only its placeholder: the section renders as it
|
/// No block and a section holding only its placeholder: the section renders as it
|
||||||
@@ -4334,6 +4368,9 @@ mod tests {
|
|||||||
let content = "# T\n\n## Relations\n_No relations._\n\n## Metadata\n\n- **ID**: x\n";
|
let content = "# T\n\n## Relations\n_No relations._\n\n## Metadata\n\n- **ID**: x\n";
|
||||||
let rendered = content_trim(content, false, &Resolved::default());
|
let rendered = content_trim(content, false, &Resolved::default());
|
||||||
|
|
||||||
assert!(rendered.contains("Relations\n─────────\n\n_No relations._\n"), "{rendered:?}");
|
assert!(
|
||||||
|
rendered.contains("Relations\n─────────\n\n_No relations._\n"),
|
||||||
|
"{rendered:?}"
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+19
-21
@@ -1,6 +1,6 @@
|
|||||||
use assert_cmd::Command;
|
use assert_cmd::Command;
|
||||||
use assert_fs::fixture::{PathChild, PathCreateDir};
|
|
||||||
use assert_fs::TempDir;
|
use assert_fs::TempDir;
|
||||||
|
use assert_fs::fixture::{PathChild, PathCreateDir};
|
||||||
use std::fs;
|
use std::fs;
|
||||||
use std::path::{Path, PathBuf};
|
use std::path::{Path, PathBuf};
|
||||||
|
|
||||||
@@ -106,9 +106,12 @@ fn add_joins_multiple_descriptions() {
|
|||||||
cmd.current_dir(temp.path())
|
cmd.current_dir(temp.path())
|
||||||
.args([
|
.args([
|
||||||
"add",
|
"add",
|
||||||
"--title", "Multi desc ticket",
|
"--title",
|
||||||
"--description", "Line one",
|
"Multi desc ticket",
|
||||||
"--description", "Line two",
|
"--description",
|
||||||
|
"Line one",
|
||||||
|
"--description",
|
||||||
|
"Line two",
|
||||||
])
|
])
|
||||||
.assert()
|
.assert()
|
||||||
.success();
|
.success();
|
||||||
@@ -285,10 +288,7 @@ fn add_accepts_prose_values_that_begin_with_a_hyphen() {
|
|||||||
// Stored verbatim, hyphens and all
|
// Stored verbatim, hyphens and all
|
||||||
assert!(content.contains("# -t is a flag name"), "was {content:?}");
|
assert!(content.contains("# -t is a flag name"), "was {content:?}");
|
||||||
assert!(content.contains("-x does nothing"), "was {content:?}");
|
assert!(content.contains("-x does nothing"), "was {content:?}");
|
||||||
assert!(
|
assert!(content.contains("- [ ] --print should be supported"), "was {content:?}");
|
||||||
content.contains("- [ ] --print should be supported"),
|
|
||||||
"was {content:?}"
|
|
||||||
);
|
|
||||||
assert!(content.contains("1. -f skips the check"), "was {content:?}");
|
assert!(content.contains("1. -f skips the check"), "was {content:?}");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -308,10 +308,7 @@ fn add_still_accepts_the_equals_form() {
|
|||||||
|
|
||||||
let content = only_ticket(&worklane);
|
let content = only_ticket(&worklane);
|
||||||
assert!(content.contains("# -x equals form"), "was {content:?}");
|
assert!(content.contains("# -x equals form"), "was {content:?}");
|
||||||
assert!(
|
assert!(content.contains("- [ ] --print via equals"), "was {content:?}");
|
||||||
content.contains("- [ ] --print via equals"),
|
|
||||||
"was {content:?}"
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Never silently dropped: a value that is nothing but hyphens is content.
|
/// Never silently dropped: a value that is nothing but hyphens is content.
|
||||||
@@ -328,10 +325,7 @@ fn add_stores_a_title_that_is_only_hyphens() {
|
|||||||
.success();
|
.success();
|
||||||
|
|
||||||
let content = only_ticket(&worklane);
|
let content = only_ticket(&worklane);
|
||||||
assert!(
|
assert!(content.starts_with(&format!("# {}\n", bare)), "for {bare:?}: {content:?}");
|
||||||
content.starts_with(&format!("# {}\n", bare)),
|
|
||||||
"for {bare:?}: {content:?}"
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -408,10 +402,7 @@ fn add_keeps_a_paragraph_break_in_the_description() {
|
|||||||
let mut show = Command::cargo_bin(BIN_NAME).unwrap();
|
let mut show = Command::cargo_bin(BIN_NAME).unwrap();
|
||||||
show.current_dir(temp.path()).args(["show", "Two Paras"]);
|
show.current_dir(temp.path()).args(["show", "Two Paras"]);
|
||||||
let stdout = String::from_utf8(show.assert().success().get_output().stdout.clone()).unwrap();
|
let stdout = String::from_utf8(show.assert().success().get_output().stdout.clone()).unwrap();
|
||||||
assert!(
|
assert!(stdout.contains("First paragraph.\n\nSecond paragraph."), "was {stdout:?}");
|
||||||
stdout.contains("First paragraph.\n\nSecond paragraph."),
|
|
||||||
"was {stdout:?}"
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// A break belongs between paragraphs, not against the section headings.
|
/// A break belongs between paragraphs, not against the section headings.
|
||||||
@@ -482,7 +473,14 @@ fn add_stores_a_valid_due_date_unchanged() {
|
|||||||
/// and is not a day.
|
/// and is not a day.
|
||||||
#[test]
|
#[test]
|
||||||
fn add_refuses_a_due_date_that_is_not_a_real_iso_date() {
|
fn add_refuses_a_due_date_that_is_not_a_real_iso_date() {
|
||||||
for value in ["next friday", "29-08-2026", "2026-13-01", "2026-02-30", "2026/08/29", ""] {
|
for value in [
|
||||||
|
"next friday",
|
||||||
|
"29-08-2026",
|
||||||
|
"2026-13-01",
|
||||||
|
"2026-02-30",
|
||||||
|
"2026/08/29",
|
||||||
|
"",
|
||||||
|
] {
|
||||||
let temp = TempDir::new().unwrap();
|
let temp = TempDir::new().unwrap();
|
||||||
let worklane = setup_worklane(&temp);
|
let worklane = setup_worklane(&temp);
|
||||||
|
|
||||||
|
|||||||
@@ -487,7 +487,12 @@ fn a_campaign_that_no_longer_exists_reads_as_missing() {
|
|||||||
let worklane = board(&temp);
|
let worklane = board(&temp);
|
||||||
|
|
||||||
run(&temp, &["assign", "v1 release", MEMBER]);
|
run(&temp, &["assign", "v1 release", MEMBER]);
|
||||||
fs::remove_file(worklane.join("campaigns").join(format!("{CAMP_A}_v1-release.md"))).unwrap();
|
fs::remove_file(
|
||||||
|
worklane
|
||||||
|
.join("campaigns")
|
||||||
|
.join(format!("{CAMP_A}_v1-release.md")),
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
let out = run(&temp, &["show", MEMBER]);
|
let out = run(&temp, &["show", MEMBER]);
|
||||||
assert!(out.status.success(), "{}", stderr(&out));
|
assert!(out.status.success(), "{}", stderr(&out));
|
||||||
@@ -578,11 +583,7 @@ fn a_search_that_names_nothing_still_reports_no_ticket() {
|
|||||||
let out = run(&temp, &["show", "nothing at all"]);
|
let out = run(&temp, &["show", "nothing at all"]);
|
||||||
|
|
||||||
assert!(!out.status.success());
|
assert!(!out.status.success());
|
||||||
assert!(
|
assert!(stderr(&out).contains("No ticket found matching"), "{}", stderr(&out));
|
||||||
stderr(&out).contains("No ticket found matching"),
|
|
||||||
"{}",
|
|
||||||
stderr(&out)
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// A campaign resolves by the same tiers a ticket does, so it can be ambiguous the same
|
/// A campaign resolves by the same tiers a ticket does, so it can be ambiguous the same
|
||||||
|
|||||||
+2
-9
@@ -298,10 +298,7 @@ fn show_numbers_the_criteria() {
|
|||||||
assert!(!stdout.contains("4. ["), "the handwritten line was numbered: {stdout:?}");
|
assert!(!stdout.contains("4. ["), "the handwritten line was numbered: {stdout:?}");
|
||||||
|
|
||||||
// And the description checkbox is left as it is, outside the numbering
|
// And the description checkbox is left as it is, outside the numbering
|
||||||
assert!(
|
assert!(stdout.contains("- [ ] A checkbox in the description"), "{stdout:?}");
|
||||||
stdout.contains("- [ ] A checkbox in the description"),
|
|
||||||
"{stdout:?}"
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
@@ -418,11 +415,7 @@ fn a_batch_that_would_change_nothing_writes_nothing() {
|
|||||||
assert!(out.status.success());
|
assert!(out.status.success());
|
||||||
|
|
||||||
let stdout = String::from_utf8_lossy(&out.stdout);
|
let stdout = String::from_utf8_lossy(&out.stdout);
|
||||||
assert_eq!(
|
assert_eq!(stdout.matches("Already checked").count(), 3, "{stdout:?}");
|
||||||
stdout.matches("Already checked").count(),
|
|
||||||
3,
|
|
||||||
"{stdout:?}"
|
|
||||||
);
|
|
||||||
assert_eq!(ticket(&worklane), before, "the file was rewritten anyway");
|
assert_eq!(ticket(&worklane), before, "the file was rewritten anyway");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+2
-9
@@ -89,11 +89,7 @@ fn chown_sets_the_owner() {
|
|||||||
create_ticket(&worklane);
|
create_ticket(&worklane);
|
||||||
|
|
||||||
let out = run(&temp, &["chown", "bob", UUID]);
|
let out = run(&temp, &["chown", "bob", UUID]);
|
||||||
assert!(
|
assert!(out.status.success(), "{:?}", String::from_utf8_lossy(&out.stderr));
|
||||||
out.status.success(),
|
|
||||||
"{:?}",
|
|
||||||
String::from_utf8_lossy(&out.stderr)
|
|
||||||
);
|
|
||||||
assert!(
|
assert!(
|
||||||
String::from_utf8_lossy(&out.stdout).contains("owner"),
|
String::from_utf8_lossy(&out.stdout).contains("owner"),
|
||||||
"{:?}",
|
"{:?}",
|
||||||
@@ -139,10 +135,7 @@ fn chown_leaves_everything_it_was_not_asked_about_alone() {
|
|||||||
run(&temp, &["chown", "bob", UUID]);
|
run(&temp, &["chown", "bob", UUID]);
|
||||||
|
|
||||||
let content = ticket(&worklane);
|
let content = ticket(&worklane);
|
||||||
assert!(
|
assert!(content.contains("- [x] Crit one"), "the tick was lost: {content}");
|
||||||
content.contains("- [x] Crit one"),
|
|
||||||
"the tick was lost: {content}"
|
|
||||||
);
|
|
||||||
assert!(
|
assert!(
|
||||||
content.contains("## Notes\nA handwritten note the tool knows nothing about.\n"),
|
content.contains("## Notes\nA handwritten note the tool knows nothing about.\n"),
|
||||||
"the unknown section was lost: {content}"
|
"the unknown section was lost: {content}"
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
use assert_cmd::Command;
|
use assert_cmd::Command;
|
||||||
use assert_fs::fixture::{PathChild, PathCreateDir};
|
|
||||||
use assert_fs::TempDir;
|
use assert_fs::TempDir;
|
||||||
|
use assert_fs::fixture::{PathChild, PathCreateDir};
|
||||||
use std::fs;
|
use std::fs;
|
||||||
use std::path::{Path, PathBuf};
|
use std::path::{Path, PathBuf};
|
||||||
|
|
||||||
@@ -17,11 +17,7 @@ fn setup_worklane(temp: &TempDir) -> PathBuf {
|
|||||||
worklane.path().to_path_buf()
|
worklane.path().to_path_buf()
|
||||||
}
|
}
|
||||||
|
|
||||||
fn create_ticket(
|
fn create_ticket(worklane_dir: &Path, status: &str, title: &str) -> String {
|
||||||
worklane_dir: &Path,
|
|
||||||
status: &str,
|
|
||||||
title: &str,
|
|
||||||
) -> String {
|
|
||||||
let uuid = uuid::Uuid::new_v4().to_string();
|
let uuid = uuid::Uuid::new_v4().to_string();
|
||||||
let slug = title
|
let slug = title
|
||||||
.to_lowercase()
|
.to_lowercase()
|
||||||
|
|||||||
@@ -13,10 +13,7 @@ fn script(shell: &str) -> String {
|
|||||||
fn completions_prints_a_script_for_every_shell() {
|
fn completions_prints_a_script_for_every_shell() {
|
||||||
for shell in ["fish", "bash", "zsh", "elvish", "powershell"] {
|
for shell in ["fish", "bash", "zsh", "elvish", "powershell"] {
|
||||||
let out = script(shell);
|
let out = script(shell);
|
||||||
assert!(
|
assert!(out.contains("worklane"), "the {shell} script never names the command");
|
||||||
out.contains("worklane"),
|
|
||||||
"the {shell} script never names the command"
|
|
||||||
);
|
|
||||||
// Long enough to be a script rather than an empty file with a comment in it.
|
// Long enough to be a script rather than an empty file with a comment in it.
|
||||||
assert!(out.len() > 500, "the {shell} script is {} bytes", out.len());
|
assert!(out.len() > 500, "the {shell} script is {} bytes", out.len());
|
||||||
}
|
}
|
||||||
@@ -56,10 +53,7 @@ fn no_other_shell_gets_the_fish_half() {
|
|||||||
!out.contains("__worklane_first_arg_of"),
|
!out.contains("__worklane_first_arg_of"),
|
||||||
"fish-only helpers leaked into {shell}"
|
"fish-only helpers leaked into {shell}"
|
||||||
);
|
);
|
||||||
assert!(
|
assert!(!out.contains("worklane ls --ids"), "the dynamic half leaked into {shell}");
|
||||||
!out.contains("worklane ls --ids"),
|
|
||||||
"the dynamic half leaked into {shell}"
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -54,11 +54,7 @@ fn every_skill_installs_outside_a_worklane_directory() {
|
|||||||
assert_eq!(std::fs::read_to_string(installed_plan(&home)).unwrap(), PLAN);
|
assert_eq!(std::fs::read_to_string(installed_plan(&home)).unwrap(), PLAN);
|
||||||
|
|
||||||
// Once, not per document: it is the one thing to do next, not part of an outcome.
|
// Once, not per document: it is the one thing to do next, not part of an outcome.
|
||||||
assert_eq!(
|
assert_eq!(stdout.matches("pick it up on their next session").count(), 1, "{stdout}");
|
||||||
stdout.matches("pick it up on their next session").count(),
|
|
||||||
1,
|
|
||||||
"{stdout}"
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Narrowing to one document is the exception, and it must leave the others alone.
|
/// Narrowing to one document is the exception, and it must leave the others alone.
|
||||||
@@ -72,7 +68,10 @@ fn a_named_skill_installs_only_that_one() {
|
|||||||
assert_eq!(out.status.code(), Some(0), "{stdout}");
|
assert_eq!(out.status.code(), Some(0), "{stdout}");
|
||||||
assert_eq!(std::fs::read_to_string(installed_review(&home)).unwrap(), REVIEW);
|
assert_eq!(std::fs::read_to_string(installed_review(&home)).unwrap(), REVIEW);
|
||||||
assert!(!installed(&home).exists(), "a named install wrote the other document too");
|
assert!(!installed(&home).exists(), "a named install wrote the other document too");
|
||||||
assert!(!installed_plan(&home).exists(), "a named install wrote the other document too");
|
assert!(
|
||||||
|
!installed_plan(&home).exists(),
|
||||||
|
"a named install wrote the other document too"
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// A name nothing ships is a stop, with the choices in the message: guessing at the
|
/// A name nothing ships is a stop, with the choices in the message: guessing at the
|
||||||
@@ -118,7 +117,10 @@ fn a_modified_copy_is_reported_and_needs_force() {
|
|||||||
assert_eq!(out.status.code(), Some(0), "{stdout}");
|
assert_eq!(out.status.code(), Some(0), "{stdout}");
|
||||||
assert!(stdout.contains("Differs from the version in this binary"), "{stdout}");
|
assert!(stdout.contains("Differs from the version in this binary"), "{stdout}");
|
||||||
assert!(stdout.contains("--force"), "{stdout}");
|
assert!(stdout.contains("--force"), "{stdout}");
|
||||||
assert!(stdout.contains("--print"), "the message never says how to compare: {stdout}");
|
assert!(
|
||||||
|
stdout.contains("--print"),
|
||||||
|
"the message never says how to compare: {stdout}"
|
||||||
|
);
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
std::fs::read_to_string(installed(&home)).unwrap(),
|
std::fs::read_to_string(installed(&home)).unwrap(),
|
||||||
"hand written\n",
|
"hand written\n",
|
||||||
@@ -186,7 +188,10 @@ fn print_without_a_name_says_which_names_there_are() {
|
|||||||
assert_ne!(out.status.code(), Some(0), "{stderr}");
|
assert_ne!(out.status.code(), Some(0), "{stderr}");
|
||||||
assert!(stderr.contains("name the skill to print"), "{stderr}");
|
assert!(stderr.contains("name the skill to print"), "{stderr}");
|
||||||
assert!(stderr.contains("worklane-review"), "{stderr}");
|
assert!(stderr.contains("worklane-review"), "{stderr}");
|
||||||
assert!(String::from_utf8_lossy(&out.stdout).is_empty(), "a document was printed anyway");
|
assert!(
|
||||||
|
String::from_utf8_lossy(&out.stdout).is_empty(),
|
||||||
|
"a document was printed anyway"
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// The command has to be findable by someone who does not already know it exists.
|
/// The command has to be findable by someone who does not already know it exists.
|
||||||
|
|||||||
+21
-7
@@ -191,7 +191,11 @@ fn ls_handles_short_and_non_ascii_filenames() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
let mut cmd = Command::cargo_bin(BIN_NAME).unwrap();
|
let mut cmd = Command::cargo_bin(BIN_NAME).unwrap();
|
||||||
cmd.current_dir(temp.path()).arg("ls").arg("backlog").assert().success();
|
cmd.current_dir(temp.path())
|
||||||
|
.arg("ls")
|
||||||
|
.arg("backlog")
|
||||||
|
.assert()
|
||||||
|
.success();
|
||||||
|
|
||||||
let stdout = get_stdout(&mut cmd);
|
let stdout = get_stdout(&mut cmd);
|
||||||
assert_eq!(stdout.matches("Odd Name").count(), 3);
|
assert_eq!(stdout.matches("Odd Name").count(), 3);
|
||||||
@@ -209,7 +213,11 @@ fn ls_survives_a_malformed_created_at() {
|
|||||||
.unwrap();
|
.unwrap();
|
||||||
|
|
||||||
let mut cmd = Command::cargo_bin(BIN_NAME).unwrap();
|
let mut cmd = Command::cargo_bin(BIN_NAME).unwrap();
|
||||||
cmd.current_dir(temp.path()).arg("ls").arg("backlog").assert().success();
|
cmd.current_dir(temp.path())
|
||||||
|
.arg("ls")
|
||||||
|
.arg("backlog")
|
||||||
|
.assert()
|
||||||
|
.success();
|
||||||
|
|
||||||
let stdout = get_stdout(&mut cmd);
|
let stdout = get_stdout(&mut cmd);
|
||||||
assert!(stdout.contains("Bad Date"));
|
assert!(stdout.contains("Bad Date"));
|
||||||
@@ -290,7 +298,10 @@ fn ls_shows_a_mark_for_the_level() {
|
|||||||
|
|
||||||
// Piped, so no escapes: the glyph is carrying the level by itself
|
// Piped, so no escapes: the glyph is carrying the level by itself
|
||||||
assert!(!stdout.contains('\u{1b}'));
|
assert!(!stdout.contains('\u{1b}'));
|
||||||
assert!(stdout.contains("\u{25cf}\u{25cf} "), "no full meter for level 1 in {stdout:?}");
|
assert!(
|
||||||
|
stdout.contains("\u{25cf}\u{25cf} "),
|
||||||
|
"no full meter for level 1 in {stdout:?}"
|
||||||
|
);
|
||||||
assert!(stdout.contains("\u{25cb}\u{25cb} "), "no empty meter for level 5");
|
assert!(stdout.contains("\u{25cb}\u{25cb} "), "no empty meter for level 5");
|
||||||
assert!(stdout.contains("\u{b7}\u{b7} "), "no unset mark");
|
assert!(stdout.contains("\u{b7}\u{b7} "), "no unset mark");
|
||||||
// The raw number is not what the listing shows
|
// The raw number is not what the listing shows
|
||||||
@@ -340,7 +351,10 @@ fn ls_filters_by_tag_and_composes_with_status_and_priority() {
|
|||||||
let stdout = get_stdout(&mut cmd);
|
let stdout = get_stdout(&mut cmd);
|
||||||
assert!(stdout.contains("Tagged bug"), "{stdout}");
|
assert!(stdout.contains("Tagged bug"), "{stdout}");
|
||||||
assert!(stdout.contains("Lower bug"), "{stdout}");
|
assert!(stdout.contains("Lower bug"), "{stdout}");
|
||||||
assert!(stdout.contains("Started bug"), "a tagged ticket in another status was dropped");
|
assert!(
|
||||||
|
stdout.contains("Started bug"),
|
||||||
|
"a tagged ticket in another status was dropped"
|
||||||
|
);
|
||||||
assert!(!stdout.contains("Tagged feature"), "an untagged ticket came through");
|
assert!(!stdout.contains("Tagged feature"), "an untagged ticket came through");
|
||||||
// The counts are filtered too, since they are the same collect.
|
// The counts are filtered too, since they are the same collect.
|
||||||
assert!(stdout.contains("[BACKLOG] 2 tickets"), "{stdout}");
|
assert!(stdout.contains("[BACKLOG] 2 tickets"), "{stdout}");
|
||||||
@@ -436,8 +450,7 @@ fn ls_never_matches_a_ticket_carrying_no_tags() {
|
|||||||
// Nor does an empty tag reach the filter: the value parser refuses it, so nothing is
|
// Nor does an empty tag reach the filter: the value parser refuses it, so nothing is
|
||||||
// listed rather than everything.
|
// listed rather than everything.
|
||||||
let mut cmd = Command::cargo_bin(BIN_NAME).unwrap();
|
let mut cmd = Command::cargo_bin(BIN_NAME).unwrap();
|
||||||
cmd.current_dir(temp.path())
|
cmd.current_dir(temp.path()).args(["ls", "backlog", "--tag", ""]);
|
||||||
.args(["ls", "backlog", "--tag", ""]);
|
|
||||||
cmd.assert().failure().code(2);
|
cmd.assert().failure().code(2);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -584,7 +597,8 @@ fn ls_ids_still_takes_the_filters() {
|
|||||||
);
|
);
|
||||||
|
|
||||||
let mut cmd = Command::cargo_bin(BIN_NAME).unwrap();
|
let mut cmd = Command::cargo_bin(BIN_NAME).unwrap();
|
||||||
cmd.current_dir(temp.path()).args(["ls", "--ids", "--tag", "cli"]);
|
cmd.current_dir(temp.path())
|
||||||
|
.args(["ls", "--ids", "--tag", "cli"]);
|
||||||
let stdout = get_stdout(&mut cmd);
|
let stdout = get_stdout(&mut cmd);
|
||||||
assert_eq!(stdout, "bbbbbbb\tTagged cli\n", "{stdout:?}");
|
assert_eq!(stdout, "bbbbbbb\tTagged cli\n", "{stdout:?}");
|
||||||
}
|
}
|
||||||
|
|||||||
+5
-9
@@ -473,7 +473,9 @@ fn stray_files(worklane: &std::path::Path) -> Vec<String> {
|
|||||||
.unwrap()
|
.unwrap()
|
||||||
.filter_map(|e| e.ok())
|
.filter_map(|e| e.ok())
|
||||||
.map(|e| e.file_name().into_string().unwrap())
|
.map(|e| e.file_name().into_string().unwrap())
|
||||||
.filter(|name| !["backlog", "committed", "reviewing", "done", "comments"].contains(&name.as_str()))
|
.filter(|name| {
|
||||||
|
!["backlog", "committed", "reviewing", "done", "comments"].contains(&name.as_str())
|
||||||
|
})
|
||||||
.collect();
|
.collect();
|
||||||
|
|
||||||
for dir in ["backlog", "committed", "reviewing", "done"] {
|
for dir in ["backlog", "committed", "reviewing", "done"] {
|
||||||
@@ -522,10 +524,7 @@ fn mv_never_leaves_stale_content_in_the_target_directory() {
|
|||||||
let moved = worklane.join("committed").join(&filename);
|
let moved = worklane.join("committed").join(&filename);
|
||||||
assert!(moved.exists(), "ticket did not move");
|
assert!(moved.exists(), "ticket did not move");
|
||||||
let content = fs::read_to_string(&moved).unwrap();
|
let content = fs::read_to_string(&moved).unwrap();
|
||||||
assert!(
|
assert!(content.contains("- **Status**: committed"), "stale status: {content:?}");
|
||||||
content.contains("- **Status**: committed"),
|
|
||||||
"stale status: {content:?}"
|
|
||||||
);
|
|
||||||
assert!(!content.contains("- **Status**: backlog"), "{content:?}");
|
assert!(!content.contains("- **Status**: backlog"), "{content:?}");
|
||||||
|
|
||||||
assert_eq!(md_files(&worklane.join("backlog")).len(), 0);
|
assert_eq!(md_files(&worklane.join("backlog")).len(), 0);
|
||||||
@@ -631,10 +630,7 @@ fn mv_moves_the_resolved_ticket_when_two_share_a_title() {
|
|||||||
] {
|
] {
|
||||||
fs::write(
|
fs::write(
|
||||||
worklane.join("backlog").join(format!("{}_foo.md", uuid)),
|
worklane.join("backlog").join(format!("{}_foo.md", uuid)),
|
||||||
format!(
|
format!("# Foo\n\n## Metadata\n\n- **ID**: {}\n- **Status**: backlog\n", uuid),
|
||||||
"# Foo\n\n## Metadata\n\n- **ID**: {}\n- **Status**: backlog\n",
|
|
||||||
uuid
|
|
||||||
),
|
|
||||||
)
|
)
|
||||||
.unwrap();
|
.unwrap();
|
||||||
}
|
}
|
||||||
|
|||||||
+6
-14
@@ -118,11 +118,7 @@ fn a_target_resolves_by_uuid_prefix_title_or_filename() {
|
|||||||
let worklane = board(&temp);
|
let worklane = board(&temp);
|
||||||
|
|
||||||
let out = run(&temp, &["relate", GATED, "--blocked-by", search]);
|
let out = run(&temp, &["relate", GATED, "--blocked-by", search]);
|
||||||
assert!(
|
assert!(out.status.success(), "{search}: {}", String::from_utf8_lossy(&out.stderr));
|
||||||
out.status.success(),
|
|
||||||
"{search}: {}",
|
|
||||||
String::from_utf8_lossy(&out.stderr)
|
|
||||||
);
|
|
||||||
assert!(
|
assert!(
|
||||||
ticket(&worklane, GATED).contains(&format!("- blocked by {}", BLOCKER)),
|
ticket(&worklane, GATED).contains(&format!("- blocked by {}", BLOCKER)),
|
||||||
"{search}: {}",
|
"{search}: {}",
|
||||||
@@ -249,11 +245,7 @@ fn a_relation_already_held_reports_no_change_and_writes_nothing() {
|
|||||||
let out = run(&temp, &["relate", GATED, "--blocked-by", BLOCKER]);
|
let out = run(&temp, &["relate", GATED, "--blocked-by", BLOCKER]);
|
||||||
assert!(out.status.success());
|
assert!(out.status.success());
|
||||||
assert!(stdout(&out).contains("No changes"), "{}", stdout(&out));
|
assert!(stdout(&out).contains("No changes"), "{}", stdout(&out));
|
||||||
assert_eq!(
|
assert_eq!(ticket(&worklane, GATED), before, "the relation was recorded twice");
|
||||||
ticket(&worklane, GATED),
|
|
||||||
before,
|
|
||||||
"the relation was recorded twice"
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// One direction is stored. The inverse is derived by a scan, so the ticket at the
|
/// One direction is stored. The inverse is derived by a scan, so the ticket at the
|
||||||
@@ -354,7 +346,9 @@ fn show_lists_the_relation_the_other_ticket_holds() {
|
|||||||
// `relates to` is symmetric, so it reads the same way from either end.
|
// `relates to` is symmetric, so it reads the same way from either end.
|
||||||
let shown = stdout(&run(&temp, &["show", FIXED]));
|
let shown = stdout(&run(&temp, &["show", FIXED]));
|
||||||
assert!(
|
assert!(
|
||||||
shown.contains(&format!("relates to {RELATES_MARK} {BACKLOG_MARK} (641e3d5) The gated one")),
|
shown.contains(&format!(
|
||||||
|
"relates to {RELATES_MARK} {BACKLOG_MARK} (641e3d5) The gated one"
|
||||||
|
)),
|
||||||
"{shown}"
|
"{shown}"
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -382,9 +376,7 @@ fn a_line_that_is_not_a_relation_is_an_error() {
|
|||||||
let worklane = board(&temp);
|
let worklane = board(&temp);
|
||||||
|
|
||||||
let path = find(&worklane, GATED);
|
let path = find(&worklane, GATED);
|
||||||
let content = fs::read_to_string(&path)
|
let content = fs::read_to_string(&path).unwrap().replace(
|
||||||
.unwrap()
|
|
||||||
.replace(
|
|
||||||
"## Metadata",
|
"## Metadata",
|
||||||
&format!("## Relations\n- depends on {}\n\n## Metadata", BLOCKER),
|
&format!("## Relations\n- depends on {}\n\n## Metadata", BLOCKER),
|
||||||
);
|
);
|
||||||
|
|||||||
+99
-50
@@ -94,13 +94,20 @@ fn set_replaces_each_field_it_is_given() {
|
|||||||
let out = run(
|
let out = run(
|
||||||
&temp,
|
&temp,
|
||||||
&[
|
&[
|
||||||
"set", UUID,
|
"set",
|
||||||
"--description", "Only paragraph.",
|
UUID,
|
||||||
"--acceptance", "New crit",
|
"--description",
|
||||||
"--plan", "New step",
|
"Only paragraph.",
|
||||||
"--tags", "beta,gamma",
|
"--acceptance",
|
||||||
"--due", "2026-12-31",
|
"New crit",
|
||||||
"--priority", "1",
|
"--plan",
|
||||||
|
"New step",
|
||||||
|
"--tags",
|
||||||
|
"beta,gamma",
|
||||||
|
"--due",
|
||||||
|
"2026-12-31",
|
||||||
|
"--priority",
|
||||||
|
"1",
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
assert!(out.status.success(), "{:?}", String::from_utf8_lossy(&out.stderr));
|
assert!(out.status.success(), "{:?}", String::from_utf8_lossy(&out.stderr));
|
||||||
@@ -253,13 +260,20 @@ fn clear_returns_every_field_it_reaches_to_unset() {
|
|||||||
let out = run(
|
let out = run(
|
||||||
&temp,
|
&temp,
|
||||||
&[
|
&[
|
||||||
"set", UUID,
|
"set",
|
||||||
"--clear", "due",
|
UUID,
|
||||||
"--clear", "tags",
|
"--clear",
|
||||||
"--clear", "priority",
|
"due",
|
||||||
"--clear", "description",
|
"--clear",
|
||||||
"--clear", "acceptance",
|
"tags",
|
||||||
"--clear", "plan",
|
"--clear",
|
||||||
|
"priority",
|
||||||
|
"--clear",
|
||||||
|
"description",
|
||||||
|
"--clear",
|
||||||
|
"acceptance",
|
||||||
|
"--clear",
|
||||||
|
"plan",
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
assert!(out.status.success(), "{:?}", String::from_utf8_lossy(&out.stderr));
|
assert!(out.status.success(), "{:?}", String::from_utf8_lossy(&out.stderr));
|
||||||
@@ -307,13 +321,20 @@ fn a_cleared_ticket_reads_like_one_filed_without_the_fields() {
|
|||||||
&temp,
|
&temp,
|
||||||
&[
|
&[
|
||||||
"add",
|
"add",
|
||||||
"--title", "Full",
|
"--title",
|
||||||
"--description", "A body.",
|
"Full",
|
||||||
"--acceptance", "One criterion",
|
"--description",
|
||||||
"--plan", "One step",
|
"A body.",
|
||||||
"--tags", "alpha,beta",
|
"--acceptance",
|
||||||
"--due", "2026-09-01",
|
"One criterion",
|
||||||
"--priority", "2",
|
"--plan",
|
||||||
|
"One step",
|
||||||
|
"--tags",
|
||||||
|
"alpha,beta",
|
||||||
|
"--due",
|
||||||
|
"2026-09-01",
|
||||||
|
"--priority",
|
||||||
|
"2",
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -321,13 +342,20 @@ fn a_cleared_ticket_reads_like_one_filed_without_the_fields() {
|
|||||||
let out = run(
|
let out = run(
|
||||||
&temp,
|
&temp,
|
||||||
&[
|
&[
|
||||||
"set", &full.0,
|
"set",
|
||||||
"--clear", "due",
|
&full.0,
|
||||||
"--clear", "tags",
|
"--clear",
|
||||||
"--clear", "priority",
|
"due",
|
||||||
"--clear", "description",
|
"--clear",
|
||||||
"--clear", "acceptance",
|
"tags",
|
||||||
"--clear", "plan",
|
"--clear",
|
||||||
|
"priority",
|
||||||
|
"--clear",
|
||||||
|
"description",
|
||||||
|
"--clear",
|
||||||
|
"acceptance",
|
||||||
|
"--clear",
|
||||||
|
"plan",
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
assert!(out.status.success(), "{:?}", String::from_utf8_lossy(&out.stderr));
|
assert!(out.status.success(), "{:?}", String::from_utf8_lossy(&out.stderr));
|
||||||
@@ -342,11 +370,7 @@ fn added(worklane: &Path, slug: &str) -> (String, PathBuf) {
|
|||||||
let entry = fs::read_dir(worklane.join("backlog"))
|
let entry = fs::read_dir(worklane.join("backlog"))
|
||||||
.unwrap()
|
.unwrap()
|
||||||
.filter_map(|e| e.ok())
|
.filter_map(|e| e.ok())
|
||||||
.find(|e| {
|
.find(|e| e.file_name().to_string_lossy().ends_with(&format!("_{slug}.md")))
|
||||||
e.file_name()
|
|
||||||
.to_string_lossy()
|
|
||||||
.ends_with(&format!("_{slug}.md"))
|
|
||||||
})
|
|
||||||
.unwrap_or_else(|| panic!("no ticket slugged {slug}"));
|
.unwrap_or_else(|| panic!("no ticket slugged {slug}"));
|
||||||
let name = entry.file_name().into_string().unwrap();
|
let name = entry.file_name().into_string().unwrap();
|
||||||
let uuid = name.split('_').next().unwrap().to_string();
|
let uuid = name.split('_').next().unwrap().to_string();
|
||||||
@@ -439,7 +463,14 @@ fn clear_refuses_a_field_it_does_not_own() {
|
|||||||
create_ticket(&worklane);
|
create_ticket(&worklane);
|
||||||
let before = ticket(&worklane);
|
let before = ticket(&worklane);
|
||||||
|
|
||||||
for field in ["owner", "title", "status", "campaign", "relations", "nonsense"] {
|
for field in [
|
||||||
|
"owner",
|
||||||
|
"title",
|
||||||
|
"status",
|
||||||
|
"campaign",
|
||||||
|
"relations",
|
||||||
|
"nonsense",
|
||||||
|
] {
|
||||||
let out = run(&temp, &["set", UUID, "--clear", field]);
|
let out = run(&temp, &["set", UUID, "--clear", field]);
|
||||||
assert_eq!(out.status.code(), Some(2), "--clear {field} was accepted");
|
assert_eq!(out.status.code(), Some(2), "--clear {field} was accepted");
|
||||||
let stderr = String::from_utf8_lossy(&out.stderr);
|
let stderr = String::from_utf8_lossy(&out.stderr);
|
||||||
@@ -480,10 +511,7 @@ fn set_keeps_a_paragraph_break_in_a_replaced_description() {
|
|||||||
let worklane = setup_worklane(&temp);
|
let worklane = setup_worklane(&temp);
|
||||||
create_ticket(&worklane);
|
create_ticket(&worklane);
|
||||||
|
|
||||||
run(
|
run(&temp, &["set", UUID, "-d", "One.", "-d", "", "-d", "Two."]);
|
||||||
&temp,
|
|
||||||
&["set", UUID, "-d", "One.", "-d", "", "-d", "Two."],
|
|
||||||
);
|
|
||||||
|
|
||||||
assert!(
|
assert!(
|
||||||
ticket(&worklane).contains("## Description\nOne.\n\nTwo.\n\n## Acceptance"),
|
ticket(&worklane).contains("## Description\nOne.\n\nTwo.\n\n## Acceptance"),
|
||||||
@@ -500,7 +528,14 @@ fn set_accepts_prose_that_begins_with_a_hyphen() {
|
|||||||
|
|
||||||
let out = run(
|
let out = run(
|
||||||
&temp,
|
&temp,
|
||||||
&["set", UUID, "-a", "--print should be supported", "-t", "-t is the title flag"],
|
&[
|
||||||
|
"set",
|
||||||
|
UUID,
|
||||||
|
"-a",
|
||||||
|
"--print should be supported",
|
||||||
|
"-t",
|
||||||
|
"-t is the title flag",
|
||||||
|
],
|
||||||
);
|
);
|
||||||
assert!(out.status.success(), "{:?}", String::from_utf8_lossy(&out.stderr));
|
assert!(out.status.success(), "{:?}", String::from_utf8_lossy(&out.stderr));
|
||||||
|
|
||||||
@@ -528,11 +563,16 @@ fn append_adds_a_paragraph_items_and_numbered_steps() {
|
|||||||
let out = run(
|
let out = run(
|
||||||
&temp,
|
&temp,
|
||||||
&[
|
&[
|
||||||
"append", UUID,
|
"append",
|
||||||
"-d", "A third paragraph.",
|
UUID,
|
||||||
"-a", "Crit three",
|
"-d",
|
||||||
"-a", "Crit four",
|
"A third paragraph.",
|
||||||
"-p", "Step three",
|
"-a",
|
||||||
|
"Crit three",
|
||||||
|
"-a",
|
||||||
|
"Crit four",
|
||||||
|
"-p",
|
||||||
|
"Step three",
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
assert!(out.status.success(), "{:?}", String::from_utf8_lossy(&out.stderr));
|
assert!(out.status.success(), "{:?}", String::from_utf8_lossy(&out.stderr));
|
||||||
@@ -547,10 +587,7 @@ fn append_adds_a_paragraph_items_and_numbered_steps() {
|
|||||||
"{content}"
|
"{content}"
|
||||||
);
|
);
|
||||||
// Numbered on from the last step, and the steps above are untouched
|
// Numbered on from the last step, and the steps above are untouched
|
||||||
assert!(
|
assert!(content.contains("1. Step one\n2. Step two\n3. Step three\n"), "{content}");
|
||||||
content.contains("1. Step one\n2. Step two\n3. Step three\n"),
|
|
||||||
"{content}"
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
@@ -574,14 +611,26 @@ fn append_replaces_an_empty_section_rather_than_following_its_placeholder() {
|
|||||||
|
|
||||||
run(
|
run(
|
||||||
&temp,
|
&temp,
|
||||||
&["append", &uuid, "-d", "A description arrives late.", "-a", "First crit", "-p", "First step"],
|
&[
|
||||||
|
"append",
|
||||||
|
&uuid,
|
||||||
|
"-d",
|
||||||
|
"A description arrives late.",
|
||||||
|
"-a",
|
||||||
|
"First crit",
|
||||||
|
"-p",
|
||||||
|
"First step",
|
||||||
|
],
|
||||||
);
|
);
|
||||||
|
|
||||||
let content = ticket(&worklane);
|
let content = ticket(&worklane);
|
||||||
assert!(!content.contains("_No description provided._"), "{content}");
|
assert!(!content.contains("_No description provided._"), "{content}");
|
||||||
assert!(!content.contains("_No acceptance criteria provided._"), "{content}");
|
assert!(!content.contains("_No acceptance criteria provided._"), "{content}");
|
||||||
assert!(!content.contains("_No implementation plan provided._"), "{content}");
|
assert!(!content.contains("_No implementation plan provided._"), "{content}");
|
||||||
assert!(content.contains("## Description\nA description arrives late.\n"), "{content}");
|
assert!(
|
||||||
|
content.contains("## Description\nA description arrives late.\n"),
|
||||||
|
"{content}"
|
||||||
|
);
|
||||||
assert!(content.contains("## Implementation Plan\n1. First step\n"), "{content}");
|
assert!(content.contains("## Implementation Plan\n1. First step\n"), "{content}");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+5
-6
@@ -350,7 +350,10 @@ fn show_disambiguates_tickets_with_non_ascii_filenames() {
|
|||||||
let temp = TempDir::new().unwrap();
|
let temp = TempDir::new().unwrap();
|
||||||
let worklane = setup_worklane(&temp);
|
let worklane = setup_worklane(&temp);
|
||||||
|
|
||||||
for (filename, title) in [("émigré-un.md", "Accented One"), ("日本語-二.md", "Accented Two")] {
|
for (filename, title) in [
|
||||||
|
("émigré-un.md", "Accented One"),
|
||||||
|
("日本語-二.md", "Accented Two"),
|
||||||
|
] {
|
||||||
fs::write(
|
fs::write(
|
||||||
worklane.join("backlog").join(filename),
|
worklane.join("backlog").join(filename),
|
||||||
format!("# {}\n\n## Metadata\n\n- **ID**: 1234\n", title),
|
format!("# {}\n\n## Metadata\n\n- **ID**: 1234\n", title),
|
||||||
@@ -444,11 +447,7 @@ fn show_prints_the_title_once() {
|
|||||||
cmd.current_dir(temp.path()).arg("show").arg("Once Only");
|
cmd.current_dir(temp.path()).arg("show").arg("Once Only");
|
||||||
let stdout = get_stdout(&mut cmd);
|
let stdout = get_stdout(&mut cmd);
|
||||||
|
|
||||||
assert_eq!(
|
assert_eq!(stdout.matches("Once Only").count(), 1, "title repeated in {stdout:?}");
|
||||||
stdout.matches("Once Only").count(),
|
|
||||||
1,
|
|
||||||
"title repeated in {stdout:?}"
|
|
||||||
);
|
|
||||||
// The rule under it is still the width of the title
|
// The rule under it is still the width of the title
|
||||||
assert!(stdout.contains("Once Only\n─────────\n"), "{stdout:?}");
|
assert!(stdout.contains("Once Only\n─────────\n"), "{stdout:?}");
|
||||||
}
|
}
|
||||||
|
|||||||
+3
-12
@@ -44,10 +44,7 @@ fn the_tui_outside_a_worklane_directory_gives_the_usual_message() {
|
|||||||
let stderr = String::from_utf8_lossy(&out.stderr);
|
let stderr = String::from_utf8_lossy(&out.stderr);
|
||||||
|
|
||||||
assert_eq!(out.status.code(), Some(1), "{args:?}");
|
assert_eq!(out.status.code(), Some(1), "{args:?}");
|
||||||
assert!(
|
assert!(stderr.contains("No .worklane directory found"), "{args:?}: {stderr:?}");
|
||||||
stderr.contains("No .worklane directory found"),
|
|
||||||
"{args:?}: {stderr:?}"
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -66,10 +63,7 @@ fn the_tui_without_a_terminal_says_so_and_names_an_alternative() {
|
|||||||
assert_eq!(out.status.code(), Some(1), "{args:?}");
|
assert_eq!(out.status.code(), Some(1), "{args:?}");
|
||||||
assert!(stderr.contains("needs a terminal"), "{args:?}: {stderr:?}");
|
assert!(stderr.contains("needs a terminal"), "{args:?}: {stderr:?}");
|
||||||
assert!(stderr.contains("worklane ls"), "{args:?}: {stderr:?}");
|
assert!(stderr.contains("worklane ls"), "{args:?}: {stderr:?}");
|
||||||
assert!(
|
assert!(!stderr.contains("os error"), "the raw mode error leaked: {stderr:?}");
|
||||||
!stderr.contains("os error"),
|
|
||||||
"the raw mode error leaked: {stderr:?}"
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -105,10 +99,7 @@ fn several_path_arguments_are_accepted() {
|
|||||||
let first = setup_project(&temp, "first");
|
let first = setup_project(&temp, "first");
|
||||||
let second = setup_project(&temp, "second");
|
let second = setup_project(&temp, "second");
|
||||||
|
|
||||||
let out = run(
|
let out = run(&temp, &["tui", first.to_str().unwrap(), second.to_str().unwrap()]);
|
||||||
&temp,
|
|
||||||
&["tui", first.to_str().unwrap(), second.to_str().unwrap()],
|
|
||||||
);
|
|
||||||
let stderr = String::from_utf8_lossy(&out.stderr);
|
let stderr = String::from_utf8_lossy(&out.stderr);
|
||||||
|
|
||||||
assert_eq!(out.status.code(), Some(1), "{stderr:?}");
|
assert_eq!(out.status.code(), Some(1), "{stderr:?}");
|
||||||
|
|||||||
Reference in New Issue
Block a user