woodci/alma
1
0
Fork 0
mirror of https://github.com/philmmanjaro/alma.git synced 2025-07-26 23:19:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add the "environment" key to presets

Browse Source
This commit is contained in:
Roey Darwish Dror 2019-06-06 13:28:15 +03:00
parent ffbd34e14f
commit 7dcff2a019
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/error.rs
View File

@ -77,6 +77,9 @@ pub enum ErrorKind {
#[fail(display = "Error loading preset \"{}\"", _0)] #[fail(display = "Error loading preset \"{}\"", _0)]
Preset(String), Preset(String),
#[fail(display = "Missing environment variables \"{:?}\"", _0)]
MissingEnvironmentVariables(Vec<String>),
#[fail(display = "Error executing preset script")] #[fail(display = "Error executing preset script")]
PresetScript, PresetScript,
} }

17
src/presets.rs
View File

@ -2,6 +2,7 @@ use crate::error::{Error, ErrorKind};
use failure::ResultExt; use failure::ResultExt;
use serde::Deserialize; use serde::Deserialize;
use std::collections::HashSet; use std::collections::HashSet;
use std::env;
use std::fs; use std::fs;
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use toml; use toml;
@ -11,6 +12,7 @@ use toml;
struct Preset { struct Preset {
packages: Option<Vec<String>>, packages: Option<Vec<String>>,
script: Option<String>, script: Option<String>,
environment_variables: Option<Vec<String>>,
} }
impl Preset { impl Preset {
@ -31,20 +33,35 @@ impl Presets {
pub fn load(list: &[PathBuf]) -> Result<Self, Error> { pub fn load(list: &[PathBuf]) -> Result<Self, Error> {
let mut packages = HashSet::new(); let mut packages = HashSet::new();
let mut scripts = Vec::new(); let mut scripts = Vec::new();
let mut environment_variables = HashSet::new();
for preset in list { for preset in list {
let Preset { let Preset {
script, script,
packages: preset_packages, packages: preset_packages,
environment_variables: preset_environment_variables,
} = Preset::load(&preset)?; } = Preset::load(&preset)?;
if let Some(preset_packages) = preset_packages { if let Some(preset_packages) = preset_packages {
packages.extend(preset_packages); packages.extend(preset_packages);
} }
if let Some(preset_environment_variables) = preset_environment_variables {
environment_variables.extend(preset_environment_variables);
}
scripts.extend(script); scripts.extend(script);
} }
let missing_envrionments: Vec<String> = environment_variables
.into_iter()
.filter(|var| env::var(var).is_err())
.collect();
if !missing_envrionments.is_empty() {
Err(ErrorKind::MissingEnvironmentVariables(missing_envrionments))?
}
Ok(Self { packages, scripts }) Ok(Self { packages, scripts })
} }
} }