cargo-rail: working on the changelogs; testing; DX/UX for v1

Author: loadingalias

src/commands/test.rs

@@ -10,8 +10,6 @@ use crate::workspace::{ChangeImpact, WorkspaceContext};
 pub struct TestConfig {
   /// Git ref to compare against (if None, auto-detect)
   pub since: Option<String>,
-  /// Show what would be tested without running tests
-  pub dry_run: bool,
   /// Explain why tests are being run
   pub explain: bool,
   /// Prefer cargo-nextest if available
@@ -42,60 +40,52 @@ pub fn run_test(ctx: &WorkspaceContext, config: TestConfig) -> RailResult<()> {
     return Ok(());
   }
 
-  // Dry run mode - just show what would be tested
-  if config.dry_run {
-    println!("Would test {} affected crate(s):", test_targets.len());
-    for target in &test_targets {
-      println!("  • {}", target);
+  if config.explain {
+    println!("Change Impact Analysis:");
+    println!("  Total files changed: {}", impact.changed_files.len());
+    println!(
+      "  Requires rebuild: {}",
+      if impact.requires_rebuild { "yes" } else { "no" }
+    );
+    println!(
+      "  Requires retest: {}",
+      if impact.requires_retest { "yes" } else { "no" }
+    );
+
+    println!("\nFile Breakdown:");
+    if impact.categories.has_source_changes() {
+      println!("  - Source code: {} file(s)", impact.categories.source_files.len());
+    }
+    if impact.categories.has_test_changes() {
+      println!("  - Tests: {} file(s)", impact.categories.test_files.len());
+    }
+    if impact.categories.has_example_changes() {
+      println!("  - Examples: {} file(s)", impact.categories.example_files.len());
+    }
+    if impact.categories.has_config_changes() {
+      println!("  - Config: {} file(s)", impact.categories.config_files.len());
+    }
+    if !impact.categories.build_scripts.is_empty() {
+      println!("  - Build scripts: {} file(s)", impact.categories.build_scripts.len());
+    }
+    if !impact.categories.doc_files.is_empty() {
+      println!("  - Documentation: {} file(s)", impact.categories.doc_files.len());
     }
 
-    if config.explain {
-      println!("\nChange Impact Analysis:");
-      println!("  Total files changed: {}", impact.changed_files.len());
-      println!(
-        "  Requires rebuild: {}",
-        if impact.requires_rebuild { "yes" } else { "no" }
-      );
-      println!(
-        "  Requires retest: {}",
-        if impact.requires_retest { "yes" } else { "no" }
-      );
-
-      println!("\nFile Breakdown:");
-      if impact.categories.has_source_changes() {
-        println!("  - Source code: {} file(s)", impact.categories.source_files.len());
-      }
-      if impact.categories.has_test_changes() {
-        println!("  - Tests: {} file(s)", impact.categories.test_files.len());
-      }
-      if impact.categories.has_example_changes() {
-        println!("  - Examples: {} file(s)", impact.categories.example_files.len());
-      }
-      if impact.categories.has_config_changes() {
-        println!("  - Config: {} file(s)", impact.categories.config_files.len());
-      }
-      if !impact.categories.build_scripts.is_empty() {
-        println!("  - Build scripts: {} file(s)", impact.categories.build_scripts.len());
-      }
-      if !impact.categories.doc_files.is_empty() {
-        println!("  - Documentation: {} file(s)", impact.categories.doc_files.len());
-      }
-
-      println!("\nAffected Crates:");
-      println!("  - Direct: {} crate(s)", impact.direct_crates.len());
-      if !impact.direct_crates.is_empty() {
-        for crate_name in &impact.direct_crates {
-          println!("    • {}", crate_name);
-        }
+    println!("\nAffected Crates:");
+    println!("  - Direct: {} crate(s)", impact.direct_crates.len());
+    if !impact.direct_crates.is_empty() {
+      for crate_name in &impact.direct_crates {
+        println!("    • {}", crate_name);
       }
-      println!("  - Transitive: {} crate(s)", impact.transitive_crates.len());
-      if !impact.transitive_crates.is_empty() {
-        for crate_name in &impact.transitive_crates {
-          println!("    • {}", crate_name);
-        }
+    }
+    println!("  - Transitive: {} crate(s)", impact.transitive_crates.len());
+    if !impact.transitive_crates.is_empty() {
+      for crate_name in &impact.transitive_crates {
+        println!("    • {}", crate_name);
       }
     }
-    return Ok(());
+    println!();
   }
 
   // Select test runner

src/commands/watch.rs

@@ -133,7 +133,22 @@ fn run_with_cargo_watch(ctx: &WorkspaceContext, config: TestConfig) -> RailResul
   let mut cmd = Command::new("cargo-watch");
   cmd.current_dir(ctx.workspace_root());
 
-  // cargo-watch -x "rail test --since HEAD~1"
+  let rail_cmd = format_watch_test_command(&config);
+  cmd.arg("-x").arg(rail_cmd);
+
+  let status = cmd
+    .status()
+    .map_err(|e| crate::error::RailError::message(format!("Failed to run cargo-watch: {}", e)))?;
+
+  if !status.success() {
+    std::process::exit(status.code().unwrap_or(1));
+  }
+
+  Ok(())
+}
+
+/// Build the inner `cargo rail test ...` command string for watch integrations.
+fn format_watch_test_command(config: &TestConfig) -> String {
   let mut rail_cmd = String::from("rail test");
 
   if let Some(ref since) = config.since {
@@ -149,17 +164,7 @@ fn run_with_cargo_watch(ctx: &WorkspaceContext, config: TestConfig) -> RailResul
     rail_cmd.push_str(&config.test_args.join(" "));
   }
 
-  cmd.arg("-x").arg(rail_cmd);
-
-  let status = cmd
-    .status()
-    .map_err(|e| crate::error::RailError::message(format!("Failed to run cargo-watch: {}", e)))?;
-
-  if !status.success() {
-    std::process::exit(status.code().unwrap_or(1));
-  }
-
-  Ok(())
+  rail_cmd
 }
 
 #[cfg(test)]
@@ -197,4 +202,20 @@ mod tests {
       }
     }
   }
+
+  #[test]
+  fn test_format_watch_test_command_includes_flags_and_args() {
+    let cfg = TestConfig {
+      since: Some("main".to_string()),
+      explain: false,
+      prefer_nextest: true,
+      test_args: vec!["--nocapture".into(), "some::test".into()],
+    };
+
+    let cmd = format_watch_test_command(&cfg);
+    assert!(cmd.starts_with("rail test"));
+    assert!(cmd.contains("--since main"));
+    assert!(cmd.contains("--nextest"));
+    assert!(cmd.contains("-- --nocapture some::test"));
+  }
 }

src/main.rs

@@ -51,9 +51,6 @@ enum Commands {
     /// Use cargo-nextest if available
     #[arg(long)]
     nextest: bool,
-    /// Show what would be tested without running tests
-    #[arg(long)]
-    dry_run: bool,
     /// Explain why tests are being run
     #[arg(long)]
     explain: bool,
@@ -329,15 +326,13 @@ fn main() {
     Commands::Test {
       since,
       nextest,
-      dry_run,
       explain,
       watch,
       watch_mode,
       test_args,
     } => {
       let config = commands::test::TestConfig {
         since,
-        dry_run,
         explain,
         prefer_nextest: nextest,
         test_args,

src/release/changelog.rs

@@ -169,10 +169,11 @@ fn extract_pr_numbers(text: &str) -> Vec<u32> {
 
   for word in text.split_whitespace() {
     if let Some(num_str) = word.strip_prefix("(#").and_then(|s| s.strip_suffix(')'))
-      && let Ok(num) = num_str.parse::<u32>() {
-        prs.push(num);
-        continue;
-      }
+      && let Ok(num) = num_str.parse::<u32>()
+    {
+      prs.push(num);
+      continue;
+    }
 
     if let Some(num_str) = word.strip_prefix('#') {
       let numeric = num_str.trim_end_matches(|c: char| !c.is_ascii_digit());

tests/integration/helpers.rs

@@ -134,6 +134,35 @@ mod tests {{
     Ok(String::from_utf8_lossy(&output.stdout).trim().to_string())
   }
 
+  /// Set origin remote (useful for link generation)
+  pub fn set_remote(&self, url: &str) -> Result<()> {
+    git(&self.path, &["remote", "remove", "origin"]).ok();
+    git(&self.path, &["remote", "add", "origin", url])?;
+    Ok(())
+  }
+
+  /// Create an annotated tag
+  pub fn tag(&self, name: &str, message: &str) -> Result<()> {
+    git(&self.path, &["tag", "-a", name, "-m", message])?;
+    Ok(())
+  }
+
+  /// Overwrite or create the release config block in .config/rail.toml
+  pub fn write_release_config(&self, content: &str) -> Result<()> {
+    let config_path = self.path.join(".config/rail.toml");
+    let mut existing = std::fs::read_to_string(&config_path)?;
+
+    if let Some(idx) = existing.find("[release]") {
+      existing.truncate(idx);
+    }
+
+    existing.push_str("\n[release]\n");
+    existing.push_str(content);
+
+    std::fs::write(&config_path, existing)?;
+    Ok(())
+  }
+
   /// Modify a file in a crate
   pub fn modify_file(&self, crate_name: &str, file: &str, content: &str) -> Result<()> {
     let file_path = self.path.join("crates").join(crate_name).join(file);

tests/integration/mod.rs

@@ -3,6 +3,7 @@ mod test_affected;
 mod test_classification;
 mod test_git_notes;
 mod test_init;
+mod test_release_changelog;
 mod test_runner;
 mod test_split;
 mod test_sync;