wip2 unified_includes

TODO -- can subs be in includes? not set up that way now but I think it should be
TODO later -- detect include loops
TODO later -- update tests?, fix ruby, remove old support

Author: evanbattaglia

src/core/config.rs

@@ -179,15 +179,22 @@ impl TabryConf {
     pub fn expand_args<'a>(
         &'a self,
         args: &'a [TabryArg],
+        includes: &'a [String],
     ) -> Box<dyn Iterator<Item = &TabryConcreteArg> + 'a> {
         let iter = args.iter().flat_map(|arg| match arg {
             TabryArg::TabryIncludeArg { include } => {
                 // TODO: bubble up error instead of unwrap (use get_arg_include)
                 let include = self.arg_includes.get(include).unwrap();
-                self.expand_args(&include.args)
+                self.expand_args(&include.args, &include.includes)
             }
             TabryArg::TabryConcreteArg(concrete_arg) => Box::new(std::iter::once(concrete_arg)),
         });
+        let iter = iter.chain(
+            includes.iter().flat_map(move |include| {
+                let inc = self.arg_includes.get(include).unwrap();
+                self.expand_args(&inc.args, &inc.includes)
+            }),
+        );
         Box::new(iter)
     }
 }

src/engine/options_finder.rs

@@ -166,10 +166,11 @@ impl OptionsFinder {
     }
 
     fn add_options_subcommand_args(&self, res: &mut OptionsResults) -> Result<(), TabryConfError> {
+        let current_sub = self.result.current_sub();
         let sub_args = self
             .result
             .config
-            .expand_args(&self.result.current_sub().args)
+            .expand_args(&current_sub.args, &current_sub.includes)
             .collect::<Vec<_>>();
 
         if let Some(arg) = sub_args.get(self.result.state.args.len()) {