Skip to content

Commit

Permalink
fix: download link (#320)
Browse files Browse the repository at this point in the history
  • Loading branch information
callicles authored Feb 2, 2024
1 parent ea168d0 commit d3ab5aa
Show file tree
Hide file tree
Showing 30 changed files with 341 additions and 301 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,6 @@ Cargo.lock
# MSVC Windows builds of rustc generate these, which store debugging information
*.pdb

.igloo/
.moose/

console.db
16 changes: 8 additions & 8 deletions CONTRIBUTING
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

You can help the project several ways

- Give us feedback on your experience with the ecosystem through [Discord](https://discord.gg/WX3V3K4QCc) or [Github Discussions](https://github.com/514-labs/igloo-stack/discussions)
- Report bugs through [Github Issues](https://github.com/514-labs/igloo-stack/issues)
- Give us feedback on your experience with the ecosystem through [Discord](https://discord.gg/WX3V3K4QCc) or [Github Discussions](https://github.com/514-labs/moose/discussions)
- Report bugs through [Github Issues](https://github.com/514-labs/moose/issues)
- Propose changes by [opening an RFD](./rfd/0001/README.mdx)
- Give you perspective on an existing opened RFD
- Contribute to the documentation
Expand Down Expand Up @@ -36,15 +36,15 @@ turbo build

We use [semantic versioning](https://semver.org/) to denote versions of the different components of the system.

We have automation that helps keep a really high cadence as we develop the initial version of the framework and ecosystem.
We have automation that helps keep a really high cadence as we develop the initial version of the framework and ecosystem.

> We might change how we release later in the lifecycle of the project.

Currently we release every time code that changes the framework or the CLI is merged to the `main` branch. We are [releasing from the trunk](https://trunkbaseddevelopment.com/release-from-trunk/).

* By Default, every commit on `main` will increase the patch version. ie in `x.y.(z+1)`
* if the commit message contains `[minor-version]`, the bot will pick up on it and will set the version of the released packages as `x.(y + 1).0`
* if the commit message contains `[major-version]`, the bot will pick up on it and will set the version of the released packages as `(x+1).0.0`
* if the commit message contains `[no-release]` in the commit message. We do not release anything.
- By Default, every commit on `main` will increase the patch version. ie in `x.y.(z+1)`
- if the commit message contains `[minor-version]`, the bot will pick up on it and will set the version of the released packages as `x.(y + 1).0`
- if the commit message contains `[major-version]`, the bot will pick up on it and will set the version of the released packages as `(x+1).0.0`
- if the commit message contains `[no-release]` in the commit message. We do not release anything.

We ensure that we don't have conflicts as branches get merged in main by leveraging git linear history as well as the [`concurrency`](https://docs.github.com/en/actions/using-jobs/using-concurrency) github actions concept to enforce order.
We ensure that we don't have conflicts as branches get merged in main by leveraging git linear history as well as the [`concurrency`](https://docs.github.com/en/actions/using-jobs/using-concurrency) github actions concept to enforce order.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ $ npm install -g @514labs/moose-cli

## Config file

The config file is located in `~/.igloo/config.toml`
The config file is located in `~/.moose/config.toml`

You can create one with the following content

Expand Down
2 changes: 1 addition & 1 deletion apps/framework-cli/.gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
scripts/igloo**
scripts/moose**

!Cargo.lock

Expand Down
4 changes: 2 additions & 2 deletions apps/framework-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
name = "moose-cli"
version = "0.0.1"
edition = "2021"
description = "Build tool for igloo apps"
license = "Apache-2.0"
description = "Build tool for moose apps"
license = "MIT"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
3 changes: 1 addition & 2 deletions apps/framework-cli/deploy/Dockerfile.fullstack
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,7 @@ VOLUME /var/lib/clickhouse

ARG FRAMEWORK_VERSION="0.0.0"

# TODO when we rename to igloo to moose, we will need to update this download link as well
RUN curl -Lo /usr/local/bin/moose https://github.com/514-labs/moose/releases/download/v${FRAMEWORK_VERSION}/igloo-cli-x86_64-unknown-linux-gnu
RUN curl -Lo /usr/local/bin/moose https://github.com/514-labs/moose/releases/download/v${FRAMEWORK_VERSION}/moose-cli-x86_64-unknown-linux-gnu
RUN chmod +x /usr/local/bin/moose

# Run it all
Expand Down
6 changes: 3 additions & 3 deletions apps/framework-cli/src/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ async fn top_command_handler(settings: Settings, commands: &Commands) {
info!("Running dev command");

let project = Project::load_from_current_dir()
.expect("No project found, please run `igloo init` to create a project");
.expect("No project found, please run `moose init` to create a project");

let mut controller = RoutineController::new();
let run_mode = RunMode::Explicit {};
Expand All @@ -131,7 +131,7 @@ async fn top_command_handler(settings: Settings, commands: &Commands) {
Commands::Clean {} => {
let run_mode = RunMode::Explicit {};
let project = Project::load_from_current_dir()
.expect("No project found, please run `igloo init` to create a project");
.expect("No project found, please run `moose init` to create a project");

let mut controller = RoutineController::new();
controller.add_routine(Box::new(CleanProject::new(project, run_mode)));
Expand All @@ -147,7 +147,7 @@ async fn top_command_handler(settings: Settings, commands: &Commands) {
}

pub async fn cli_run() {
setup_user_directory().expect("Failed to setup igloo user directory");
setup_user_directory().expect("Failed to setup moose user directory");
init_config_file().unwrap();

let config = read_settings().unwrap();
Expand Down
8 changes: 4 additions & 4 deletions apps/framework-cli/src/cli/display.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ use std::sync::{Arc, RwLock};
/// MessageType::Info,
/// Message {
/// action: "Loading Config".to_string(),
/// details: "Reading configuration from ~/.igloo/config.toml".to_string(),
/// details: "Reading configuration from ~/.moose/config.toml".to_string(),
/// });
/// ```
///
Expand All @@ -32,7 +32,7 @@ use std::sync::{Arc, RwLock};
/// ```
/// Message {
/// action: "Loading Config".to_string(),
/// details: "Reading configuration from ~/.igloo/config.toml".to_string(),
/// details: "Reading configuration from ~/.moose/config.toml".to_string(),
/// }
/// ```
///
Expand Down Expand Up @@ -74,12 +74,12 @@ pub fn styled_banner() -> String {
We're simplifying how engineers build, deploy and maintain data-intensive applications
with the first full-stack data-intensive framework.
Join our community to keep up with our progress, contribute to igloo or join our team:
Join our community to keep up with our progress, contribute to moose or join our team:
{}
---------------------------------------------------------------------------------------
"#,
style("# Igloo is coming soon").bold(),
style("# Moose is coming soon").bold(),
style("https://join.slack.com/t/igloocommunity/shared_invite/zt-25gsnx2x2-9ttVTt4L9LYFrRcM6jimcg").color256(118).bold()
)
}
Expand Down
4 changes: 2 additions & 2 deletions apps/framework-cli/src/cli/routines.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
//!
//! ## Example
//! ```
//! use igloo::cli::routines::{Routine, RoutineSuccess, RoutineFailure, RunMode};
//! use igloo::cli::display::{Message, MessageType};
//! use crate::cli::routines::{Routine, RoutineSuccess, RoutineFailure, RunMode};
//! use crate::cli::display::{Message, MessageType};
//!
//! struct HelloWorldRoutine {}
//! impl HelloWorldRoutine {
Expand Down
24 changes: 12 additions & 12 deletions apps/framework-cli/src/cli/routines/clean.rs
Original file line number Diff line number Diff line change
Expand Up @@ -73,17 +73,17 @@ impl Routine for RemoveDockerNetwork {
}

struct DeleteRedpandaMountVolume {
igloo_dir: PathBuf,
internal_dir: PathBuf,
}
impl DeleteRedpandaMountVolume {
fn new(igloo_dir: PathBuf) -> Self {
Self { igloo_dir }
fn new(internal_dir: PathBuf) -> Self {
Self { internal_dir }
}
}

impl Routine for DeleteRedpandaMountVolume {
fn run_silent(&self) -> Result<RoutineSuccess, RoutineFailure> {
let mount_dir = self.igloo_dir.join(".panda_house");
let mount_dir = self.internal_dir.join(".panda_house");
fs::remove_dir_all(&mount_dir).map_err(|err| {
RoutineFailure::new(
Message::new(
Expand All @@ -105,16 +105,16 @@ impl Routine for DeleteRedpandaMountVolume {
}

struct DeleteClickhouseMountVolume {
igloo_dir: PathBuf,
internal_dir: PathBuf,
}
impl DeleteClickhouseMountVolume {
fn new(igloo_dir: PathBuf) -> Self {
Self { igloo_dir }
fn new(internal_dir: PathBuf) -> Self {
Self { internal_dir }
}
}
impl Routine for DeleteClickhouseMountVolume {
fn run_silent(&self) -> Result<RoutineSuccess, RoutineFailure> {
let mount_dir = self.igloo_dir.join(".clickhouse");
let mount_dir = self.internal_dir.join(".clickhouse");
fs::remove_dir_all(&mount_dir).map_err(|err| {
RoutineFailure::new(
Message::new(
Expand All @@ -136,18 +136,18 @@ impl Routine for DeleteClickhouseMountVolume {
}

struct DeleteModelVolume {
igloo_dir: PathBuf,
internal_dir: PathBuf,
}

impl DeleteModelVolume {
fn new(igloo_dir: PathBuf) -> Self {
Self { igloo_dir }
fn new(internal_dir: PathBuf) -> Self {
Self { internal_dir }
}
}

impl Routine for DeleteModelVolume {
fn run_silent(&self) -> Result<RoutineSuccess, RoutineFailure> {
let mount_dir = self.igloo_dir.join("models");
let mount_dir = self.internal_dir.join("models");
fs::remove_dir_all(&mount_dir).map_err(|err| {
RoutineFailure::new(
Message::new(
Expand Down
58 changes: 29 additions & 29 deletions apps/framework-cli/src/cli/routines/initialize.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ impl Routine for InitializeProject {
fn run_silent(&self) -> Result<RoutineSuccess, RoutineFailure> {
let run_mode: RunMode = self.run_mode;

CreateIglooTempDirectoryTree::new(run_mode, self.project.clone()).run(run_mode)?;
CreateInternalTempDirectoryTree::new(run_mode, self.project.clone()).run(run_mode)?;

self.project.setup_app_dir().map_err(|err| {
RoutineFailure::new(
Expand All @@ -44,31 +44,31 @@ impl Routine for InitializeProject {

Ok(RoutineSuccess::success(Message::new(
"Created".to_string(),
"Igloo directory with Red Panda and Clickhouse mount volumes".to_string(),
"Moose directory with Red Panda and Clickhouse mount volumes".to_string(),
)))
}
}

pub struct CreateVolumes {
igloo_dir: PathBuf,
internal_dir: PathBuf,
run_mode: RunMode,
}

impl CreateVolumes {
fn new(igloo_dir: PathBuf, run_mode: RunMode) -> Self {
fn new(internal_dir: PathBuf, run_mode: RunMode) -> Self {
Self {
igloo_dir,
internal_dir,
run_mode,
}
}
}

impl Routine for CreateVolumes {
fn run_silent(&self) -> Result<RoutineSuccess, RoutineFailure> {
let igloo_dir = self.igloo_dir.clone();
let internal_dir = self.internal_dir.clone();
let run_mode = self.run_mode;
CreateRedPandaMountVolume::new(igloo_dir.clone()).run(run_mode)?;
CreateClickhouseMountVolume::new(igloo_dir.clone()).run(run_mode)?;
CreateRedPandaMountVolume::new(internal_dir.clone()).run(run_mode)?;
CreateClickhouseMountVolume::new(internal_dir.clone()).run(run_mode)?;

Ok(RoutineSuccess::success(Message::new(
"Created".to_string(),
Expand All @@ -78,17 +78,17 @@ impl Routine for CreateVolumes {
}

pub struct ValidateMountVolumes {
igloo_dir: PathBuf,
internal_dir: PathBuf,
}
impl ValidateMountVolumes {
pub fn new(igloo_dir: PathBuf) -> Self {
Self { igloo_dir }
pub fn new(internal_dir: PathBuf) -> Self {
Self { internal_dir }
}
}
impl Routine for ValidateMountVolumes {
fn run_silent(&self) -> Result<RoutineSuccess, RoutineFailure> {
let panda_house = self.igloo_dir.join(".panda_house").exists();
let clickhouse = self.igloo_dir.join(".clickhouse").exists();
let panda_house = self.internal_dir.join(".panda_house").exists();
let clickhouse = self.internal_dir.join(".clickhouse").exists();

if panda_house && clickhouse {
Ok(RoutineSuccess::success(Message::new(
Expand All @@ -105,22 +105,22 @@ impl Routine for ValidateMountVolumes {
}
}

pub struct CreateIglooTempDirectoryTree {
pub struct CreateInternalTempDirectoryTree {
run_mode: RunMode,
project: Project,
}
impl CreateIglooTempDirectoryTree {
impl CreateInternalTempDirectoryTree {
pub fn new(run_mode: RunMode, project: Project) -> Self {
Self { run_mode, project }
}
}
impl Routine for CreateIglooTempDirectoryTree {
impl Routine for CreateInternalTempDirectoryTree {
fn run_silent(&self) -> Result<RoutineSuccess, RoutineFailure> {
let internal_dir = self.project.internal_dir().map_err(|err| {
RoutineFailure::new(
Message::new(
"Failed".to_string(),
"to create .igloo directory. Check permissions or contact us`".to_string(),
"to create .moose directory. Check permissions or contact us`".to_string(),
),
err,
)
Expand All @@ -132,7 +132,7 @@ impl Routine for CreateIglooTempDirectoryTree {

Ok(RoutineSuccess::success(Message::new(
"Created".to_string(),
"Igloo directory with Red Panda and Clickhouse mount volumes".to_string(),
"Moose directory with Red Panda and Clickhouse mount volumes".to_string(),
)))
}
}
Expand All @@ -149,18 +149,18 @@ impl CreateTempDataVolumes {
}
impl Routine for CreateTempDataVolumes {
fn run_silent(&self) -> Result<RoutineSuccess, RoutineFailure> {
let igloo_dir = self.project.internal_dir().map_err(|err| {
let internal_dir = self.project.internal_dir().map_err(|err| {
RoutineFailure::new(
Message::new(
"Failed".to_string(),
"to create .igloo directory. Check permissions or contact us`".to_string(),
"to create .moose directory. Check permissions or contact us`".to_string(),
),
err,
)
})?;

let run_mode = self.run_mode;
CreateVolumes::new(igloo_dir, run_mode).run(run_mode)?;
CreateVolumes::new(internal_dir, run_mode).run(run_mode)?;
Ok(RoutineSuccess::success(Message::new(
"Created".to_string(),
"Red Panda and Clickhouse mount volumes".to_string(),
Expand All @@ -169,18 +169,18 @@ impl Routine for CreateTempDataVolumes {
}

pub struct CreateRedPandaMountVolume {
igloo_dir: PathBuf,
internal_dir: PathBuf,
}

impl CreateRedPandaMountVolume {
fn new(igloo_dir: PathBuf) -> Self {
Self { igloo_dir }
fn new(internal_dir: PathBuf) -> Self {
Self { internal_dir }
}
}

impl Routine for CreateRedPandaMountVolume {
fn run_silent(&self) -> Result<RoutineSuccess, RoutineFailure> {
let mount_dir = self.igloo_dir.join(".panda_house");
let mount_dir = self.internal_dir.join(".panda_house");
match fs::create_dir_all(mount_dir.clone()) {
Ok(_) => Ok(RoutineSuccess::success(Message::new(
"Created".to_string(),
Expand All @@ -201,18 +201,18 @@ impl Routine for CreateRedPandaMountVolume {
}

pub struct CreateClickhouseMountVolume {
igloo_dir: PathBuf,
internal_dir: PathBuf,
}

impl CreateClickhouseMountVolume {
fn new(igloo_dir: PathBuf) -> Self {
Self { igloo_dir }
fn new(internal_dir: PathBuf) -> Self {
Self { internal_dir }
}
}

impl Routine for CreateClickhouseMountVolume {
fn run_silent(&self) -> Result<RoutineSuccess, RoutineFailure> {
let mount_dir = self.igloo_dir.join(".clickhouse");
let mount_dir = self.internal_dir.join(".clickhouse");

// fs::create_dir_all(&server_config_path)?;
fs::create_dir_all(&mount_dir).map_err(|err| {
Expand Down
Loading

0 comments on commit d3ab5aa

Please sign in to comment.