migrate git-node-apply to node scripts

Author: joyeecheung

bin/git/git-node

@@ -3,7 +3,7 @@
 
 const CMD = process.argv[2];
 const path = require('path');
-const { execSync } = require('child_process');
+const { run } = require('../../lib/run');
 const fs = require('fs');
 
 if (!CMD) {
@@ -13,10 +13,8 @@ if (!CMD) {
 
 const script = path.join(__dirname, `git-node-${CMD}`);
 if (!fs.existsSync(script)) {
-  console.log(`No such command: git node ${CMD}`);
+  console.error(`No such command: git node ${CMD}`);
   process.exit(1);
 }
 
-execSync(script, process.argv.slice(2), {
-  stdio: 'inherit'
-});
+run(script, process.argv.slice(3));

bin/git/git-node-apply

@@ -1,10 +1,29 @@
-#!/usr/bin/env bash
+#!/usr/bin/env node
+'use strict';
 
-set -x;
+const PRID = parseInt(process.argv[2]);
+const Request = require('./../../lib/request');
+const paths = require('./../../lib/paths');
+const { run, runAsync } = require('../../lib/run');
+const fs = require('fs');
+const CLI = require('../../lib/CLI');
+const cli = new CLI(process.stderr);
 
-if [[ $1 -eq 0 ]] ; then
-  echo 'no patch number specified!'
-  exit 1
-fi
+if (!PRID) {
+  cli.error('No patch number specified!');
+  process.exit(1);
+}
 
-curl -L "https://github.com/nodejs/node/pull/$1.patch" | git am --whitespace=fix
+async function main() {
+  cli.startSpinner(`Downloading patch for ${PRID}`);
+  // TODO: support other repos/owners later?
+  const patch = await new Request().promise({
+    url: `https://github.com/nodejs/node/pull/${PRID}.patch`
+  });
+  const patchName = paths.patch(PRID);
+  fs.writeFileSync(patchName, patch, 'utf8');
+  cli.stopSpinner(`Downloaded patch to ${patchName}`);
+  return run('git', ['am', '--whitespace=fix', patchName]);
+}
+
+runAsync(main());

lib/paths.js

@@ -0,0 +1,26 @@
+'use strict';
+
+const path = require('path');
+const fs = require('fs');
+
+Object.defineProperty(module.exports, 'ncuDir', {
+  get() {
+    const ncu = path.join(process.cwd(), '.ncu');
+    if (!fs.existsSync(ncu)) {
+      fs.mkdirSync(ncu);
+    }
+    return ncu;
+  }
+});
+
+exports.metadata = function(prid) {
+  return path.join(exports.ncuDir, `meta-${prid}.txt`);
+};
+
+exports.message = function(sha) {
+  return path.join(exports.ncuDir, `msg-${sha}.txt`);
+};
+
+exports.patch = function(prid) {
+  return path.join(exports.ncuDir, `patch-${prid}.patch`);
+};

lib/request.js

@@ -14,8 +14,10 @@ class Request {
     return fs.readFileSync(filePath, 'utf8');
   }
 
-  async promise() {
-    return rp(...arguments);
+  async promise(options) {
+    return rp(Object.assign({
+      gzip: true
+    }, options));
   }
 
   async gql(name, variables, path) {

lib/run.js

@@ -0,0 +1,34 @@
+'use strict';
+
+const { spawn } = require('child_process');
+
+const IGNORE = '__ignore__';
+
+function runAsync(promise) {
+  return promise.catch((error) => {
+    if (error.message !== IGNORE) {
+      console.error(error);
+    }
+    process.exit(1);
+  });
+};
+
+exports.run = function(cmd, args, options) {
+  const promise = new Promise((resolve, reject) => {
+    const child = spawn(cmd, args, Object.assign({
+      cwd: process.cwd(),
+      stdio: 'inherit'
+    }, options));
+    // console.log(child.pid);
+    child.on('close', (code) => {
+      if (code !== 0) {
+        return reject(new Error(IGNORE));
+      }
+      return resolve();
+    });
+  });
+
+  return runAsync(promise);
+};
+
+exports.runAsync = runAsync;