From 4bb4c3cc076b49e86720e882bf8c489877199f2d Mon Sep 17 00:00:00 2001
From: Kevin K <kbknapp@gmail.com>
Date: Mon, 27 Apr 2015 00:35:56 -0400
Subject: [PATCH] fix(RequiredArgs): required by default args should no longer
 be required when their exclusions are present

---
 src/app.rs    | 41 ++++++++++++++++++++++++++++++++++++-----
 src/macros.rs | 22 ++++++++++++++++++++++
 2 files changed, 58 insertions(+), 5 deletions(-)

diff --git a/src/app.rs b/src/app.rs
index 4db028f2097..84d6e225b92 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -1124,11 +1124,13 @@ impl<'a, 'v, 'ab, 'u, 'h, 'ar> App<'a, 'v, 'ab, 'u, 'h, 'ar>{
         self.validate_blacklist(&matches);
 
         if !self.required.is_empty() {
-            println!("reqs: {:?}", self.required);
-            println!("bls:  {:?}", self.blacklist);
-            println!("grps: {:?}", self.groups);
-            self.report_error("One or more required arguments were not supplied".to_owned(),
-                    true, true);
+            // println!("reqs: {:?}", self.required);
+            // println!("bls:  {:?}", self.blacklist);
+            // println!("grps: {:?}", self.groups);
+            if self.validate_required(&matches) {
+                self.report_error("One or more required arguments were not supplied".to_owned(),
+                        true, true);
+            }
         }
 
         matches.usage = Some(self.create_usage());
@@ -1504,4 +1506,33 @@ impl<'a, 'v, 'ab, 'u, 'h, 'ar> App<'a, 'v, 'ab, 'u, 'h, 'ar>{
         }
     }
 
+    fn validate_required(&self, matches: &ArgMatches<'ar, 'ar>) -> bool{
+        for name in self.required.iter() {
+            validate_reqs!(self, flags, matches, name);
+
+            validate_reqs!(self, opts, matches, name);
+
+            // because positions use different keys, we dont use the macro
+            match self.positionals_idx.values().filter(|ref p| &p.name == name).next() {
+                Some(p) =>{
+                    if let Some(ref bl) = p.blacklist {
+                        for n in bl.iter() {
+                            if matches.args.contains_key(n) {
+                                return false
+                            } else if self.groups.contains_key(n) {
+                                let grp = self.groups.get(n).unwrap();
+                                for an in grp.args.iter() {
+                                    if matches.args.contains_key(an) {
+                                        return false
+                                    }
+                                }
+                            }
+                        } 
+                    }
+                },
+                None    =>(),
+            }
+        }
+        true
+    }
 }
diff --git a/src/macros.rs b/src/macros.rs
index 5946b11db74..99047c0227e 100644
--- a/src/macros.rs
+++ b/src/macros.rs
@@ -47,6 +47,28 @@ macro_rules! parse_group_reqs {
     };
 }
 
+// De-duplication macro used in src/app.rs
+macro_rules! validate_reqs {
+	($me:ident, $t:ident, $m:ident, $n:ident) => {
+        if let Some(a) = $me.$t.get($n) {
+            if let Some(ref bl) = a.blacklist {
+                for n in bl.iter() {
+                    if $m.args.contains_key(n) {
+                        return false
+                    } else if $me.groups.contains_key(n) {
+                        let grp = $me.groups.get(n).unwrap();
+                        for an in grp.args.iter() {
+                            if $m.args.contains_key(an) {
+                                return false
+                            }
+                        }
+                    }
+                } 
+            }
+        }
+	};
+}
+
 // Thanks to bluss and flan3002 in #rust IRC
 //
 // Helps with rightward drift when iterating over something and matching each item.