Make josh-proxy installation unconditional

Author: Kobzol

src/bin/josh_sync.rs

@@ -153,17 +153,9 @@ fn maybe_create_gh_pr(repo: &str, title: &str, description: &str) -> anyhow::Res
 }
 
 fn get_josh_proxy() -> anyhow::Result<JoshProxy> {
-    match JoshProxy::lookup() {
+    println!("Updating/installing josh-proxy binary...");
+    match try_install_josh() {
         Some(proxy) => Ok(proxy),
-        None => {
-            if prompt("josh-proxy not found. Do you want to install it?") {
-                match try_install_josh() {
-                    Some(proxy) => Ok(proxy),
-                    None => Err(anyhow::anyhow!("Could not install josh-proxy")),
-                }
-            } else {
-                Err(anyhow::anyhow!("josh-proxy could not be found"))
-            }
-        }
+        None => Err(anyhow::anyhow!("Could not install josh-proxy")),
     }
 }

src/josh.rs

@@ -62,6 +62,7 @@ impl JoshProxy {
     }
 }
 
+/// Try to install (or update) josh-proxy, to make sure that we use the correct version.
 pub fn try_install_josh() -> Option<JoshProxy> {
     run_command(&[
         "cargo",

src/sync.rs

@@ -1,8 +1,6 @@
 use crate::SyncContext;
 use crate::josh::JoshProxy;
-use crate::utils::{
-    StderrMode, ensure_clean_git_state, replace_references, run_command, run_command_at,
-};
+use crate::utils::{ensure_clean_git_state, replace_references, run_command, run_command_at};
 use anyhow::{Context, Error};
 use std::path::{Path, PathBuf};
 
@@ -225,13 +223,7 @@ Filtered ref: {incoming_ref}
         println!("Preparing {user_upstream_url} (base: {base_upstream_sha})...");
 
         // Check if the remote branch doesn't already exist
-        if run_command_at(
-            &["git", "fetch", &user_upstream_url, branch],
-            &rustc_git,
-            StderrMode::Print,
-        )
-        .is_ok()
-        {
+        if run_command_at(&["git", "fetch", &user_upstream_url, branch], &rustc_git).is_ok() {
             return Err(anyhow::anyhow!(
                 "The branch '{branch}' seems to already exist in '{user_upstream_url}'. Please delete it and try again."
             ));
@@ -246,7 +238,6 @@ Filtered ref: {incoming_ref}
                 &base_upstream_sha,
             ],
             &rustc_git,
-            StderrMode::Print,
         )
         .context("cannot download latest upstream SHA")?;
 
@@ -259,7 +250,6 @@ Filtered ref: {incoming_ref}
                 &format!("{base_upstream_sha}:refs/heads/{branch}"),
             ],
             &rustc_git,
-            StderrMode::Ignore,
         )
         .context("cannot push to your fork")?;
         println!();
@@ -273,7 +263,6 @@ Filtered ref: {incoming_ref}
         run_command_at(
             &["git", "fetch", &josh_url, &branch],
             &std::env::current_dir().unwrap(),
-            StderrMode::Ignore,
         )?;
         let head = run_command(&["git", "rev-parse", "HEAD"])?;
         let fetch_head = run_command(&["git", "rev-parse", "FETCH_HEAD"])?;

src/utils.rs

@@ -1,38 +1,30 @@
 use regex::Regex;
 use std::borrow::Cow;
 use std::path::Path;
-use std::process::{Command, Stdio};
+use std::process::Command;
 
 /// Run command and return its stdout.
 pub fn run_command<'a, Args: AsRef<[&'a str]>>(args: Args) -> anyhow::Result<String> {
-    run_command_at(args, &std::env::current_dir()?, StderrMode::Print)
-}
-
-pub enum StderrMode {
-    Ignore,
-    Print,
+    run_command_at(args, &std::env::current_dir()?)
 }
 
 pub fn run_command_at<'a, Args: AsRef<[&'a str]>>(
     args: Args,
     workdir: &Path,
-    stderr: StderrMode,
 ) -> anyhow::Result<String> {
     let args = args.as_ref();
 
     let mut cmd = Command::new(args[0]);
     cmd.current_dir(workdir);
     cmd.args(&args[1..]);
 
-    if matches!(stderr, StderrMode::Ignore) {
-        cmd.stderr(Stdio::null());
-    }
     eprintln!("+ {cmd:?}");
     let out = cmd.output().expect("command failed");
     let stdout = String::from_utf8_lossy(out.stdout.trim_ascii()).to_string();
+    let stderr = String::from_utf8_lossy(out.stderr.trim_ascii()).to_string();
     if !out.status.success() {
         Err(anyhow::anyhow!(
-            "Command `{cmd:?}` failed with exit code {:?}. STDOUT:\n{stdout}",
+            "Command `{cmd:?}` failed with exit code {:?}. STDOUT:\n{stdout}\nSTDERR:\n{stderr}",
             out.status.code()
         ))
     } else {