Delete env vars after leaving directory

crates/nu-cli/src/env/environment.rs

@@ -1,10 +1,12 @@
 use crate::data::config::Conf;
 use indexmap::{indexmap, IndexSet};
 use nu_protocol::{UntaggedValue, Value};
+use std::collections::HashMap;
 use std::ffi::OsString;
 use std::fmt::Debug;
 use std::fs::File;
 use std::io::prelude::*;
+use std::path::PathBuf;
 
 pub trait Env: Debug + Send {
     fn env(&self) -> Option<Value>;
@@ -36,6 +38,7 @@ impl Env for Box<dyn Env> {
 pub struct Environment {
     environment_vars: Option<Value>,
     path_vars: Option<Value>,
+    nurc_env_vars: HashMap<PathBuf, Vec<String>>,
 }
 
 impl Environment {
@@ -43,6 +46,7 @@ impl Environment {
         Environment {
             environment_vars: None,
             path_vars: None,
+            nurc_env_vars: HashMap::new(),
         }
     }
 
@@ -53,24 +57,84 @@ impl Environment {
         Environment {
             environment_vars: env,
             path_vars: path,
+            nurc_env_vars: HashMap::new(),
         }
     }
 
     //Add env vars specified in the current dirs .nurc, if it exists.
     //TODO: Remove env vars after leaving the directory. Save added vars in env?
+    //Map directory to vars
     //TODO: Add authentication by saving the path to the .nurc file in some variable?
+    //TODO: handle errors
+
+    pub fn maintain_nurc_environment_vars(&mut self) {
+        self.clear_vars_from_unvisited_dirs();
+        self.add_nurc();
+    }
+
     pub fn add_nurc(&mut self) -> std::io::Result<()> {
         let mut file = File::open(".nurc")?;
         let mut contents = String::new();
         file.read_to_string(&mut contents)?;
 
-        let value = contents.parse::<toml::Value>().unwrap();
+        let toml_doc = contents.parse::<toml::Value>().unwrap();
-        let nurc_vars = value.get("env").unwrap().as_table().unwrap();
+        let nurc_vars = toml_doc.get("env").unwrap().as_table().unwrap();
 
-        nurc_vars.iter().for_each(|(k, v)| self.add_env(k, v.as_str().unwrap()));
+        nurc_vars.iter().for_each(|(k, v)| {
+            self.add_env(k, v.as_str().unwrap());
+        });
+
+        self.nurc_env_vars.insert(
+            std::env::current_dir()?,
+            nurc_vars.keys().map(|k| k.clone()).collect(),
+        ); //Maybe could do without clone here, but leave for now
         Ok(())
     }
 
+    //If the user has left directories which added env vars through .nurc, we clear those vars
+    //For each directory d in nurc_env_vars:
+    //if current_dir does not have d as a parent (possibly recursive),
+    //the vars set by d should be removed
+    pub fn clear_vars_from_unvisited_dirs(&mut self) -> std::io::Result<()> {
+        let current_dir = std::env::current_dir()?;
+
+        let mut vars_to_keep = HashMap::new();
+        for (d, v) in self.nurc_env_vars.iter() {
+            let mut working_dir = Some(current_dir.as_path());
+            while working_dir.is_some() {
+                if working_dir.unwrap() == d {
+                    vars_to_keep.insert(d.clone(), v.clone());
+                    break;
+                } else {
+                    working_dir = working_dir.unwrap().parent();
+                }
+            }
+        }
+
+        let mut vars_to_delete = vec![];
+        for (path, vals) in self.nurc_env_vars.iter() {
+            if !vars_to_keep.contains_key(path) {
+                vars_to_delete.extend(vals.clone());
+            }
+        }
+
+        vars_to_delete.iter().for_each(|var| self.remove_env(var));
+
+        self.nurc_env_vars = vars_to_keep;
+        Ok(())
+    }
+
+    // environment_vars: Option<Value>,
+    pub fn remove_env(&mut self, key: &str) {
+        if let Some(Value {
+            value: UntaggedValue::Row(envs),
+            tag: _,
+        }) = &mut self.environment_vars
+        {
+            envs.entries.remove(key);
+        }
+    }
+
     pub fn morph<T: Conf>(&mut self, configuration: &T) {
         self.environment_vars = configuration.env();
         self.path_vars = configuration.path();

crates/nu-cli/src/env/environment_syncer.rs

@@ -44,7 +44,7 @@ impl EnvironmentSyncer {
     pub fn sync_env_vars(&mut self, ctx: &mut Context) {
         let mut environment = self.env.lock();
 
-        environment.add_nurc();
+        environment.maintain_nurc_environment_vars();
         if environment.env().is_some() {
             for (name, value) in ctx.with_host(|host| host.vars()) {
                 if name != "path" && name != "PATH" {