tectonic(!): switch to using tectonic_bundles

Start using the separated-out bundle implementation crate. Now you can
work with bundles, and the cache, without having to link to XeTeX and
everything! This is a BREAKING CHANGE because the original bundle
implementations have been removed, and the Bundle trait has gained a new
required method.

Author: pkgw

Diff for: CARGO_README.md

@@ -57,8 +57,10 @@ sub-crates:
 - [`tectonic_bridge_graphite2`](https://crates.io/crates/tectonic_bridge_graphite2)
 - [`tectonic_bridge_harfbuzz`](https://crates.io/crates/tectonic_bridge_harfbuzz)
 - [`tectonic_bridge_icu`](https://crates.io/crates/tectonic_bridge_icu)
+- [`tectonic_bundles`](https://crates.io/crates/tectonic_bundles)
 - [`tectonic_cfg_support`](https://crates.io/crates/tectonic_cfg_support)
 - [`tectonic_dep_support`](https://crates.io/crates/tectonic_dep_support)
+- [`tectonic_docmodel`](https://crates.io/crates/tectonic_docmodel)
 - [`tectonic_engine_bibtex`](https://crates.io/crates/tectonic_engine_bibtex)
 - [`tectonic_engine_xdvipdfmx`](https://crates.io/crates/tectonic_engine_xdvipdfmx)
 - [`tectonic_engine_xetex`](https://crates.io/crates/tectonic_engine_xetex)

Diff for: Cargo.lock

@@ -67,6 +67,7 @@ serde = { version = "^1.0", features = ["derive"], optional = true }
 sha2 = "^0.9"
 structopt = "0.3"
 tectonic_bridge_core = { path = "crates/bridge_core", version = "0.0.0-dev.0" }
+tectonic_bundles = { path = "crates/bundles", version = "0.0.0-dev.0", default-features = false }
 tectonic_docmodel = { path = "crates/docmodel", version = "0.0.0-dev.0", optional = true }
 tectonic_engine_bibtex = { path = "crates/engine_bibtex", version = "0.0.0-dev.0" }
 tectonic_engine_xdvipdfmx = { path = "crates/engine_xdvipdfmx", version = "0.0.0-dev.0" }
@@ -97,10 +98,10 @@ serialization = ["serde", "tectonic_docmodel", "toml"]
 
 external-harfbuzz = ["tectonic_engine_xetex/external-harfbuzz"]
 
-geturl-curl = ["tectonic_geturl/curl"]
-geturl-reqwest = ["tectonic_geturl/reqwest"]
+geturl-curl = ["tectonic_bundles/geturl-curl", "tectonic_geturl/curl"]
+geturl-reqwest = ["tectonic_bundles/geturl-reqwest", "tectonic_geturl/reqwest"]
 
-native-tls-vendored = ["tectonic_geturl/native-tls-vendored"]
+native-tls-vendored = ["tectonic_bundles/native-tls-vendored", "tectonic_geturl/native-tls-vendored"]
 
 # developer feature to compile with the necessary flags for profiling tectonic.
 profile = []
@@ -129,6 +130,7 @@ tectonic_bridge_flate = "thiscommit:2021-01-01:eer4ahL4"
 tectonic_bridge_graphite2 = "2c1ffcd702a662c003bd3d7d0ca4d169784cb6ad"
 tectonic_bridge_harfbuzz = "2c1ffcd702a662c003bd3d7d0ca4d169784cb6ad"
 tectonic_bridge_icu = "2c1ffcd702a662c003bd3d7d0ca4d169784cb6ad"
+tectonic_bundles = "thiscommit:2021-06-13:Q0esYor"
 tectonic_cfg_support = "thiscommit:aeRoo7oa"
 tectonic_dep_support = "5faf4205bdd3d31101b749fc32857dd746f9e5bc"
 tectonic_docmodel = "cd77b60d48b1ae3ef80d708e6858ea91cd9fa812"

Diff for: Cargo.toml

@@ -15,15 +15,14 @@ use std::{
     path::{Path, PathBuf},
     sync::atomic::{AtomicBool, Ordering},
 };
+use tectonic_bundles::{
+    cache::Cache, dir::DirBundle, itar::IndexedTarBackend, zip::ZipBundle, Bundle,
+};
+use tectonic_io_base::app_dirs;
 use url::Url;
 
 use crate::{
-    app_dirs,
     errors::{ErrorKind, Result},
-    io::cached_itarbundle::CachedITarBundle,
-    io::dirbundle::DirBundle,
-    io::zipbundle::ZipBundle,
-    io::Bundle,
     status::StatusBackend,
 };
 
@@ -123,8 +122,13 @@ impl PersistentConfig {
         custom_cache_root: Option<&Path>,
         status: &mut dyn StatusBackend,
     ) -> Result<Box<dyn Bundle>> {
-        let bundle = CachedITarBundle::new(url, only_cached, custom_cache_root, status)?;
+        let mut cache = if let Some(root) = custom_cache_root {
+            Cache::get_for_custom_directory(root)
+        } else {
+            Cache::get_user_default()?
+        };
 
+        let bundle = cache.open::<IndexedTarBackend>(url, only_cached, status)?;
         Ok(Box::new(bundle) as _)
     }
 
@@ -190,7 +194,7 @@ impl Default for PersistentConfig {
     fn default() -> Self {
         PersistentConfig {
             default_bundles: vec![BundleInfo {
-                url: String::from("https://archive.org/services/purl/net/pkgwpub/tectonic-default"),
+                url: String::from(tectonic_bundles::FALLBACK_BUNDLE_URL),
             }],
         }
     }

Diff for: src/config.rs

@@ -12,6 +12,9 @@ use std::{
     fs, io,
     path::{Path, PathBuf},
 };
+use tectonic_bundles::{
+    cache::Cache, dir::DirBundle, itar::IndexedTarBackend, zip::ZipBundle, Bundle,
+};
 use tectonic_docmodel::{
     document::{BuildTargetType, Document},
     workspace::{Workspace, WorkspaceCreator},
@@ -23,7 +26,6 @@ use crate::{
     config, ctry,
     driver::{OutputFormat, PassSetting, ProcessingSessionBuilder},
     errors::{ErrorKind, Result},
-    io::{cached_itarbundle::CachedITarBundle, dirbundle::DirBundle, zipbundle::ZipBundle, Bundle},
     status::StatusBackend,
     test_util, tt_note,
 };
@@ -109,10 +111,10 @@ impl DocumentExt for Document {
             Ok(Box::new(test_util::TestBundle::default()))
         } else if let Ok(url) = Url::parse(&self.bundle_loc) {
             if url.scheme() != "file" {
-                let bundle = CachedITarBundle::new(
+                let mut cache = Cache::get_user_default()?;
+                let bundle = cache.open::<IndexedTarBackend>(
                     &self.bundle_loc,
                     setup_options.only_cached,
-                    None,
                     status,
                 )?;
                 Ok(Box::new(bundle))

Diff for: src/docmodel.rs

@@ -27,6 +27,7 @@ use std::{
     time::SystemTime,
 };
 use tectonic_bridge_core::{CoreBridgeLauncher, DriverHooks, SystemRequestError};
+use tectonic_bundles::Bundle;
 use tectonic_io_base::{
     digest::DigestData,
     filesystem::{FilesystemIo, FilesystemPrimaryInputIo},
@@ -40,7 +41,7 @@ use crate::{
     io::{
         format_cache::FormatCache,
         memory::{MemoryFileCollection, MemoryIo},
-        Bundle, InputOrigin,
+        InputOrigin,
     },
     status::StatusBackend,
     tt_error, tt_note, tt_warning,