combine cli and lib using workspace

pkgxdev · Nov 26, 2024 · 58031a9 · 58031a9
1 parent 90ebbc3
commit 58031a9
Show file tree

Hide file tree

Showing 25 changed files with 1,477 additions and 39 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,28 +1,3 @@
-[package]
-name = "bpb_pkgx"
-description = "boats's personal barricade - pkgx updates"
-license = "MIT OR Apache-2.0"
-version = "1.1.1"
-repository = "https://github.com/pkgxdev/bpb-pkgx"
-edition = "2021"
-authors = ["Without Boats <[email protected]>", "Jacob Heider <[email protected]>"]
-
-[dependencies]
-toml = "0.4.6"
-rand = { version = "0.8.5", features = ["std"] }
-sha2 = "0.7.1"
-serde_derive = "1.0.215"
-serde = "1.0.215"
-hex = "0.3.2"
-failure = "0.1.1"
-
-[dependencies.pbp_pkgx]
-version = "0.4.1"
-git = "https://github.com/pkgxdev//pbp-pkgx.git"
-rev = "5aa86ffeb794a8c120b33b85f8ae463b7cc05f3d"
-features = ["dalek"]
-
-[dependencies.ed25519-dalek]
-# [dependencies.ed25519]
-# package = "ed25519-dalek"
-version = "2.1.1"
+[workspace]
+members = ["bpb-pkgx-cli", "pbp-pkgx-lib"]
+default-members = ["bpb-pkgx-cli"]
diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@ do.
 ```sh
 git clone https://github.com/pkgxdev/bpb-pkgx
 cd bpb-pkgx
-cargo install --path .
+cargo install --path bpb-pkgx-cli
 ```
 
 ## How to Set Up

diff --git a/bpb-pkgx-cli/Cargo.toml b/bpb-pkgx-cli/Cargo.toml
@@ -0,0 +1,26 @@
+[package]
+name = "bpb_pkgx"
+description = "boats's personal barricade - pkgx updates"
+license = "MIT OR Apache-2.0"
+version = "1.1.1"
+repository = "https://github.com/pkgxdev/bpb-pkgx"
+edition = "2021"
+authors = ["Without Boats <[email protected]>", "Jacob Heider <[email protected]>"]
+
+[dependencies]
+toml = "0.4.6"
+rand = { version = "0.8.5", features = ["std"] }
+sha2 = "0.7.1"
+serde_derive = "1.0.215"
+serde = "1.0.215"
+hex = "0.3.2"
+failure = "0.1.1"
+
+[dependencies.pbp_pkgx]
+path = "../pbp-pkgx-lib"
+features = ["dalek"]
+
+[dependencies.ed25519-dalek]
+# [dependencies.ed25519]
+# package = "ed25519-dalek"
+version = "2.1.1"
diff --git a/src/config.rs → bpb-pkgx-cli/src/config.rs b/src/config.rs → bpb-pkgx-cli/src/config.rs
diff --git a/src/key_data.rs → bpb-pkgx-cli/src/key_data.rs b/src/key_data.rs → bpb-pkgx-cli/src/key_data.rs
diff --git a/src/keychain.rs → bpb-pkgx-cli/src/keychain.rs b/src/keychain.rs → bpb-pkgx-cli/src/keychain.rs
diff --git a/src/main.rs → bpb-pkgx-cli/src/main.rs b/src/main.rs → bpb-pkgx-cli/src/main.rs
diff --git a/src/tests.rs → bpb-pkgx-cli/src/tests.rs b/src/tests.rs → bpb-pkgx-cli/src/tests.rs
diff --git a/pbp-pkgx-lib/Cargo.toml b/pbp-pkgx-lib/Cargo.toml
@@ -0,0 +1,29 @@
+[package]
+authors = ["Without Boats <[email protected]>", "Jacob Heider <[email protected]>"]
+description = "bridge non-PGP system to PGP data format - pkgx updates"
+edition = "2021"
+license = "MIT OR Apache-2.0"
+readme = "README.md"
+name = "pbp_pkgx"
+version = "0.4.1"
+repository = "https://github.com/pkgxdev/bpb-pkgx"
+
+[dependencies]
+base64 = "0.9.2"
+byteorder = "1.1.0"
+digest = "0.7.0"
+sha1 = "0.2.0"
+typenum = "1.9.0"
+failure = "0.1.1"
+bitflags = "1.3.2"
+
+[dependencies.ed25519-dalek]
+version = "2.1.1"
+optional = true
+
+[features]
+dalek = ["ed25519-dalek"]
+
+[dev-dependencies]
+rand = "0.7.3"
+sha2 = "0.7.1"