From fb9a67112b14cb1b82c61d224f7e81f3514a71df Mon Sep 17 00:00:00 2001
From: Ashley Williams <ashley666ashley@gmail.com>
Date: Mon, 15 Apr 2019 11:04:39 -0500
Subject: [PATCH] fix(generate): s/generate/new, name is postional

---
 docs/src/SUMMARY.md           |  2 +-
 docs/src/commands/generate.md | 32 ----------------------
 docs/src/commands/index.md    |  9 ++++---
 docs/src/commands/new.md      | 50 +++++++++++++++++++++++++++++++++++
 docs/src/quickstart.md        |  2 +-
 src/command/mod.rs            |  7 +++--
 tests/all/generate.rs         |  8 +++---
 7 files changed, 65 insertions(+), 45 deletions(-)
 delete mode 100644 docs/src/commands/generate.md
 create mode 100644 docs/src/commands/new.md

diff --git a/docs/src/SUMMARY.md b/docs/src/SUMMARY.md
index d564a06a..9e183240 100644
--- a/docs/src/SUMMARY.md
+++ b/docs/src/SUMMARY.md
@@ -6,7 +6,7 @@
   - [npm (optional)](./prerequisites/npm.md)
   - [Non-`rustup` setups](./prerequisites/non-rustup-setups.md)
 - [Commands](./commands/index.md)
-  - [`generate`](./commands/generate.md)
+  - [`new`](./commands/new.md)
   - [`build`](./commands/build.md)
   - [`test`](./commands/test.md)
   - [`pack` and `publish`](./commands/pack-and-publish.md)
diff --git a/docs/src/commands/generate.md b/docs/src/commands/generate.md
deleted file mode 100644
index 345a03fd..00000000
--- a/docs/src/commands/generate.md
+++ /dev/null
@@ -1,32 +0,0 @@
-# wasm-pack generate
-
-The `wasm-pack generate` command creates a new RustWasm project for you,
-using [`cargo-generate`] under the hood.
-
-It takes 2 optional parameters, template and name:
-
-```
-wasm-pack generate --template <template> --name <name>
-```
-
-The template will default to the `rustwasm/wasm-pack-template` and the name
-will default to `hello-wasm`.
-
-## Template
-
-The `wasm-pack generate` command can be given an optional template argument, e.g.:
-
-```
-wasm-pack generate --template https://github.com/rustwasm/wasm-pack-template
-```
-
-The template can be an address to a git repo that contains a [`cargo-generate`]
-template.
-
-## Name
-
-The `wasm-pack generate` command can be given and optional name argument, e.g.:
-
-```
-wasm-pack generate --name myproject
-```
diff --git a/docs/src/commands/index.md b/docs/src/commands/index.md
index 263445ab..2ad2d706 100644
--- a/docs/src/commands/index.md
+++ b/docs/src/commands/index.md
@@ -3,11 +3,14 @@
 `wasm-pack` has several commands to help you during the process of building
 a Rust-generated WebAssembly project.
 
-- `init`: This command has been deprecated in favor of `build`.
-- `generate`: This command generates a new project for you using a template. [Learn more][generate]
+- `new`: This command generates a new project for you using a template. [Learn more][generate]
 - `build`: This command builds a `pkg` directory for you with compiled wasm and generated JS. [Learn more][build]
 - `pack` and `publish`: These command will create a tarball, and optionally publish it to a registry, such as npm. [Learn more][pack-pub]
 
+
+### Deprecated Commands
+- `init`: This command has been deprecated in favor of `build`.
+
 [build]: ./build.html
-[generate]: ./generate.html
+[new]: ./new.html
 [pack-pub]: ./pack-and-publish.html
diff --git a/docs/src/commands/new.md b/docs/src/commands/new.md
new file mode 100644
index 00000000..42246da6
--- /dev/null
+++ b/docs/src/commands/new.md
@@ -0,0 +1,50 @@
+# wasm-pack new
+
+The `wasm-pack new` command creates a new RustWasm project for you,
+using [`cargo-generate`] under the hood.
+
+It takes 3 parameters, name, template, and mode:
+
+```
+wasm-pack new <name> --template <template> --mode <normal|noinstall|force>
+```
+
+The template will default to the `rustwasm/wasm-pack-template`.
+
+## Name
+
+The `wasm-pack new` command must be given a name argument, e.g.:
+
+```
+wasm-pack new myproject
+```
+
+## Template
+
+The `wasm-pack new` command can be given an optional template argument, e.g.:
+
+```
+wasm-pack new myproject --template https://github.com/rustwasm/wasm-pack-template
+```
+
+The template can be an address to a git repo that contains a [`cargo-generate`]
+template.
+
+[`cargo-generate`]: https://github.com/ashleygwilliams/cargo-generate
+
+## Mode
+
+The `wasm-pack new` command can be given an optional mode argument, e.g.:
+
+```
+wasm-pack new myproject --mode noinstall
+```
+
+The mode pass can be either "normal", "noinstall", or "force". "normal is passed by
+degault.
+
+`noinstall` means that wasm-pack should not attempt to install any underlying tools.
+If a necessary tool cannot be found, the command will error.
+
+`force` means that wasm-pack should not check the local Rust version. If a local Rust
+is an unacceptable Rust version, the command will error.
diff --git a/docs/src/quickstart.md b/docs/src/quickstart.md
index 81374a88..85927be2 100644
--- a/docs/src/quickstart.md
+++ b/docs/src/quickstart.md
@@ -2,7 +2,7 @@
 
 1. Install `rust` using [`rustup`].
 1. [Install this tool.]
-1. Run `wasm-pack generate`.
+1. Run `wasm-pack new hello-wasm`.
 1. `cd hello-wasm`
 1. Run `wasm-pack build`.
 1. This tool generates files in a `pkg` dir
diff --git a/src/command/mod.rs b/src/command/mod.rs
index bce35d7a..1fd24fd6 100644
--- a/src/command/mod.rs
+++ b/src/command/mod.rs
@@ -36,9 +36,11 @@ pub enum Command {
         path: Option<PathBuf>,
     },
 
-    #[structopt(name = "generate")]
+    #[structopt(name = "new")]
     /// 🐑 create a new project with a template
     Generate {
+        /// The name of the project
+        name: String,
         /// The URL to the template
         #[structopt(
             long = "template",
@@ -46,9 +48,6 @@ pub enum Command {
             default_value = "https://github.com/rustwasm/wasm-pack-template"
         )]
         template: String,
-        /// The name of the project
-        #[structopt(long = "name", short = "n")]
-        name: String,
         #[structopt(long = "mode", short = "m", default_value = "normal")]
         /// Should we install or check the presence of binary tools. [possible values: no-install, normal, force]
         mode: InstallMode,
diff --git a/tests/all/generate.rs b/tests/all/generate.rs
index eee57cb1..bec03e8d 100644
--- a/tests/all/generate.rs
+++ b/tests/all/generate.rs
@@ -3,17 +3,17 @@ use std::str;
 use utils;
 
 #[test]
-fn generate_with_defaults() {
+fn new_with_no_name_errors() {
     let fixture = utils::fixture::not_a_crate();
-    let cmd = fixture.wasm_pack().arg("generate").assert().failure();
+    fixture.wasm_pack().arg("new").assert().failure();
 }
 
 #[test]
-fn generate_with_provided_name() {
+fn new_with_provided_name() {
     let fixture = utils::fixture::not_a_crate();
     let cmd = fixture
         .wasm_pack()
-        .arg("generate")
+        .arg("new")
         .arg("--name")
         .arg("ferris")
         .assert();