fix(progressbar): refactor msg into pb fn

master
Ashley Williams 7 years ago
parent 3763fdfe8d
commit c8fb09a24c
  1. 12
      src/bindgen.rs
  2. 21
      src/main.rs
  3. 3
      src/progressbar.rs

@ -1,7 +1,7 @@
use std::process::Command; use std::process::Command;
pub fn cargo_install_wasm_bindgen() { pub fn cargo_install_wasm_bindgen() {
let output = Command::new("cargo") let _output = Command::new("cargo")
.arg("install") .arg("install")
.arg("--git") .arg("--git")
.arg("https://github.com/alexcrichton/wasm-bindgen") .arg("https://github.com/alexcrichton/wasm-bindgen")
@ -21,7 +21,7 @@ pub fn cargo_install_wasm_bindgen() {
pub fn wasm_bindgen_build(path: &str, name: &str) { pub fn wasm_bindgen_build(path: &str, name: &str) {
let binary_name = name.replace("-", "_"); let binary_name = name.replace("-", "_");
let wasm_path = format!("target/wasm32-unknown-unknown/release/{}.wasm", binary_name); let wasm_path = 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(&wasm_path) .arg(&wasm_path)
.arg("--out-dir") .arg("--out-dir")
@ -29,9 +29,9 @@ pub fn wasm_bindgen_build(path: &str, name: &str) {
.output() .output()
.unwrap_or_else(|e| panic!("failed to execute process: {}", e)); .unwrap_or_else(|e| panic!("failed to execute process: {}", e));
if !output.status.success() { //if !output.status.success() {
let s = String::from_utf8_lossy(&output.stderr); // let s = String::from_utf8_lossy(&output.stderr);
print!("⛔ wasm_bindgen_build failed and stderr was:\n{}", s); // print!("⛔ wasm_bindgen_build failed and stderr was:\n{}", s);
} //}
} }

@ -61,8 +61,7 @@ main!(|args: Cli, log_level: verbosity| match args.cmd {
style("[1/7]").bold().dim(), style("[1/7]").bold().dim(),
TARGET TARGET
); );
let pb1 = progressbar::new(); let pb1 = progressbar::new(step1);
pb1.set_message(&step1);
build::rustup_add_wasm_target(); build::rustup_add_wasm_target();
pb1.finish(); pb1.finish();
let step2 = format!( let step2 = format!(
@ -70,8 +69,7 @@ main!(|args: Cli, log_level: verbosity| match args.cmd {
style("[2/7]").bold().dim(), style("[2/7]").bold().dim(),
CYCLONE CYCLONE
); );
let pb2 = progressbar::new(); let pb2 = progressbar::new(step2);
pb2.set_message(&step2);
build::cargo_build_wasm(&crate_path); build::cargo_build_wasm(&crate_path);
pb2.finish(); pb2.finish();
let step3 = format!( let step3 = format!(
@ -79,8 +77,7 @@ main!(|args: Cli, log_level: verbosity| match args.cmd {
style("[3/7]").bold().dim(), style("[3/7]").bold().dim(),
FOLDER FOLDER
); );
let pb3 = progressbar::new(); let pb3 = progressbar::new(step3);
pb3.set_message(&step3);
wasm_pack::create_pkg_dir(&crate_path)?; wasm_pack::create_pkg_dir(&crate_path)?;
pb3.finish(); pb3.finish();
let step4 = format!( let step4 = format!(
@ -88,8 +85,7 @@ main!(|args: Cli, log_level: verbosity| match args.cmd {
style("[4/7]").bold().dim(), style("[4/7]").bold().dim(),
MEMO MEMO
); );
let pb4 = progressbar::new(); let pb4 = progressbar::new(step4);
pb4.set_message(&step4);
manifest::write_package_json(&crate_path)?; manifest::write_package_json(&crate_path)?;
pb4.finish(); pb4.finish();
let step5 = format!( let step5 = format!(
@ -97,8 +93,7 @@ main!(|args: Cli, log_level: verbosity| match args.cmd {
style("[5/7]").bold().dim(), style("[5/7]").bold().dim(),
DANCERS DANCERS
); );
let pb5 = progressbar::new(); let pb5 = progressbar::new(step5);
pb5.set_message(&step5);
readme::copy_from_crate(&crate_path)?; readme::copy_from_crate(&crate_path)?;
pb5.finish(); pb5.finish();
let step6 = format!( let step6 = format!(
@ -106,8 +101,7 @@ main!(|args: Cli, log_level: verbosity| match args.cmd {
style("[6/7]").bold().dim(), style("[6/7]").bold().dim(),
DOWN_ARROW DOWN_ARROW
); );
let pb6 = progressbar::new(); let pb6 = progressbar::new(step6);
pb6.set_message(&step6);
bindgen::cargo_install_wasm_bindgen(); bindgen::cargo_install_wasm_bindgen();
pb6.finish(); pb6.finish();
let name = manifest::get_crate_name(&crate_path)?; let name = manifest::get_crate_name(&crate_path)?;
@ -116,8 +110,7 @@ main!(|args: Cli, log_level: verbosity| match args.cmd {
style("[7/7]").bold().dim(), style("[7/7]").bold().dim(),
RUNNER RUNNER
); );
let pb7 = progressbar::new(); let pb7 = progressbar::new(step7);
pb7.set_message(&step7);
bindgen::wasm_bindgen_build(&crate_path, &name); bindgen::wasm_bindgen_build(&crate_path, &name);
pb7.finish(); pb7.finish();
println!("{} Done in {}", SPARKLE, HumanDuration(started.elapsed())); println!("{} Done in {}", SPARKLE, HumanDuration(started.elapsed()));

@ -1,6 +1,6 @@
use indicatif::{ProgressBar, ProgressStyle}; use indicatif::{ProgressBar, ProgressStyle};
pub fn new() -> ProgressBar { pub fn new(msg: String) -> ProgressBar {
let pb = ProgressBar::new_spinner(); let pb = ProgressBar::new_spinner();
pb.enable_steady_tick(200); pb.enable_steady_tick(200);
pb.set_style( pb.set_style(
@ -8,5 +8,6 @@ pub fn new() -> ProgressBar {
.tick_chars("/|\\- ") .tick_chars("/|\\- ")
.template("{spinner:.dim.bold} {wide_msg}"), .template("{spinner:.dim.bold} {wide_msg}"),
); );
pb.set_message(&msg);
pb pb
} }

Loading…
Cancel
Save