Handle -v, -h

Fixes #1097

Author: mxcl

.github/workflows/ci.yml

@@ -110,7 +110,7 @@ jobs:
       # coverage for conflict error messages
       - run: '! pkgx yarn --version'
       # coverage for display-name resolution
-      - run: pkgx +agg
+      - run: pkgx -v +agg
 
       - name: generate coverage
         run: |

crates/cli/src/args.rs

@@ -10,6 +10,7 @@ pub struct Flags {
     pub quiet: bool,
     pub silent: bool,
     pub json: bool,
+    pub version_n_continue: bool,
 }
 
 pub struct Args {
@@ -29,6 +30,7 @@ pub fn parse() -> Args {
     let mut json: bool = false;
     let mut find_program = false;
     let mut collecting_args = false;
+    let mut version_n_continue = false;
 
     for arg in std::env::args().skip(1) {
         if collecting_args {
@@ -86,8 +88,10 @@ pub fn parse() -> Args {
                             quiet = true
                         }
                     }
+                    'h' => mode = Mode::Help,
                     's' => silent = true,
                     'j' => json = true,
+                    'v' => version_n_continue = true,
                     _ => panic!("unknown argument: -{}", c),
                 }
             }
@@ -107,6 +111,7 @@ pub fn parse() -> Args {
             silent,
             json,
             quiet,
+            version_n_continue,
         },
     }
 }

crates/cli/src/main.rs

@@ -25,6 +25,10 @@ async fn main() -> Result<(), Box<dyn Error>> {
         find_program,
     } = args::parse();
 
+    if flags.version_n_continue {
+        eprintln!("pkgx {}", env!("CARGO_PKG_VERSION"));
+    }
+
     match mode {
         args::Mode::Help => {
             println!("{}", help::usage());
@@ -234,10 +238,12 @@ async fn main() -> Result<(), Box<dyn Error>> {
             println!("{}", json);
         }
         Ok(())
-    } else {
+    } else if !flags.version_n_continue {
         clear_progress_bar();
         eprintln!("{}", help::usage());
         std::process::exit(2);
+    } else {
+        Ok(())
     }
 }