Add color

Author: owjs3901

Cargo.lock

@@ -13,6 +13,7 @@ publish = true
 anyhow = "1"
 clap = { version = "4", features = ["derive"] }
 chrono = { version = "0.4", default-features = false, features = ["clock", "serde"] }
+colored = "3"
 serde_json = "1"
 serde_yaml = "0.9"
 schemars = "1.1"

crates/vespertide-cli/Cargo.toml

@@ -1,4 +1,5 @@
 use anyhow::Result;
+use colored::Colorize;
 use vespertide_planner::plan_next_migration;
 
 use crate::utils::{load_config, load_migrations, load_models};
@@ -13,13 +14,26 @@ pub fn cmd_diff() -> Result<()> {
         .map_err(|e| anyhow::anyhow!("planning error: {}", e))?;
 
     if plan.actions.is_empty() {
-        println!("No differences found. Schema is up to date.");
+        println!(
+            "{} {}",
+            "No differences found.".bright_green(),
+            "Schema is up to date.".bright_white()
+        );
     } else {
-        println!("Found {} change(s) to apply:", plan.actions.len());
+        println!(
+            "{} {} {}",
+            "Found".bright_cyan(),
+            plan.actions.len().to_string().bright_yellow().bold(),
+            "change(s) to apply:".bright_cyan()
+        );
         println!();
 
         for (i, action) in plan.actions.iter().enumerate() {
-            println!("{}. {}", i + 1, format_action(action));
+            println!(
+                "{}. {}",
+                (i + 1).to_string().bright_magenta().bold(),
+                format_action(action)
+            );
         }
     }
     Ok(())
@@ -28,38 +42,87 @@ pub fn cmd_diff() -> Result<()> {
 fn format_action(action: &MigrationAction) -> String {
     match action {
         MigrationAction::CreateTable { table, .. } => {
-            format!("Create table: {}", table)
+            format!(
+                "{} {}",
+                "Create table:".bright_green(),
+                table.bright_cyan().bold()
+            )
         }
         MigrationAction::DeleteTable { table } => {
-            format!("Delete table: {}", table)
+            format!(
+                "{} {}",
+                "Delete table:".bright_red(),
+                table.bright_cyan().bold()
+            )
         }
         MigrationAction::AddColumn { table, column, .. } => {
-            format!("Add column: {}.{}", table, column.name)
+            format!(
+                "{} {}.{}",
+                "Add column:".bright_green(),
+                table.bright_cyan(),
+                column.name.bright_cyan().bold()
+            )
         }
         MigrationAction::RenameColumn { table, from, to } => {
-            format!("Rename column: {}.{} -> {}", table, from, to)
+            format!(
+                "{} {}.{} {} {}",
+                "Rename column:".bright_yellow(),
+                table.bright_cyan(),
+                from.bright_white(),
+                "->".bright_white(),
+                to.bright_cyan().bold()
+            )
         }
         MigrationAction::DeleteColumn { table, column } => {
-            format!("Delete column: {}.{}", table, column)
+            format!(
+                "{} {}.{}",
+                "Delete column:".bright_red(),
+                table.bright_cyan(),
+                column.bright_cyan().bold()
+            )
         }
         MigrationAction::ModifyColumnType { table, column, .. } => {
-            format!("Modify column type: {}.{}", table, column)
+            format!(
+                "{} {}.{}",
+                "Modify column type:".bright_yellow(),
+                table.bright_cyan(),
+                column.bright_cyan().bold()
+            )
         }
         MigrationAction::AddIndex { table, index } => {
-            format!("Add index: {} on {}", index.name, table)
+            format!(
+                "{} {} {} {}",
+                "Add index:".bright_green(),
+                index.name.bright_cyan().bold(),
+                "on".bright_white(),
+                table.bright_cyan()
+            )
         }
         MigrationAction::RemoveIndex { table, name } => {
-            format!("Remove index: {} from {}", name, table)
+            format!(
+                "{} {} {} {}",
+                "Remove index:".bright_red(),
+                name.bright_cyan().bold(),
+                "from".bright_white(),
+                table.bright_cyan()
+            )
         }
         MigrationAction::RenameTable { from, to } => {
-            format!("Rename table: {} -> {}", from, to)
+            format!(
+                "{} {} {} {}",
+                "Rename table:".bright_yellow(),
+                from.bright_cyan(),
+                "->".bright_white(),
+                to.bright_cyan().bold()
+            )
         }
     }
 }
 
 #[cfg(test)]
 mod tests {
     use super::*;
+    use colored::Colorize;
     use rstest::rstest;
     use serial_test::serial;
     use std::fs;
@@ -113,11 +176,11 @@ mod tests {
     #[rstest]
     #[case(
         MigrationAction::CreateTable { table: "users".into(), columns: vec![], constraints: vec![] },
-        "Create table: users"
+        format!("{} {}", "Create table:".bright_green(), "users".bright_cyan().bold())
     )]
     #[case(
         MigrationAction::DeleteTable { table: "users".into() },
-        "Delete table: users"
+        format!("{} {}", "Delete table:".bright_red(), "users".bright_cyan().bold())
     )]
     #[case(
         MigrationAction::AddColumn {
@@ -130,27 +193,27 @@ mod tests {
             },
             fill_with: None,
         },
