Update wapm dependencies (#184)

MarkMcCaskey · web-flow · commit f128812e7252 · 2020-03-10T17:46:44.000-07:00
* Update wapm dependencies

* Manually update dependencies

This reduces the total number of dependencies by ~80-100

* Update reqwest for update notifications too

* Clean up merge, fix tempdir upgrade mistake
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -11,50 +11,42 @@ license = "MIT"
 atty = "0.2"
 billboard = { version = "0.1.0", optional = true }
 chrono = { version = "0.4", features = ["serde"] }
-colored = "1.8"
+colored = { version = "1.8", optional = true }
 dirs = "1"
-dotenv = "0.13.0"
-dunce = "1.0.0"
 failure = "*"
-fern = {version = "0.5", features = ["colored"]}
+fern = {version = "0.6", features = ["colored"]}
 flate2 = "1.0.7"
-fs_extra = "1"
-graphql_client = "0.7.0"
-indicatif = "0.11"
+graphql_client = "0.8.0"
 lazy_static = "1.3"
 license-exprs = "1.4.0"
 log = "0.4"
 maplit = { version = "1", optional = true }
-minisign = "0.5.9"
-path-slash = "0.1.1"
+minisign = "0.5"
 prettytable-rs = "0.8.0"
 regex = "1"
-reqwest = {version = "0.9.12", features = ["default-tls-vendored"]}
-rpassword = "3.0.0"
-rusqlite = {version = "0.18", features = ["bundled"]}
-semver = "0.9"
+reqwest = {version = "0.10", features = ["native-tls-vendored", "blocking", "json", "gzip"]}
+rpassword = "4"
+rusqlite = {version = "0.21", features = ["bundled"]}
+semver = { version = "0.9", features = ["serde"] }
 sentry = {version = "0.15", optional = true, features = ["with_failure", "with_panic", "with_backtrace"]}
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
 structopt = { version = "0.3", features = ["color"] }
 tar = "0.4"
-tempdir = "0.3"
+tempfile = "3"
 time = "0.1"
 toml = "0.5.6"
-toml-query = "0.9.2"
-url = "1.7"
-walrus = "0.5"
+url = "2"
 wasm-interface = { path = "lib/wasm-interface" }
-wasmparser = "0.39.2"
+wasmparser = "0.51.4"
 whoami = "0.5"
-zstd = "0.4"
 dialoguer = "0.4.0"
 hex = { version = "0.4", optional = true }
 blake3 = { version = "0.1.0", optional = true }
 
 [dev-dependencies]
-tempdir = "0.3"
+tempfile = "3"
 
 [workspace]
 members = [
@@ -65,7 +57,7 @@ members = [
 [features]
 default = ["packagesigning"]
 telemetry = ["sentry"]
-update-notifications= ["billboard"]
+update-notifications= ["billboard", "colored"]
 prehash-module = ["hex", "blake3"]
 packagesigning = []
 integration_tests = ["maplit"]
diff --git a/lib/wasm-interface/Cargo.toml b/lib/wasm-interface/Cargo.toml
@@ -12,7 +12,7 @@ bincode = { version = "1", optional = true }
 either = "1.5"
 nom = "5"
 serde = { version = "1", features = ["derive"] }
-wasmparser = { version = "0.32", optional = true }
+wasmparser = { version = "0.51.4", optional = true }
 
 [dev-dependencies]
 wabt = "0.7"
diff --git a/src/commands/execute.rs b/src/commands/execute.rs
@@ -300,7 +300,6 @@ pub fn execute(opt: ExecuteOpt) -> Result<(), failure::Error> {
                 &opt.pre_opened_directories,
                 &opt.args,
                 prehashed_cache_key,
-                &default_wax_command_name_formatter,
             )?;
             return Ok(());
         }
@@ -553,7 +552,6 @@ fn run(
                 pre_opened_directories,
                 args,
                 prehashed_cache_key,
-                &default_wax_command_name_formatter,
             );
         }
         FindCommandResult::Error(e) => return Err(e),
@@ -599,7 +597,3 @@ fn get_wax_cooldown() -> i32 {
         .map(|c| c.wax_cooldown)
         .unwrap_or(config::wax_default_cooldown())
 }
-
-fn default_wax_command_name_formatter(command_name: &str) -> String {
-    format!("wax {}", command_name)
-}
diff --git a/src/commands/publish.rs b/src/commands/publish.rs
@@ -116,8 +116,12 @@ pub fn publish(publish_opts: PublishOpt) -> Result<(), failure::Error> {
                                                         // TODO:
                                                         PublishError::NoModule)?;
     let archive_name = "package.tar.gz".to_string();
-    let archive_dir = tempdir::TempDir::new("wapm_package")?;
-    let archive_path = archive_dir.as_ref().join(&archive_name);
+    let archive_dir = tempfile::TempDir::new()?;
+    fs::create_dir(archive_dir.path().join("wapm_package"))?;
+    let archive_path = archive_dir
+        .as_ref()
+        .join("wapm_package")
+        .join(&archive_name);
     let mut compressed_archive = fs::File::create(&archive_path).unwrap();
     let mut gz_enc = GzEncoder::new(&mut compressed_archive, Compression::default());
 
diff --git a/src/commands/run.rs b/src/commands/run.rs
@@ -75,14 +75,9 @@ pub fn run(run_options: RunOpt) -> Result<(), failure::Error> {
         &run_options.pre_opened_directories,
         &args,
         prehashed_cache_key,
-        &default_wapm_command_name_formatter,
     )
 }
 
