ncu-ci: support parsing CI links from PR thread

Author: joyeecheung

bin/ncu-ci

@@ -3,7 +3,9 @@
 'use strict';
 
 const {
-  PRBuild, BenchmarkRun, CommitBuild, jobCache, parseJobFromURL, constants
+  PRBuild, BenchmarkRun, CommitBuild, parseJobFromURL,
+  constants, JobParser
+  // , jobCache
 } = require('../lib/ci');
 const clipboardy = require('clipboardy');
 
@@ -12,13 +14,14 @@ const {
 } = constants;
 
 const { runPromise } = require('../lib/run');
+const auth = require('../lib/auth');
 const Request = require('../lib/request');
 const CLI = require('../lib/cli');
 const yargs = require('yargs');
 
 // This is used for testing
 // Default cache dir is ${ncu-source-dir}/.ncu/cache
-jobCache.enable();
+// jobCache.enable();
 
 // eslint-disable-next-line no-unused-vars
 const argv = yargs
@@ -99,7 +102,8 @@ async function getResults(cli, request, job) {
 
 async function main(command, argv) {
   const cli = new CLI();
-  const request = new Request({});
+  const credentials = await auth();
+  const request = new Request(credentials);
   const queue = [];
 
   const commandToType = {
@@ -114,31 +118,45 @@ async function main(command, argv) {
       queue.push({
         type: parsed.type,
         jobid: parsed.jobid,
-        markdown: argv.markdown
+        copy: argv.copy
       });
     } else {
-      // TODO: parse CI links from PR thread
-      return yargs.showHelp();
+      const parser = await JobParser.fromPR(argv.url, cli, request);
+      if (!parser) {  // Not a valid PR URL
+        return yargs.showHelp();
+      }
+      const ciMap = parser.parse();
+      for (const [type, ci] of ciMap) {
+        queue.push({
+          type: type,
+          jobid: ci.jobid,
+          copy: argv.copy
+        });
+      }
     }
   } else {
     queue.push({
       type: commandToType[command],
       jobid: argv.jobid,
-      markdown: argv.markdown
+      copy: argv.copy
     });
   }
 
+  let dataToCopy = '';
+
   for (let job of queue) {
     const build = await getResults(cli, request, job);
     build.display();
 
     if (argv.copy) {
-      clipboardy.writeSync(build.formatAsMarkdown());
+      dataToCopy += build.formatAsMarkdown();
     }
+  }
 
+  if (argv.copy) {
+    clipboardy.writeSync(dataToCopy);
     cli.separator('');
     cli.log(`Written markdown to clipboard`);
-    return build;
   }
 }
 

lib/ci.js

@@ -1,7 +1,8 @@
 'use strict';
 
 const Cache = require('./cache');
-
+const PRData = require('./pr_data');
+const { parsePRFromURL } = require('./links');
 const qs = require('querystring');
 const chalk = require('chalk');
 
@@ -48,7 +49,7 @@ function parseJobFromURL(url) {
   }
 
   for (let [ type, info ] of CI_TYPES) {
-    const re = new RegExp(`${CI_DOMAIN}/job/${info.jobName}/(\\d+)`);
+    const re = new RegExp(`job/${info.jobName}/(\\d+)`);
     const match = url.match(re);
     if (match) {
       return {
@@ -119,6 +120,17 @@ class JobParser {
   }
 }
 
+JobParser.fromPR = async function(url, cli, request) {
+  const argv = parsePRFromURL(url);
+  if (!argv) {
+    return undefined;
+  }
+  const data = new PRData(argv, cli, request);
+  await data.getThreadData();
+  const thread = data.getThread();
+  return new JobParser(thread);
+};
+
 const SUCCESS = 'SUCCESS';
 const FAILURE = 'FAILURE';
 const ABORTED = 'ABORTED';

lib/pr_checker.js

@@ -194,13 +194,9 @@ class PRChecker {
   // TODO: we might want to check CI status when it's less flaky...
   // TODO: not all PR requires CI...labels?
   checkCI() {
-    const { pr, cli, comments, reviews, commits, argv } = this;
-    const prNode = {
-      publishedAt: pr.createdAt,
-      bodyText: pr.bodyText
-    };
+    const { cli, commits, argv } = this;
     const { maxCommits } = argv;
-    const thread = comments.concat([prNode]).concat(reviews);
+    const thread = this.data.getThread();
     const ciMap = new JobParser(thread).parse();
     let status = true;
     if (!ciMap.size) {

lib/pr_data.js

@@ -38,14 +38,29 @@ class PRData {
     this.reviewers = [];
   }
 
+  getThread() {
+    const { pr, comments, reviews } = this;
+    const prNode = {
+      publishedAt: pr.createdAt,
+      bodyText: pr.bodyText
+    };
+    return comments.concat([prNode]).concat(reviews);
+  }
+
+  async getThreadData() {
+    return Promise.all([
+      this.getPR(),
+      this.getReviews(),
+      this.getComments()
+    ]);
+  }
+
   async getAll(argv) {
     const { prStr } = this;
     this.cli.startSpinner(`Loading data for ${prStr}`);
     await Promise.all([
       this.getCollaborators(),
-      this.getPR(),
-      this.getReviews(),
-      this.getComments(),
+      this.getThreadData(),
       this.getCommits()
     ]).then(() => {
       this.cli.stopSpinner(`Done loading data for ${prStr}`);

lib/request.js

@@ -58,6 +58,13 @@ class Request {
       };
       throw err;
     }
+    if (result.message) {
+      const err = new Error(`GraphQL request Error: ${result.message}`);
+      err.data = {
+        variables
+      };
+      throw err;
+    }
     return result.data;
   }
 

test/unit/metadata_gen.test.js

@@ -40,7 +40,6 @@ describe('MetadataGenerator', () => {
 
   it('should handle cross-owner and cross-repo fixes properly', () => {
     const results = new MetadataGenerator(crossData).getMetadata();
-    console.log(results);
     assert.strictEqual(crossExpected, results);
   });
 });