Merge pull request #1 from pkgxdev/move-lib-in

combine cli and lib using workspace
pkgxdev · Nov 26, 2024 · 3be5874 · 3be5874
2 parents 35251bb + 1404b99
commit 3be5874
Show file tree

Hide file tree

Showing 26 changed files with 1,484 additions and 45 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -21,7 +21,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: nightly
+          toolchain: 1.81.0
           override: true
       - uses: actions-rs/cargo@v1
         with:
@@ -37,7 +37,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: nightly
+          toolchain: 1.81.0
           override: true
       - run: rustup component add rustfmt
       - uses: actions-rs/cargo@v1
@@ -52,7 +52,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly
+          toolchain: 1.81.0
           components: clippy
           override: true
       - uses: actions-rs/cargo@v1
@@ -75,15 +75,15 @@ jobs:
     env:
       PROJECT_NAME_UNDERSCORE: bpb_pkgx
       CARGO_INCREMENTAL: 0
-      RUSTFLAGS: -Ccodegen-units=1 -Copt-level=0 -Clink-dead-code -Coverflow-checks=off -Zpanic_abort_tests -Cpanic=abort -D warnings
+      RUSTFLAGS: -Ccodegen-units=1 -Copt-level=0 -Clink-dead-code -Coverflow-checks=off -D warnings
       RUSTDOCFLAGS: -Cpanic=abort
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v4
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: nightly
+          toolchain: 1.81.0
           override: true
       - name: Cache dependencies
         uses: actions/cache@v2
@@ -111,7 +111,7 @@ jobs:
   #     - uses: actions-rs/toolchain@v1
   #       with:
   #         profile: minimal
-  #         toolchain: nightly
+  #         toolchain: 1.81.0
   #         override: true
   #     - name: Generate test result and coverage report
   #       run: |

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,28 +1,4 @@
-[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"]
+resolver = "2"
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"