This lets us leverage `cargo` for semver finding and then ensure that we get the exact same version of the CLI that cargo selected. It also lets us support fuzzy dependencies like "0.2" instead of exact dependencies like "0.2.21" again.master
data-pup
7 years ago
committed by
Alex Crichton
parent
6f0a8b8ece
commit
dd87211323
@ -0,0 +1,91 @@ |
||||
//! Reading Cargo.lock lock file.
|
||||
|
||||
use std::fs::File; |
||||
use std::io::Read; |
||||
use std::path::{Path, PathBuf}; |
||||
|
||||
use cargo_metadata; |
||||
use console::style; |
||||
use error::Error; |
||||
use toml; |
||||
|
||||
/// This struct represents the contents of `Cargo.lock`.
|
||||
#[derive(Clone, Debug, Deserialize)] |
||||
struct Lockfile { |
||||
package: Vec<Package>, |
||||
} |
||||
|
||||
/// This struct represents a single package entry in `Cargo.lock`
|
||||
#[derive(Clone, Debug, Deserialize)] |
||||
struct Package { |
||||
name: String, |
||||
version: String, |
||||
} |
||||
|
||||
impl Lockfile { |
||||
fn get_package_version(&self, package: &str) -> Option<String> { |
||||
self.package |
||||
.iter() |
||||
.find(|p| p.name == package) |
||||
.map(|p| p.version.clone()) |
||||
} |
||||
} |
||||
|
||||
/// Get the version of `wasm-bindgen` dependency used in the `Cargo.lock`.
|
||||
pub fn get_wasm_bindgen_version(path: &Path) -> Result<String, Error> { |
||||
let lockfile = read_cargo_lock(&path)?; |
||||
lockfile.get_package_version("wasm-bindgen").ok_or_else(|| { |
||||
let message = format!( |
||||
"Ensure that you have \"{}\" as a dependency in your Cargo.toml file:\n\ |
||||
[dependencies]\n\ |
||||
wasm-bindgen = \"0.2\"", |
||||
style("wasm-bindgen").bold().dim(), |
||||
); |
||||
Error::CrateConfig { message } |
||||
}) |
||||
} |
||||
|
||||
/// Get the version of `wasm-bindgen` dependency used in the `Cargo.lock`.
|
||||
pub fn get_wasm_bindgen_test_version(path: &Path) -> Result<String, Error> { |
||||
let lockfile = read_cargo_lock(&path)?; |
||||
lockfile |
||||
.get_package_version("wasm-bindgen-test") |
||||
.ok_or_else(|| { |
||||
let message = format!( |
||||
"Ensure that you have \"{}\" as a dependency in your Cargo.toml file:\n\ |
||||
[dev-dependencies]\n\ |
||||
wasm-bindgen-test = \"0.2\"", |
||||
style("wasm-bindgen").bold().dim(), |
||||
); |
||||
Error::CrateConfig { message } |
||||
}) |
||||
} |
||||
|
||||
/// Read the `Cargo.lock` file for the crate at the given path.
|
||||
fn read_cargo_lock(crate_path: &Path) -> Result<Lockfile, Error> { |
||||
let lock_path = get_lockfile_path(crate_path)?; |
||||
let mut lockfile = String::new(); |
||||
File::open(lock_path)?.read_to_string(&mut lockfile)?; |
||||
toml::from_str(&lockfile).map_err(Error::from) |
||||
} |
||||
|
||||
/// Given the path to the crate that we are buliding, return a `PathBuf`
|
||||
/// containing the location of the lock file, by finding the workspace root.
|
||||
fn get_lockfile_path(crate_path: &Path) -> Result<PathBuf, Error> { |
||||
// Identify the crate's root directory, or return an error.
|
||||
let manifest = crate_path.join("Cargo.toml"); |
||||
let crate_root = cargo_metadata::metadata(Some(&manifest)) |
||||
.map_err(|_| Error::CrateConfig { |
||||
message: String::from("Error while processing crate metadata"), |
||||
})?.workspace_root; |
||||
// Check that a lock file can be found in the directory. Return an error
|
||||
// if it cannot, otherwise return the path buffer.
|
||||
let lockfile_path = Path::new(&crate_root).join("Cargo.lock"); |
||||
if !lockfile_path.is_file() { |
||||
Err(Error::CrateConfig { |
||||
message: format!("Could not find lockfile at {:?}", lockfile_path), |
||||
}) |
||||
} else { |
||||
Ok(lockfile_path) |
||||
} |
||||
} |
||||
@ -0,0 +1,131 @@ |
||||
use utils::fixture; |
||||
use wasm_pack::lockfile; |
||||
|
||||
#[test] |
||||
fn it_gets_wasm_bindgen_version() { |
||||
let fixture = fixture::js_hello_world(); |
||||
fixture.cargo_check(); |
||||
assert_eq!( |
||||
lockfile::get_wasm_bindgen_version(&fixture.path).unwrap(), |
||||
"0.2.21" |
||||
); |
||||
} |
||||
|
||||
#[test] |
||||
fn it_gets_wasm_bindgen_test_version() { |
||||
let fixture = fixture::wbg_test_node(); |
||||
fixture.cargo_check(); |
||||
assert_eq!( |
||||
lockfile::get_wasm_bindgen_test_version(&fixture.path).unwrap(), |
||||
"0.2.21" |
||||
); |
||||
} |
||||
|
||||
#[test] |
||||
fn it_gets_wasm_bindgen_version_in_crate_inside_workspace() { |
||||
let fixture = fixture::Fixture::new(); |
||||
fixture |
||||
.file( |
||||
"Cargo.toml", |
||||
r#" |
||||
[workspace] |
||||
members = ["./blah"] |
||||
"#, |
||||
).file( |
||||
"blah/Cargo.toml", |
||||
r#" |
||||
[package] |
||||
authors = ["The wasm-pack developers"] |
||||
description = "so awesome rust+wasm package" |
||||
license = "WTFPL" |
||||
name = "blah" |
||||
repository = "https://github.com/rustwasm/wasm-pack.git" |
||||
version = "0.1.0" |
||||
|
||||
[lib] |
||||
crate-type = ["cdylib"] |
||||
|
||||
[dependencies] |
||||
wasm-bindgen = "=0.2.21" |
||||
"#, |
||||
).file( |
||||
"blah/src/lib.rs", |
||||
r#" |
||||
extern crate wasm_bindgen; |
||||
use wasm_bindgen::prelude::*; |
||||
|
||||
#[wasm_bindgen] |
||||
pub fn hello() -> u32 { 42 } |
||||
"#, |
||||
); |
||||
fixture.cargo_check(); |
||||
assert_eq!( |
||||
lockfile::get_wasm_bindgen_version(&fixture.path.join("blah")).unwrap(), |
||||
"0.2.21" |
||||
); |
||||
} |
||||
|
||||
#[test] |
||||
fn it_gets_wasm_bindgen_version_from_dependencies() { |
||||
let fixture = fixture::Fixture::new(); |
||||
fixture |
||||
.file( |
||||
"Cargo.toml", |
||||
r#" |
||||
[workspace] |
||||
members = ["./parent", "./child"] |
||||
"#, |
||||
).file( |
||||
"child/Cargo.toml", |
||||
r#" |
||||
[package] |
||||
authors = ["The wasm-pack developers"] |
||||
description = "so awesome rust+wasm package" |
||||
license = "WTFPL" |
||||
name = "child" |
||||
repository = "https://github.com/rustwasm/wasm-pack.git" |
||||
version = "0.1.0" |
||||
|
||||
[lib] |
||||
crate-type = ["cdylib"] |
||||
|
||||
[dependencies] |
||||
wasm-bindgen = "=0.2.21" |
||||
"#, |
||||
).file( |
||||
"child/src/lib.rs", |
||||
r#" |
||||
extern crate wasm_bindgen; |
||||
use wasm_bindgen::prelude::*; |
||||
|
||||
#[wasm_bindgen] |
||||
pub fn hello() -> u32 { 42 } |
||||
"#, |
||||
).file( |
||||
"parent/Cargo.toml", |
||||
r#" |
||||
[package] |
||||
authors = ["The wasm-pack developers"] |
||||
description = "so awesome rust+wasm package" |
||||
license = "WTFPL" |
||||
name = "parent" |
||||
repository = "https://github.com/rustwasm/wasm-pack.git" |
||||
version = "0.1.0" |
||||
|
||||
[lib] |
||||
crate-type = ["cdylib"] |
||||
"#, |
||||
).file( |
||||
"parent/src/lib.rs", |
||||
r#" |
||||
// Just re-export all of `child`.
|
||||
extern crate child; |
||||
pub use child::*; |
||||
"#, |
||||
); |
||||
fixture.cargo_check(); |
||||
assert_eq!( |
||||
lockfile::get_wasm_bindgen_version(&fixture.path.join("parent")).unwrap(), |
||||
"0.2.21" |
||||
); |
||||
} |
||||
Loading…
Reference in new issue