From 1e19808ddc7ee5a016676ed94ca91c493fab3664 Mon Sep 17 00:00:00 2001 From: timotree3 Date: Sat, 21 Dec 2019 19:04:32 -0500 Subject: [PATCH 1/4] hc-generate: Change default template to rust-proc Fixes https://github.com/holochain/rust-proc-zome-template/issues/5 --- CHANGELOG-UNRELEASED.md | 2 ++ crates/cli/src/main.rs | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG-UNRELEASED.md b/CHANGELOG-UNRELEASED.md index 2f730af61f..80fb3d06b1 100644 --- a/CHANGELOG-UNRELEASED.md +++ b/CHANGELOG-UNRELEASED.md @@ -8,6 +8,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ### Changed +- Changed `hc generate` to use the `rust-proc` template by default [PR#0000](https://github.com/holochain/holochain-rust/pull/0000) + ### Deprecated ### Removed diff --git a/crates/cli/src/main.rs b/crates/cli/src/main.rs index 527b8cc818..123709143f 100755 --- a/crates/cli/src/main.rs +++ b/crates/cli/src/main.rs @@ -61,8 +61,8 @@ enum Cli { #[structopt(parse(from_os_str))] /// The path to the zome that should be generated (usually in ./zomes/) zome: PathBuf, - #[structopt(default_value = "rust")] - /// Either the name of a built-in template (rust, rust-proc) or the url to a git repo containing a Zome template. + #[structopt(default_value = "rust-proc")] + /// Either the name of a built-in template (rust-proc, rust) or the url to a git repo containing a Zome template. template: String, }, #[structopt(alias = "r")] From 3d5864fd3d2426e1171b859cd2c5e92fc451daf7 Mon Sep 17 00:00:00 2001 From: timotree3 Date: Sat, 21 Dec 2019 19:06:00 -0500 Subject: [PATCH 2/4] hc-generate: Clarify template argument documentation --- crates/cli/src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/cli/src/main.rs b/crates/cli/src/main.rs index 123709143f..daaa497bf1 100755 --- a/crates/cli/src/main.rs +++ b/crates/cli/src/main.rs @@ -62,7 +62,7 @@ enum Cli { /// The path to the zome that should be generated (usually in ./zomes/) zome: PathBuf, #[structopt(default_value = "rust-proc")] - /// Either the name of a built-in template (rust-proc, rust) or the url to a git repo containing a Zome template. + /// Either the name of a built-in template (rust-proc, rust) or the url to a `tar.gz` containing a Zome template. template: String, }, #[structopt(alias = "r")] From 3bf5f921c7b8167247a80d725371988627c66107 Mon Sep 17 00:00:00 2001 From: timotree3 Date: Sat, 21 Dec 2019 19:12:07 -0500 Subject: [PATCH 3/4] hc-generate: Improve documentation formatting --- crates/cli/src/main.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crates/cli/src/main.rs b/crates/cli/src/main.rs index daaa497bf1..64f9ce37ae 100755 --- a/crates/cli/src/main.rs +++ b/crates/cli/src/main.rs @@ -62,7 +62,10 @@ enum Cli { /// The path to the zome that should be generated (usually in ./zomes/) zome: PathBuf, #[structopt(default_value = "rust-proc")] - /// Either the name of a built-in template (rust-proc, rust) or the url to a `tar.gz` containing a Zome template. + /// The template from which to generate the zome + /// + /// This should either be the name of a built-in template (rust-proc, rust) or + /// the url to a `tar.gz` containing a Zome template. template: String, }, #[structopt(alias = "r")] From d5d65518a4cb9a99e2f913631d6c11cca5dad0c2 Mon Sep 17 00:00:00 2001 From: timotree3 Date: Sat, 21 Dec 2019 19:42:26 -0500 Subject: [PATCH 4/4] changelog: Update PR link to reflect actual PR --- CHANGELOG-UNRELEASED.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG-UNRELEASED.md b/CHANGELOG-UNRELEASED.md index 80fb3d06b1..ac302558e1 100644 --- a/CHANGELOG-UNRELEASED.md +++ b/CHANGELOG-UNRELEASED.md @@ -8,7 +8,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ### Changed -- Changed `hc generate` to use the `rust-proc` template by default [PR#0000](https://github.com/holochain/holochain-rust/pull/0000) +- Changed `hc generate` to use the `rust-proc` template by default [PR#2009](https://github.com/holochain/holochain-rust/pull/2009) ### Deprecated