select build target

Cargo.toml

@@ -38,6 +38,7 @@ structopt = "0.2"
 tar = "0.4.16"
 toml = "0.4"
 which = "2.0.0"
+walkdir = "2"
 zip = "0.5.0"
 
 [dev-dependencies]

src/command/publish/mod.rs

@@ -4,7 +4,7 @@ pub mod access;
 use self::access::Access;
 use command::build::{Build, BuildOptions};
 use command::utils::{find_pkg_directory, set_crate_path};
-use dialoguer::{Confirmation, Input};
+use dialoguer::{Confirmation, Input, Select};
 use failure::Error;
 use npm;
 use slog::Logger;
@@ -15,7 +15,7 @@ use PBAR;
 /// Creates a tarball from a 'pkg' directory
 /// and publishes it to the NPM registry
 pub fn publish(
-    target: String,
+    _target: String,
     path: Option<PathBuf>,
     access: Option<Access>,
     log: &Logger,
@@ -31,18 +31,19 @@ pub fn publish(
             // while `wasm-pack publish`, if the pkg directory cannot be found,
             // then try to `wasm-pack build`
             if Confirmation::new()
-                .with_text("Your npm package hasn't be built, build it?")
+                .with_text("Your package hasn't been built, build it?")
                 .interact()?
             {
                 let out_dir = Input::new()
-                    .with_prompt("out_dir")
-                    .default("pkg".to_string())
-                    .show_default(true)
+                    .with_prompt("out_dir[default: pkg]")
+                    .default(".".to_string())
+                    .show_default(false)
                     .interact()?;
-                let target = Input::new()
-                    .with_prompt("target")
-                    .default(target)
-                    .show_default(true)
+                let out_dir = format!("{}/pkg", out_dir);
+                let target = Select::new()
+                    .with_prompt("target[default: browser]")
+                    .items(&["browser", "nodejs", "no-modules"])
+                    .default(0)
                     .interact()?
                     .to_string();
                 let build_opts = BuildOptions {

src/command/utils.rs

@@ -5,6 +5,7 @@ use failure;
 use progressbar::Step;
 use std::fs;
 use std::path::{Path, PathBuf};
+use walkdir::WalkDir;
 use PBAR;
 
 /// If an explicit path is given, then use it, otherwise assume the current
@@ -28,11 +29,10 @@ pub fn find_pkg_directory(path: &Path) -> Option<PathBuf> {
         return Some(path.to_owned());
     }
 
-    path.read_dir().ok().and_then(|entries| {
-        entries
-            .filter_map(|x| x.ok().map(|v| v.path()))
-            .find(|x| is_pkg_directory(&x))
-    })
+    WalkDir::new(path)
+        .into_iter()
+        .filter_map(|x| x.ok().map(|e| e.into_path()))
+        .find(|x| is_pkg_directory(&x))
 }
 
 fn is_pkg_directory(path: &Path) -> bool {

src/lib.rs

@@ -31,6 +31,7 @@ extern crate slog_async;
 extern crate slog_term;
 extern crate tar;
 extern crate toml;
+extern crate walkdir;
 extern crate which;
 extern crate zip;