NixOS · Apr 13, 2019 · Apr 13, 2019 · Apr 13, 2019 · Apr 13, 2019 · Apr 13, 2019
diff --git a/ofborg/Cargo.lock b/ofborg/Cargo.lock
diff --git a/ofborg/Cargo.nix b/ofborg/Cargo.nix
@@ -123,6 +123,7 @@ let crates = cratesIO // rec {
       (cratesIO.crates."lru_cache"."${deps."ofborg"."0.1.8"."lru_cache"}" deps)
       (cratesIO.crates."md5"."${deps."ofborg"."0.1.8"."md5"}" deps)
       (cratesIO.crates."nom"."${deps."ofborg"."0.1.8"."nom"}" deps)
+      (cratesIO.crates."separator"."${deps."ofborg"."0.1.8"."separator"}" deps)
       (cratesIO.crates."serde"."${deps."ofborg"."0.1.8"."serde"}" deps)
       (cratesIO.crates."serde_derive"."${deps."ofborg"."0.1.8"."serde_derive"}" deps)
       (cratesIO.crates."serde_json"."${deps."ofborg"."0.1.8"."serde_json"}" deps)
@@ -145,6 +146,7 @@ let crates = cratesIO // rec {
     md5."${deps.ofborg."0.1.8".md5}".default = true;
     nom."${deps.ofborg."0.1.8".nom}".default = true;
     ofborg."0.1.8".default = (f.ofborg."0.1.8".default or true);
+    separator."${deps.ofborg."0.1.8".separator}".default = true;
     serde."${deps.ofborg."0.1.8".serde}".default = true;
     serde_derive."${deps.ofborg."0.1.8".serde_derive}".default = true;
     serde_json."${deps.ofborg."0.1.8".serde_json}".default = true;
@@ -167,6 +169,7 @@ let crates = cratesIO // rec {
     (cratesIO.features_.lru_cache."${deps."ofborg"."0.1.8"."lru_cache"}" deps)
     (cratesIO.features_.md5."${deps."ofborg"."0.1.8"."md5"}" deps)
     (cratesIO.features_.nom."${deps."ofborg"."0.1.8"."nom"}" deps)
+    (cratesIO.features_.separator."${deps."ofborg"."0.1.8"."separator"}" deps)
     (cratesIO.features_.serde."${deps."ofborg"."0.1.8"."serde"}" deps)
     (cratesIO.features_.serde_derive."${deps."ofborg"."0.1.8"."serde_derive"}" deps)
     (cratesIO.features_.serde_json."${deps."ofborg"."0.1.8"."serde_json"}" deps)
