From 9f306efed597765b70da704e1739ecc67f2510e0 Mon Sep 17 00:00:00 2001 From: Michael Dougherty Date: Fri, 20 Sep 2024 13:50:33 -0700 Subject: [PATCH] Bump 0.5.2 --- CHANGELOG.md | 4 ++++ Cargo.lock | 6 +++--- Cargo.toml | 16 +++++++------- README.md | 10 ++++----- crates/hc_seed_bundle/Cargo.toml | 13 ++++++------ crates/lair_keystore/Cargo.toml | 21 ++++++++++--------- crates/lair_keystore/README.md | 10 ++++----- crates/lair_keystore/src/docs/help.md | 2 +- .../src/docs/import-seed-help.md | 2 +- crates/lair_keystore/src/docs/init-help.md | 2 +- crates/lair_keystore/src/docs/server-help.md | 2 +- crates/lair_keystore/src/docs/url-help.md | 2 +- crates/lair_keystore_api/Cargo.toml | 11 +++++----- 13 files changed, 52 insertions(+), 49 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ed8c160..e92d1b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.5.2 + +- enables some basic tracing [#135](https://github.com/holochain/lair/pull/135) + ## 0.5.1 - fix to build.rs to not check sql formatting unless environment variable CHK_SQL_FMT=1 diff --git a/Cargo.lock b/Cargo.lock index bf1854c..22a0d46 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -634,7 +634,7 @@ dependencies = [ [[package]] name = "hc_seed_bundle" -version = "0.2.4" +version = "0.2.5" dependencies = [ "base64 0.22.1", "futures", @@ -739,7 +739,7 @@ dependencies = [ [[package]] name = "lair_keystore" -version = "0.5.1" +version = "0.5.2" dependencies = [ "criterion", "lair_keystore_api", @@ -755,7 +755,7 @@ dependencies = [ [[package]] name = "lair_keystore_api" -version = "0.5.1" +version = "0.5.2" dependencies = [ "assert_cmd", "base64 0.22.1", diff --git a/Cargo.toml b/Cargo.toml index 1af36b6..e6d66da 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,21 +14,21 @@ dunce = "1.0.4" futures = "0.3.28" # this doesn't strictly need to be pinned, but it supports the # determinism of the strict client/server version checks -hc_seed_bundle = { version = "=0.2.4", path = "./crates/hc_seed_bundle" } +hc_seed_bundle = { version = "=0.2.5", path = "./crates/hc_seed_bundle" } # lair_keystore_api must be pinned to enable strict version checks -lair_keystore_api = { version = "=0.5.1", path = "./crates/lair_keystore_api" } +lair_keystore_api = { version = "=0.5.2", path = "./crates/lair_keystore_api" } lru = "0.12.3" nanoid = "0.4.0" one_err = "0.0.8" once_cell = "1.17.1" parking_lot = "0.12.1" pretty_assertions = "1.3.0" -rcgen = { version = "0.10.0", features = [ "zeroize" ] } +rcgen = { version = "0.10.0", features = ["zeroize"] } rmp-serde = "1.3.0" -rmpv = { version = "1.3.0", features = [ "with-serde" ] } +rmpv = { version = "1.3.0", features = ["with-serde"] } rpassword = "7.2.0" -rusqlite = { version = "0.32.1", features = [ "modern_sqlite" ] } -serde = { version = "1", features = [ "derive", "rc" ] } +rusqlite = { version = "0.32.1", features = ["modern_sqlite"] } +serde = { version = "1", features = ["derive", "rc"] } serde_bytes = "0.11.9" serde_json = "1" serde_yaml = "0.9.21" @@ -41,8 +41,8 @@ time = "0.3.36" tokio = { version = "1.35.1" } toml = "0.8.14" tracing = "0.1.37" -tracing-subscriber = { version = "0.3.17", features = [ "env-filter" ] } -url = { version = "2.3.1", features = [ "serde" ] } +tracing-subscriber = { version = "0.3.17", features = ["env-filter"] } +url = { version = "2.3.1", features = ["serde"] } winapi = { version = "0.3.9", features = ["winerror"] } zeroize = "1.6.0" diff --git a/README.md b/README.md index 5b2f6aa..2dd7553 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ License: MIT OR Apache-2.0 ### `lair-keystore --help` ```text -lair_keystore 0.5.1 +lair_keystore 0.5.2 secret lair private keystore USAGE: @@ -73,7 +73,7 @@ SUBCOMMANDS: ``` ### `lair-keystore init --help` ```text -lair-keystore-init 0.5.1 +lair-keystore-init 0.5.2 Set up a new lair private keystore. USAGE: @@ -91,7 +91,7 @@ FLAGS: ``` ### `lair-keystore url --help` ```text -lair-keystore-url 0.5.1 +lair-keystore-url 0.5.2 Print the connection_url for a configured lair-keystore server to stdout and exit. @@ -105,7 +105,7 @@ FLAGS: ``` ### `lair-keystore import-seed --help` ```text -lair-keystore-import-seed 0.5.1 +lair-keystore-import-seed 0.5.2 Load a seed bundle into this lair-keystore instance. Note, this operation requires capturing the pid_file, make sure you do not have a lair-server running. @@ -142,7 +142,7 @@ ARGS: ``` ### `lair-keystore server --help` ```text -lair-keystore-server 0.5.1 +lair-keystore-server 0.5.2 Run a lair keystore server instance. Note you must have initialized a config file first with 'lair-keystore init'. diff --git a/crates/hc_seed_bundle/Cargo.toml b/crates/hc_seed_bundle/Cargo.toml index 2fbfb75..b75edb6 100644 --- a/crates/hc_seed_bundle/Cargo.toml +++ b/crates/hc_seed_bundle/Cargo.toml @@ -1,20 +1,20 @@ [package] name = "hc_seed_bundle" -version = "0.2.4" +version = "0.2.5" description = "SeedBundle parsing and generation library." license = "MIT OR Apache-2.0" repository = "https://github.com/holochain/lair" documentation = "https://docs.rs/hc_seed_bundle" -authors = [ "Holochain Core Dev Team " ] -keywords = [ "holochain", "holo", "keystore", "secret", "cryptography" ] -categories = [ "cryptography" ] +authors = ["Holochain Core Dev Team "] +keywords = ["holochain", "holo", "keystore", "secret", "cryptography"] +categories = ["cryptography"] edition = "2018" [dependencies] futures = { workspace = true } one_err = { workspace = true } rmp-serde = { workspace = true } -rmpv = { workspace = true } # Version 1.0.1 requires Rust 1.70.0 +rmpv = { workspace = true } # Version 1.0.1 requires Rust 1.70.0 serde = { workspace = true } serde_bytes = { workspace = true } sodoken = { workspace = true } @@ -22,5 +22,4 @@ sodoken = { workspace = true } [dev-dependencies] base64 = { workspace = true } serde_json = { workspace = true } -tokio = { workspace = true, features = [ "full" ] } - +tokio = { workspace = true, features = ["full"] } diff --git a/crates/lair_keystore/Cargo.toml b/crates/lair_keystore/Cargo.toml index a440792..7bccf22 100644 --- a/crates/lair_keystore/Cargo.toml +++ b/crates/lair_keystore/Cargo.toml @@ -1,21 +1,23 @@ [package] name = "lair_keystore" -version = "0.5.1" +version = "0.5.2" description = "secret lair private keystore" license = "MIT OR Apache-2.0" repository = "https://github.com/holochain/lair" documentation = "https://docs.rs/lair_keystore" -authors = [ "Holochain Core Dev Team " ] -keywords = [ "holochain", "holo", "keystore", "secret", "cryptography" ] -categories = [ "cryptography" ] +authors = ["Holochain Core Dev Team "] +keywords = ["holochain", "holo", "keystore", "secret", "cryptography"] +categories = ["cryptography"] edition = "2018" [features] -default = [ "rusqlite-bundled-sqlcipher-vendored-openssl" ] -rusqlite-bundled = [ "rusqlite/bundled" ] -rusqlite-bundled-sqlcipher = [ "rusqlite/bundled-sqlcipher" ] -rusqlite-bundled-sqlcipher-vendored-openssl = [ "rusqlite/bundled-sqlcipher-vendored-openssl" ] -rusqlite-sqlcipher = [ "rusqlite/sqlcipher" ] +default = ["rusqlite-bundled-sqlcipher-vendored-openssl"] +rusqlite-bundled = ["rusqlite/bundled"] +rusqlite-bundled-sqlcipher = ["rusqlite/bundled-sqlcipher"] +rusqlite-bundled-sqlcipher-vendored-openssl = [ + "rusqlite/bundled-sqlcipher-vendored-openssl", +] +rusqlite-sqlcipher = ["rusqlite/sqlcipher"] [dependencies] # lair_keystore_api must be pinned to enable strict version checks @@ -43,4 +45,3 @@ path = "src/lib.rs" name = "lair-keystore" path = "src/bin/lair-keystore-bin/main.rs" doc = false - diff --git a/crates/lair_keystore/README.md b/crates/lair_keystore/README.md index 5b2f6aa..2dd7553 100644 --- a/crates/lair_keystore/README.md +++ b/crates/lair_keystore/README.md @@ -42,7 +42,7 @@ License: MIT OR Apache-2.0 ### `lair-keystore --help` ```text -lair_keystore 0.5.1 +lair_keystore 0.5.2 secret lair private keystore USAGE: @@ -73,7 +73,7 @@ SUBCOMMANDS: ``` ### `lair-keystore init --help` ```text -lair-keystore-init 0.5.1 +lair-keystore-init 0.5.2 Set up a new lair private keystore. USAGE: @@ -91,7 +91,7 @@ FLAGS: ``` ### `lair-keystore url --help` ```text -lair-keystore-url 0.5.1 +lair-keystore-url 0.5.2 Print the connection_url for a configured lair-keystore server to stdout and exit. @@ -105,7 +105,7 @@ FLAGS: ``` ### `lair-keystore import-seed --help` ```text -lair-keystore-import-seed 0.5.1 +lair-keystore-import-seed 0.5.2 Load a seed bundle into this lair-keystore instance. Note, this operation requires capturing the pid_file, make sure you do not have a lair-server running. @@ -142,7 +142,7 @@ ARGS: ``` ### `lair-keystore server --help` ```text -lair-keystore-server 0.5.1 +lair-keystore-server 0.5.2 Run a lair keystore server instance. Note you must have initialized a config file first with 'lair-keystore init'. diff --git a/crates/lair_keystore/src/docs/help.md b/crates/lair_keystore/src/docs/help.md index 899dde2..d44ce67 100644 --- a/crates/lair_keystore/src/docs/help.md +++ b/crates/lair_keystore/src/docs/help.md @@ -1,6 +1,6 @@ ### `lair-keystore --help` ```text -lair_keystore 0.5.1 +lair_keystore 0.5.2 secret lair private keystore USAGE: diff --git a/crates/lair_keystore/src/docs/import-seed-help.md b/crates/lair_keystore/src/docs/import-seed-help.md index 29d0c22..dc41734 100644 --- a/crates/lair_keystore/src/docs/import-seed-help.md +++ b/crates/lair_keystore/src/docs/import-seed-help.md @@ -1,6 +1,6 @@ ### `lair-keystore import-seed --help` ```text -lair-keystore-import-seed 0.5.1 +lair-keystore-import-seed 0.5.2 Load a seed bundle into this lair-keystore instance. Note, this operation requires capturing the pid_file, make sure you do not have a lair-server running. diff --git a/crates/lair_keystore/src/docs/init-help.md b/crates/lair_keystore/src/docs/init-help.md index 7f59c22..596fd07 100644 --- a/crates/lair_keystore/src/docs/init-help.md +++ b/crates/lair_keystore/src/docs/init-help.md @@ -1,6 +1,6 @@ ### `lair-keystore init --help` ```text -lair-keystore-init 0.5.1 +lair-keystore-init 0.5.2 Set up a new lair private keystore. USAGE: diff --git a/crates/lair_keystore/src/docs/server-help.md b/crates/lair_keystore/src/docs/server-help.md index 7344236..24dedc0 100644 --- a/crates/lair_keystore/src/docs/server-help.md +++ b/crates/lair_keystore/src/docs/server-help.md @@ -1,6 +1,6 @@ ### `lair-keystore server --help` ```text -lair-keystore-server 0.5.1 +lair-keystore-server 0.5.2 Run a lair keystore server instance. Note you must have initialized a config file first with 'lair-keystore init'. diff --git a/crates/lair_keystore/src/docs/url-help.md b/crates/lair_keystore/src/docs/url-help.md index f628c58..6858483 100644 --- a/crates/lair_keystore/src/docs/url-help.md +++ b/crates/lair_keystore/src/docs/url-help.md @@ -1,6 +1,6 @@ ### `lair-keystore url --help` ```text -lair-keystore-url 0.5.1 +lair-keystore-url 0.5.2 Print the connection_url for a configured lair-keystore server to stdout and exit. diff --git a/crates/lair_keystore_api/Cargo.toml b/crates/lair_keystore_api/Cargo.toml index de833ce..850af68 100644 --- a/crates/lair_keystore_api/Cargo.toml +++ b/crates/lair_keystore_api/Cargo.toml @@ -1,13 +1,13 @@ [package] name = "lair_keystore_api" -version = "0.5.1" +version = "0.5.2" description = "secret lair private keystore API library" license = "MIT OR Apache-2.0" repository = "https://github.com/holochain/lair" documentation = "https://docs.rs/lair_keystore_api" -authors = [ "Holochain Core Dev Team " ] -keywords = [ "holochain", "holo", "keystore", "secret", "cryptography" ] -categories = [ "cryptography" ] +authors = ["Holochain Core Dev Team "] +keywords = ["holochain", "holo", "keystore", "secret", "cryptography"] +categories = ["cryptography"] edition = "2018" [dependencies] @@ -23,7 +23,7 @@ time = { workspace = true } serde = { workspace = true } serde_json = { workspace = true } serde_yaml = { workspace = true } -tokio = { workspace = true, features = [ "full" ] } +tokio = { workspace = true, features = ["full"] } toml = { workspace = true } tracing = { workspace = true } url = { workspace = true } @@ -39,4 +39,3 @@ tracing-subscriber = { workspace = true } [build-dependencies] toml = { workspace = true } -