Add consistent --web-bundle for v1 & v2 CLI

- Promote `--web-bundle` to a top level option, in v1 & v2 CLI.

- Allow `--web-bundle` to be specified in any position in v2 CLI.
  This makes use of `clap::Arg::global`.

- Allow user overrides of `--web-bundle` by specifying it multiple
  times, and the last specification wins over the previous ones.
  This makes use of `clap::Arg::overrides_with`.

By design, `tectonic -X build` is special as it never reads from the
global config, but only from the local `Tectonic.toml` file, to ensure
maximal reproducibility across different environments. Therefore, for
`-X build`, the global `--web-bundle` option, if specified, is ignored
with a warning `tt_note`.

Author: bryango

src/bin/tectonic/compile.rs

@@ -36,11 +36,6 @@ pub struct CompileOptions {
     #[structopt(takes_value(true), parse(from_os_str), long, short, name = "file_path")]
     bundle: Option<PathBuf>,
 
-    /// Use this URL to find resource files instead of the default
-    #[structopt(takes_value(true), long, short, name = "url")]
-    // TODO add URL validation
-    web_bundle: Option<String>,
-
     /// Use only resource files cached locally
     #[structopt(short = "C", long)]
     only_cached: bool,
@@ -95,7 +90,12 @@ pub struct CompileOptions {
 }
 
 impl CompileOptions {
-    pub fn execute(self, config: PersistentConfig, status: &mut dyn StatusBackend) -> Result<i32> {
+    pub fn execute(
+        self,
+        config: PersistentConfig,
+        status: &mut dyn StatusBackend,
+        web_bundle: Option<String>,
+    ) -> Result<i32> {
         let unstable = UnstableOptions::from_unstable_args(self.unstable.into_iter());
 
         // Default to allowing insecure since it would be super duper annoying
@@ -193,7 +193,7 @@ impl CompileOptions {
         }
         if let Some(path) = self.bundle {
             sess_builder.bundle(config.make_local_file_provider(path, status)?);
-        } else if let Some(u) = self.web_bundle {
+        } else if let Some(u) = web_bundle {
             sess_builder.bundle(config.make_cached_url_provider(&u, only_cached, None, status)?);
         } else {
             sess_builder.bundle(config.default_bundle(only_cached, status)?);

src/bin/tectonic/main.rs

@@ -51,6 +51,11 @@ struct CliOptions {
     #[structopt(long = "color", name = "when", default_value = "auto", possible_values(&["always", "auto", "never"]))]
     cli_color: String,
 
+    /// Use this URL to find resource files instead of the default
+    #[structopt(takes_value(true), long, short, name = "url", overrides_with = "url")]
+    // TODO add URL validation
+    web_bundle: Option<String>,
+
     #[structopt(flatten)]
     compile: compile::CompileOptions,
 }
@@ -165,7 +170,7 @@ fn main() {
     // all so that we can print out the word "error:" in red. This code
     // parallels various bits of the `error_chain` crate.
 
-    if let Err(e) = args.compile.execute(config, &mut *status) {
+    if let Err(e) = args.compile.execute(config, &mut *status, args.web_bundle) {
         status.report_error(&SyncError::new(e).into());
         process::exit(1)
     }

src/bin/tectonic/v2cli.rs

@@ -62,6 +62,18 @@ struct V2CliOptions {
     )]
     cli_color: String,
 
+    /// Use this URL to find resource files instead of the default
+    #[structopt(
+        takes_value(true),
+        long,
+        short,
+        name = "url",
+        overrides_with = "url",
+        global(true)
+    )]
+    // TODO add URL validation
+    web_bundle: Option<String>,
+
     #[structopt(subcommand)]
     command: Commands,
 }
@@ -138,7 +150,7 @@ pub fn v2_main(effective_args: &[OsString]) {
 
     // Now that we've got colorized output, pass off to the inner function.
 
-    let code = match args.command.execute(config, &mut *status) {
+    let code = match args.command.execute(config, &mut *status, args.web_bundle) {
         Ok(c) => c,
         Err(e) => {
             status.report_error(&SyncError::new(e).into());
@@ -204,14 +216,19 @@ impl Commands {
         }
     }
 
-    fn execute(self, config: PersistentConfig, status: &mut dyn StatusBackend) -> Result<i32> {
+    fn execute(
+        self,
+        config: PersistentConfig,
+        status: &mut dyn StatusBackend,
+        web_bundle: Option<String>,
+    ) -> Result<i32> {
         match self {
-            Commands::Build(o) => o.execute(config, status),
+            Commands::Build(o) => o.execute(config, status, web_bundle),
             Commands::Bundle(o) => o.execute(config, status),
-            Commands::Compile(o) => o.execute(config, status),
+            Commands::Compile(o) => o.execute(config, status, web_bundle),
             Commands::Dump(o) => o.execute(config, status),
-            Commands::New(o) => o.execute(config, status),
-            Commands::Init(o) => o.execute(config, status),
+            Commands::New(o) => o.execute(config, status, web_bundle),
+            Commands::Init(o) => o.execute(config, status, web_bundle),
             Commands::Show(o) => o.execute(config, status),
             Commands::Watch(o) => o.execute(config, status),
             Commands::External(args) => do_external(args),
@@ -254,7 +271,18 @@ pub struct BuildCommand {
 impl BuildCommand {
     fn customize(&self, _cc: &mut CommandCustomizations) {}
 
-    fn execute(self, config: PersistentConfig, status: &mut dyn StatusBackend) -> Result<i32> {
+    fn execute(
+        self,
+        config: PersistentConfig,
+        status: &mut dyn StatusBackend,
+        web_bundle: Option<String>,
+    ) -> Result<i32> {
+        // `--web-bundle` is not actually used for `-X build`,
+        // so inform the user instead of ignoring silently.
+        if let Some(url) = web_bundle {
+            tt_note!(status, "--web-bundle {} ignored", &url);
+            tt_note!(status, "using workspace bundle configuration");
+        }
         let ws = Workspace::open_from_environment()?;
         let doc = ws.first_document();
 
@@ -681,7 +709,12 @@ pub struct NewCommand {
 impl NewCommand {
     fn customize(&self, _cc: &mut CommandCustomizations) {}
 
-    fn execute(self, config: PersistentConfig, status: &mut dyn StatusBackend) -> Result<i32> {
+    fn execute(
+        self,
+        config: PersistentConfig,
+        status: &mut dyn StatusBackend,
+        web_bundle: Option<String>,
+    ) -> Result<i32> {
         tt_note!(
             status,
             "creating new document in directory `{}`",
@@ -690,7 +723,7 @@ impl NewCommand {
 
         let wc = WorkspaceCreator::new(self.path);
         ctry!(
-            wc.create_defaulted(&config, status);
+            wc.create_defaulted(config, status, web_bundle);
             "failed to create the new Tectonic workspace"
         );
         Ok(0)
@@ -704,7 +737,12 @@ pub struct InitCommand {}
 impl InitCommand {
     fn customize(&self, _cc: &mut CommandCustomizations) {}
 
-    fn execute(self, config: PersistentConfig, status: &mut dyn StatusBackend) -> Result<i32> {
+    fn execute(
+        self,
+        config: PersistentConfig,
+        status: &mut dyn StatusBackend,
+        web_bundle: Option<String>,
+    ) -> Result<i32> {
         let path = env::current_dir()?;
         tt_note!(
             status,
@@ -714,7 +752,7 @@ impl InitCommand {
 
         let wc = WorkspaceCreator::new(path);
         ctry!(
-            wc.create_defaulted(&config, status);
+            wc.create_defaulted(config, status, web_bundle);
             "failed to create the new Tectonic workspace"
         );
         Ok(0)

src/docmodel.rs

@@ -28,7 +28,7 @@ use crate::{
     driver::{OutputFormat, PassSetting, ProcessingSessionBuilder},
     errors::{ErrorKind, Result},
     status::StatusBackend,
-    test_util, tt_note,
+    tt_note,
     unstable_opts::UnstableOptions,
 };
 
@@ -111,9 +111,8 @@ impl DocumentExt for Document {
             }
         }
 
-        if config::is_config_test_mode_activated() {
-            let bundle = test_util::TestBundle::default();
-            Ok(Box::new(bundle))
+        if let Ok(test_bundle) = config::maybe_return_test_bundle(None) {
+            Ok(test_bundle)
         } else if let Ok(url) = Url::parse(&self.bundle_loc) {
             if url.scheme() != "file" {
                 let mut cache = Cache::get_user_default()?;
@@ -216,22 +215,25 @@ pub trait WorkspaceCreatorExt {
     /// for the main document.
     fn create_defaulted(
         self,
-        config: &config::PersistentConfig,
+        config: config::PersistentConfig,
         status: &mut dyn StatusBackend,
+        web_bundle: Option<String>,
     ) -> Result<Workspace>;
 }
 
 impl WorkspaceCreatorExt for WorkspaceCreator {
     fn create_defaulted(
         self,
-        config: &config::PersistentConfig,
+        config: config::PersistentConfig,
         status: &mut dyn StatusBackend,
+        web_bundle: Option<String>,
     ) -> Result<Workspace> {
-        let bundle_loc = if config::is_config_test_mode_activated() {
+        let bundle_loc = if config::is_test_bundle_wanted(web_bundle.clone()) {
             "test-bundle://".to_owned()
         } else {
+            let unresolved_loc = web_bundle.unwrap_or(config.default_bundle_loc().to_owned());
             let mut gub = DefaultBackend::default();
-            gub.resolve_url(config.default_bundle_loc(), status)?
+            gub.resolve_url(&unresolved_loc, status)?
         };
 
         Ok(self.create(bundle_loc)?)