@@ -375,6 +378,7 @@ rec {
     lru_cache = "0.1.1";
     md5 = "0.3.8";
     nom = "4.1.1";
+    separator = "0.4.1";
     serde = "1.0.84";
     serde_derive = "1.0.84";
     serde_json = "1.0.34";
@@ -459,6 +463,7 @@ rec {
     core_foundation_sys = "0.2.3";
     libc = "0.2.46";
   };
+  deps.separator."0.4.1" = {};
   deps.serde."1.0.84" = {};
   deps.serde_derive."1.0.84" = {
     proc_macro2 = "0.4.24";

diff --git a/ofborg/Cargo.toml b/ofborg/Cargo.toml
@@ -27,6 +27,7 @@ lru-cache = "0.1.1"
 nom = "4.0.0-beta3"
 sys-info = "0.5.6"
 chrono = "0.4.6"
+separator = "0.4.1"
 
 [patch.crates-io]
 #hubcaps = { path = "../hubcaps" }

diff --git a/ofborg/crates-io.list b/ofborg/crates-io.list
@@ -73,6 +73,7 @@ safemem-0.3.0
 schannel-0.1.14
 security-framework-0.1.16
 security-framework-sys-0.1.16
+separator-0.4.1
 serde-1.0.84
 serde_derive-1.0.84
 serde_json-1.0.34

diff --git a/ofborg/crates-io.nix b/ofborg/crates-io.nix
@@ -2118,6 +2118,20 @@ rec {
   ];
 
 
+# end
+# separator-0.4.1
+
+  crates.separator."0.4.1" = deps: { features?(features_.separator."0.4.1" deps {}) }: buildRustCrate {
+    crateName = "separator";
+    version = "0.4.1";
+    authors = [ "Saghm Rossi <saghmrossi@gmail.com>" ];
+    sha256 = "1l7yhf6dy09k9cy0kkwb9wy98rn8mnz72q27wbd6bhiflllwghr7";
+  };
+  features_.separator."0.4.1" = deps: f: updateFeatures f (rec {
+    separator."0.4.1".default = (f.separator."0.4.1".default or true);
+  }) [];
+
+
 # end
 # serde-1.0.84
 

diff --git a/ofborg/src/bin/mass-rebuilder.rs b/ofborg/src/bin/mass-rebuilder.rs
@@ -51,6 +51,7 @@ fn main() {
         cloner,
         &nix,
         cfg.github(),
+        cfg.github_app_vendingmachine(),
         cfg.acl(),
         cfg.runner.identity.clone(),
         events,

diff --git a/ofborg/src/lib.rs b/ofborg/src/lib.rs
@@ -27,6 +27,7 @@ extern crate hyper;
 extern crate hyper_native_tls;
 extern crate lru_cache;
 extern crate md5;
+extern crate separator;
 extern crate tempfile;
 extern crate uuid;
 
@@ -47,6 +48,8 @@ pub mod locks;
 pub mod maintainers;
 pub mod message;
 pub mod nix;
+pub mod nixenv;
+pub mod nixstats;
 pub mod notifyworker;
 pub mod outpathdiff;
 pub mod stats;

diff --git a/ofborg/src/nix.rs b/ofborg/src/nix.rs
@@ -2,6 +2,7 @@ use ofborg::asynccmd::{AsyncCmd, SpawnedAsyncCmd};
 use ofborg::partition_result;
 use std::collections::HashMap;
 use std::env;
+use std::ffi::OsStr;
 use std::fmt;
 use std::fs;
 use std::io::BufRead;
@@ -161,7 +162,7 @@ impl Nix {
         file: File,
         attrs: Vec<String>,
     ) -> Result<fs::File, fs::File> {
-        let mut command = self.safe_command(&Operation::Instantiate, nixpkgs, vec![], &[]);
+        let mut command = self.safe_command::<&OsStr>(&Operation::Instantiate, nixpkgs, &[], &[]);
         self.set_attrs_command(&mut command, file, attrs);
         self.run(command, true)
     }
@@ -182,7 +183,7 @@ impl Nix {
             attrargs.push(argstr.to_owned());
         }
 
-        self.safe_command(&Operation::Evaluate, nixpkgs, attrargs, &extra_paths)
+        self.safe_command(&Operation::Evaluate, nixpkgs, &attrargs, &extra_paths)
     }
 
     pub fn safely_build_attrs(
@@ -191,7 +192,7 @@ impl Nix {
         file: File,
         attrs: Vec<String>,
     ) -> Result<fs::File, fs::File> {
-        let mut command = self.safe_command(&Operation::Build, nixpkgs, vec![], &[]);
+        let mut command = self.safe_command::<&OsStr>(&Operation::Build, nixpkgs, &[], &[]);
         self.set_attrs_command(&mut command, file, attrs);
         self.run(command, true)
     }
@@ -202,7 +203,7 @@ impl Nix {
         file: File,
         attrs: Vec<String>,
     ) -> SpawnedAsyncCmd {
-        let mut command = self.safe_command(&Operation::Build, nixpkgs, vec![], &[]);
+        let mut command = self.safe_command::<&OsStr>(&Operation::Build, nixpkgs, &[], &[]);
         self.set_attrs_command(&mut command, file, attrs);
         AsyncCmd::new(command).spawn()
     }
@@ -231,7 +232,7 @@ impl Nix {
         args: Vec<String>,
         keep_stdout: bool,
     ) -> Result<fs::File, fs::File> {
-        self.run(self.safe_command(&op, nixpkgs, args, &[]), keep_stdout)
+        self.run(self.safe_command(&op, nixpkgs, &args, &[]), keep_stdout)
     }
 
     pub fn run(&self, mut cmd: Command, keep_stdout: bool) -> Result<fs::File, fs::File> {
@@ -261,13 +262,43 @@ impl Nix {
         }
     }
 
-    pub fn safe_command(
+    pub fn run_stderr_stdout(&self, mut cmd: Command) -> (bool, fs::File, fs::File) {
+        let stdout_file = tempfile().expect("Fetching a stdout tempfile");
+        let mut stdout_reader = stdout_file
+            .try_clone()
+            .expect("Cloning stdout to the reader");
+
+        let stderr_file = tempfile().expect("Fetching a stderr tempfile");
+        let mut stderr_reader = stderr_file
+            .try_clone()
+            .expect("Cloning stderr to the reader");
+
+        let status = cmd
+            .stdout(Stdio::from(stdout_file))
+            .stderr(Stdio::from(stderr_file))
+            .status()
+            .expect("Running a program ...");
+
+        stdout_reader
+            .seek(SeekFrom::Start(0))
+            .expect("Seeking dout to Start(0)");
+        stderr_reader
+            .seek(SeekFrom::Start(0))
+            .expect("Seeking stderr to Start(0)");
+
+        (status.success(), stdout_reader, stderr_reader)
+    }
+
+    pub fn safe_command<S>(
         &self,
         op: &Operation,
         nixpkgs: &Path,
-        args: Vec<String>,
+        args: &[S],
         safe_paths: &[&Path],
-    ) -> Command {
+    ) -> Command
+    where
+        S: AsRef<OsStr>,
+    {
         let nixpkgspath = format!("nixpkgs={}", nixpkgs.display());
         let mut nixpath: Vec<String> = safe_paths
             .iter()
@@ -462,12 +493,7 @@ mod tests {
         assert_eq!(op.to_string(), "nix-build");
 
         let ret: Result<fs::File, fs::File> = nix.run(
-            nix.safe_command(
-                &op,
-                build_path().as_path(),
-                vec![String::from("--version")],
-                &[],
-            ),
+            nix.safe_command(&op, build_path().as_path(), &["--version"], &[]),
             true,
         );
 
@@ -485,12 +511,7 @@ mod tests {
         assert_eq!(op.to_string(), "nix-instantiate");
 
         let ret: Result<fs::File, fs::File> = nix.run(
-            nix.safe_command(
-                &op,
-                build_path().as_path(),
-                vec![String::from("--version")],
-                &[],
-            ),
+            nix.safe_command(&op, build_path().as_path(), &["--version"], &[]),
             true,
         );
 
@@ -504,12 +525,7 @@ mod tests {
         assert_eq!(op.to_string(), "nix-env -qa --json");
 
         let ret: Result<fs::File, fs::File> = nix.run(
-            nix.safe_command(
-                &op,
-                build_path().as_path(),
-                vec![String::from("--version")],
-                &[],
-            ),
+            nix.safe_command(&op, build_path().as_path(), &["--version"], &[]),
             true,
         );
 
@@ -527,12 +543,7 @@ mod tests {
         assert_eq!(op.to_string(), "nix-env -qaP --no-name --out-path");
 
         let ret: Result<fs::File, fs::File> = nix.run(
-            nix.safe_command(
-                &op,
-                build_path().as_path(),
-                vec![String::from("--version")],
-                &[],
-            ),
+            nix.safe_command(&op, build_path().as_path(), &["--version"], &[]),
             true,
         );
 
@@ -551,7 +562,7 @@ mod tests {
         let nix = nix();
 
         let ret: Result<fs::File, fs::File> = nix.run(
-            nix.safe_command(&env_noop(), build_path().as_path(), vec![], &[]),
+            nix.safe_command::<&OsStr>(&env_noop(), build_path().as_path(), &[], &[]),
             true,
         );
 
@@ -578,7 +589,7 @@ mod tests {
         );
 
         let ret: Result<fs::File, fs::File> = nix.run(
-            nix.safe_command(&env_noop(), build_path().as_path(), vec![], &[]),
+            nix.safe_command::<&OsStr>(&env_noop(), build_path().as_path(), &[], &[]),
             true,
         );
 
@@ -601,7 +612,7 @@ mod tests {
         let op = noop(Operation::Build);
 
         let ret: Result<fs::File, fs::File> = nix.run(
-            nix.safe_command(&op, build_path().as_path(), vec![], &[]),
+            nix.safe_command::<&OsStr>(&op, build_path().as_path(), &[], &[]),
             true,
         );
 
@@ -617,7 +628,7 @@ mod tests {
         let nix = nix();
         let op = noop(Operation::Build);
 
-        let mut command = nix.safe_command(&op, build_path().as_path(), vec![], &[]);
+        let mut command = nix.safe_command::<&OsStr>(&op, build_path().as_path(), &[], &[]);
         nix.set_attrs_command(
             &mut command,
             File::DefaultNixpkgs,
@@ -634,7 +645,7 @@ mod tests {
         let nix = nix();
         let op = noop(Operation::Instantiate);
 
-        let mut command = nix.safe_command(&op, build_path().as_path(), vec![], &[]);
+        let mut command = nix.safe_command::<&OsStr>(&op, build_path().as_path(), &[], &[]);
         nix.set_attrs_command(
             &mut command,
             File::ReleaseNixOS,