Fix command line option parsing (#86)

Summary:
Positional arguments in 0.9 version of bpaf must go to the right most position.

Fixes #85

Pull Request resolved: #86

Test Plan: - CI, it includes new tests

Reviewed By: jcpetruzza

Differential Revision: D70096890

Pulled By: alanz

fbshipit-source-id: 87518036f3ed61e899b995e7009784c49e67c918

Author: pacak

crates/elp/src/bin/args.rs

@@ -151,13 +151,13 @@ pub struct EqwalizeTarget {
     pub project: PathBuf,
     /// Also eqwalize opted-in generated modules from application
     pub include_generated: bool,
-    /// target, like //erl/chatd/...
-    #[bpaf(positional::< String > ("TARGET"))]
-    pub target: String,
     /// Use experimental clause coverage checker
     pub clause_coverage: bool,
     /// Exit with a non-zero status code if any errors are found
     pub bail_on_error: bool,
+    /// target, like //erl/chatd/...
+    #[bpaf(positional("TARGET"))]
+    pub target: String,
 }
 
 #[derive(Clone, Debug, Bpaf)]
@@ -172,13 +172,13 @@ pub struct EqwalizeApp {
     pub include_generated: bool,
     /// Run with rebar
     pub rebar: bool,
-    /// app name
-    #[bpaf(positional::< String > ("APP"))]
-    pub app: String,
     /// Use experimental clause coverage checker
     pub clause_coverage: bool,
     /// Exit with a non-zero status code if any errors are found
     pub bail_on_error: bool,
+    /// app name
+    #[bpaf(positional::< String > ("APP"))]
+    pub app: String,
 }
 
 #[derive(Clone, Debug, Bpaf)]
@@ -684,3 +684,16 @@ impl ParseAllElp {
         self.format == Some("json".to_string())
     }
 }
+
+#[cfg(test)]
+mod tests {
+
+    use bpaf::Parser;
+
+    use super::command;
+
+    #[test]
+    fn check_options() {
+        command().to_options().check_invariants(false)
+    }
+}

crates/elp/src/bin/main.rs

@@ -1757,6 +1757,8 @@ mod tests {
         }
     }
 
+    // -----------------------------------------------------------------
+
     #[test]
     fn help() {
         let args = args::args().run_inner(Args::from(&["--help"])).unwrap_err();
@@ -1785,6 +1787,26 @@ mod tests {
         expected.assert_eq(&stdout);
     }
 
+    #[test]
+    fn eqwalize_target_help() {
+        let args = args::args()
+            .run_inner(Args::from(&["eqwalize-target", "--help"]))
+            .unwrap_err();
+        let expected = expect_file!["../resources/test/eqwalize_target_help.stdout"];
+        let stdout = args.unwrap_stdout();
+        expected.assert_eq(&stdout);
+    }
+
+    #[test]
+    fn eqwalize_app_help() {
+        let args = args::args()
+            .run_inner(Args::from(&["eqwalize-app", "--help"]))
+            .unwrap_err();
+        let expected = expect_file!["../resources/test/eqwalize_app.stdout"];
+        let stdout = args.unwrap_stdout();
+        expected.assert_eq(&stdout);
+    }
+
     #[test]
     fn dialyze_all_help() {
         let args = args::args()
@@ -1875,6 +1897,8 @@ mod tests {
         expected.assert_eq(&stdout);
     }
 
+    // -----------------------------------------------------------------
+
     #[test]
     fn explain_code() {
         let args = args_vec!["explain", "--code", "W0005"];

crates/elp/src/resources/test/eqwalize_app.stdout

@@ -0,0 +1,13 @@
+Usage: [--project PROJECT] [--as PROFILE] [--include-generated] [--rebar] [--clause-coverage] [--bail-on-error] <APP>
+
+Available positional items:
+    <APP>  app name
+
+Available options:
+        --project <PROJECT>  Path to directory with project, or to a JSON file (defaults to `.`)
+        --as <PROFILE>       Rebar3 profile to pickup (default is test)
+        --include-generated  Also eqwalize opted-in generated modules from project
+        --rebar              Run with rebar
+        --clause-coverage    Use experimental clause coverage checker
+        --bail-on-error      Exit with a non-zero status code if any errors are found
+    -h, --help               Prints help information

crates/elp/src/resources/test/eqwalize_target_help.stdout

@@ -0,0 +1,11 @@
+Usage: [--project PROJECT] [--include-generated] [--clause-coverage] [--bail-on-error] <TARGET>
+
+Available positional items:
+    <TARGET>  target, like //erl/chatd/...
+
+Available options:
+        --project <PROJECT>  Path to directory with project, or to a JSON file (defaults to `.`)
+        --include-generated  Also eqwalize opted-in generated modules from application
+        --clause-coverage    Use experimental clause coverage checker
+        --bail-on-error      Exit with a non-zero status code if any errors are found
+    -h, --help               Prints help information