Add support for repository extract --sources. (#71)

All that remains is handling the `--use-system-time` flag.

Author: jsirois

Cargo.lock

@@ -22,15 +22,16 @@ members = [
     "crates/pexrs",
     "crates/platform",
     "crates/python-proxy",
+    "crates/request",
     "crates/scripts",
     "crates/target",
     "crates/testing",
     "crates/tools",
-    "crates/venv",
+    "crates/venv"
 ]
 
 [package.metadata.build]
-zig_version = "0.15.2"
+zig_version = "0.16.0"
 
 [package.metadata.build.cargo_binstall]
 version = "1.17.4"
@@ -134,6 +135,7 @@ anstream = "1.0"
 anyhow = "1.0"
 base64 = "0.22"
 bstr = "1.12"
+chrono = "0.4"
 clap = {  version = "4.6", features = ["color", "derive", "string"] }
 clap-verbosity-flag = "3.0"
 colorchoice-clap = "1.0"
@@ -170,7 +172,6 @@ pep508_rs = "0.9"
 python-pkginfo = "0.6"
 rayon = "1.12"
 regex = "1.12"
-reqwest = { version = "0.13", features = ["blocking"] }
 rstest = "0.26"
 rust-ini = "0.21"
 same-file = "1.0"
@@ -190,7 +191,7 @@ url = "2.5"
 walkdir = "2.5"
 which = "8.0"
 xz2 = "0.1"
-zip = { version = "8.5", default-features = false, features = ["deflate", "zstd"] }
+zip = { version = "8.6", default-features = false, features = ["chrono", "deflate", "zstd"] }
 zstd = "0.13"
 
 [build-dependencies]
@@ -226,11 +227,13 @@ pexrs = { path = "crates/pexrs" }
 platform = { path = "crates/platform" }
 python-proxy = { path = "crates/python-proxy" }
 rayon = { workspace = true }
+request = { path = "crates/request" }
 scripts = { path = "crates/scripts", features = ["embedded"] }
 sha2 = { workspace = true }
 strum = { workspace = true }
 target = { path = "crates/target" }
 tempfile = { workspace = true }
+url = { workspace = true }
 walkdir = { workspace = true }
 zip = { workspace = true }
-zstd = { workspace = true }
+zstd = { workspace = true }

Cargo.toml

@@ -46,7 +46,11 @@ pub fn sh_boot_shebang(pex: &Path, escaped: bool) -> anyhow::Result<Option<Strin
 
     let interpreter_constraints =
         InterpreterConstraints::try_from(&pex.info.interpreter_constraints)?;
-    let selection_strategy: SelectionStrategy = pex.info.interpreter_selection_strategy.into();
+    let selection_strategy: SelectionStrategy = pex
+        .info
+        .interpreter_selection_strategy
+        .unwrap_or(pex::InterpreterSelectionStrategy::Oldest)
+        .into();
     let pythons = interpreter_constraints
         .calculate_compatible_binary_names(selection_strategy)
         .into_iter()

crates/boot/src/lib.rs

@@ -17,7 +17,7 @@ fs-err = { workspace = true }
 hex = { workspace = true }
 itertools = { workspace = true }
 platform = { path = "../platform" }
-reqwest = { workspace = true }
+request = { path = "../request" }
 serde = { workspace = true }
 sha2 = { workspace = true }
 strum = { workspace = true }
@@ -27,6 +27,7 @@ target = { path = "../target" }
 target-lexicon = { workspace = true }
 toml = { workspace = true }
 tempfile = { workspace = true }
+url = { workspace = true }
 xz2 = { workspace = true }
 zip = { workspace = true }
 which = { workspace = true }

crates/build-system/Cargo.toml

@@ -9,6 +9,7 @@ use anyhow::{anyhow, bail};
 use fs_err as fs;
 use fs_err::File;
 use sha2::{Digest, Sha256};
+use url::Url;
 
 use crate::metadata::{Download, FileType};
 
@@ -111,9 +112,9 @@ pub(crate) fn ensure_download(download: &Download, download_dir: &Path) -> anyho
         algorithm => bail!("No support for {algorithm} hashes."),
     };
 
-    let url = reqwest::Url::parse(download.url.as_ref())?;
+    let url = Url::parse(download.url.as_ref())?;
 
-    let response = reqwest::blocking::get(url.as_ref())?;
+    let response = request::get(url.as_ref())?;
     if let Some(actual_size) = response.content_length()
         && actual_size != download.size
     {

crates/build-system/src/downloads.rs

@@ -135,6 +135,12 @@ fn get_zig_version(zig: &Path) -> Option<String> {
         })
 }
 
+fn check_zig_version(version: &str, zig: &Path) -> bool {
+    get_zig_version(zig)
+        .map(|zig_version| zig_version == version)
+        .unwrap_or_default()
+}
+
 pub struct InstallDirs {
     bin_dir: PathBuf,
     pub(crate) data_dir: PathBuf,
@@ -295,6 +301,7 @@ fn install_tools<'a>(
             if platform::is_executable(&python_zig)
                 .ok()
                 .unwrap_or_default()
+                && check_zig_version(version, &python_zig)
             {
                 return Ok(Cow::Owned(FoundTool {
                     env_var: ZIG_TOOL_ENV_VAR,
@@ -306,6 +313,7 @@ fn install_tools<'a>(
                 if platform::is_executable(&python_zig_exe)
                     .ok()
                     .unwrap_or_default()
+                    && check_zig_version(version, &python_zig_exe)
                 {
                     return Ok(Cow::Owned(FoundTool {
                         env_var: ZIG_TOOL_ENV_VAR,