-
-
Notifications
You must be signed in to change notification settings - Fork 35
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
6 changed files
with
381 additions
and
359 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,117 @@ | ||
| use crate::env::*; | ||
| use crate::error::Error; | ||
| use crate::pm::*; | ||
| use serde::{Deserialize, Serialize}; | ||
| use std::collections::HashMap; | ||
|
|
||
| #[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)] | ||
| #[serde(untagged)] | ||
| pub enum DependencyName { | ||
| Single(String), | ||
| SingleMap(HashMap<String, String>), | ||
| Multiple(Vec<String>), | ||
| } | ||
|
|
||
| impl Default for DependencyName { | ||
| fn default() -> DependencyName { | ||
| DependencyName::Single(String::new()) | ||
| } | ||
| } | ||
|
|
||
| #[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)] | ||
| #[serde(default)] | ||
| pub struct DependencyConfig { | ||
| pub arch: Option<SystemArch>, | ||
| pub dep: DependencyName, | ||
| pub manager: Option<SystemPackageManager>, | ||
| // pub optional: bool, | ||
| pub os: Option<SystemOS>, | ||
| pub sudo: bool, | ||
| pub version: Option<String>, | ||
| } | ||
|
|
||
| impl DependencyConfig { | ||
| pub fn get_package_names( | ||
| &self, | ||
| os: &SystemOS, | ||
| pm: &SystemPackageManager, | ||
| ) -> Result<Vec<String>, Error> { | ||
| match &self.dep { | ||
| DependencyName::Single(name) => Ok(vec![name.to_owned()]), | ||
| DependencyName::SingleMap(map) => map | ||
| .get(&pm.to_string()) | ||
| .or_else(|| map.get(&os.to_string())) | ||
| .or_else(|| map.get("*")) | ||
| .map(|name| vec![name.to_owned()]) | ||
| .ok_or(Error::MissingName), | ||
| DependencyName::Multiple(list) => Ok(list.clone()), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // This shape is what users configure. | ||
| #[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)] | ||
| #[serde(untagged)] | ||
| pub enum SystemDependency { | ||
| Name(String), | ||
| Names(Vec<String>), | ||
| Config(DependencyConfig), | ||
| Map(HashMap<String, String>), | ||
| } | ||
|
|
||
| impl SystemDependency { | ||
| pub fn name(name: &str) -> SystemDependency { | ||
| SystemDependency::Name(name.to_owned()) | ||
| } | ||
|
|
||
| pub fn names<I, V>(names: I) -> SystemDependency | ||
| where | ||
| I: IntoIterator<Item = V>, | ||
| V: AsRef<str>, | ||
| { | ||
| SystemDependency::Names(names.into_iter().map(|n| n.as_ref().to_owned()).collect()) | ||
| } | ||
|
|
||
| pub fn for_arch(name: &str, arch: SystemArch) -> SystemDependency { | ||
| SystemDependency::Config(DependencyConfig { | ||
| arch: Some(arch), | ||
| dep: DependencyName::Single(name.into()), | ||
| ..DependencyConfig::default() | ||
| }) | ||
| } | ||
|
|
||
| pub fn for_os(name: &str, os: SystemOS) -> SystemDependency { | ||
| SystemDependency::Config(DependencyConfig { | ||
| dep: DependencyName::Single(name.into()), | ||
| os: Some(os), | ||
| ..DependencyConfig::default() | ||
| }) | ||
| } | ||
|
|
||
| pub fn for_os_arch(name: &str, os: SystemOS, arch: SystemArch) -> SystemDependency { | ||
| SystemDependency::Config(DependencyConfig { | ||
| arch: Some(arch), | ||
| dep: DependencyName::Single(name.into()), | ||
| os: Some(os), | ||
| ..DependencyConfig::default() | ||
| }) | ||
| } | ||
|
|
||
| pub fn to_config(self) -> DependencyConfig { | ||
| match self { | ||
| Self::Name(name) => DependencyConfig { | ||
| dep: DependencyName::Single(name), | ||
| ..DependencyConfig::default() | ||
| }, | ||
| Self::Names(names) => DependencyConfig { | ||
| dep: DependencyName::Multiple(names), | ||
| ..DependencyConfig::default() | ||
| }, | ||
| Self::Map(map) => DependencyConfig { | ||
| dep: DependencyName::SingleMap(map), | ||
| ..DependencyConfig::default() | ||
| }, | ||
| Self::Config(config) => config, | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,154 +1,13 @@ | ||
| mod deps; | ||
| mod env; | ||
| mod error; | ||
| mod pm; | ||
| mod pm_vendor; | ||
| mod system; | ||
|
|
||
| pub use deps::*; | ||
| pub use env::*; | ||
| pub use error::*; | ||
| pub use pm::*; | ||
| pub use pm_vendor::*; | ||
|
|
||
| use serde::{Deserialize, Serialize}; | ||
| use std::collections::HashMap; | ||
|
|
||
| #[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)] | ||
| #[serde(untagged)] | ||
| pub enum DependencyName { | ||
| Single(String), | ||
| SingleMap(HashMap<String, String>), | ||
| Multiple(Vec<String>), | ||
| } | ||
|
|
||
| impl Default for DependencyName { | ||
| fn default() -> DependencyName { | ||
| DependencyName::Single(String::new()) | ||
| } | ||
| } | ||
|
|
||
| #[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)] | ||
| #[serde(default)] | ||
| pub struct DependencyConfig { | ||
| pub arch: Option<SystemArch>, | ||
| pub dep: DependencyName, | ||
| pub manager: Option<SystemPackageManager>, | ||
| // pub optional: bool, | ||
| pub os: Option<SystemOS>, | ||
| pub sudo: bool, | ||
| pub version: Option<String>, | ||
| } | ||
|
|
||
| impl DependencyConfig { | ||
| pub fn get_package_names( | ||
| &self, | ||
| os: &SystemOS, | ||
| pm: &SystemPackageManager, | ||
| ) -> Result<Vec<String>, Error> { | ||
| match &self.dep { | ||
| DependencyName::Single(name) => Ok(vec![name.to_owned()]), | ||
| DependencyName::SingleMap(map) => map | ||
| .get(&pm.to_string()) | ||
| .or_else(|| map.get(&os.to_string())) | ||
| .or_else(|| map.get("*")) | ||
| .map(|name| vec![name.to_owned()]) | ||
| .ok_or(Error::MissingName), | ||
| DependencyName::Multiple(list) => Ok(list.clone()), | ||
| } | ||
| } | ||
|
|
||
| pub fn get_package_manager(&self) -> Result<PackageClient, Error> { | ||
| if let Some(manager) = &self.manager { | ||
| return Ok(PackageClient::from(*manager)); | ||
| } | ||
|
|
||
| PackageClient::detect() | ||
| } | ||
| } | ||
|
|
||
| // This shape is what users configure. | ||
| #[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)] | ||
| #[serde(untagged)] | ||
| pub enum SystemDependency { | ||
| Name(String), | ||
| Names(Vec<String>), | ||
| Config(DependencyConfig), | ||
| Map(HashMap<String, String>), | ||
| } | ||
|
|
||
| impl SystemDependency { | ||
| pub fn name(name: &str) -> SystemDependency { | ||
| SystemDependency::Name(name.to_owned()) | ||
| } | ||
|
|
||
| pub fn names<I, V>(names: I) -> SystemDependency | ||
| where | ||
| I: IntoIterator<Item = V>, | ||
| V: AsRef<str>, | ||
| { | ||
| SystemDependency::Names(names.into_iter().map(|n| n.as_ref().to_owned()).collect()) | ||
| } | ||
|
|
||
| pub fn for_arch(name: &str, arch: SystemArch) -> SystemDependency { | ||
| SystemDependency::Config(DependencyConfig { | ||
| arch: Some(arch), | ||
| dep: DependencyName::Single(name.into()), | ||
| ..DependencyConfig::default() | ||
| }) | ||
| } | ||
|
|
||
| pub fn for_os(name: &str, os: SystemOS) -> SystemDependency { | ||
| SystemDependency::Config(DependencyConfig { | ||
| dep: DependencyName::Single(name.into()), | ||
| os: Some(os), | ||
| ..DependencyConfig::default() | ||
| }) | ||
| } | ||
|
|
||
| pub fn for_os_arch(name: &str, os: SystemOS, arch: SystemArch) -> SystemDependency { | ||
| SystemDependency::Config(DependencyConfig { | ||
| arch: Some(arch), | ||
| dep: DependencyName::Single(name.into()), | ||
| os: Some(os), | ||
| ..DependencyConfig::default() | ||
| }) | ||
| } | ||
|
|
||
| pub fn to_config(self) -> DependencyConfig { | ||
| match self { | ||
| Self::Name(name) => DependencyConfig { | ||
| dep: DependencyName::Single(name), | ||
| ..DependencyConfig::default() | ||
| }, | ||
| Self::Names(names) => DependencyConfig { | ||
| dep: DependencyName::Multiple(names), | ||
| ..DependencyConfig::default() | ||
| }, | ||
| Self::Map(map) => DependencyConfig { | ||
| dep: DependencyName::SingleMap(map), | ||
| ..DependencyConfig::default() | ||
| }, | ||
| Self::Config(config) => config, | ||
| } | ||
| } | ||
| } | ||
|
|
||
| pub fn resolve_dependencies(deps: Vec<SystemDependency>) -> Vec<DependencyConfig> { | ||
| let os = SystemOS::from_env(); | ||
| let arch = SystemArch::from_env(); | ||
| let mut configs = vec![]; | ||
|
|
||
| for dep in deps { | ||
| let config = dep.to_config(); | ||
|
|
||
| if config.os.as_ref().is_some_and(|o| o != &os) { | ||
| continue; | ||
| } | ||
|
|
||
| if config.arch.as_ref().is_some_and(|a| a != &arch) { | ||
| continue; | ||
| } | ||
|
|
||
| configs.push(config); | ||
| } | ||
|
|
||
| configs | ||
| } | ||
| pub use system::*; |
Oops, something went wrong.