From e3119036aa759517a1c1fc6cd30e34969120e4af Mon Sep 17 00:00:00 2001 From: Miles Johnson Date: Wed, 29 Dec 2021 14:39:13 -0800 Subject: [PATCH] new: Rename project to moon. (#9) * Rename monolith to moon. * Rename folders. --- {.monolith => .moon}/project.yml | 0 {.monolith => .moon}/workspace.yml | 0 Cargo.lock | 36 +++++++++---------- README.md | 11 ++++-- crates/cli/Cargo.toml | 10 +++--- crates/cli/src/app.rs | 2 +- crates/cli/src/commands/bin.rs | 4 +-- crates/cli/src/commands/project.rs | 2 +- crates/cli/src/commands/project_graph.rs | 4 +-- crates/cli/src/commands/setup.rs | 2 +- crates/cli/src/commands/teardown.rs | 2 +- crates/cli/src/main.rs | 4 +-- crates/config/Cargo.toml | 2 +- crates/config/src/constants.rs | 2 +- crates/config/src/global_project.rs | 2 +- crates/config/src/workspace.rs | 2 +- crates/config/templates/project.yml | 4 +-- crates/config/templates/workspace.yml | 2 +- crates/logger/Cargo.toml | 2 +- crates/project/Cargo.toml | 6 ++-- crates/project/src/errors.rs | 4 +-- crates/project/src/lib.rs | 4 +-- crates/project/src/project.rs | 6 ++-- crates/project/src/project_graph.rs | 8 ++--- crates/project/src/target.rs | 2 +- crates/project/src/task.rs | 4 +-- crates/project/src/task_graph.rs | 2 +- crates/project/tests/project_test.rs | 6 ++-- crates/toolchain/Cargo.toml | 6 ++-- crates/toolchain/src/errors.rs | 2 +- crates/toolchain/src/helpers.rs | 2 +- crates/toolchain/src/tool.rs | 6 ++-- crates/toolchain/src/toolchain.rs | 12 +++---- crates/toolchain/src/tools/node.rs | 4 +-- crates/toolchain/src/tools/npm.rs | 4 +-- crates/toolchain/src/tools/npx.rs | 2 +- crates/toolchain/src/tools/pnpm.rs | 4 +-- crates/toolchain/src/tools/yarn.rs | 4 +-- crates/toolchain/tests/node_test.rs | 12 +++---- crates/toolchain/tests/npm_test.rs | 16 ++++----- crates/toolchain/tests/npx_test.rs | 14 ++++---- crates/toolchain/tests/pnpm_test.rs | 12 +++---- crates/toolchain/tests/toolchain_test.rs | 18 +++++----- crates/toolchain/tests/yarn_test.rs | 12 +++---- crates/workspace/Cargo.toml | 10 +++--- crates/workspace/src/errors.rs | 8 ++--- crates/workspace/src/lib.rs | 14 ++++---- docs/commands.md | 2 +- docs/project.md | 20 +++++------ docs/task.md | 2 +- docs/toolchain.md | 21 ++++++----- docs/workspace.md | 20 +++++------ package.json | 2 +- .../base/{.monolith => .moon}/project.yml | 0 .../base/{.monolith => .moon}/workspace.yml | 0 .../projects/{.monolith => .moon}/project.yml | 0 .../{.monolith => .moon}/workspace.yml | 0 .../tasks/{.monolith => .moon}/project.yml | 0 .../tasks/{.monolith => .moon}/workspace.yml | 0 59 files changed, 181 insertions(+), 183 deletions(-) rename {.monolith => .moon}/project.yml (100%) rename {.monolith => .moon}/workspace.yml (100%) rename tests/fixtures/base/{.monolith => .moon}/project.yml (100%) rename tests/fixtures/base/{.monolith => .moon}/workspace.yml (100%) rename tests/fixtures/projects/{.monolith => .moon}/project.yml (100%) rename tests/fixtures/projects/{.monolith => .moon}/workspace.yml (100%) rename tests/fixtures/tasks/{.monolith => .moon}/project.yml (100%) rename tests/fixtures/tasks/{.monolith => .moon}/workspace.yml (100%) diff --git a/.monolith/project.yml b/.moon/project.yml similarity index 100% rename from .monolith/project.yml rename to .moon/project.yml diff --git a/.monolith/workspace.yml b/.moon/workspace.yml similarity index 100% rename from .monolith/workspace.yml rename to .moon/workspace.yml diff --git a/Cargo.lock b/Cargo.lock index d5984e539a6..b0e818e9899 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -942,7 +942,7 @@ dependencies = [ ] [[package]] -name = "monolith_cli" +name = "moon_cli" version = "0.1.0" dependencies = [ "assert_cmd", @@ -951,16 +951,16 @@ dependencies = [ "insta", "itertools", "log", - "monolith_logger", - "monolith_project", - "monolith_toolchain", - "monolith_workspace", + "moon_logger", + "moon_project", + "moon_toolchain", + "moon_workspace", "predicates", "tokio", ] [[package]] -name = "monolith_config" +name = "moon_config" version = "0.1.0" dependencies = [ "assert_fs", @@ -975,7 +975,7 @@ dependencies = [ ] [[package]] -name = "monolith_logger" +name = "moon_logger" version = "0.1.0" dependencies = [ "ansi_term", @@ -985,20 +985,20 @@ dependencies = [ ] [[package]] -name = "monolith_project" +name = "moon_project" version = "0.1.0" dependencies = [ "dep-graph", "itertools", - "monolith_config", - "monolith_logger", + "moon_config", + "moon_logger", "serde", "serde_json", "thiserror", ] [[package]] -name = "monolith_toolchain" +name = "moon_toolchain" version = "0.1.0" dependencies = [ "assert_fs", @@ -1006,8 +1006,8 @@ dependencies = [ "dirs", "flate2", "mockito", - "monolith_config", - "monolith_logger", + "moon_config", + "moon_logger", "predicates", "reqwest", "sha2", @@ -1017,13 +1017,13 @@ dependencies = [ ] [[package]] -name = "monolith_workspace" +name = "moon_workspace" version = "0.1.0" dependencies = [ - "monolith_config", - "monolith_logger", - "monolith_project", - "monolith_toolchain", + "moon_config", + "moon_logger", + "moon_project", + "moon_toolchain", "thiserror", ] diff --git a/README.md b/README.md index d5824e38706..4c551571483 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,13 @@ -# Monolith +# Moon -Monolith is a Rust program for managing JavaScript based monorepo's. +> Currently a work in progress! -> Inspired heavily from Bazel. +Moon is a *m*onorepo *o*rganization, *o*rchestration, and *n*otification tool for JavaScript based +projects, written in Rust. Many of the concepts within Moon are heavily inspired from Bazel. +- [Documentation](./docs/README.md) + + diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml index 4dd0bd7cfb3..78d7648e92e 100644 --- a/crates/cli/Cargo.toml +++ b/crates/cli/Cargo.toml @@ -1,13 +1,13 @@ [package] -name = "monolith_cli" +name = "moon_cli" version = "0.1.0" edition = "2021" [dependencies] -monolith_logger = { path = "../logger" } -monolith_project = { path = "../project" } -monolith_toolchain = { path = "../toolchain" } -monolith_workspace = { path = "../workspace" } +moon_logger = { path = "../logger" } +moon_project = { path = "../project" } +moon_toolchain = { path = "../toolchain" } +moon_workspace = { path = "../workspace" } clap = { version = "3.0.0-beta.1", features = ["derive"] } dot-writer = "0.1" itertools = "0.10" diff --git a/crates/cli/src/app.rs b/crates/cli/src/app.rs index fa3e30481b7..3cbbc30a161 100644 --- a/crates/cli/src/app.rs +++ b/crates/cli/src/app.rs @@ -74,7 +74,7 @@ pub enum Commands { #[derive(Debug, Parser)] #[clap( bin_name = "mono", - name = "Monolith", + name = "Moon", about = "Take your monorepo to the moon!", version )] diff --git a/crates/cli/src/commands/bin.rs b/crates/cli/src/commands/bin.rs index c7507999e17..836c00ef6a9 100644 --- a/crates/cli/src/commands/bin.rs +++ b/crates/cli/src/commands/bin.rs @@ -1,7 +1,7 @@ use crate::helpers::safe_exit; use clap::ArgEnum; -use monolith_toolchain::Tool; -use monolith_workspace::Workspace; +use moon_toolchain::Tool; +use moon_workspace::Workspace; #[derive(ArgEnum, Clone, Debug)] pub enum BinTools { diff --git a/crates/cli/src/commands/project.rs b/crates/cli/src/commands/project.rs index c78f6d5d3bb..ef3497876e6 100644 --- a/crates/cli/src/commands/project.rs +++ b/crates/cli/src/commands/project.rs @@ -1,6 +1,6 @@ use crate::helpers::{print_list, safe_exit}; use itertools::Itertools; -use monolith_workspace::Workspace; +use moon_workspace::Workspace; enum ProjectExitCodes { UnknownProject = 1, diff --git a/crates/cli/src/commands/project_graph.rs b/crates/cli/src/commands/project_graph.rs index 8a935092da4..408e480bcdd 100644 --- a/crates/cli/src/commands/project_graph.rs +++ b/crates/cli/src/commands/project_graph.rs @@ -1,6 +1,6 @@ use dot_writer::{ArrowType, Attributes, Color, DotWriter, Scope, Shape, Style}; -use monolith_project::{ProjectError, ROOT_NODE_ID}; -use monolith_workspace::Workspace; +use moon_project::{ProjectError, ROOT_NODE_ID}; +use moon_workspace::Workspace; fn create_edge(dot_graph: &mut Scope, from: &str, to: &str) { let mut attr = dot_graph.edge(from, to).attributes(); diff --git a/crates/cli/src/commands/setup.rs b/crates/cli/src/commands/setup.rs index 77a1e9a7f4e..8cd960991f8 100644 --- a/crates/cli/src/commands/setup.rs +++ b/crates/cli/src/commands/setup.rs @@ -1,4 +1,4 @@ -use monolith_workspace::Workspace; +use moon_workspace::Workspace; pub async fn setup(workspace: Workspace) -> Result<(), clap::Error> { workspace.toolchain.setup().await.unwrap(); // TODO error diff --git a/crates/cli/src/commands/teardown.rs b/crates/cli/src/commands/teardown.rs index 064f23c50e4..e168ca2547b 100644 --- a/crates/cli/src/commands/teardown.rs +++ b/crates/cli/src/commands/teardown.rs @@ -1,4 +1,4 @@ -use monolith_workspace::Workspace; +use moon_workspace::Workspace; pub async fn teardown(workspace: Workspace) -> Result<(), clap::Error> { workspace.toolchain.teardown().await.unwrap(); // TODO error diff --git a/crates/cli/src/main.rs b/crates/cli/src/main.rs index 7c0c5740da6..6f107975457 100644 --- a/crates/cli/src/main.rs +++ b/crates/cli/src/main.rs @@ -10,8 +10,8 @@ use commands::project_graph::project_graph; use commands::setup::setup; use commands::teardown::teardown; use log::LevelFilter; -use monolith_logger::Logger; -use monolith_workspace::Workspace; +use moon_logger::Logger; +use moon_workspace::Workspace; // This is annoying, but clap requires applying the `ArgEnum` // trait onto the enum, which we can't apply to the log package. diff --git a/crates/config/Cargo.toml b/crates/config/Cargo.toml index ea834b66c68..8df58874b05 100644 --- a/crates/config/Cargo.toml +++ b/crates/config/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "monolith_config" +name = "moon_config" version = "0.1.0" edition = "2021" diff --git a/crates/config/src/constants.rs b/crates/config/src/constants.rs index 8f5f9682aea..4a9812129dc 100644 --- a/crates/config/src/constants.rs +++ b/crates/config/src/constants.rs @@ -1,4 +1,4 @@ -pub const CONFIG_DIRNAME: &str = ".monolith"; +pub const CONFIG_DIRNAME: &str = ".moon"; pub const CONFIG_WORKSPACE_FILENAME: &str = "workspace.yml"; diff --git a/crates/config/src/global_project.rs b/crates/config/src/global_project.rs index 0ccbdaf1dab..32fedd72004 100644 --- a/crates/config/src/global_project.rs +++ b/crates/config/src/global_project.rs @@ -1,4 +1,4 @@ -// .monolith/project.yml +// .moon/project.yml use crate::constants; use crate::errors::{create_validation_error, map_figment_error_to_validation_errors}; diff --git a/crates/config/src/workspace.rs b/crates/config/src/workspace.rs index d4e7acedee3..be30b1c1d27 100644 --- a/crates/config/src/workspace.rs +++ b/crates/config/src/workspace.rs @@ -1,4 +1,4 @@ -// .monolith/workspace.yml +// .moon/workspace.yml use crate::constants; use crate::errors::map_figment_error_to_validation_errors; diff --git a/crates/config/templates/project.yml b/crates/config/templates/project.yml index 63af68d0b99..90a54b98058 100644 --- a/crates/config/templates/project.yml +++ b/crates/config/templates/project.yml @@ -27,9 +27,9 @@ project: dependsOn: [] # OPTIONAL: File groups are a mechanism for grouping similar types of files within -# a project using file glob patterns. View `.monolith/project.yml` for more info. +# a project using file glob patterns. View `.moon/project.yml` for more info. fileGroups: {} # OPTIONAL: A task is an action that is ran within the context of a project, and -# wraps around an npm or shell command. View `.monolith/project.yml` for more info. +# wraps around an npm or shell command. View `.moon/project.yml` for more info. tasks: {} diff --git a/crates/config/templates/workspace.yml b/crates/config/templates/workspace.yml index 55f7f9d301b..1409c35d5b3 100644 --- a/crates/config/templates/workspace.yml +++ b/crates/config/templates/workspace.yml @@ -1,4 +1,4 @@ -# Configures Node.js within the toolchain. Monolith manages its own version of Node.js +# Configures Node.js within the toolchain. Moon manages its own version of Node.js # instead of relying on a version found on the host machine. This ensures deterministic # and reproducible builds across any machine. node: diff --git a/crates/logger/Cargo.toml b/crates/logger/Cargo.toml index e1ec8dbc85d..4ee3ae3f06c 100644 --- a/crates/logger/Cargo.toml +++ b/crates/logger/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "monolith_logger" +name = "moon_logger" version = "0.1.0" edition = "2021" diff --git a/crates/project/Cargo.toml b/crates/project/Cargo.toml index ad6dd07f9f1..64cae417e9a 100644 --- a/crates/project/Cargo.toml +++ b/crates/project/Cargo.toml @@ -1,11 +1,11 @@ [package] -name = "monolith_project" +name = "moon_project" version = "0.1.0" edition = "2021" [dependencies] -monolith_config = { path = "../config" } -monolith_logger = { path = "../logger" } +moon_config = { path = "../config" } +moon_logger = { path = "../logger" } dep-graph = "0.2" itertools = "0.10" serde = { version = "1.0", features = ["derive"] } diff --git a/crates/project/src/errors.rs b/crates/project/src/errors.rs index b76e7bfc131..d97bfb27665 100644 --- a/crates/project/src/errors.rs +++ b/crates/project/src/errors.rs @@ -1,4 +1,4 @@ -use monolith_config::{constants, ValidationErrors}; +use moon_config::{constants, ValidationErrors}; use thiserror::Error; #[derive(Error, Debug)] @@ -24,6 +24,6 @@ pub enum ProjectError { #[error("Task `{0}` has not been configured for project `{1}`.")] UnconfiguredTask(String, String), - #[error("Unknown monolith project error.")] + #[error("Unknown moon project error.")] Unknown, } diff --git a/crates/project/src/lib.rs b/crates/project/src/lib.rs index 4043415dd74..16e34d4d487 100644 --- a/crates/project/src/lib.rs +++ b/crates/project/src/lib.rs @@ -10,12 +10,12 @@ pub use constants::ROOT_NODE_ID; pub use errors::ProjectError; // Projects -pub use monolith_config::{FileGroups, ProjectID, ProjectType}; +pub use moon_config::{FileGroups, ProjectID, ProjectType}; pub use project::{Project, ProjectsMap}; pub use project_graph::ProjectGraph; // Tasks -pub use monolith_config::{TargetID, TaskType}; +pub use moon_config::{TargetID, TaskType}; pub use target::Target; pub use task::{Task, TaskOptions}; pub use task_graph::TaskGraph; diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs index 93b5cad4dfc..f809494719f 100644 --- a/crates/project/src/project.rs +++ b/crates/project/src/project.rs @@ -1,11 +1,11 @@ use crate::errors::ProjectError; use crate::task::Task; -use monolith_config::constants::CONFIG_PROJECT_FILENAME; -use monolith_config::{ +use moon_config::constants::CONFIG_PROJECT_FILENAME; +use moon_config::{ FileGroups, FilePath, GlobalProjectConfig, PackageJson, PackageJsonValue, ProjectConfig, ProjectID, }; -use monolith_logger::{color, debug, trace}; +use moon_logger::{color, debug, trace}; use serde::{Deserialize, Serialize}; use std::collections::HashMap; use std::path::{Path, PathBuf}; diff --git a/crates/project/src/project_graph.rs b/crates/project/src/project_graph.rs index c95095f5a63..98394cdc352 100644 --- a/crates/project/src/project_graph.rs +++ b/crates/project/src/project_graph.rs @@ -3,15 +3,15 @@ use crate::errors::ProjectError; use crate::project::Project; use dep_graph::{DepGraph, Node}; use itertools::Itertools; -use monolith_config::{GlobalProjectConfig, ProjectID}; -use monolith_logger::{color, debug, trace}; +use moon_config::{GlobalProjectConfig, ProjectID}; +use moon_logger::{color, debug, trace}; use std::cell::{RefCell, RefMut}; use std::collections::HashMap; use std::path::{Path, PathBuf}; pub struct ProjectGraph { /// The global project configuration that all projects inherit from. - /// Is loaded from `.monolith/project.yml`. + /// Is loaded from `.moon/project.yml`. global_config: GlobalProjectConfig, /// A lightweight dependency graph, where each node is a project ID, @@ -22,7 +22,7 @@ pub struct ProjectGraph { projects: RefCell>, /// The mapping of projects by ID to a relative file system location. - /// Is the `projects` setting in `.monolith/workspace.yml`. + /// Is the `projects` setting in `.moon/workspace.yml`. projects_config: HashMap, /// The workspace root, in which projects are relatively loaded from. diff --git a/crates/project/src/target.rs b/crates/project/src/target.rs index 355fe68b994..10da18a0c9c 100644 --- a/crates/project/src/target.rs +++ b/crates/project/src/target.rs @@ -1,4 +1,4 @@ -use monolith_config::{ProjectID, TargetID, TaskID}; +use moon_config::{ProjectID, TargetID, TaskID}; pub struct Target {} diff --git a/crates/project/src/task.rs b/crates/project/src/task.rs index 5c13c6cba0c..1702f63de54 100644 --- a/crates/project/src/task.rs +++ b/crates/project/src/task.rs @@ -1,7 +1,7 @@ -use monolith_config::{ +use moon_config::{ FilePathOrGlob, TargetID, TaskConfig, TaskMergeStrategy, TaskOptionsConfig, TaskType, }; -use monolith_logger::{color, debug}; +use moon_logger::{color, debug}; use serde::{Deserialize, Serialize}; #[derive(Clone, Debug, Deserialize, PartialEq, Serialize)] diff --git a/crates/project/src/task_graph.rs b/crates/project/src/task_graph.rs index 23bd9a58527..ff9fba00bf2 100644 --- a/crates/project/src/task_graph.rs +++ b/crates/project/src/task_graph.rs @@ -3,7 +3,7 @@ use crate::project_graph::ProjectGraph; use crate::target::Target; use crate::task::Task; use dep_graph::{DepGraph, Node}; -use monolith_config::TargetID; +use moon_config::TargetID; use std::collections::HashMap; #[derive(Default)] diff --git a/crates/project/tests/project_test.rs b/crates/project/tests/project_test.rs index 28fcd352299..b14febc918f 100644 --- a/crates/project/tests/project_test.rs +++ b/crates/project/tests/project_test.rs @@ -1,9 +1,9 @@ -use monolith_config::project::ProjectMetadataConfig; -use monolith_config::{ +use moon_config::project::ProjectMetadataConfig; +use moon_config::{ FileGroups, GlobalProjectConfig, PackageJson, ProjectConfig, ProjectType, TaskConfig, TaskMergeStrategy, TaskOptionsConfig, TaskType, }; -use monolith_project::{Project, Task}; +use moon_project::{Project, Task}; use std::collections::HashMap; use std::env; use std::path::PathBuf; diff --git a/crates/toolchain/Cargo.toml b/crates/toolchain/Cargo.toml index 7a753222192..9ea44ac3b3c 100644 --- a/crates/toolchain/Cargo.toml +++ b/crates/toolchain/Cargo.toml @@ -1,11 +1,11 @@ [package] -name = "monolith_toolchain" +name = "moon_toolchain" version = "0.1.0" edition = "2021" [dependencies] -monolith_config = { path = "../config" } -monolith_logger = { path = "../logger" } +moon_config = { path = "../config" } +moon_logger = { path = "../logger" } async-trait = "0.1" dirs = "4.0" flate2 = "1.0" diff --git a/crates/toolchain/src/errors.rs b/crates/toolchain/src/errors.rs index ba6945fdddf..96a6d2b8a19 100644 --- a/crates/toolchain/src/errors.rs +++ b/crates/toolchain/src/errors.rs @@ -3,7 +3,7 @@ use thiserror::Error; #[derive(Error, Debug)] pub enum ToolchainError { - #[error("Unknown monolith toolchain error.")] + #[error("Unknown moon toolchain error.")] Unknown, // TODO diff --git a/crates/toolchain/src/helpers.rs b/crates/toolchain/src/helpers.rs index db5303847ca..22a1b641a68 100644 --- a/crates/toolchain/src/helpers.rs +++ b/crates/toolchain/src/helpers.rs @@ -1,5 +1,5 @@ use crate::errors::ToolchainError; -use monolith_logger::{color, trace}; +use moon_logger::{color, trace}; use sha2::{Digest, Sha256}; use std::env; use std::fs; diff --git a/crates/toolchain/src/tool.rs b/crates/toolchain/src/tool.rs index f83b41726c4..b64c5abbc12 100644 --- a/crates/toolchain/src/tool.rs +++ b/crates/toolchain/src/tool.rs @@ -12,13 +12,13 @@ pub trait Tool { /// Determine whether the tool has already been downloaded. fn is_downloaded(&self) -> bool; - /// Downloads the tool into the ~/.monolith/temp folder, + /// Downloads the tool into the ~/.moon/temp folder, /// and returns a file path to the downloaded binary. async fn download(&self, host: Option<&str>) -> Result<(), ToolchainError>; /// Returns an absolute file path to the temporary downloaded file. /// This _may not exist_, as the path is composed ahead of time. - /// This is typically ~/.monolith/temp/. + /// This is typically ~/.moon/temp/. fn get_download_path(&self) -> Option<&PathBuf>; /// Determine whether the tool has already been installed. @@ -30,7 +30,7 @@ pub trait Tool { /// Returns an absolute file path to the directory containing the downloaded tool. /// This _may not exist_, as the path is composed ahead of time. - /// This is typically ~/.monolith/tools//. + /// This is typically ~/.moon/tools//. fn get_install_dir(&self) -> &PathBuf; /// Returns a semver version for the currently installed binary. diff --git a/crates/toolchain/src/toolchain.rs b/crates/toolchain/src/toolchain.rs index 1f0ea5c809f..efe80f49f70 100644 --- a/crates/toolchain/src/toolchain.rs +++ b/crates/toolchain/src/toolchain.rs @@ -7,11 +7,11 @@ use crate::tools::npx::NpxTool; use crate::tools::pnpm::PnpmTool; use crate::tools::yarn::YarnTool; use dirs::home_dir as get_home_dir; -use monolith_config::constants::CONFIG_DIRNAME; -use monolith_config::workspace::{ +use moon_config::constants::CONFIG_DIRNAME; +use moon_config::workspace::{ NpmConfig, PackageManager as PM, PnpmConfig, WorkspaceConfig, YarnConfig, }; -use monolith_logger::{color, debug, trace}; +use moon_logger::{color, debug, trace}; use std::fs; use std::path::{Path, PathBuf}; @@ -32,15 +32,15 @@ fn create_dir(dir: &Path) -> Result<(), ToolchainError> { #[derive(Debug)] pub struct Toolchain { /// The directory where toolchain artifacts are stored. - /// This is typically ~/.monolith. + /// This is typically ~/.moon. pub dir: PathBuf, /// The directory where temporary files are stored. - /// This is typically ~/.monolith/temp. + /// This is typically ~/.moon/temp. pub temp_dir: PathBuf, /// The directory where tools are installed by version. - /// This is typically ~/.monolith/tools. + /// This is typically ~/.moon/tools. pub tools_dir: PathBuf, /// The workspace root directory. diff --git a/crates/toolchain/src/tools/node.rs b/crates/toolchain/src/tools/node.rs index fbf5f74aa4a..b71e72c41c2 100644 --- a/crates/toolchain/src/tools/node.rs +++ b/crates/toolchain/src/tools/node.rs @@ -4,8 +4,8 @@ use crate::tool::Tool; use crate::Toolchain; use async_trait::async_trait; use flate2::read::GzDecoder; -use monolith_config::workspace::NodeConfig; -use monolith_logger::{color, debug, error}; +use moon_config::workspace::NodeConfig; +use moon_logger::{color, debug, error}; use std::env::consts; use std::fs; use std::io::{BufRead, BufReader}; diff --git a/crates/toolchain/src/tools/npm.rs b/crates/toolchain/src/tools/npm.rs index 1cf4effce68..312b43918d2 100644 --- a/crates/toolchain/src/tools/npm.rs +++ b/crates/toolchain/src/tools/npm.rs @@ -3,8 +3,8 @@ use crate::helpers::{exec_command, get_bin_version, is_ci}; use crate::tool::{PackageManager, Tool}; use crate::Toolchain; use async_trait::async_trait; -use monolith_config::workspace::NpmConfig; -use monolith_logger::{color, debug, trace}; +use moon_config::workspace::NpmConfig; +use moon_logger::{color, debug, trace}; use std::env::consts; use std::path::PathBuf; diff --git a/crates/toolchain/src/tools/npx.rs b/crates/toolchain/src/tools/npx.rs index 8dd4dd5c7af..33d0ab1d854 100644 --- a/crates/toolchain/src/tools/npx.rs +++ b/crates/toolchain/src/tools/npx.rs @@ -3,7 +3,7 @@ use crate::helpers::{exec_command, get_bin_version}; use crate::tool::Tool; use crate::Toolchain; use async_trait::async_trait; -use monolith_logger::{color, debug, trace}; +use moon_logger::{color, debug, trace}; use std::env::consts; use std::path::{Path, PathBuf}; diff --git a/crates/toolchain/src/tools/pnpm.rs b/crates/toolchain/src/tools/pnpm.rs index 9abffc336d7..260878ae830 100644 --- a/crates/toolchain/src/tools/pnpm.rs +++ b/crates/toolchain/src/tools/pnpm.rs @@ -3,8 +3,8 @@ use crate::helpers::{exec_command, get_bin_version}; use crate::tool::{PackageManager, Tool}; use crate::Toolchain; use async_trait::async_trait; -use monolith_config::workspace::PnpmConfig; -use monolith_logger::{color, debug, trace}; +use moon_config::workspace::PnpmConfig; +use moon_logger::{color, debug, trace}; use std::env::consts; use std::path::PathBuf; diff --git a/crates/toolchain/src/tools/yarn.rs b/crates/toolchain/src/tools/yarn.rs index fa65ff2ff0d..d86919fef2e 100644 --- a/crates/toolchain/src/tools/yarn.rs +++ b/crates/toolchain/src/tools/yarn.rs @@ -3,8 +3,8 @@ use crate::helpers::{exec_command, get_bin_version, is_ci}; use crate::tool::{PackageManager, Tool}; use crate::Toolchain; use async_trait::async_trait; -use monolith_config::workspace::YarnConfig; -use monolith_logger::{color, debug, trace}; +use moon_config::workspace::YarnConfig; +use moon_logger::{color, debug, trace}; use std::env::consts; use std::path::PathBuf; diff --git a/crates/toolchain/tests/node_test.rs b/crates/toolchain/tests/node_test.rs index ff237169b40..9a3212b761e 100644 --- a/crates/toolchain/tests/node_test.rs +++ b/crates/toolchain/tests/node_test.rs @@ -1,6 +1,6 @@ -use monolith_config::WorkspaceConfig; -use monolith_toolchain::tools::node::NodeTool; -use monolith_toolchain::{Tool, Toolchain}; +use moon_config::WorkspaceConfig; +use moon_toolchain::tools::node::NodeTool; +use moon_toolchain::{Tool, Toolchain}; use predicates::prelude::*; use std::env; @@ -30,16 +30,16 @@ fn get_node_platform() -> &'static str { fn generates_paths() { let (node, temp_dir) = create_node_tool(); - assert!(predicates::str::ends_with(".monolith/tools/node/1.0.0") + assert!(predicates::str::ends_with(".moon/tools/node/1.0.0") .eval(node.get_install_dir().to_str().unwrap())); assert!( - predicates::str::ends_with(".monolith/tools/node/1.0.0/bin/node") + predicates::str::ends_with(".moon/tools/node/1.0.0/bin/node") .eval(node.get_bin_path().to_str().unwrap()) ); assert!(predicates::str::ends_with(format!( - ".monolith/temp/node/node-v1.0.0-{}-x64.tar.gz", + ".moon/temp/node/node-v1.0.0-{}-x64.tar.gz", get_node_platform() )) .eval(node.get_download_path().unwrap().to_str().unwrap())); diff --git a/crates/toolchain/tests/npm_test.rs b/crates/toolchain/tests/npm_test.rs index b63492a55ba..116edf73d66 100644 --- a/crates/toolchain/tests/npm_test.rs +++ b/crates/toolchain/tests/npm_test.rs @@ -1,7 +1,7 @@ -use monolith_config::workspace::NpmConfig; -use monolith_config::WorkspaceConfig; -use monolith_toolchain::tools::npm::NpmTool; -use monolith_toolchain::{Tool, Toolchain}; +use moon_config::workspace::NpmConfig; +use moon_config::WorkspaceConfig; +use moon_toolchain::tools::npm::NpmTool; +use moon_toolchain::{Tool, Toolchain}; use predicates::prelude::*; use std::env; @@ -24,13 +24,11 @@ pub fn create_npm_tool() -> (NpmTool, assert_fs::TempDir) { fn generates_paths() { let (npm, temp_dir) = create_npm_tool(); - assert!(predicates::str::ends_with(".monolith/tools/node/1.0.0") + assert!(predicates::str::ends_with(".moon/tools/node/1.0.0") .eval(npm.get_install_dir().to_str().unwrap())); - assert!( - predicates::str::ends_with(".monolith/tools/node/1.0.0/bin/npm") - .eval(npm.get_bin_path().to_str().unwrap()) - ); + assert!(predicates::str::ends_with(".moon/tools/node/1.0.0/bin/npm") + .eval(npm.get_bin_path().to_str().unwrap())); temp_dir.close().unwrap(); } diff --git a/crates/toolchain/tests/npx_test.rs b/crates/toolchain/tests/npx_test.rs index 8bdb34d37e3..1a21f489d12 100644 --- a/crates/toolchain/tests/npx_test.rs +++ b/crates/toolchain/tests/npx_test.rs @@ -1,6 +1,6 @@ -use monolith_config::WorkspaceConfig; -use monolith_toolchain::tools::npx::NpxTool; -use monolith_toolchain::{Tool, Toolchain}; +use moon_config::WorkspaceConfig; +use moon_toolchain::tools::npx::NpxTool; +use moon_toolchain::{Tool, Toolchain}; use predicates::prelude::*; use std::env; @@ -20,13 +20,11 @@ pub fn create_npx_tool() -> (NpxTool, assert_fs::TempDir) { fn generates_paths() { let (npx, temp_dir) = create_npx_tool(); - assert!(predicates::str::ends_with(".monolith/tools/node/1.0.0") + assert!(predicates::str::ends_with(".moon/tools/node/1.0.0") .eval(npx.get_install_dir().to_str().unwrap())); - assert!( - predicates::str::ends_with(".monolith/tools/node/1.0.0/bin/npx") - .eval(npx.get_bin_path().to_str().unwrap()) - ); + assert!(predicates::str::ends_with(".moon/tools/node/1.0.0/bin/npx") + .eval(npx.get_bin_path().to_str().unwrap())); temp_dir.close().unwrap(); } diff --git a/crates/toolchain/tests/pnpm_test.rs b/crates/toolchain/tests/pnpm_test.rs index 4537fcade78..c05c93b922e 100644 --- a/crates/toolchain/tests/pnpm_test.rs +++ b/crates/toolchain/tests/pnpm_test.rs @@ -1,7 +1,7 @@ -use monolith_config::workspace::{PackageManager, PnpmConfig}; -use monolith_config::WorkspaceConfig; -use monolith_toolchain::tools::pnpm::PnpmTool; -use monolith_toolchain::{Tool, Toolchain}; +use moon_config::workspace::{PackageManager, PnpmConfig}; +use moon_config::WorkspaceConfig; +use moon_toolchain::tools::pnpm::PnpmTool; +use moon_toolchain::{Tool, Toolchain}; use predicates::prelude::*; use std::env; @@ -25,11 +25,11 @@ pub fn create_pnpm_tool() -> (PnpmTool, assert_fs::TempDir) { fn generates_paths() { let (pnpm, temp_dir) = create_pnpm_tool(); - assert!(predicates::str::ends_with(".monolith/tools/node/1.0.0") + assert!(predicates::str::ends_with(".moon/tools/node/1.0.0") .eval(pnpm.get_install_dir().to_str().unwrap())); assert!( - predicates::str::ends_with(".monolith/tools/node/1.0.0/bin/pnpm") + predicates::str::ends_with(".moon/tools/node/1.0.0/bin/pnpm") .eval(pnpm.get_bin_path().to_str().unwrap()) ); diff --git a/crates/toolchain/tests/toolchain_test.rs b/crates/toolchain/tests/toolchain_test.rs index 4dbb8cbe95c..397d5bb2ba8 100644 --- a/crates/toolchain/tests/toolchain_test.rs +++ b/crates/toolchain/tests/toolchain_test.rs @@ -1,5 +1,5 @@ -use monolith_config::WorkspaceConfig; -use monolith_toolchain::Toolchain; +use moon_config::WorkspaceConfig; +use moon_toolchain::Toolchain; use predicates::prelude::*; use std::env; use std::path::Path; @@ -17,11 +17,9 @@ fn generates_paths() { let base_dir = assert_fs::TempDir::new().unwrap(); let toolchain = create_toolchain(&base_dir); - assert!(predicates::str::ends_with(".monolith").eval(toolchain.dir.to_str().unwrap())); - assert!(predicates::str::ends_with(".monolith/temp").eval(toolchain.temp_dir.to_str().unwrap())); - assert!( - predicates::str::ends_with(".monolith/tools").eval(toolchain.tools_dir.to_str().unwrap()) - ); + assert!(predicates::str::ends_with(".moon").eval(toolchain.dir.to_str().unwrap())); + assert!(predicates::str::ends_with(".moon/temp").eval(toolchain.temp_dir.to_str().unwrap())); + assert!(predicates::str::ends_with(".moon/tools").eval(toolchain.tools_dir.to_str().unwrap())); base_dir.close().unwrap(); } @@ -29,9 +27,9 @@ fn generates_paths() { #[test] fn creates_dirs() { let base_dir = assert_fs::TempDir::new().unwrap(); - let home_dir = base_dir.join(".monolith"); - let temp_dir = base_dir.join(".monolith/temp"); - let tools_dir = base_dir.join(".monolith/tools"); + let home_dir = base_dir.join(".moon"); + let temp_dir = base_dir.join(".moon/temp"); + let tools_dir = base_dir.join(".moon/tools"); assert!(!home_dir.exists()); assert!(!temp_dir.exists()); diff --git a/crates/toolchain/tests/yarn_test.rs b/crates/toolchain/tests/yarn_test.rs index bc4dbbe1858..d8a81948f5e 100644 --- a/crates/toolchain/tests/yarn_test.rs +++ b/crates/toolchain/tests/yarn_test.rs @@ -1,7 +1,7 @@ -use monolith_config::workspace::{PackageManager, YarnConfig}; -use monolith_config::WorkspaceConfig; -use monolith_toolchain::tools::yarn::YarnTool; -use monolith_toolchain::{Tool, Toolchain}; +use moon_config::workspace::{PackageManager, YarnConfig}; +use moon_config::WorkspaceConfig; +use moon_toolchain::tools::yarn::YarnTool; +use moon_toolchain::{Tool, Toolchain}; use predicates::prelude::*; use std::env; @@ -25,11 +25,11 @@ pub fn create_yarn_tool() -> (YarnTool, assert_fs::TempDir) { fn generates_paths() { let (yarn, temp_dir) = create_yarn_tool(); - assert!(predicates::str::ends_with(".monolith/tools/node/1.0.0") + assert!(predicates::str::ends_with(".moon/tools/node/1.0.0") .eval(yarn.get_install_dir().to_str().unwrap())); assert!( - predicates::str::ends_with(".monolith/tools/node/1.0.0/bin/yarn") + predicates::str::ends_with(".moon/tools/node/1.0.0/bin/yarn") .eval(yarn.get_bin_path().to_str().unwrap()) ); diff --git a/crates/workspace/Cargo.toml b/crates/workspace/Cargo.toml index 7d7fd436e32..4a4ba7381e0 100644 --- a/crates/workspace/Cargo.toml +++ b/crates/workspace/Cargo.toml @@ -1,11 +1,11 @@ [package] -name = "monolith_workspace" +name = "moon_workspace" version = "0.1.0" edition = "2021" [dependencies] -monolith_config = { path = "../config" } -monolith_logger = { path = "../logger" } -monolith_project = { path = "../project" } -monolith_toolchain = { path = "../toolchain" } +moon_config = { path = "../config" } +moon_logger = { path = "../logger" } +moon_project = { path = "../project" } +moon_toolchain = { path = "../toolchain" } thiserror = "1.0" diff --git a/crates/workspace/src/errors.rs b/crates/workspace/src/errors.rs index 90be405eac0..7e933266f0e 100644 --- a/crates/workspace/src/errors.rs +++ b/crates/workspace/src/errors.rs @@ -1,6 +1,6 @@ -use monolith_config::{constants, ValidationErrors}; -use monolith_project::ProjectError; -use monolith_toolchain::ToolchainError; +use moon_config::{constants, ValidationErrors}; +use moon_project::ProjectError; +use moon_toolchain::ToolchainError; use thiserror::Error; #[derive(Error, Debug)] @@ -45,7 +45,7 @@ pub enum WorkspaceError { )] InvalidGlobalProjectConfigFile(ValidationErrors), - #[error("Unknown monolith workspace error.")] + #[error("Unknown moon workspace error.")] Unknown, #[error("Project error.")] diff --git a/crates/workspace/src/lib.rs b/crates/workspace/src/lib.rs index fd7d6de00ef..119392169d7 100644 --- a/crates/workspace/src/lib.rs +++ b/crates/workspace/src/lib.rs @@ -1,14 +1,14 @@ mod errors; use errors::WorkspaceError; -use monolith_config::{constants, GlobalProjectConfig, WorkspaceConfig}; -use monolith_logger::{color, debug, trace}; -use monolith_project::ProjectGraph; -use monolith_toolchain::Toolchain; +use moon_config::{constants, GlobalProjectConfig, WorkspaceConfig}; +use moon_logger::{color, debug, trace}; +use moon_project::ProjectGraph; +use moon_toolchain::Toolchain; use std::env; use std::path::{Path, PathBuf}; -/// Recursively attempt to find the workspace root by locating the ".monolith" +/// Recursively attempt to find the workspace root by locating the ".moon" /// configuration folder, starting from the current working directory. fn find_workspace_root(current_dir: PathBuf) -> Option { let config_dir = current_dir.join(constants::CONFIG_DIRNAME); @@ -105,10 +105,10 @@ fn load_workspace_config(root_dir: &Path) -> Result Knowledge of [`.monolith/project.yml`](./workspace.md#filegroups) is required before continuing. +> Knowledge of [`.moon/project.yml`](./workspace.md#filegroups) is required before continuing. As mentioned in the link above, file groups are a mechanism for grouping similar types of files within a project using file glob patterns. By default, this setting _is not required_ for the following reasons: - File groups are an optional feature, and are designed for advanced use cases. -- File groups defined in `.monolith/project.yml` will be inherited by all projects. +- File groups defined in `.moon/project.yml` will be inherited by all projects. The only scenario in which to define file groups at the project-level is when you want to _override_ file groups defined at the workspace-level. @@ -129,12 +129,12 @@ fileGroups: - 'types/**/*' ``` -> File groups defined in `project.yml` will override file groups defined in `.monolith/project.yml` -> by object key, and _will not_ merge the value arrays. +> File groups defined in `project.yml` will override file groups defined in `.moon/project.yml` by +> object key, and _will not_ merge the value arrays. #### tasks -> Knowledge of [`.monolith/project.yml`](./workspace.md#tasks) is required before continuing. +> Knowledge of [`.moon/project.yml`](./workspace.md#tasks) is required before continuing. As mentioned in the link above, [tasks](./task.md) are actions that are ran within the context of a project, and commonly wrap an npm or shell command. By default, this setting _is not required_ as @@ -162,8 +162,8 @@ tasks: ### `package.json` -A Monolith project _does not require_ a `package.json`, but when one exists, the following -functionality is enabled. +A Moon project _does not require_ a `package.json`, but when one exists, the following functionality +is enabled. - Dependency versions are included when computing cache keys. - Depended on projects (`dependsOn`) are mapped as npm/pnpm/yarn workspace dependencies (when @@ -171,7 +171,7 @@ functionality is enabled. ### `tsconfig.json` -A Monolith project _does not require_ TypeScript or a `tsconfig.json`, but when one exists, the +A Moon project _does not require_ TypeScript or a `tsconfig.json`, but when one exists, the following functionality is enabled. - Depended on projects (`dependsOn`) are mapped as TypeScript project references (when applicable). diff --git a/docs/task.md b/docs/task.md index d39dd2600c2..ba6ccf8e288 100644 --- a/docs/task.md +++ b/docs/task.md @@ -5,7 +5,7 @@ Tasks are commands that are ran in the context of a [project](./project.md). Underneath the hood, a task is simply a node module binary or system/shell command that is ran as a child-process. Tasks -communicate between the Monolith client and server through a JSON-like message system. +communicate between the Moon client and server through a JSON-like message system. ## Targets diff --git a/docs/toolchain.md b/docs/toolchain.md index 8126de70c0e..51af57324ff 100644 --- a/docs/toolchain.md +++ b/docs/toolchain.md @@ -22,23 +22,22 @@ necessary tools, _and_ to keep them in sync as time passes. ## How it works -The toolchain is a `.monolith` directory within the current user's home directory, e.g., -`~/.monolith`. +The toolchain is a `.moon` directory within the current user's home directory, e.g., `~/.moon`. -The first step in a tool's life-cycle is being downloaded to `~/.monolith/temp`. Downloads are -typically an archive that can be unpacked into a target directory. +The first step in a tool's life-cycle is being downloaded to `~/.moon/temp`. Downloads are typically +an archive that can be unpacked into a target directory. Once downloaded, we verify the downloaded file by running a sha256 checksum. If this check fails for _any reason_, the toolchain is unusable, and the process is aborted. After a successful verification, the last step in the tool's life-cycle can begin, installation. Depending on the type of download, the installation process may differ. For archives, we unpack the -tool to `~/.monolith/tools//`. +tool to `~/.moon/tools//`. ## Configuration The tools that are managed by the toolchain are configured through the -[`.monolith/workspace.yml`](./workspace.md#workspaceyml) file. +[`.moon/workspace.yml`](./workspace.md#workspaceyml) file. ## Supported tools @@ -49,11 +48,11 @@ The following tools will be managed by the toolchain. ### Node.js -Since Monolith was designed for JavaScript based monorepo's, we intentionally support Node.js as a +Since Moon was designed for JavaScript based monorepo's, we intentionally support Node.js as a first-class citizen within the toolchain. Because of this, Node.js is _always enabled_. - Configured with: `node` -- Installed to: `~/.monolith/tools/node/x.x.x` +- Installed to: `~/.moon/tools/node/x.x.x` ### npm, npx @@ -61,7 +60,7 @@ The `npm` and `npx` binaries come pre-installed with Node.js, and will _always e the `node.packageManager` setting. - Configured with: `node.npm` -- Installed to: `~/.monolith/tools/node/x.x.x/bin/npm` (and `npx`) +- Installed to: `~/.moon/tools/node/x.x.x/bin/npm` (and `npx`) ### pnpm @@ -70,7 +69,7 @@ be enabled when `node.packageManager` is set to "pnpm". The binary will be insta global npm dependency. - Configured with: `node.pnpm` -- Installed to: `~/.monolith/tools/node/x.x.x/bin/pnpm` +- Installed to: `~/.moon/tools/node/x.x.x/bin/pnpm` ### Yarn @@ -79,6 +78,6 @@ will be enabled when `node.packageManager` is set to "yarn". The binary will be toolchain global npm dependency. - Configured with: `node.yarn` -- Installed to: `~/.monolith/tools/node/x.x.x/bin/yarn` +- Installed to: `~/.moon/tools/node/x.x.x/bin/yarn` > Supports v1 and v2/v3 in `node-modules` or `pnp` linker mode. diff --git a/docs/workspace.md b/docs/workspace.md index b4b834a1753..0c0d021d9a8 100644 --- a/docs/workspace.md +++ b/docs/workspace.md @@ -20,20 +20,20 @@ A workspace is a directory that contains [projects](./project.md), manages a [toolchain](./toolchain.md), and is typically coupled with a VCS repository. The root of a workspace -is denoted by a `.monolith` folder and a `package.json`. +is denoted by a `.moon` folder and a `package.json`. -By default Monolith has been designed for monorepos, but can also be used for polyrepos. +By default Moon has been designed for monorepos, but can also be used for polyrepos. ## Configuration -Configurations that apply to the entire workspace are located within a `.monolith` folder at the +Configurations that apply to the entire workspace are located within a `.moon` folder at the workspace root. > This folder _must_ be relative to the root `package.json` and it's associated lock file. ### `workspace.yml` -The `.monolith/workspace.yml` file configures projects and the toolchain. +The `.moon/workspace.yml` file configures projects and the toolchain. #### projects @@ -51,10 +51,10 @@ projects: hooks: 'packages/react-hooks' ``` -Unlike packages in the JavaScript ecosystem, a Monolith project _does not_ require a `package.json`. +Unlike packages in the JavaScript ecosystem, a Moon project _does not_ require a `package.json`. -> **Why doesn't Monolith auto-detect projects?** Monolith _does not_ automatically detect projects -> using file system globs for the following reasons: +> **Why doesn't Moon auto-detect projects?** Moon _does not_ automatically detect projects using +> file system globs for the following reasons: > > - Depth-first scans are expensive, especially when the workspace continues to grow. > - CI and other machines may inadvertently detect more projects because of left over artifacts. @@ -63,7 +63,7 @@ Unlike packages in the JavaScript ecosystem, a Monolith project _does not_ requi #### node The `node` setting defines the Node.js version and package manager to install within the toolchain, -as Monolith _does not_ use a Node.js binary found on the host machine. Managing the Node.js version +as Moon _does not_ use a Node.js binary found on the host machine. Managing the Node.js version within the toolchain ensures a deterministic environment across any machine (whether a developer, CI, or production machine). @@ -111,7 +111,7 @@ node: ### `project.yml` -The `.monolith/project.yml` file configures settings that are inherited by _every_ project in the +The `.moon/project.yml` file configures settings that are inherited by _every_ project in the workspace. Projects can override these settings within their `/project.yml` ([view the projects docs for more information](./project.md#configuration)). @@ -298,5 +298,5 @@ tasks: type: 'shell' ``` -> This param exists because of our [toolchain](./toolchain.md), and Monolith ensuring the correct +> This param exists because of our [toolchain](./toolchain.md), and Moon ensuring the correct > command is ran. diff --git a/package.json b/package.json index a354db4de30..7edb43cdbb0 100644 --- a/package.json +++ b/package.json @@ -1,3 +1,3 @@ { - "name": "monolith" + "name": "moon" } diff --git a/tests/fixtures/base/.monolith/project.yml b/tests/fixtures/base/.moon/project.yml similarity index 100% rename from tests/fixtures/base/.monolith/project.yml rename to tests/fixtures/base/.moon/project.yml diff --git a/tests/fixtures/base/.monolith/workspace.yml b/tests/fixtures/base/.moon/workspace.yml similarity index 100% rename from tests/fixtures/base/.monolith/workspace.yml rename to tests/fixtures/base/.moon/workspace.yml diff --git a/tests/fixtures/projects/.monolith/project.yml b/tests/fixtures/projects/.moon/project.yml similarity index 100% rename from tests/fixtures/projects/.monolith/project.yml rename to tests/fixtures/projects/.moon/project.yml diff --git a/tests/fixtures/projects/.monolith/workspace.yml b/tests/fixtures/projects/.moon/workspace.yml similarity index 100% rename from tests/fixtures/projects/.monolith/workspace.yml rename to tests/fixtures/projects/.moon/workspace.yml diff --git a/tests/fixtures/tasks/.monolith/project.yml b/tests/fixtures/tasks/.moon/project.yml similarity index 100% rename from tests/fixtures/tasks/.monolith/project.yml rename to tests/fixtures/tasks/.moon/project.yml diff --git a/tests/fixtures/tasks/.monolith/workspace.yml b/tests/fixtures/tasks/.moon/workspace.yml similarity index 100% rename from tests/fixtures/tasks/.monolith/workspace.yml rename to tests/fixtures/tasks/.moon/workspace.yml