Make --version flags work as expected.

Author: Byron

src/plumbing-cli.rs

@@ -1,6 +1,8 @@
 #![forbid(unsafe_code)]
 
 mod plumbing;
+#[cfg(feature = "lean-cli")]
+mod shared;
 
 use anyhow::Result;
 

src/plumbing/lean.rs

@@ -6,6 +6,10 @@ mod options {
     #[argh(name = "gio-plumbing")]
     /// The lean git underworld
     pub struct Args {
+        #[argh(switch)]
+        /// print the program version.
+        pub version: bool,
+
         #[argh(subcommand)]
         pub subcommand: SubCommands,
     }
@@ -20,10 +24,10 @@ mod options {
     #[derive(FromArgs, PartialEq, Debug)]
     #[argh(subcommand, name = "verify-pack")]
     pub struct VerifyPack {
-        /// if set, output statistical information about the pack
+        /// output statistical information about the pack
         #[argh(switch, short = 's')]
         pub statistics: bool,
-        /// if set, verbose progress messages are printed line by line
+        /// verbose progress messages are printed line by line
         #[argh(switch, short = 'v')]
         pub verbose: bool,
         /// the '.pack' or '.idx' file whose checksum to validate.
@@ -39,7 +43,7 @@ use std::io::{stderr, stdout};
 
 pub fn main() -> Result<()> {
     pub use options::*;
-    let cli: Args = argh::from_env();
+    let cli: Args = crate::shared::from_env();
     match cli.subcommand {
         SubCommands::VerifyPack(VerifyPack {
             path,

src/plumbing/pretty.rs

@@ -25,7 +25,7 @@ mod options {
         /// Verify the integrity of a pack or index file
         #[structopt(setting = AppSettings::ColoredHelp)]
         VerifyPack {
-            /// if set, output statistical information about the pack
+            /// output statistical information about the pack
             #[structopt(long, short = "s")]
             statistics: bool,
             /// Determine the format to use when outputting statistics.
@@ -37,15 +37,15 @@ mod options {
             )]
             format: core::OutputFormat,
 
-            /// if set, verbose progress messages are printed line by line
+            /// verbose progress messages are printed line by line
             #[structopt(long, short = "v")]
             verbose: bool,
 
-            /// if set, bring up a terminal user interface displaying progress visually
+            /// bring up a terminal user interface displaying progress visually
             #[structopt(long, conflicts_with("verbose"))]
             progress: bool,
 
-            /// if set, the progress TUI will stay up even though the work is already completed.
+            /// the progress TUI will stay up even though the work is already completed.
             ///
             /// Use this to be able to read progress messages or additional information visible in the TUI log pane.
             #[structopt(long, conflicts_with("verbose"), requires("progress"))]

src/porcelain-cli.rs

@@ -2,6 +2,9 @@
 
 mod porcelain;
 
+#[cfg(feature = "lean-cli")]
+mod shared;
+
 use anyhow::Result;
 
 #[cfg(feature = "pretty-cli")]

src/porcelain/lean.rs

@@ -4,6 +4,10 @@ mod options {
     #[derive(FromArgs)]
     /// The lean git
     pub struct Args {
+        #[argh(switch)]
+        /// print the program version.
+        pub version: bool,
+
         #[argh(subcommand)]
         pub subcommand: SubCommands,
     }
@@ -25,7 +29,8 @@ use gitoxide_core as core;
 
 pub fn main() -> Result<()> {
     pub use options::*;
-    let cli: Args = argh::from_env();
+    let cli: Args = crate::shared::from_env();
+
     match cli.subcommand {
         SubCommands::Init(_) => core::init(),
     }

src/shared.rs

@@ -0,0 +1,21 @@
+pub static VERSION: &str = concat!(env!("CARGO_PKG_NAME"), " ", env!("CARGO_PKG_VERSION"));
+
+pub fn from_env<T: argh::TopLevelCommand>() -> T {
+    let strings: Vec<String> = std::env::args().collect();
+    let strs: Vec<&str> = strings.iter().map(|s| s.as_str()).collect();
+    T::from_args(&[strs[0]], &strs[1..]).unwrap_or_else(|early_exit| {
+        // This allows us to make subcommands mandatory,
+        // and trigger a helpful message unless --version is specified
+        if let Some(arg) = std::env::args().skip(1).next() {
+            if arg == "--version" {
+                println!("{}", VERSION);
+                std::process::exit(0);
+            }
+        }
+        println!("{}", early_exit.output);
+        std::process::exit(match early_exit.status {
+            Ok(()) => 0,
+            Err(()) => 1,
+        })
+    })
+}

tasks.md

@@ -5,6 +5,7 @@
     * [x] pretty + fast
     * [x] lean + fast
     * [x] lean + small
+  * [x] `--version|-v` option
 * **progress**
   * [ ] one-line progress indicator, maybe implemented in prodash (similar to what `git` does when receiving)
 * **initial release**