Merge pull request #254 from TimNN/versionless-irc

don't print version for playpot

Author: alexcrichton

docker/bin/compile.sh

@@ -2,7 +2,9 @@
 
 set -o errexit
 
-rustc --version
+if [ "$RUST_PLAYPEN_ENV" != "irc" ]; then
+    rustc --version
+fi
 
 RUST_NEW_ERROR_FORMAT=1 TERM=xterm rustc - -o ./out "$@"
 printf '\377' # 255 in octal

docker/bin/evaluate.sh

@@ -2,7 +2,9 @@
 
 set -o errexit
 
-rustc --version
+if [ "$RUST_PLAYPEN_ENV" != "irc" ]; then
+    rustc --version
+fi
 
 RUST_NEW_ERROR_FORMAT=1 TERM=xterm rustc - -o ./out "$@"
 printf '\377' # 255 in octal

src/bin/playbot.rs

@@ -18,12 +18,18 @@ use std::process;
 
 use hyper::client::Client;
 use irc::client::prelude::*;
-use rust_playpen::{ReleaseChannel, Cache};
+use rust_playpen::{ReleaseChannel, Cache, PLAYPEN_ENV_VAR_NAME};
 use rustc_serialize::json;
 use url::form_urlencoded;
 
 static DEFAULT_CHANNEL: ReleaseChannel = ReleaseChannel::Stable;
 
+const ENV: &'static str = "irc";
+
+fn base_env() -> Vec<(String, String)> {
+    vec![(PLAYPEN_ENV_VAR_NAME.into(), ENV.into())]
+}
+
 fn get_rust_versions(cache: &Cache) -> Vec<String> {
     let mut versions = Vec::new();
     // Note: Keep these in the same order as their discriminant values
@@ -33,7 +39,7 @@ fn get_rust_versions(cache: &Cache) -> Vec<String> {
         let (status, output) = cache.exec(*channel,
                                           "rustc",
                                           vec![String::from("-V")],
-                                          vec![],
+                                          base_env(),
                                           String::new()).unwrap();
         assert!(status.success(), "couldn't get version (this currently needs to run as root)");
         let version = str::from_utf8(&output).unwrap();
@@ -85,7 +91,7 @@ impl Playbot {
         let (_status, output) = try!(self.cache.exec(channel,
                                                      "/usr/local/bin/evaluate.sh",
                                                      Vec::new(),
-                                                     Vec::new(),
+                                                     base_env(),
                                                      String::from(full_code)));
 
         let output_merged = output.splitn(2, |b| *b == b'\xff')
@@ -297,3 +303,17 @@ fn main() {
         thread.join().unwrap();
     }
 }
+
+#[test]
+fn irc_no_version() {
+    drop(env_logger::init());
+
+    let cache = Cache::new();
+    let input = r#"fn main() {}"#;
+
+    let (status, out) = cache.exec(ReleaseChannel::Stable, "/usr/local/bin/evaluate.sh",
+                                   vec![], base_env(), input.into()).unwrap();
+
+    assert!(status.success());
+    assert_eq!(&out, b"\xFF"); // 0xFF is a separator produced by evaluate.sh
+}

src/bin/playpen.rs

@@ -29,6 +29,12 @@ use rustc_serialize::json;
 use staticfile::Static;
 use unicase::UniCase;
 
+const ENV: &'static str = "web";
+
+fn base_env() -> Vec<(String, String)> {
+    vec![(PLAYPEN_ENV_VAR_NAME.into(), ENV.into())]
+}
+
 #[derive(Clone, Debug)]
 struct XXssProtection(bool);
 
@@ -104,7 +110,7 @@ fn evaluate(req: &mut Request) -> IronResult<Response> {
         args.push(String::from("--test"));
     }
 
-    let mut env = vec![];
+    let mut env = base_env();
     if backtrace.is_requested(opt == OptLevel::O0) {
         env.push(("RUST_BACKTRACE".into(), "1".into()));
     }
@@ -180,7 +186,7 @@ fn compile(req: &mut Request) -> IronResult<Response> {
         args.push(String::from("--color=always"));
     }
 
-    let mut env = vec![];
+    let mut env = base_env();
     if backtrace.is_requested(opt == OptLevel::O0) {
         env.push(("RUST_BACKTRACE".into(), "1".into()));
     }
@@ -225,7 +231,7 @@ fn format(req: &mut Request) -> IronResult<Response> {
     let version = itry!(data.version.map(|v| v.parse()).unwrap_or(Ok(ReleaseChannel::Stable)));
     let backtrace = itry!(data.backtrace.map(|b| b.parse()).unwrap_or(Ok(Backtrace::Auto)));
 
-    let mut env = vec![];
+    let mut env = base_env();
     if backtrace == Backtrace::Always {
         env.push(("RUST_BACKTRACE".into(), "1".into()));
     }
@@ -298,3 +304,17 @@ fn main() {
     println!("listening on {:?}", addr);
     Iron::new(chain).http(addr).unwrap();
 }
+
+#[test]
+fn web_has_version() {
+    drop(env_logger::init());
+
+    let cache = Cache::new();
+    let input = r#"fn main() {}"#;
+
+    let (status, out) = cache.exec(ReleaseChannel::Stable, "/usr/local/bin/evaluate.sh",
+                                   vec![], base_env(), input.into()).unwrap();
+
+    assert!(status.success());
+    assert!(String::from_utf8_lossy(&out).contains("rustc "));
+}

src/lib.rs

@@ -19,6 +19,8 @@ use docker::Container;
 
 mod docker;
 
+pub const PLAYPEN_ENV_VAR_NAME: &'static str = "RUST_PLAYPEN_ENV";
+
 /// Error type holding a description
 pub struct StringError(pub String);