feat(boil): Add human-readable output (default)

Author: Techassi

Cargo.lock

@@ -14,6 +14,7 @@ clap_complete = "4.5.55"
 clap_complete_nushell = "4.5.8"
 git2 = "0.20.1"
 glob = "0.3.2"
+humansize = "2.1.3"
 oci-spec = "0.9.0"
 reqwest = { version = "0.13.2", features = ["json"] }
 rstest = "0.26.1"

Cargo.toml

@@ -14,6 +14,7 @@ clap_complete.workspace = true
 clap_complete_nushell.workspace = true
 git2.workspace = true
 glob.workspace = true
+humansize.workspace = true
 oci-spec.workspace = true
 reqwest.workspace = true
 regex.workspace = true

rust/boil/Cargo.toml

@@ -77,6 +77,13 @@ pub struct ImageSizeArguments {
         help_heading = "Image Options"
     )]
     pub target_platform: TargetPlatform,
+
+    /// Pretty print the structured output.
+    #[arg(long, value_enum, default_value_t = Pretty::default(), help_heading = "Output Options")]
+    pub pretty: Pretty,
+
+    #[arg(short, long, value_enum, default_value_t = Format::default(), help_heading = "Output Options")]
+    pub format: Format,
 }
 
 impl ImageSizeArguments {
@@ -86,11 +93,17 @@ impl ImageSizeArguments {
     }
 }
 
-// #[derive(Clone, Debug, Default, strum::Display, strum::EnumString)]
 #[derive(Clone, Debug, Default, ValueEnum)]
 pub enum Pretty {
     #[default]
     Auto,
     Always,
     Never,
 }
+
+#[derive(Clone, Debug, Default, ValueEnum)]
+pub enum Format {
+    #[default]
+    Plain,
+    Json,
+}

rust/boil/src/cli/image.rs

@@ -8,7 +8,7 @@ use serde::Serialize;
 use snafu::{ResultExt, Snafu};
 
 use crate::{
-    cli::{ImageCheckArguments, ImageListArguments, ImageSizeArguments, Pretty},
+    cli::{Format, ImageCheckArguments, ImageListArguments, ImageSizeArguments, Pretty},
     config::Config,
     core::bakefile::{self, Targets, TargetsOptions},
     models::{Manifest, TagList},
@@ -70,7 +70,7 @@ pub fn list_images(arguments: ImageListArguments) -> Result<(), Error> {
         })
         .collect();
 
-    print_to_stdout(list, arguments.pretty)
+    serialize_to_stdout(list, arguments.pretty)
 }
 
 pub async fn check_images(arguments: ImageCheckArguments, config: Config) -> Result<(), Error> {
@@ -243,10 +243,35 @@ pub async fn calculate_size(arguments: ImageSizeArguments, config: Config) -> Re
         }
     }
 
-    print_to_stdout(result, Pretty::Always)
+    match arguments.format {
+        Format::Plain => {
+            if let Some(max_width) = result
+                .images
+                .iter()
+                .map(|i| i.0.len())
+                .max_by(|lhs, rhs| lhs.cmp(rhs))
+            {
+                for (image, size) in result.images {
+                    println!(
+                        "{image:max_width$} {size}",
+                        size = humansize::format_size(size, humansize::BINARY)
+                    );
+                }
+
+                println!(
+                    "{total_text:max_width$} {total}",
+                    total_text = "Total",
+                    total = humansize::format_size(result.total, humansize::BINARY)
+                )
+            }
+
+            Ok(())
+        }
+        Format::Json => serialize_to_stdout(&result, arguments.pretty),
+    }
 }
 
-fn print_to_stdout<T>(value: T, pretty: Pretty) -> Result<(), Error>
+fn serialize_to_stdout<T>(value: T, pretty: Pretty) -> Result<(), Error>
 where
     T: Serialize,
 {