extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2024-11-26 10:23:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Non-working errors

Browse Source
This commit is contained in:
Sam Hedin 2020-06-22 18:42:46 +02:00
parent 632c6d1cd9
commit 3d213a63c5
4 changed files with 42 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/nu-cli/src/cli.rs
View File

@ -238,7 +238,7 @@ pub fn create_default_context(
syncer.load_environment();
let mut context = Context::basic()?;
syncer.sync_env_vars(&mut context);
syncer.sync_env_vars(&mut context)?;
syncer.sync_path_vars(&mut context);
{
@ -677,7 +677,7 @@ pub async fn cli(
// TODO: make sure config is cached so we don't path this load every call
// FIXME: we probably want to be a bit more graceful if we can't set the environment
syncer.reload();
syncer.sync_env_vars(&mut context);
syncer.sync_env_vars(&mut context)?;
syncer.sync_path_vars(&mut context);
match line {

59
crates/nu-cli/src/env/directory_specific_environment.rs vendored
View File

@ -1,6 +1,7 @@
use crate::commands::{self, autoenv::Trusted};
use commands::autoenv;
use indexmap::{IndexMap, IndexSet};
use nu_errors::ShellError;
use std::{
collections::hash_map::DefaultHasher,
ffi::OsString,
@ -32,7 +33,10 @@ impl DirectorySpecificEnvironment {
}
}
fn toml_if_directory_is_trusted(&self, mut wdirenv: PathBuf) -> std::io::Result<toml::Value> {
fn toml_if_directory_is_trusted(
&self,
mut wdirenv: PathBuf,
) -> Result<toml::Value, ShellError> {
if let Some(trusted) = &self.trusted {
wdirenv.push(".nu-env");
if wdirenv.exists() {
@ -42,41 +46,48 @@ impl DirectorySpecificEnvironment {
if trusted.files.get(wdirenv.to_str().unwrap())
== Some(&hasher.finish().to_string())
{
return Ok(content.parse::<toml::Value>()?);
return Ok(content.parse::<toml::Value>().or_else(|_| {
Err(
ShellError::untagged_runtime_error(
"Could not parse .nu-env file. Is it well-formed?",
),
)
})?);
} else {
return Err(ShellError::untagged_runtime_error("Found .nu-env file in this directory, but it is not trusted. You can run 'autoenv trust' to allow it. This needs to be done after each change to the file"));
}
}
}
Err(Error::new(ErrorKind::Other, "No trusted directories"))
Err(ShellError::untagged_runtime_error("No trusted directories"))
}
pub fn env_vars_to_add(&mut self) -> std::io::Result<IndexMap<EnvKey, EnvVal>> {
pub fn env_vars_to_add(&mut self) -> Result<IndexMap<EnvKey, EnvVal>, ShellError> {
let current_dir = std::env::current_dir()?;
let mut working_dir = Some(current_dir.as_path());
let mut vars_to_add = IndexMap::new();
//Start in the current directory, then traverse towards the root with working_dir to see if we are in a subdirectory of a valid directory.
while let Some(wdir) = working_dir {
if let Ok(toml_doc) = self.toml_if_directory_is_trusted(wdir.to_path_buf()) {
toml_doc
.get("env")
.ok_or_else(|| Error::new(ErrorKind::InvalidData, "env section missing"))?
.as_table()
.ok_or_else(|| Error::new(ErrorKind::InvalidData, "env section malformed"))?
.iter()
.for_each(|(dir_env_key, dir_env_val)| {
let dir_env_val: EnvVal = dir_env_val.as_str().unwrap().into();
let toml_doc = self.toml_if_directory_is_trusted(wdir.to_path_buf())?;
toml_doc
.get("env")
.ok_or_else(|| Error::new(ErrorKind::InvalidData, "env section missing"))?
.as_table()
.ok_or_else(|| Error::new(ErrorKind::InvalidData, "env section malformed"))?
.iter()
.for_each(|(dir_env_key, dir_env_val)| {
let dir_env_val: EnvVal = dir_env_val.as_str().unwrap().into();
//This condition is to make sure variables in parent directories don't overwrite variables set by subdirectories.
if !vars_to_add.contains_key(dir_env_key) {
vars_to_add.insert(dir_env_key.clone(), dir_env_val);
//This condition is to make sure variables in parent directories don't overwrite variables set by subdirectories.
if !vars_to_add.contains_key(dir_env_key) {
vars_to_add.insert(dir_env_key.clone(), dir_env_val);
self.added_env_vars
.entry(wdir.to_path_buf())
.or_insert(IndexSet::new())
.insert(dir_env_key.clone());
}
});
}
self.added_env_vars
.entry(wdir.to_path_buf())
.or_insert(IndexSet::new())
.insert(dir_env_key.clone());
}
});
working_dir = working_dir //Keep going up in the directory structure with .parent()
.expect("This should not be None because of the while condition")
@ -88,7 +99,7 @@ impl DirectorySpecificEnvironment {
//If the user has left directories which added env vars through .nu, we clear those vars
//once they are marked for deletion, remove them from added_env_vars
pub fn env_vars_to_delete(&mut self) -> std::io::Result<IndexSet<EnvKey>> {
pub fn env_vars_to_delete(&mut self) -> Result<IndexSet<EnvKey>, ShellError> {
let current_dir = std::env::current_dir()?;
let mut working_dir = Some(current_dir.as_path());

3
crates/nu-cli/src/env/environment.rs vendored
View File

@ -4,6 +4,7 @@ use indexmap::{indexmap, IndexSet};
use nu_protocol::{UntaggedValue, Value};
use std::ffi::OsString;
use std::fmt::Debug;
use nu_errors::ShellError;
pub trait Env: Debug + Send {
fn env(&self) -> Option<Value>;
@ -57,7 +58,7 @@ impl Environment {
}
}
pub fn maintain_directory_environment(&mut self) -> std::io::Result<()> {
pub fn maintain_directory_environment(&mut self) -> Result<(), ShellError> {
self.direnv.env_vars_to_delete()?.iter().for_each(|k| {
self.remove_env(&k);
});

4
crates/nu-cli/src/env/environment_syncer.rs vendored
View File

@ -3,6 +3,7 @@ use crate::data::config::{Conf, NuConfig};
use crate::env::environment::{Env, Environment};
use parking_lot::Mutex;
use std::sync::Arc;
use nu_errors::ShellError;
pub struct EnvironmentSyncer {
pub env: Arc<Mutex<Box<Environment>>>,
@ -41,7 +42,7 @@ impl EnvironmentSyncer {
environment.morph(&*self.config);
}
pub fn sync_env_vars(&mut self, ctx: &mut Context) {
pub fn sync_env_vars(&mut self, ctx: &mut Context) -> Result<(), ShellError>{
let mut environment = self.env.lock();
environment.maintain_directory_environment().ok();
@ -71,6 +72,7 @@ impl EnvironmentSyncer {
}
}
}
Ok(())
}
pub fn sync_path_vars(&mut self, ctx: &mut Context) {