Merge branch '627-bindgen-version-error' of https://github.com/gameldar/wasm-pack into gameldar-627-bindgen-version-error

src/bindgen.rs

@@ -4,8 +4,10 @@ use binary_install::Download;
 use child;
 use command::build::{BuildProfile, Target};
 use failure::{self, ResultExt};
+use install::Tool;
+use log::info;
 use manifest::CrateData;
-use std::path::Path;
+use std::path::{Path, PathBuf};
 use std::process::Command;
 
 /// Run the `wasm-bindgen` CLI to generate bindings for the current crate's
@@ -45,7 +47,7 @@ pub fn wasm_bindgen_build(
         Target::Bundler => "--browser",
     };
     let bindgen_path = bindgen.binary("wasm-bindgen")?;
-    let mut cmd = Command::new(bindgen_path);
+    let mut cmd = Command::new(&bindgen_path);
     cmd.arg(&wasm_path)
         .arg("--out-dir")
         .arg(out_dir)
@@ -67,6 +69,50 @@ pub fn wasm_bindgen_build(
         cmd.arg("--keep-debug");
     }
 
-    child::run(cmd, "wasm-bindgen").context("Running the wasm-bindgen CLI")?;
+    let result = child::run(cmd, "wasm-bindgen");
+    let result: Result<(), failure::Error> = match result {
+        Ok(r) => Ok(r),
+        Err(e) => process_error(&bindgen_path, e),
+    };
+    result.context("Running the wasm-bindgen CLI")?;
     Ok(())
 }
+
+fn process_error(bindgen_path: &PathBuf, e: child::CommandError) -> Result<(), failure::Error> {
+    match &e.stderr {
+        Some(err) if err.trim().starts_with("Unknown flag: '--web'") => {
+            let v = wasm_bindgen_get_version(bindgen_path).unwrap_or(String::from("unknown"));
+            bail!("Failed to execute `wasm-bindgen`: --web is not supported in version '{}'. Upgrade the wasm-bindgen dependency in Cargo.toml to version 0.2.39 or later.", v)
+        }
+        Some(err) => {
+            eprintln!("{}", err);
+            bail!("{}", e.to_string())
+        }
+        _ => bail!("{}", e.to_string()),
+    }
+}
+
+/// Check if the `wasm-bindgen` dependency is locally satisfied.
+fn wasm_bindgen_version_check(bindgen_path: &PathBuf, dep_version: &str) -> bool {
+    wasm_bindgen_get_version(bindgen_path)
+        .map(|v| {
+            info!(
+                "Checking installed `wasm-bindgen` version == expected version: {} == {}",
+                v, dep_version
+            );
+            v == dep_version
+        })
+        .unwrap_or(false)
+}
+
+/// Get the `wasm-bindgen` version
+fn wasm_bindgen_get_version(bindgen_path: &PathBuf) -> Option<String> {
+    let mut cmd = Command::new(bindgen_path);
+    cmd.arg("--version");
+    child::run_capture_stdout(cmd, &Tool::WasmBindgen)
+        .map(|stdout| match stdout.trim().split_whitespace().nth(1) {
+            Some(v) => return Some(v.to_owned()),
+            None => return None,
+        })
+        .unwrap_or(None)
+}

src/child.rs

@@ -3,10 +3,10 @@
 //! This module helps us ensure that all child processes that we spawn get
 //! properly logged and their output is logged as well.
 
-use failure::Error;
 use install::Tool;
 use log::info;
-use std::process::{Command, Stdio};
+use std::io::Error as StdError;
+use std::process::{Command, ExitStatus, Stdio};
 
 /// Return a new Command object
 pub fn new_command(program: &str) -> Command {
@@ -24,39 +24,81 @@ pub fn new_command(program: &str) -> Command {
     }
 }
 
-/// Run the given command and return its stdout.
-pub fn run(mut command: Command, command_name: &str) -> Result<(), Error> {
-    info!("Running {:?}", command);
+/// Error from running Command processes
+/// This captures the standard error output
+#[derive(Fail, Debug)]
+#[fail(display = "failed to execute `{}`: {}", command_name, fail_reason)]
+pub struct CommandError {
+    command_name: String,
+    fail_reason: String,
+    /// the output printed to stderr, if any
+    pub stderr: Option<String>,
+}
 
-    let status = command.status()?;
+impl CommandError {
+    fn from_status(command_name: &str, status: ExitStatus, stderr: Option<String>) -> CommandError {
+        CommandError {
+            command_name: command_name.to_string(),
+            fail_reason: format!("exited with {}", status),
+            stderr: stderr,
+        }
+    }
 
-    if status.success() {
-        Ok(())
-    } else {
-        bail!(
-            "failed to execute `{}`: exited with {}",
-            command_name,
-            status
-        )
+    fn from_error(command_name: &str, err: StdError) -> CommandError {
+        CommandError {
+            command_name: command_name.to_string(),
+            fail_reason: err.to_string(),
+            stderr: None,
+        }
     }
 }
 
-/// Run the given command and return its stdout.
-pub fn run_capture_stdout(mut command: Command, command_name: &Tool) -> Result<String, Error> {
+/// Run the given command and return on success.
+pub fn run(mut command: Command, command_name: &str) -> Result<(), CommandError> {
     info!("Running {:?}", command);
 
-    let output = command
-        .stderr(Stdio::inherit())
+    let cmd_output = command
         .stdin(Stdio::inherit())
-        .output()?;
+        .stdout(Stdio::inherit())
+        .output();
+    match cmd_output {
+        Ok(output) => {
+            if output.status.success() {
+                Ok(())
+            } else {
+                Err(CommandError::from_status(
+                    command_name,
+                    output.status,
+                    Some(String::from_utf8_lossy(&output.stderr).into_owned()),
+                ))
+            }
+        }
+        Err(e) => Err(CommandError::from_error(command_name, e)),
+    }
+}
 
-    if output.status.success() {
-        Ok(String::from_utf8_lossy(&output.stdout).into_owned())
-    } else {
-        bail!(
-            "failed to execute `{}`: exited with {}",
-            command_name,
-            output.status
-        )
+/// Run the given command and return its stdout.
+pub fn run_capture_stdout(
+    mut command: Command,
+    command_name: &Tool,
+) -> Result<String, CommandError> {
+    info!("Running {:?}", command);
+
+    let cmd_display = command_name.to_string();
+
+    let cmd_output = command.stdin(Stdio::inherit()).output();
+    match cmd_output {
+        Ok(output) => {
+            if output.status.success() {
+                Ok(String::from_utf8_lossy(&output.stdout).into_owned())
+            } else {
+                Err(CommandError::from_status(
+                    &cmd_display,
+                    output.status,
+                    Some(String::from_utf8_lossy(&output.stderr).into_owned()),
+                ))
+            }
+        }
+        Err(e) => Err(CommandError::from_error(&cmd_display, e)),
     }
 }