cargo-rail: clean up duplicate methods; merge unify tests; move tests into the integration/ instead of orphaned out.

Author: loadingalias

src/commands/affected.rs

@@ -6,6 +6,7 @@
 //! - The minimal set of crates that need testing/building
 
 use crate::change_detection::classify::{ChangeKind, classify_file};
+use crate::commands::common::OutputFormat;
 use crate::config::ChangeDetectionConfig;
 use crate::error::{RailError, RailResult};
 use crate::git::detect_default_base_ref;
@@ -16,37 +17,6 @@ use glob::Pattern;
 use std::io::Write;
 use std::path::PathBuf;
 
-/// Output format for affected command
-#[derive(Debug, Clone, Copy, PartialEq)]
-enum OutputFormat {
-  Text,
-  Json,
-  NamesOnly,
-  /// GitHub Actions output format for $GITHUB_OUTPUT
-  GitHub,
-  /// GitHub Actions matrix format for strategy.matrix
-  GitHubMatrix,
-  /// JSON Lines format (one object per line)
-  JsonLines,
-}
-
-impl OutputFormat {
-  fn from_str(s: &str) -> RailResult<Self> {
-    match s.to_lowercase().as_str() {
-      "text" => Ok(Self::Text),
-      "json" => Ok(Self::Json),
-      "names" | "names-only" => Ok(Self::NamesOnly),
-      "github" => Ok(Self::GitHub),
-      "github-matrix" => Ok(Self::GitHubMatrix),
-      "jsonl" | "json-lines" => Ok(Self::JsonLines),
-      _ => Err(RailError::message(format!(
-        "Unknown format '{}'. Valid formats: text, json, names-only, github, github-matrix, jsonl",
-        s
-      ))),
-    }
-  }
-}
-
 /// Run the affected command
 pub fn run_affected(
   ctx: &WorkspaceContext,
@@ -57,13 +27,10 @@ pub fn run_affected(
   all: bool,
   output: Option<PathBuf>,
 ) -> RailResult<()> {
-  let output_format = OutputFormat::from_str(&format)?;
+  let output_format: OutputFormat = format.parse()?;
 
   // JSON-like formats enable structured error output and suppress progress
-  if matches!(
-    output_format,
-    OutputFormat::Json | OutputFormat::JsonLines | OutputFormat::GitHub | OutputFormat::GitHubMatrix
-  ) {
+  if output_format.is_json_like() {
     crate::output::set_json_mode(true);
   }
 

src/commands/common.rs

@@ -8,24 +8,39 @@ use crate::workspace::WorkspaceContext;
 use std::path::PathBuf;
 use std::str::FromStr;
 
-/// Standard output format for most commands
+/// Standard output format for all commands
 ///
-/// Use this for commands that just need text/json output.
-/// For commands with more formats (like `affected`), define a specialized enum.
+/// Supports both simple (text/json) and specialized formats (GitHub Actions, JSONL, etc.)
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
 pub enum OutputFormat {
   /// Human-readable text output (default)
   #[default]
   Text,
   /// Machine-readable JSON output
   Json,
+  /// Names only (one per line)
+  NamesOnly,
+  /// GitHub Actions output format for $GITHUB_OUTPUT
+  GitHub,
+  /// GitHub Actions matrix format for strategy.matrix
+  GitHubMatrix,
+  /// JSON Lines format (one object per line)
+  JsonLines,
 }
 
 impl OutputFormat {
   /// Check if this format is JSON
   pub fn is_json(&self) -> bool {
     matches!(self, Self::Json)
   }
+
+  /// Check if this format is a JSON-like structured format
+  ///
+  /// Returns true for any format that produces structured output (json, jsonl, github, github-matrix).
+  /// Used to enable JSON mode which suppresses progress messages.
+  pub fn is_json_like(&self) -> bool {
+    matches!(self, Self::Json | Self::JsonLines | Self::GitHub | Self::GitHubMatrix)
+  }
 }
 
 impl FromStr for OutputFormat {
@@ -35,8 +50,12 @@ impl FromStr for OutputFormat {
     match s.to_lowercase().as_str() {
       "text" => Ok(Self::Text),
       "json" => Ok(Self::Json),
+      "names" | "names-only" => Ok(Self::NamesOnly),
+      "github" => Ok(Self::GitHub),
+      "github-matrix" => Ok(Self::GitHubMatrix),
+      "jsonl" | "json-lines" => Ok(Self::JsonLines),
       _ => Err(RailError::message(format!(
-        "Unknown format '{}'. Valid formats: text, json",
+        "Unknown format '{}'. Valid formats: text, json, names-only, github, github-matrix, jsonl",
         s
       ))),
     }
@@ -48,6 +67,10 @@ impl std::fmt::Display for OutputFormat {
     match self {
       Self::Text => write!(f, "text"),
       Self::Json => write!(f, "json"),
+      Self::NamesOnly => write!(f, "names-only"),
+      Self::GitHub => write!(f, "github"),
+      Self::GitHubMatrix => write!(f, "github-matrix"),
+      Self::JsonLines => write!(f, "jsonl"),
     }
   }
 }

tests/integration/mod.rs

@@ -2,6 +2,7 @@ mod helpers;
 mod test_affected;
 mod test_check;
 mod test_classification;
+mod test_clean;
 mod test_error_handling;
 mod test_git_notes;
 mod test_init;
@@ -10,6 +11,5 @@ mod test_runner;
 mod test_split;
 mod test_sync;
 mod test_unify;
-mod test_unify_comprehensive;
 mod test_unify_undo;
 mod test_unused_detection;