feat: Add table-arrangement output option

Add `--table-arrangement` cli option to allow user choose between 3
table arrangement strategies:

- dynamic (default) - content is distributed evenly trying to use as
  much space as necessary
- dynamic-full-width - spread the output to the full available width
- disabled - use as much space as necessary to render cells (table row
  may continue on the next row).

Also fix accidentially ignored `--pretty` modifier when there is
configuration for the requested resource.

Author: gtema

openstack_cli/src/cli.rs

@@ -182,8 +182,12 @@ pub struct GlobalOpts {
     #[arg(short, long, global=true, action = clap::ArgAction::Count, display_order = 920)]
     pub verbose: u8,
 
+    /// Output Table arrangement
+    #[arg(long, global=true, default_value_t = TableArrangement::Dynamic, value_enum, display_order = 930)]
+    pub table_arrangement: TableArrangement,
+
     /// Record HTTP request timings
-    #[arg(long, global=true, action = clap::ArgAction::SetTrue, display_order = 920)]
+    #[arg(long, global=true, action = clap::ArgAction::SetTrue, display_order = 950)]
     pub timing: bool,
 }
 
@@ -197,6 +201,22 @@ pub enum OutputFormat {
     Wide,
 }
 
+/// Table arrangement
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, PartialOrd, Ord, ValueEnum)]
+pub enum TableArrangement {
+    /// Dynamically determine the width of columns in regard to terminal width and content length.
+    /// With this mode, the content in cells will wrap dynamically to get the the best column
+    /// layout for the given content.
+    #[default]
+    Dynamic,
+    /// This is mode is the same as the `Dynamic` arrangement, but it will always use as much space
+    /// as it’s given. Any surplus space will be distributed between all columns.
+    DynamicFullWidth,
+    /// Don’t do any content arrangement. Tables with this mode might become wider than your output
+    /// and look ugly.
+    Disabled,
+}
+
 /// Supported Top Level commands (services)
 #[allow(missing_docs)]
 #[derive(Parser)]

openstack_cli/src/output.rs

@@ -21,7 +21,7 @@ use std::collections::BTreeSet;
 use std::io::{self, Write};
 
 use crate::OpenStackCliError;
-use crate::cli::{Cli, OutputFormat};
+use crate::cli::{Cli, OutputFormat, TableArrangement};
 use structable::{OutputConfig, StructTable};
 
 /// Output Processor
@@ -31,6 +31,8 @@ pub(crate) struct OutputProcessor {
     pub(crate) config: OutputConfig,
     /// Whether output is for human or for machine
     pub(crate) target: OutputFor,
+    /// Table arrangement
+    pub(crate) table_arrangement: TableArrangement,
 }
 
 /// Output target (human or machine) enum
@@ -40,6 +42,16 @@ pub(crate) enum OutputFor {
     Machine,
 }
 
+impl From<TableArrangement> for ContentArrangement {
+    fn from(value: TableArrangement) -> Self {
+        match value {
+            TableArrangement::Dynamic => Self::Dynamic,
+            TableArrangement::DynamicFullWidth => Self::DynamicFullWidth,
+            TableArrangement::Disabled => Self::Disabled,
+        }
+    }
+}
+
 impl OutputProcessor {
     /// Get OutputConfig from passed arguments
     pub fn from_args(args: &Cli) -> Self {
@@ -55,6 +67,7 @@ impl OutputProcessor {
                 pretty: args.global_opts.pretty,
             },
             target,
+            table_arrangement: args.global_opts.table_arrangement,
         }
     }
 
@@ -73,10 +86,16 @@ impl OutputProcessor {
         if config.fields.is_empty() && !config.wide {
             if let Some(cfg) = args.config.views.get(resource_key.as_ref()) {
                 config = cfg.clone();
+                config.wide = matches!(args.global_opts.output, Some(OutputFormat::Wide));
+                config.pretty = args.global_opts.pretty;
             }
         }
 
-        Self { config, target }
+        Self {
+            config,
+            target,
+            table_arrangement: args.global_opts.table_arrangement,
+        }
     }
 
     /// Validate command arguments with respect to the output producing
@@ -137,7 +156,7 @@ impl OutputProcessor {
                 let mut table = Table::new();
                 table
                     .load_preset(UTF8_FULL_CONDENSED)
-                    .set_content_arrangement(ContentArrangement::Dynamic)
+                    .set_content_arrangement(ContentArrangement::from(self.table_arrangement))
                     .set_header(headers)
                     .add_rows(rows);
                 println!("{table}");
@@ -175,7 +194,7 @@ impl OutputProcessor {
         let mut table = Table::new();
         table
             .load_preset(UTF8_FULL_CONDENSED)
-            .set_content_arrangement(ContentArrangement::Dynamic)
+            .set_content_arrangement(ContentArrangement::from(self.table_arrangement))
             .set_header(headers)
             .add_rows(table_rows);
         println!("{table}");