-fn default_wapm_command_name_formatter(command_name: &str) -> String {
-    format!("wapm run {}", command_name)
-}
-
 pub(crate) fn do_run(
     run_dir: PathBuf,
     source_path_buf: PathBuf,
@@ -92,7 +87,6 @@ pub(crate) fn do_run(
     pre_opened_directories: &[String],
     args: &[OsString],
     prehashed_cache_key: Option<String>,
-    command_name_formatter: &dyn Fn(&str) -> String,
 ) -> Result<(), failure::Error> {
     debug!(
         "Running module located at {:?}",
@@ -130,13 +124,11 @@ pub(crate) fn do_run(
         .collect();
 
     let mut disable_command_rename = false;
-    let mut rename_commands_to_raw_command_name = false;
 
     match ManifestResult::find_in_directory(&manifest_dir) {
         ManifestResult::Manifest(manifest) => {
             disable_command_rename = manifest.package.disable_command_rename;
-            rename_commands_to_raw_command_name =
-                manifest.package.rename_commands_to_raw_command_name;
+            manifest.package.rename_commands_to_raw_command_name;
             if let Some(ref fs) = manifest.fs {
                 // todo: normalize (rm `:` and newline, etc) these paths if we haven't yet
                 for (guest_path, host_path) in fs.iter() {
@@ -235,15 +227,14 @@ mod test {
     #[test]
     fn create_run_command_vec() {
         let args: Vec<OsString> = vec![OsString::from("arg1"), OsString::from("arg2")];
-        let tmp_dir = tempdir::TempDir::new("create_run_command_vec").unwrap();
+        let tmp_dir = tempfile::TempDir::new().unwrap();
         let dir = tmp_dir.path();
         let wapm_module_dir = dir.join(
             [PACKAGES_DIR_NAME, "_", "foo@1.0.2"]
                 .iter()
                 .collect::<PathBuf>(),
         );
         fs::create_dir_all(&wapm_module_dir).unwrap();
-        // calling dunce here to help wih comparing paths on different platforms
         let expected_dir: PathBuf = wapm_module_dir.clone();
         let expected_dir = expected_dir.join("foo_entry.wasm");
         let expected_command = vec![
diff --git a/src/commands/validate.rs b/src/commands/validate.rs
@@ -37,7 +37,7 @@ pub fn validate_manifest_and_modules(pkg_path: PathBuf) -> Result<(), failure::E
         gz.read_to_end(&mut archive_data)
             .map_err(|e| format_err!("Failed to read archive data: {}", e.to_string()))?;
 
-        let temp_out_dir = tempdir::TempDir::new("temp")
+        let temp_out_dir = tempfile::TempDir::new()
             .map_err(|e| format_err!("Could not create temporary directory: {}", e.to_string()))?;
         let out_dir = temp_out_dir.path();
         let mut archive = Archive::new(archive_data.as_slice());
diff --git a/src/config.rs b/src/config.rs
@@ -302,7 +302,7 @@ mod test {
 
     #[test]
     fn get_non_existent_config() {
-        let tmp_dir = tempdir::TempDir::new("get_non_existent_config").unwrap();
+        let tmp_dir = tempfile::TempDir::new().unwrap();
         // set the env var to our temp dir
         std::env::set_var(
             GLOBAL_CONFIG_FOLDER_ENV_VAR,
@@ -320,7 +320,7 @@ mod test {
 
     #[test]
     fn get_global_config() {
-        let tmp_dir = tempdir::TempDir::new("get_global_config").unwrap();
+        let tmp_dir = tempfile::TempDir::new().unwrap();
         let manifest_absolute_path = tmp_dir.path().join(GLOBAL_CONFIG_FILE_NAME);
         let mut file = File::create(&manifest_absolute_path).unwrap();
         let config = Config::default();
diff --git a/src/data/manifest.rs b/src/data/manifest.rs
@@ -288,7 +288,7 @@ mod dependency_tests {
 
     #[test]
     fn add_new_dependency() {
-        let tmp_dir = tempdir::TempDir::new("add_new_dependency").unwrap();
+        let tmp_dir = tempfile::TempDir::new().unwrap();
         let manifest_path = tmp_dir.path().join(MANIFEST_FILE_NAME);
         let mut file = File::create(&manifest_path).unwrap();
         let wapm_toml = toml! {
diff --git a/src/database.rs b/src/database.rs
@@ -124,7 +124,7 @@ mod test {
 
     #[test]
     fn data_version_was_updated() {
-        let tmp_dir = tempdir::TempDir::new("DB").unwrap().path().to_owned();
+        let tmp_dir = tempfile::TempDir::new().unwrap().path().to_owned();
         let mut conn = Connection::open(tmp_dir).unwrap();
         if let Err(MigrationError::MigrationNumberDoesNotExist { .. }) =
             apply_migration(&mut conn, CURRENT_DATA_VERSION)
diff --git a/src/dataflow/installed_packages.rs b/src/dataflow/installed_packages.rs
@@ -10,7 +10,7 @@ use crate::util::{
     self, create_package_dir, fully_qualified_package_display_name, get_package_namespace_and_name,
 };
 use flate2::read::GzDecoder;
-use reqwest::ClientBuilder;
+use reqwest::blocking::ClientBuilder;
 use std::fs::{self, OpenOptions};
 use std::io;
 use std::io::{Seek, SeekFrom};
@@ -387,9 +387,14 @@ impl<'a> Install<'a> for RegistryInstaller {
                 Box::new(|_dest| Ok(()))
             };
 
-        let temp_dir = tempdir::TempDir::new("wapm_package_install")
+        let temp_dir = tempfile::TempDir::new()
             .map_err(|e| Error::DownloadError(key.to_string(), e.to_string()))?;
-        let temp_tar_gz_path = temp_dir.path().join("package.tar.gz");
+        fs::create_dir(temp_dir.path().join("wapm_package_install"))
+            .map_err(|e| Error::IoErrorCreatingDirectory(key.to_string(), e.to_string()))?;
+        let temp_tar_gz_path = temp_dir
+            .path()
+            .join("wapm_package_install")
+            .join("package.tar.gz");
         let mut dest = OpenOptions::new()
             .read(true)
             .write(true)
diff --git a/src/graphql.rs b/src/graphql.rs
@@ -1,8 +1,9 @@
 use crate::proxy;
 use failure;
 use graphql_client::{QueryBody, Response};
+use reqwest::blocking::multipart;
+use reqwest::blocking::Client;
 use reqwest::header::USER_AGENT;
-use reqwest::Client;
 use serde;
 use std::string::ToString;
 
@@ -24,7 +25,7 @@ pub fn execute_query_modifier<R, V, F>(
 where
     for<'de> R: serde::Deserialize<'de>,
     V: serde::Serialize,
-    F: FnOnce(reqwest::multipart::Form) -> reqwest::multipart::Form,
+    F: FnOnce(multipart::Form) -> multipart::Form,
 {
     let client = {
         let builder = Client::builder();
@@ -41,7 +42,7 @@ where
     let registry_url = &config.registry.get_graphql_url();
     let vars = serde_json::to_string(&query.variables).unwrap();
 
-    let form = reqwest::multipart::Form::new()
+    let form = multipart::Form::new()
         .text("query", query.query.to_string())
         .text("operationName", query.operation_name.to_string())
         .text("variables", vars);
@@ -55,7 +56,7 @@ where
         whoami::os().to_lowercase(),
     );
 
-    let mut res = client
+    let res = client
         .post(registry_url)
         .multipart(form)
         .bearer_auth(&config.registry.token.unwrap_or_else(|| "".to_string()))
diff --git a/src/integration_tests/prelude.rs b/src/integration_tests/prelude.rs
@@ -12,9 +12,8 @@ pub fn set_registry_to_dev() -> Result<(), failure::Error> {
     ))
 }
 
-pub fn set_test_dir_to_new_temp_dir() -> tempdir::TempDir {
-    let new_dir =
-        tempdir::TempDir::new("wapm_integration_test").expect("Could not create temp dir");
+pub fn set_test_dir_to_new_temp_dir() -> tempfile::TempDir {
+    let new_dir = tempfile::TempDir::new().expect("Could not create temp dir");
     let new_cur_dir = new_dir.path().join("integration_test");
     std::fs::create_dir(&new_cur_dir).expect("Could not create subdir");
     std::env::set_current_dir(new_cur_dir)
diff --git a/src/update_notifier.rs b/src/update_notifier.rs
@@ -7,8 +7,9 @@ use billboard::{Billboard, BorderStyle};
 use chrono::{DateTime, Utc};
 use colored::*;
 use reqwest::{
+    blocking::{Client, Response},
     header::{HeaderValue, ACCEPT},
-    Client, RedirectPolicy, Response,
+    redirect,
 };
 use std::env;
 use std::fs::File;
@@ -200,11 +201,11 @@ pub fn get_latest_tag() -> Result<String, String> {
         Ok(None) => builder, //continue without proxy
         Err(e) => return Err(e.to_string()),
     }
-    .redirect(RedirectPolicy::limited(10))
+    .redirect(redirect::Policy::limited(10))
     .build()
     .map_err(|err| err.to_string())?;
 
-    let mut response: Response = client
+    let response: Response = client
         .get(GITHUB_RELEASE_PAGE)
         .header(ACCEPT, HeaderValue::from_static("application/json"))
         .send()
diff --git a/src/validate.rs b/src/validate.rs
@@ -103,7 +103,7 @@ pub fn validate_wasm_and_report_errors_old(
     let mut parser = wasmparser::ValidatingParser::new(wasm, None);
     loop {
         let state = parser.read();
-        match *state {
+        match state {
             wasmparser::ParserState::EndWasm => return Ok(()),
             wasmparser::ParserState::Error(e) => {
                 return Err(ValidationError::InvalidWasm {
