feat(log): improve logging + messages

master
Ashley Williams 7 years ago
parent 52ff3b0133
commit d5191686e3
  1. 14
      src/bindgen.rs
  2. 9
      src/build.rs
  3. 3
      src/main.rs

@ -11,19 +11,20 @@ pub fn cargo_install_wasm_bindgen() {
if output.status.success() { if output.status.success() {
let s = String::from_utf8_lossy(&output.stdout); let s = String::from_utf8_lossy(&output.stdout);
print!( println!(
"cargo_install_wasm_bindgen succeeded and stdout was:\n{}", "cargo_install_wasm_bindgen succeeded and stdout was:\n{}",
s s
); );
} else { } else {
let s = String::from_utf8_lossy(&output.stderr); let s = String::from_utf8_lossy(&output.stderr);
print!("cargo_install_wasm_bindgen failed and stderr was:\n{}", s); print!("cargo_install_wasm_bindgen failed and stderr was:\n{}", s);
} }
} }
pub fn wasm_bindgen_build(path: &str, name: &str) { pub fn wasm_bindgen_build(path: &str, name: &str) {
let path_to_wasm = format!("target/wasm32-unknown-unknown/release/{}.wasm", name); let binary_name = name.replace("-", "_");
let path_to_wasm = format!("target/wasm32-unknown-unknown/release/{}.wasm", binary_name);
let output = Command::new("wasm-bindgen") let output = Command::new("wasm-bindgen")
.current_dir(path) .current_dir(path)
.arg(&path_to_wasm) .arg(&path_to_wasm)
@ -35,10 +36,11 @@ pub fn wasm_bindgen_build(path: &str, name: &str) {
if output.status.success() { if output.status.success() {
let s = String::from_utf8_lossy(&output.stdout); let s = String::from_utf8_lossy(&output.stdout);
print!("cargo_build_wasm succeeded and stdout was:\n{}", s); println!("✅ wasm_bindgen_build succeeded and stdout was:\n{}", s);
println!("🏄<200d>♀ ready to go!");
} else { } else {
let s = String::from_utf8_lossy(&output.stderr); let s = String::from_utf8_lossy(&output.stderr);
print!("cargo_build_wasm failed and stderr was:\n{}", s); print!("⛔ wasm_bindgen_build failed and stderr was:\n{}", s);
} }
} }

@ -11,11 +11,11 @@ pub fn rustup_add_wasm_target() {
if output.status.success() { if output.status.success() {
let s = String::from_utf8_lossy(&output.stdout); let s = String::from_utf8_lossy(&output.stdout);
print!("rustup_add_wasm_target succeeded and stdout was:\n{}", s); println!("rustup_add_wasm_target succeeded and stdout was:\n{}", s);
} else { } else {
let s = String::from_utf8_lossy(&output.stderr); let s = String::from_utf8_lossy(&output.stderr);
print!("rustup_add_wasm_target failed and stderr was:\n{}", s); print!("rustup_add_wasm_target failed and stderr was:\n{}", s);
} }
} }
@ -32,10 +32,11 @@ pub fn cargo_build_wasm(path: &str) {
if output.status.success() { if output.status.success() {
let s = String::from_utf8_lossy(&output.stdout); let s = String::from_utf8_lossy(&output.stdout);
print!("cargo_build_wasm succeeded and stdout was:\n{}", s); println!("✅ cargo_build_wasm succeeded and stdout was:\n{}", s);
println!("🏎 💨 compiled to wasm!");
} else { } else {
let s = String::from_utf8_lossy(&output.stderr); let s = String::from_utf8_lossy(&output.stderr);
print!("cargo_build_wasm failed and stderr was:\n{}", s); print!("cargo_build_wasm failed and stderr was:\n{}", s);
} }
} }

@ -38,13 +38,10 @@ main!(|args: Cli, log_level: verbosity| match args.cmd {
}; };
build::rustup_add_wasm_target(); build::rustup_add_wasm_target();
build::cargo_build_wasm(&crate_path); build::cargo_build_wasm(&crate_path);
println!("🏎 💨 compiled to wasm!");
wasm_pack::write_package_json(&crate_path)?; wasm_pack::write_package_json(&crate_path)?;
println!("✍ wrote a package.json!");
bindgen::cargo_install_wasm_bindgen(); bindgen::cargo_install_wasm_bindgen();
let name = wasm_pack::get_crate_name(&crate_path)?; let name = wasm_pack::get_crate_name(&crate_path)?;
bindgen::wasm_bindgen_build(&crate_path, &name); bindgen::wasm_bindgen_build(&crate_path, &name);
println!("🏄 ready to go!");
} }
Command::Pack { .. } => { Command::Pack { .. } => {
println!("🎒 packed up your package!"); println!("🎒 packed up your package!");

Loading…
Cancel
Save