fix(spawn): better error reporting

nokome · nokome · commit 3a99d26bdb4d · 2019-01-30T17:21:13.000+13:00
diff --git a/src/Environment.ts b/src/Environment.ts
@@ -8,11 +8,10 @@ import del from 'del'
 import glob from 'glob'
 import mkdirp from 'mkdirp'
 import * as pty from 'node-pty'
-// @ts-ignore
-import spawn from 'await-spawn'
 import tmp from 'tmp'
 import yaml from 'js-yaml'
 
+import spawn from './spawn'
 import * as nix from './nix'
 
 // The home directory for environments
diff --git a/src/nix.ts b/src/nix.ts
@@ -5,11 +5,10 @@ import fs from 'fs'
 import path from 'path'
 
 import mkdirp from 'mkdirp'
-// @ts-ignore
-import spawn from 'await-spawn'
 import { sprintf } from 'sprintf-js'
 
 import db from './db'
+import spawn from './spawn'
 
 /**
  * Create a version string that can be ordered
@@ -46,14 +45,14 @@ mkdirp.sync(profiles)
 export async function channel (url: string = 'https://nixos.org/channels/nixpkgs-unstable', name: string = 'nixpkgs-unstable') {
   // Update the channel
   // nix-channel --add url [name] : Adds a channel named name with URL url to the list of subscribed channels
-  spawn('nix-channel', ['--add', url, name])
+  await spawn('nix-channel', ['--add', url, name])
   // nix-channel --update [names...] : Downloads the Nix expressions of all subscribed channels (or only those included in names if specified) and
   // makes them the default for nix-env operations (by symlinking them from the directory ~/.nix-defexpr).
-  spawn('nix-channel', ['--update', name])
+  await spawn('nix-channel', ['--update', name])
   // nix-channel --list : Prints the names and URLs of all subscribed channels on standard output.
-  const list = spawn('nix-channel', ['--list'])
+  const list = await spawn('nix-channel', ['--list'])
   console.log('Updated channel. Current channel list:')
-  list.stdout.pipe(process.stdout)
+  console.log(list)
 }
 
 /**
@@ -95,13 +94,7 @@ export async function update (channels: string | Array<string> = [], last: boole
     ['--attr', 'rPackages']
   ]) {
     let allArgs = args.concat(extraArgs)
-    let query
-    try {
-      query = await spawn('nix-env', allArgs)
-    } catch (error) {
-      throw new Error(`Running "nix-env ${allArgs.join(' ')}" failed: ${error.stderr}`)
-    }
-    let json = query.toString()
+    let json = await spawn('nix-env', allArgs)
     let newPkgs
     try {
       newPkgs = JSON.parse(json)
@@ -265,7 +258,7 @@ export async function location (env: string): Promise<string> {
   const profile = path.join(profiles, env)
   if (!fs.existsSync(profile)) return ''
   const readlink = await spawn('readlink', ['-f', profile])
-  return readlink.toString().trim()
+  return readlink
 }
 
 /**
diff --git a/src/spawn.ts b/src/spawn.ts
@@ -0,0 +1,21 @@
+// @ts-ignore
+import awaitSpawn from 'await-spawn'
+
+/**
+ * Spawn a process
+ *
+ * A wrapper function around `await-spawn` to provide better error
+ * reporting.
+ *
+ * @param file The executable file to be spawned
+ * @param args Arguments
+ */
+export default async function spawn (file: string, args: Array<string>, options: any = {}) {
+  let buffer
+  try {
+    buffer = await awaitSpawn(file, args, options)
+  } catch (error) {
+    throw new Error(`Running "${file} ${args.join(' ')}" failed: ${error.code}: ${error.stderr.toString()}`)
+  }
+  return buffer.toString().trim()
+}