-        "Add column: users.name"
+        format!("{} {}.{}", "Add column:".bright_green(), "users".bright_cyan(), "name".bright_cyan().bold())
     )]
     #[case(
         MigrationAction::RenameColumn {
             table: "users".into(),
             from: "old".into(),
             to: "new".into(),
         },
-        "Rename column: users.old -> new"
+        format!("{} {}.{} {} {}", "Rename column:".bright_yellow(), "users".bright_cyan(), "old".bright_white(), "->".bright_white(), "new".bright_cyan().bold())
     )]
     #[case(
         MigrationAction::DeleteColumn { table: "users".into(), column: "name".into() },
-        "Delete column: users.name"
+        format!("{} {}.{}", "Delete column:".bright_red(), "users".bright_cyan(), "name".bright_cyan().bold())
     )]
     #[case(
         MigrationAction::ModifyColumnType {
             table: "users".into(),
             column: "id".into(),
             new_type: ColumnType::Integer,
         },
-        "Modify column type: users.id"
+        format!("{} {}.{}", "Modify column type:".bright_yellow(), "users".bright_cyan(), "id".bright_cyan().bold())
     )]
     #[case(
         MigrationAction::AddIndex {
@@ -161,18 +224,18 @@ mod tests {
                 unique: false,
             },
         },
-        "Add index: idx on users"
+        format!("{} {} {} {}", "Add index:".bright_green(), "idx".bright_cyan().bold(), "on".bright_white(), "users".bright_cyan())
     )]
     #[case(
         MigrationAction::RemoveIndex { table: "users".into(), name: "idx".into() },
-        "Remove index: idx from users"
+        format!("{} {} {} {}", "Remove index:".bright_red(), "idx".bright_cyan().bold(), "from".bright_white(), "users".bright_cyan())
     )]
     #[case(
         MigrationAction::RenameTable { from: "users".into(), to: "accounts".into() },
-        "Rename table: users -> accounts"
+        format!("{} {} {} {}", "Rename table:".bright_yellow(), "users".bright_cyan(), "->".bright_white(), "accounts".bright_cyan().bold())
     )]
     #[serial]
-    fn format_action_cases(#[case] action: MigrationAction, #[case] expected: &str) {
+    fn format_action_cases(#[case] action: MigrationAction, #[case] expected: String) {
         assert_eq!(format_action(&action), expected);
     }
 

crates/vespertide-cli/src/commands/diff.rs

@@ -1,6 +1,7 @@
 use std::{fs, path::PathBuf};
 
 use anyhow::{Context, Result, bail};
+use colored::Colorize;
 use vespertide_config::VespertideConfig;
 
 pub fn cmd_init() -> Result<()> {
@@ -12,7 +13,11 @@ pub fn cmd_init() -> Result<()> {
     let config = VespertideConfig::default();
     let json = serde_json::to_string_pretty(&config).context("serialize default config")?;
     fs::write(&path, json).context("write vespertide.json")?;
-    println!("created {:?}", path);
+    println!(
+        "{} {}",
+        "created".bright_green().bold(),
+        format!("{}", path.display()).bright_white()
+    );
     Ok(())
 }