boulder: Standardize version handling

Signed-off-by: Reilly Brogan <[email protected]>

Author: ReillyBrogan

boulder/src/cli.rs

@@ -11,9 +11,9 @@ mod build;
 mod chroot;
 mod profile;
 mod recipe;
+mod version;
 
 #[derive(Debug, Parser)]
-#[command(version = serpent_buildinfo::get_simple_version())]
 pub struct Command {
     #[command(flatten)]
     pub global: Global,
@@ -23,6 +23,14 @@ pub struct Command {
 
 #[derive(Debug, Args)]
 pub struct Global {
+    #[arg(
+        short,
+        long = "verbose",
+        help = "Prints additional information about what boulder is doing",
+        default_value = "false",
+        global = true
+    )]
+    pub verbose: bool,
     #[arg(long, global = true)]
     pub cache_dir: Option<PathBuf>,
     #[arg(long, global = true)]
@@ -39,19 +47,28 @@ pub enum Subcommand {
     Chroot(chroot::Command),
     Profile(profile::Command),
     Recipe(recipe::Command),
+    Version(version::Command),
 }
 
 pub fn process() -> Result<(), Error> {
     let args = replace_aliases(std::env::args());
     let Command { global, subcommand } = Command::parse_from(args);
 
+    if global.verbose {
+        match subcommand {
+            Subcommand::Version(_) => (),
+            _ => version::print(),
+        }
+    }
+
     let env = Env::new(global.cache_dir, global.config_dir, global.data_dir, global.moss_root)?;
 
     match subcommand {
         Subcommand::Build(command) => build::handle(command, env)?,
         Subcommand::Chroot(command) => chroot::handle(command, env)?,
         Subcommand::Profile(command) => profile::handle(command, env)?,
         Subcommand::Recipe(command) => recipe::handle(command, env)?,
+        Subcommand::Version(command) => version::handle(command),
     }
 
     Ok(())

boulder/src/cli/version.rs

@@ -0,0 +1,34 @@
+// SPDX-FileCopyrightText: Copyright © 2020-2024 Serpent OS Developers
+//
+// SPDX-License-Identifier: MPL-2.0
+
+use clap::Parser;
+
+#[derive(Debug, Parser)]
+#[command(about = "Print version info and exit")]
+pub struct Command {
+    #[arg(
+        long = "full",
+        help = "Print the full build and version info",
+        default_value = "false"
+    )]
+    full: bool,
+}
+
+pub fn handle(command: Command) {
+    if command.full {
+        print_full()
+    } else {
+        print()
+    }
+}
+
+/// Print program version
+pub fn print() {
+    println!("boulder {}", serpent_buildinfo::get_simple_version());
+}
+
+/// Print additional build information
+pub fn print_full() {
+    println!("boulder {}", serpent_buildinfo::get_full_version());
+}