-
Notifications
You must be signed in to change notification settings - Fork 824
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #4287 from wasmerio/feat-cli-package-download
feat(cli): Add package commands
- Loading branch information
Showing
15 changed files
with
522 additions
and
69 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| mod unpack; | ||
|
|
||
| pub use unpack::PackageUnpack; | ||
|
|
||
| /// Container related commands. (inspecting, unpacking, ...) | ||
| #[derive(clap::Subcommand, Debug)] | ||
| // Allowing missing_docs because the comment would override the doc comment on | ||
| // the command struct. | ||
| #[allow(missing_docs)] | ||
| pub enum Container { | ||
| Unpack(PackageUnpack), | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| use std::path::PathBuf; | ||
|
|
||
| use anyhow::Context; | ||
|
|
||
| /// Extract contents of a container to a directory. | ||
| #[derive(clap::Parser, Debug)] | ||
| pub struct PackageUnpack { | ||
| /// The output directory. | ||
| #[clap(short = 'o', long)] | ||
| out_dir: PathBuf, | ||
|
|
||
| /// Overwrite existing directories/files. | ||
| #[clap(long)] | ||
| overwrite: bool, | ||
|
|
||
| /// Path to the package. | ||
| package_path: PathBuf, | ||
| } | ||
|
|
||
| impl PackageUnpack { | ||
| pub(crate) fn execute(&self) -> Result<(), anyhow::Error> { | ||
| eprintln!("Unpacking..."); | ||
|
|
||
| let pkg = webc::compat::Container::from_disk(&self.package_path).with_context(|| { | ||
| format!( | ||
| "could not open package at '{}'", | ||
| self.package_path.display() | ||
| ) | ||
| })?; | ||
|
|
||
| let outdir = &self.out_dir; | ||
| std::fs::create_dir_all(outdir) | ||
| .with_context(|| format!("could not create output directory '{}'", outdir.display()))?; | ||
|
|
||
| pkg.unpack(outdir, self.overwrite) | ||
| .with_context(|| "could not extract package".to_string())?; | ||
|
|
||
| eprintln!("Extracted package contents to '{}'", self.out_dir.display()); | ||
|
|
||
| Ok(()) | ||
| } | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| mod tests { | ||
| use super::*; | ||
|
|
||
| /// Download a package from the dev registry. | ||
| #[test] | ||
| fn test_cmd_package_extract() { | ||
| let dir = tempfile::tempdir().unwrap(); | ||
|
|
||
| let package_path = std::env::var("CARGO_MANIFEST_DIR").map(PathBuf::from).unwrap() | ||
| .parent().unwrap() | ||
| .parent().unwrap() | ||
| .join("tests/integration/cli/tests/webc/hello-0.1.0-665d2ddc-80e6-4845-85d3-4587b1693bb7.webc"); | ||
|
|
||
| assert!(package_path.is_file()); | ||
|
|
||
| let cmd = PackageUnpack { | ||
| out_dir: dir.path().to_owned(), | ||
| overwrite: false, | ||
| package_path, | ||
| }; | ||
|
|
||
| cmd.execute().unwrap(); | ||
|
|
||
| let mut items = std::fs::read_dir(dir.path()) | ||
| .unwrap() | ||
| .map(|x| { | ||
| x.unwrap() | ||
| .path() | ||
| .file_name() | ||
| .unwrap() | ||
| .to_str() | ||
| .unwrap() | ||
| .to_string() | ||
| }) | ||
| .collect::<Vec<_>>(); | ||
| items.sort(); | ||
| assert_eq!( | ||
| items, | ||
| vec![ | ||
| "atom".to_string(), | ||
| "manifest.json".to_string(), | ||
| "metadata".to_string(), | ||
| ] | ||
| ); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.