feat(pbar): style warning/info/err better

master
Ashley Williams 7 years ago
parent c915075d0c
commit bf1f5eda9d
  1. 2
      src/bindgen.rs
  2. 8
      src/command.rs
  3. 1
      src/emoji.rs
  4. 14
      src/progressbar.rs

@ -20,7 +20,7 @@ pub fn cargo_install_wasm_bindgen() -> Result<(), Error> {
if !output.status.success() {
let s = String::from_utf8_lossy(&output.stderr);
if s.contains("already exists") {
PBAR.one_off_message("wasm-bindgen already installed");
PBAR.info("wasm-bindgen already installed");
return Ok(());
}
PBAR.error("Installing wasm-bindgen failed");

@ -78,12 +78,12 @@ fn init(path: Option<String>, scope: Option<String>) -> result::Result<(), Error
bindgen::cargo_install_wasm_bindgen()?;
let name = manifest::get_crate_name(&crate_path)?;
bindgen::wasm_bindgen_build(&crate_path, &name)?;
PBAR.one_off_message(&format!(
PBAR.message(&format!(
"{} Done in {}",
emoji::SPARKLE,
HumanDuration(started.elapsed())
));
PBAR.one_off_message(&format!(
PBAR.message(&format!(
"{} Your WASM pkg is ready to publish at {}/pkg",
emoji::PACKAGE,
&crate_path
@ -95,7 +95,7 @@ fn pack(path: Option<String>) -> result::Result<(), Error> {
let crate_path = set_crate_path(path);
npm::npm_pack(&crate_path)?;
PBAR.one_off_message("🎒 packed up your package!");
PBAR.message("🎒 packed up your package!");
Ok(())
}
@ -103,7 +103,7 @@ fn publish(path: Option<String>) -> result::Result<(), Error> {
let crate_path = set_crate_path(path);
npm::npm_publish(&crate_path)?;
PBAR.one_off_message("💥 published your package!");
PBAR.message("💥 published your package!");
Ok(())
}

@ -11,3 +11,4 @@ pub static PACKAGE: Emoji = Emoji("📦 ", ":-)");
pub static WARN: Emoji = Emoji("⚠ ", ":-)");
pub static DANCERS: Emoji = Emoji("👯 ", "");
pub static ERROR: Emoji = Emoji("⛔ ", "");
pub static INFO: Emoji = Emoji("ℹ ", "");

@ -18,16 +18,22 @@ impl ProgressOutput {
self.bar.add(Self::progressbar(message))
}
pub fn one_off_message(&self, message: &str) {
let bar = self.bar.add(Self::progressbar(message));
pub fn info(&self, message: &str) {
let info = format!(
"{} {}: {}",
emoji::INFO,
style("[INFO]").bold().dim(),
message
);
let bar = self.bar.add(Self::progressbar(&info));
bar.finish();
}
pub fn warn(&self, message: &str) {
let warn = format!(
"{} {}: {}",
style("[WARN]").bold().dim(),
emoji::WARN,
style("[WARN]").bold().dim(),
message
);
let bar = self.bar.add(Self::progressbar(&warn));
@ -37,8 +43,8 @@ impl ProgressOutput {
pub fn error(&self, message: &str) {
let err = format!(
"{} {}: {}",
style("[ERR]").bold().dim(),
emoji::ERROR,
style("[ERR]").bold().dim(),
message
);
let bar = self.bar.add(Self::progressbar(&err));

Loading…
Cancel
Save