Merge pull request #156 from brson/show

Add `rustup show`

Author: alexcrichton

src/multirust-cli/rustup_mode.rs

@@ -24,6 +24,7 @@ pub fn main() -> Result<()> {
         ("update", Some(m)) => try!(update(cfg, m)),
         ("run", Some(m)) => try!(run(cfg, m)),
         ("which", Some(m)) => try!(which(cfg, m)),
+        ("show", Some(_)) => try!(show(cfg)),
         ("target", Some(c)) => {
             match c.subcommand() {
                 ("list", Some(_)) => try!(target_list(cfg)),
@@ -98,6 +99,8 @@ pub fn cli() -> App<'static, 'static> {
             .about("Display which binary will be run for a given command")
             .arg(Arg::with_name("command")
                 .required(true)))
+        .subcommand(SubCommand::with_name("show")
+            .about("Show the active toolchain"))
         .subcommand(SubCommand::with_name("target")
             .about("Modify a toolchain's supported targets")
             .setting(AppSettings::SubcommandRequired)
@@ -113,7 +116,7 @@ pub fn cli() -> App<'static, 'static> {
                     .required(true))
                 .arg(Arg::with_name("toolchain"))))
         .subcommand(SubCommand::with_name("toolchain")
-            .about("Modify the installed toolchains")
+            .about("Modify or query the installed toolchains")
             .setting(AppSettings::SubcommandRequired)
             .subcommand(SubCommand::with_name("list")
                 .about("List installed toolchains"))
@@ -236,6 +239,26 @@ fn which(cfg: &Cfg, m: &ArgMatches) -> Result<()> {
     try!(utils::assert_is_file(&binary_path));
 
     println!("{}", binary_path.display());
+
+    Ok(())
+}
+
+fn show(cfg: &Cfg) -> Result<()> {
+    let ref cwd = try!(utils::current_dir());
+    let override_ = try!(cfg.find_override(cwd));
+    if let Some((toolchain, reason)) = override_ {
+        println!("{} ({})", toolchain.name(), reason);
+        return Ok(());
+    }
+
+    let toolchain = try!(cfg.find_default());
+    if let Some(toolchain) = toolchain {
+        println!("{} (default toolchain)", toolchain.name());
+        return Ok(());
+    }
+
+    println!("no active toolchain");
+
     Ok(())
 }
 

tests/cli-rustup.rs

@@ -8,6 +8,7 @@ extern crate tempdir;
 use multirust_mock::clitools::{self, Config, Scenario,
                                expect_ok, expect_ok_ex,
                                expect_stdout_ok,
+                               expect_err_ex,
                                set_current_dist_date};
 
 pub fn setup(f: &Fn(&Config)) {
@@ -222,3 +223,79 @@ fn link() {
                          "hash-c-1");
     });
 }
+
+#[test]
+fn show_toolchain_none() {
+    setup(&|config| {
+        expect_ok_ex(config, &["rustup", "show"],
+r"no active toolchain
+",
+r"");
+    });
+}
+
+#[test]
+fn show_toolchain_default() {
+    setup(&|config| {
+        expect_ok(config, &["rustup", "default", "nightly"]);
+        expect_ok_ex(config, &["rustup", "show"],
+r"nightly (default toolchain)
+",
+r"");
+    });
+}
+
+#[test]
+fn show_toolchain_override() {
+    setup(&|config| {
+        let cwd = ::std::env::current_dir().unwrap();
+        expect_ok(config, &["rustup", "override", "add", "nightly"]);
+        expect_ok_ex(config, &["rustup", "show"],
+&format!(r"nightly (directory override for '{}')
+", cwd.display()),
+r"");
+    });
+}
+
+#[test]
+fn show_toolchain_override_not_installed() {
+    setup(&|config| {
+        expect_ok(config, &["rustup", "override", "add", "nightly"]);
+        expect_ok(config, &["rustup", "toolchain", "remove", "nightly"]);
+        // I'm not sure this should really be erroring when the toolchain
+        // is not installed; just capturing the behavior.
+        expect_err_ex(config, &["rustup", "show"],
+r"",
+r"error: toolchain 'nightly' is not installed
+");
+    });
+}
+
+#[test]
+fn show_toolchain_env() {
+    setup(&|config| {
+        expect_ok(config, &["rustup", "default", "nightly"]);
+        let mut cmd = clitools::cmd(config, "rustup", &["show"]);
+        clitools::env(config, &mut cmd);
+        cmd.env("MULTIRUST_TOOLCHAIN", "nightly");
+        let out = cmd.output().unwrap();
+        assert!(out.status.success());
+        let stdout = String::from_utf8(out.stdout).unwrap();
+        assert!(stdout == "nightly (environment override by MULTIRUST_TOOLCHAIN)\n");
+    });
+}
+
+#[test]
+fn show_toolchain_env_not_installed() {
+    setup(&|config| {
+        let mut cmd = clitools::cmd(config, "rustup", &["show"]);
+        clitools::env(config, &mut cmd);
+        cmd.env("MULTIRUST_TOOLCHAIN", "nightly");
+        let out = cmd.output().unwrap();
+        // I'm not sure this should really be erroring when the toolchain
+        // is not installed; just capturing the behavior.
+        assert!(!out.status.success());
+        let stderr = String::from_utf8(out.stderr).unwrap();
+        assert!(stderr == "error: toolchain 'nightly' is not installed\n");
+    });
+}