-
-
Notifications
You must be signed in to change notification settings - Fork 163
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
tests: Add tests for new config crate. (#862)
* Update schematic. * Add more toolchain tests. * Rename types. * Start on workspace config. * Start on workspace tests. * Test projects. * Update loaders. * Start on project tests. * Add more. * Add task tests. * Remove cache.
- Loading branch information
Showing
31 changed files
with
2,281 additions
and
261 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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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
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
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
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
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
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
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,156 @@ | ||
| use crate::validate::{validate_child_or_root_path, validate_child_relative_path}; | ||
| use schematic::ValidateError; | ||
| use serde::{de, Deserialize, Deserializer, Serialize}; | ||
|
|
||
| // Not accurate at all but good enough... | ||
| fn is_glob(value: &str) -> bool { | ||
| value.contains("**") || value.contains('*') || value.contains('{') || value.contains('[') | ||
| } | ||
|
|
||
| pub trait Portable: Sized { | ||
| fn from_str(path: &str) -> Result<Self, ValidateError>; | ||
| } | ||
|
|
||
| macro_rules! path_type { | ||
| ($name:ident) => { | ||
| #[derive(Clone, Debug, Default, Eq, PartialEq, Serialize)] | ||
| pub struct $name(pub String); | ||
|
|
||
| impl TryFrom<String> for $name { | ||
| type Error = ValidateError; | ||
|
|
||
| fn try_from(value: String) -> Result<Self, Self::Error> { | ||
| $name::from_str(&value) | ||
| } | ||
| } | ||
|
|
||
| impl TryFrom<&String> for $name { | ||
| type Error = ValidateError; | ||
|
|
||
| fn try_from(value: &String) -> Result<Self, Self::Error> { | ||
| $name::from_str(value) | ||
| } | ||
| } | ||
|
|
||
| impl TryFrom<&str> for $name { | ||
| type Error = ValidateError; | ||
|
|
||
| fn try_from(value: &str) -> Result<Self, Self::Error> { | ||
| $name::from_str(value) | ||
| } | ||
| } | ||
|
|
||
| impl<'de> Deserialize<'de> for $name { | ||
| fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> | ||
| where | ||
| D: Deserializer<'de>, | ||
| { | ||
| let value = String::deserialize(deserializer)?; | ||
|
|
||
| $name::from_str(&value).map_err(|error| de::Error::custom(error.message)) | ||
| } | ||
| } | ||
| }; | ||
| } | ||
|
|
||
| // Represents any file glob pattern. | ||
| path_type!(GlobPath); | ||
|
|
||
| impl Portable for GlobPath { | ||
| fn from_str(value: &str) -> Result<Self, ValidateError> { | ||
| Ok(GlobPath(value.into())) | ||
| } | ||
| } | ||
|
|
||
| // Represents a project-relative file glob pattern. | ||
| path_type!(ProjectFileGlob); | ||
|
|
||
| impl Portable for ProjectFileGlob { | ||
| fn from_str(value: &str) -> Result<Self, ValidateError> { | ||
| validate_child_relative_path(value)?; | ||
|
|
||
| if value.starts_with('/') { | ||
| return Err(ValidateError::new( | ||
| "workspace relative paths are not supported", | ||
| )); | ||
| } | ||
|
|
||
| Ok(ProjectFileGlob(value.into())) | ||
| } | ||
| } | ||
|
|
||
| // Represents any file system path. | ||
| path_type!(FilePath); | ||
|
|
||
| impl Portable for FilePath { | ||
| fn from_str(value: &str) -> Result<Self, ValidateError> { | ||
| if is_glob(value) { | ||
| return Err(ValidateError::new( | ||
| "globs are not supported, expected a literal file path", | ||
| )); | ||
| } | ||
|
|
||
| Ok(FilePath(value.into())) | ||
| } | ||
| } | ||
|
|
||
| // Represents a project-relative file system path. | ||
| path_type!(ProjectFilePath); | ||
|
|
||
| impl Portable for ProjectFilePath { | ||
| fn from_str(value: &str) -> Result<Self, ValidateError> { | ||
| if is_glob(value) { | ||
| return Err(ValidateError::new( | ||
| "globs are not supported, expected a literal file path", | ||
| )); | ||
| } | ||
|
|
||
| validate_child_relative_path(value)?; | ||
|
|
||
| if value.starts_with('/') { | ||
| return Err(ValidateError::new( | ||
| "workspace relative paths are not supported", | ||
| )); | ||
| } | ||
|
|
||
| Ok(ProjectFilePath(value.into())) | ||
| } | ||
| } | ||
|
|
||
| // Represents either a workspace or project relative glob/path, or env var. | ||
| // Workspace paths are prefixed with "/", and env vars with "$". | ||
| #[derive(Clone, Debug, Eq, PartialEq, Serialize)] | ||
| pub enum PortablePath { | ||
| EnvVar(String), | ||
| ProjectFile(FilePath), | ||
| ProjectGlob(GlobPath), | ||
| WorkspaceFile(FilePath), | ||
| WorkspaceGlob(GlobPath), | ||
| } | ||
|
|
||
| impl Portable for PortablePath { | ||
| fn from_str(value: &str) -> Result<Self, ValidateError> { | ||
| if let Some(env_var) = value.strip_prefix('$') { | ||
| return Ok(PortablePath::EnvVar(env_var.to_owned())); | ||
| } | ||
|
|
||
| validate_child_or_root_path(value)?; | ||
|
|
||
| Ok(match (value.starts_with('/'), is_glob(value)) { | ||
| (true, true) => PortablePath::WorkspaceGlob(GlobPath::from_str(&value[1..])?), | ||
| (true, false) => PortablePath::WorkspaceFile(FilePath::from_str(&value[1..])?), | ||
| (false, true) => PortablePath::ProjectGlob(GlobPath::from_str(value)?), | ||
| (false, false) => PortablePath::ProjectFile(FilePath::from_str(value)?), | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| impl<'de> Deserialize<'de> for PortablePath { | ||
| fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> | ||
| where | ||
| D: Deserializer<'de>, | ||
| { | ||
| PortablePath::from_str(&String::deserialize(deserializer)?) | ||
| .map_err(|error| de::Error::custom(error.message)) | ||
| } | ||
| } |
Oops, something went wrong.