Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #4

Merged
merged 5 commits into from
Nov 26, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,14 @@ updates:
directory: /acme
schedule:
interval: daily
- package-ecosystem: cargo
directory: /clusters
schedule:
interval: daily
- package-ecosystem: cargo
directory: /conduits
schedule:
interval: daily
- package-ecosystem: cargo
directory: /minis
schedule:
Expand Down
4 changes: 2 additions & 2 deletions .gitpod.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
tasks:
- init: sh scripts/setup.sh
command: cargo watch -x test -q
- init: rustup default nightly && rustup target add wasm32-unknown-unknown wasm32-wasi --toolchain nightly && rustup component add clippy rustfmt --toolchain nightly
command: cargo build --workspace --target wasm32-unknown-unknown
1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ default-members = [

members = [
"acme",
"clusters",
"minis"
]

Expand Down
39 changes: 28 additions & 11 deletions acme/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,33 +1,50 @@
[package]
authors = ["FL03 <jo3mccain@icloud.com> (https://gitlab.com)"]
authors = ["FL03 <jo3mccain@icloud.com> (https://github.com)"]
categories = []
description = "A client library for the Scattered Systems Ecosystem"
description = "Acme is a complete networking toolkit for wasm enabling dvelopers to quickly build powerful p2p applications"
edition = "2021"
homepage = "https://gitlab.com/scsys/lib/crates/acme/-/wikis/home"
homepage = "https://github.com/scattered-systems/acme/wikis"
keywords = ["async", "scsys"]
license = "MIT"
name = "acme"
publish = true
readme = "README.md"
repository = "https://gitlab.com/scsys/lib/crates/acme"
repository = "https://github.com/scattered-systems/acme"
version = "0.2.2" # TODO - Update cargo package version

[lib]
crate-type = ["cdylib", "rlib"]
test = true

[features]
default = ["core"]
full = ["core"]
default = ["core", "wasm"]
full = ["core", "extras", "wasm"]

core = ["minis"]
core = [
"clusters",
"conduits",
"minis"
]
extras = []

clusters = ["acme-clusters"]
conduits = ["acme-conduits"]
minis = ["acme-minis"]

wasm = [
"wasm-ext"
]
wasm-ext = []

[build-dependencies]

[dependencies]
acme-conduits = { optional = true, path = "../conduits", version = "0.2.2" }
acme-clusters = { optional = true, path = "../clusters", version = "0.2.2" }
acme-minis = { optional = true, path = "../minis", version = "0.2.2" }

[package.metadata.docs.rs]
all-features = true
rustc-args = ["--cfg", "docsrs"]

[dependencies.acme-minis]
optional = true
path = "../minis"
version = "0.2.2"
[target.wasm32-unknown-unknown]
5 changes: 2 additions & 3 deletions acme/src/core/primitives.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
/*
Appellation: primitives <module>
Contributors: FL03 <jo3mccain@icloud.com> (https://gitlab.com/FL03)
Description:
... Summary ...
Contrib: FL03 <jo3mccain@icloud.com>
Description: ... Summary ...
*/
pub use self::{constants::*, types::*, variants::*};

Expand Down
2 changes: 1 addition & 1 deletion acme/src/core/utils/mod.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Appellation: core <module>
Appellation: utils <module>
Contrib: FL03 <jo3mccain@icloud.com>
Description: ... Summary ...
*/
10 changes: 7 additions & 3 deletions acme/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
/*
Appellation: acme <module>
Contributors: FL03 <jo3mccain@icloud.com> (https://gitlab.com/FL03)
Contrib: FL03 <jo3mccain@icloud.com>
Description:
Acme is designed to simplify the creation of agile web applications written in Rust
Acme was built to facilitate the creation of secure peer-to-peer applications written natively in WebAssembley

*/
#[doc(inline)]
pub use self::core::*;

pub(crate) mod core;

#[cfg(feature = "clusters")]
pub use acme_clusters as clusters;
#[cfg(feature = "conduits")]
pub use acme_conduits as conduits;
#[cfg(feature = "minis")]
pub use acme_minis as minis;

Expand Down
41 changes: 41 additions & 0 deletions clusters/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
[package]
authors = ["FL03 <jo3mccain@icloud.com> (https://github.com)"]
categories = []
description = "acme-clusters"
edition = "2021"
homepage = "https://github.com/scattered-systems/acme/wiki/"
keywords = ["async", "scsys"]
license = "MIT"
name = "acme-clusters"
publish = true
readme = "README.md"
repository = "https://github.com/scattered-systems/acme"
version = "0.2.2" # TODO - Update cargo package version

[features]
default = ["core", "extras", "wasm"]
full = ["core", "extras", "wasm"]

core = []
extras = []
wasm = ["wasm-ext"]
wasm-ext = []

[lib]
crate-type = ["cdylib", "rlib"]
test = true

[build-dependencies]

[dependencies]
mio = "0.8.4"
scsys = { features = ["wasm"], git = "https://github.com/scattered-systems/scsys", version = "0.1.28" }
serde = { features = ["derive"], version = "1.0.147" }
serde_json = "1.0.87"
strum = { features = ["derive"], version = "0.24.1" }
tokio = { features = ["macros"], version = "1.21.2" }

[dev-dependencies]
acme = { path = "../acme" }

[target.wasm32-unknown-unknown]
2 changes: 2 additions & 0 deletions clusters/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# acme-clusters

5 changes: 5 additions & 0 deletions clusters/src/lib.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
/*
Appellation: acme-clusters <library>
Contrib: FL03 <jo3mccain@icloud.com>
Description: ... Summary ...
*/
11 changes: 11 additions & 0 deletions clusters/tests/default.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#[cfg(test)]
mod tests {


#[test]
fn lib_compiles() {
let f = | i: usize, j: usize | i * j;

assert_eq!(f(10, 2), 20);
}
}
41 changes: 41 additions & 0 deletions conduits/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
[package]
authors = ["FL03 <jo3mccain@icloud.com> (https://github.com)"]
categories = []
description = "acme-conduits"
edition = "2021"
homepage = "https://github.com/scattered-systems/acme/wiki/"
keywords = ["async", "scsys"]
license = "MIT"
name = "acme-conduits"
publish = true
readme = "README.md"
repository = "https://github.com/scattered-systems/acme"
version = "0.2.2" # TODO - Update cargo package version

[features]
default = ["core", "extras", "wasm"]
full = ["core", "extras", "wasm"]

core = []
extras = []
wasm = ["wasm-ext"]
wasm-ext = []

[lib]
crate-type = ["cdylib", "rlib"]
test = true

[build-dependencies]

[dependencies]
mio = "0.8.4"
scsys = { features = ["wasm"], git = "https://github.com/scattered-systems/scsys", version = "0.1.28" }
serde = { features = ["derive"], version = "1.0.147" }
serde_json = "1.0.87"
strum = { features = ["derive"], version = "0.24.1" }
tokio = { features = ["macros"], version = "1.21.2" }

[dev-dependencies]
acme = { path = "../acme" }

[target.wasm32-unknown-unknown]
2 changes: 2 additions & 0 deletions conduits/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# acme-conduits

5 changes: 5 additions & 0 deletions conduits/src/lib.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
/*
Appellation: acme-clusters <library>
Contrib: FL03 <jo3mccain@icloud.com>
Description: ... Summary ...
*/
11 changes: 11 additions & 0 deletions conduits/tests/default.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#[cfg(test)]
mod tests {


#[test]
fn lib_compiles() {
let f = | i: usize, j: usize | i * j;

assert_eq!(f(10, 2), 20);
}
}
27 changes: 20 additions & 7 deletions minis/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,28 +1,41 @@
[package]
authors = ["FL03 <jo3mccain@icloud.com> (https://gitlab.com)"]
authors = ["FL03 <jo3mccain@icloud.com> (https://github.com)"]
categories = []
description = "A client library for the Scattered Systems Ecosystem"
description = "acme-minis"
edition = "2021"
homepage = "https://gitlab.com/scsys/lib/crates/acme/-/wiki/"
homepage = "https://github.com/scattered-systems/acme/wiki/"
keywords = ["async", "scsys"]
license = "MIT"
name = "acme-minis"
publish = true
readme = "README.md"
repository = "https://gitlab.com/scsys/lib/crates/acme"
repository = "https://github.com/scattered-systems/acme"
version = "0.2.2" # TODO - Update cargo package version

[features]
default = ["core", "extras", "wasm"]
full = ["core", "extras", "wasm"]

core = []
extras = []
wasm = ["wasm-ext"]
wasm-ext = []

[lib]
crate-type = ["cdylib", "rlib"]
test = true


[build-dependencies]

[dependencies]
mio = "0.8.4"
scsys = { features = ["full"], version = "0.1.23" }
scsys = { features = ["wasm"], git = "https://github.com/scattered-systems/scsys", version = "0.1.28" }
serde = { features = ["derive"], version = "1.0.147" }
serde_json = "1.0.87"
strum = { features = ["derive"], version = "0.24.1" }
tokio = { features = ["macros", "rt-multi-thread"], version = "1.21.2" }
tokio = { features = ["macros"], version = "1.21.2" }

[dev-dependencies]
acme = { path = "../acme" }

[target.wasm32-unknown-unknown]