moss: Standardize version handling

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

Author: ReillyBrogan

moss/src/cli/mod.rs

@@ -26,9 +26,11 @@ fn command() -> Command {
     Command::new("moss")
         .about("Next generation package manager")
         .arg(
-            Arg::new("version")
+            Arg::new("verbose")
                 .short('v')
-                .long("version")
+                .long("verbose")
+                .global(true)
+                .help("Prints additional information about what moss is doing")
                 .action(ArgAction::SetTrue),
         )
         .arg(
@@ -77,9 +79,13 @@ pub fn process() -> Result<(), Error> {
     let args = replace_aliases(env::args());
     let matches = command().get_matches_from(args);
 
-    if matches.get_flag("version") {
-        version::print();
-        return Ok(());
+    // Print the version, but not if the user is using the version subcommand
+    if matches.get_flag("verbose") {
+        if let Some(command) = matches.subcommand_name() {
+            if command != "version" {
+                version::print();
+            }
+        }
     }
 
     let root = matches.get_one::<PathBuf>("root").unwrap();
@@ -105,8 +111,8 @@ pub fn process() -> Result<(), Error> {
         Some(("search", args)) => search::handle(args, installation).map_err(Error::Search),
         Some(("state", args)) => state::handle(args, installation).map_err(Error::State),
         Some(("sync", args)) => sync::handle(args, installation).map_err(Error::Sync),
-        Some(("version", _)) => {
-            version::print();
+        Some(("version", args)) => {
+            version::handle(args);
             Ok(())
         }
         None => {

moss/src/cli/version.rs

@@ -2,14 +2,30 @@
 //
 // SPDX-License-Identifier: MPL-2.0
 
-use clap::Command;
+use clap::{arg, ArgMatches, Command};
 
 /// Construct the Version command
 pub fn command() -> Command {
-    Command::new("version").about("Display version and exit")
+    Command::new("version")
+        .about("Display version and exit")
+        .arg(arg!(-f --"full" "Print the full build and version info").action(clap::ArgAction::SetTrue))
+}
+
+pub fn handle(args: &ArgMatches) {
+    let show_full = args.get_flag("full");
+    if show_full {
+        print_full()
+    } else {
+        print()
+    }
 }
 
 /// Print program version
 pub fn print() {
     println!("moss {}", serpent_buildinfo::get_simple_version());
 }
+
+/// Print additional build information
+pub fn print_full() {
+    println!("moss {}", serpent_buildinfo::get_full_version());
+}