Add CLI progress bars

Cargo.toml

@@ -30,7 +30,6 @@ typed-arena = "2"
 dirs = "6"
 pathdiff = "0.2"
 itertools = "0.14"
-is-terminal = "0.4"
 tabwriter = "1.2.1"
 indexmap = { version = "2", features = ["serde"] }
 tempfile = "3.5"
@@ -39,8 +38,10 @@ walkdir = "2"
 subst = "0.3"
 tera = "1.19"
 miette = "7.6.0"
-thiserror = "2.0.17"
-owo-colors = "4.2.3"
+thiserror = "2.0.18"
+owo-colors = { version = "4.2.3", features = ["supports-colors"] }
+indicatif = "0.18.3"
+regex = "1.12.2"
 
 [target.'cfg(windows)'.dependencies]
 dunce = "1.0.4"

src/cli.rs

@@ -27,6 +27,7 @@ use crate::diagnostic::{Diagnostics, Warnings};
 use crate::error::*;
 use crate::lockfile::*;
 use crate::sess::{Session, SessionArenas, SessionIo};
+use crate::{fmt_path, fmt_pkg};
 
 #[derive(Parser, Debug)]
 #[command(name = "bender")]
@@ -265,7 +266,6 @@ pub fn main() -> Result<()> {
 
             // Create the symlink if there is nothing at the destination.
             if !path.exists() {
-                stageln!("Linking", "{} ({:?})", pkg_name, path);
                 if let Some(parent) = path.parent() {
                     std::fs::create_dir_all(parent).map_err(|cause| {
                         Error::chain(format!("Failed to create directory {:?}.", parent), cause)
@@ -291,6 +291,12 @@ pub fn main() -> Result<()> {
                 if let Some(d) = previous_dir {
                     std::env::set_current_dir(d).unwrap();
                 }
+                stageln!(
+                    "Linked",
+                    "{} to {}",
+                    fmt_pkg!(pkg_name),
+                    fmt_path!(path.display())
+                );
             }
         }
     }

src/cmd/checkout.rs

@@ -7,7 +7,9 @@ use clap::Args;
 use tokio::runtime::Runtime;
 
 use crate::error::*;
+use crate::fmt_dim;
 use crate::sess::{Session, SessionIo};
+use crate::util::fmt_duration;
 
 /// Checkout all dependencies referenced in the Lock file
 #[derive(Args, Debug)]
@@ -26,7 +28,15 @@ pub fn run(sess: &Session, args: &CheckoutArgs) -> Result<()> {
 pub fn run_plain(sess: &Session, force: bool, update_list: &[String]) -> Result<()> {
     let rt = Runtime::new()?;
     let io = SessionIo::new(sess);
+    let start_time = std::time::Instant::now();
     let _srcs = rt.block_on(io.sources(force, update_list))?;
+    let num_dependencies = io.sess.packages().iter().flatten().count();
+    infoln!(
+        "{} {} dependencies {}",
+        fmt_dim!("Checked out"),
+        num_dependencies,
+        fmt_dim!(fmt_duration(start_time.elapsed()))
+    );
 
     Ok(())
 }

src/cmd/clone.rs

@@ -16,6 +16,7 @@ use crate::config::{Locked, LockedSource};
 use crate::diagnostic::Warnings;
 use crate::error::*;
 use crate::sess::{DependencyRef, DependencySource, Session, SessionIo};
+use crate::{fmt_path, fmt_pkg};
 
 /// Clone dependency to a working directory
 #[derive(Args, Debug)]
@@ -281,7 +282,6 @@ pub fn run(sess: &Session, path: &Path, args: &CloneArgs) -> Result<()> {
 
             // Create the symlink if there is nothing at the destination.
             if !link_path.exists() {
-                stageln!("Linking", "{} ({:?})", pkg_name, link_path);
                 if let Some(parent) = link_path.parent() {
                     std::fs::create_dir_all(parent).map_err(|cause| {
                         Error::chain(format!("Failed to create directory {:?}.", parent), cause)
@@ -307,6 +307,12 @@ pub fn run(sess: &Session, path: &Path, args: &CloneArgs) -> Result<()> {
                 if let Some(d) = previous_dir {
                     std::env::set_current_dir(d).unwrap();
                 }
+                stageln!(
+                    "Linked",
+                    "{} to {}",
+                    fmt_pkg!(pkg_name),
+                    fmt_path!(path.display())
+                );
             }
             eprintln!("{} symlink updated", dep);
         }

src/cmd/fusesoc.rs

@@ -8,12 +8,12 @@ use std::ffi::OsStr;
 use std::fmt::Write as _;
 use std::fs;
 use std::fs::read_to_string;
+use std::io::IsTerminal;
 use std::io::{self, Write};
 use std::path::PathBuf;
 
 use clap::{ArgAction, Args};
 use indexmap::{IndexMap, IndexSet};
-use is_terminal::IsTerminal;
 use itertools::Itertools;
 use tokio::runtime::Runtime;
 use walkdir::{DirEntry, WalkDir};

src/cmd/snapshot.rs

@@ -16,6 +16,7 @@ use crate::config::{Dependency, Locked, LockedSource};
 use crate::diagnostic::Warnings;
 use crate::error::*;
 use crate::sess::{DependencySource, Session, SessionIo};
+use crate::{fmt_path, fmt_pkg};
 
 /// Snapshot the cloned IPs from the working directory into the Bender.lock file
 #[derive(Args, Debug)]
@@ -273,7 +274,6 @@ pub fn run(sess: &Session, args: &SnapshotArgs) -> Result<()> {
 
             // Create the symlink if there is nothing at the destination.
             if !link_path.exists() {
-                stageln!("Linking", "{} ({:?})", pkg_name, link_path);
                 if let Some(parent) = link_path.parent() {
                     std::fs::create_dir_all(parent).map_err(|cause| {
                         Error::chain(format!("Failed to create directory {:?}.", parent), cause)
@@ -299,8 +299,13 @@ pub fn run(sess: &Session, args: &SnapshotArgs) -> Result<()> {
                 if let Some(d) = previous_dir {
                     std::env::set_current_dir(d).unwrap();
                 }
+                stageln!(
+                    "Linked",
+                    "{} to {}",
+                    fmt_pkg!(pkg_name),
+                    fmt_path!(link_path.display())
+                );
             }
-            eprintln!("{} symlink updated", pkg_name);
         }
     }