1.2.0

CHANGELOG.md

@@ -1,6 +1,23 @@
 ### Changelog
 
-#### 0.1.0 (18 October 2018)
+#### [v1.2.0](https://git.w33ble.com/w33ble/gh-action-bot/compare/v1.1.0...v1.2.0) (23 October 2018)
+- feat: add debugging output to script [`0dce327`](https://git.w33ble.com/w33ble/gh-action-bot/commit/0dce32781b0f8c138d7f8b28382289d67be730dd)
+- feat: debug logging and better timestamps [`08799b4`](https://git.w33ble.com/w33ble/gh-action-bot/commit/08799b48d74d12266d5ebb85811f5d3fa046b086)
+- docs: add note about using DEBUG=1 output [`872d9c7`](https://git.w33ble.com/w33ble/gh-action-bot/commit/872d9c790fc723f1b255536225be60f547cf5196)
+
+#### [v1.1.0](https://git.w33ble.com/w33ble/gh-action-bot/compare/v1.0.1...v1.1.0) (22 October 2018)
+- feat: add timestamp to log output [`725638e`](https://git.w33ble.com/w33ble/gh-action-bot/commit/725638ee6b7fbb816518239f5524f6c37056da2e)
+
+#### [v1.0.1](https://git.w33ble.com/w33ble/gh-action-bot/compare/v1.0.0...v1.0.1) (22 October 2018)
+- feat: add a force retest script [`def91e3`](https://git.w33ble.com/w33ble/gh-action-bot/commit/def91e35d3c8028b7f78772049b0e93c3c8d677e)
+- fix: add error handling code [`3b44968`](https://git.w33ble.com/w33ble/gh-action-bot/commit/3b4496864b0e9bd248e6d4ea12f2608dd41c0374)
+- docs: add info about force script [`eb4666c`](https://git.w33ble.com/w33ble/gh-action-bot/commit/eb4666c3df312a9b5d8eb8ff5cf58027d794b417)
+- docs: add token info to readme [`4794c6b`](https://git.w33ble.com/w33ble/gh-action-bot/commit/4794c6be2673402d5a76d8c61974ba3f9c936977)
+
+### [v1.0.0](https://git.w33ble.com/w33ble/gh-action-bot/compare/v0.1.0...v1.0.0) (18 October 2018)
+- feat: allow filtering by pr author [`68cccb7`](https://git.w33ble.com/w33ble/gh-action-bot/commit/68cccb72a9801c502003c7b913844fc01721a6e3)
+
+#### v0.1.0 (18 October 2018)
 - docs: update readme, add sample env [`a28d6a2`](https://git.w33ble.com/w33ble/gh-action-bot/commit/a28d6a25096efb9c8acea3e8d26e7f7f50dfd6b5)
 - feat: add retest comment, delete it [`ced41f4`](https://git.w33ble.com/w33ble/gh-action-bot/commit/ced41f4a495823205e5769e4531f923a982d29b4)
 - feat: process 2 pages of events [`c117cb8`](https://git.w33ble.com/w33ble/gh-action-bot/commit/c117cb847d5cb7a6b57b705e0c192cc725c0d646)

README.md

@@ -7,11 +7,20 @@ Action bot for Github. Checks a repo's event stream and leaves a ghost comment w
 
 ## Usage
 
-`node . owner/repo`
+`yarn start owner/repo`: watch the event stream and handle matches
+
+`yarn run force owner/repo pr_number`: force a comment on a specific pr, by number
 
 You'll need to set some environment flags. Check `sample-env` for what is available, and you can copy the file to `.env` in the root and add your settings there as well.
 
+### Personal Access Token
+
+You will need to provide a Github [Personal Access Token](https://github.com/settings/tokens/new). It will need `write:org` access in order to create comments.
+
+### Debugging
+
+If the script isn't doing what you expect, you can get more output from it by prepending the script with `DEBUG=1`.
 
 #### License
 
-MIT © [w33ble](https://github.com/w33ble)
+MIT © [w33ble](https://github.com/w33ble)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gh-action-bot",
-  "version": "0.1.0",
+  "version": "1.2.0",
   "private": true,
   "description": "Action bot for Github",
   "main": "index",
@@ -9,7 +9,8 @@
     "lint": "eslint \"*.{js,mjs}\" \"src/**/*.{js,mjs}\"",
     "precommit": "lint-staged",
     "version": "auto-changelog -p && auto-authors && git add CHANGELOG.md AUTHORS.md",
-    "start": "node ."
+    "start": "node .",
+    "force": "node -r esm src/force.mjs"
   },
   "repository": {
     "type": "git",

sample-env

@@ -1,6 +1,7 @@
 GITHUB_ACCESS_TOKEN=xxx
-COMMENT_ACTOR=ci-comment-username
+COMMENT_ACTOR=username
 COMMENT_BODY_REGEXP=build failed
 COMMENT_BODY_REGEXP_FLAGS=i
 PULL_LABEL_FILTER=
+PULL_AUTHOR_FILTER=
 PULL_RETEST_BODY=retest

src/force.mjs

@@ -0,0 +1,20 @@
+import dotenv from 'dotenv';
+import createRepo from './lib/create_repo.mjs';
+import { createComment, deleteComment } from './lib/comments.mjs';
+
+dotenv.config();
+
+async function forceRetest() {
+  const [ownerRepo, prNumber] = process.argv.splice(2);
+  const { PULL_RETEST_BODY } = process.env;
+
+  if (!ownerRepo || !prNumber) {
+    throw new Error('You must specify an owner/repo combo and a pull request number');
+  }
+
+  const repo = createRepo(ownerRepo);
+  const comment = await createComment(repo, prNumber, PULL_RETEST_BODY);
+  await deleteComment(repo, comment.id);
+}
+
+forceRetest().catch(err => console.error(err));

src/index.mjs

@@ -1,4 +1,5 @@
 import dotenv from 'dotenv';
+import logger from './lib/logger.mjs';
 import createRepo from './lib/create_repo.mjs';
 import getComments from './lib/get_comments.mjs';
 import getPull from './lib/get_pull.mjs';
@@ -10,14 +11,16 @@ import History from './lib/history.mjs';
 // load env vars from .env file
 dotenv.config();
 
-export default async function() {
+async function ghActionBot() {
   // parse repo name from cli and create repo instance
   const repo = createRepo(process.argv.splice(2)[0]);
+
   const {
     COMMENT_BODY_REGEXP,
     COMMENT_BODY_REGEXP_FLAGS,
     COMMENT_ACTOR,
     PULL_LABEL_FILTER,
+    PULL_AUTHOR_FILTER,
     PULL_RETEST_BODY,
   } = process.env;
 
@@ -35,8 +38,18 @@ export default async function() {
     comments.map(async comment => {
       const pull = await getPull(repo, comment.number);
 
-      if (pull.state !== 'open') return false; // filter out any closed pulls
+      if (pull.state !== 'open') {
-      if (PULL_LABEL_FILTER && !pull.labels.includes(PULL_LABEL_FILTER)) return false; // filter on label
+        logger.debug(`SKIP #${pull.number}: state is ${pull.state}`);
+        return false; // filter out any closed pulls
+      }
+      if (PULL_AUTHOR_FILTER && !pull.owner !== PULL_AUTHOR_FILTER) {
+        logger.debug(`SKIP #${pull.number}: author is ${pull.owner}`);
+        return false; // filter on owner
+      }
+      if (PULL_LABEL_FILTER && !pull.labels.includes(PULL_LABEL_FILTER)) {
+        logger.debug(`SKIP #${pull.number}: labels are ${pull.labels.join(',')}`);
+        return false; // filter on label
+      }
 
       return { comment, pull };
     })
@@ -47,34 +60,33 @@ export default async function() {
       const commit = await getCommits(repo, pull.number, true);
       const buildStatus = await getCommitStatus(repo, commit.sha);
       // do nothing if the build has not started, or is pending or successful
-      if (!buildStatus || buildStatus.state === 'pending' || buildStatus.state === 'success')
+      if (!buildStatus || buildStatus.state === 'pending' || buildStatus.state === 'success') {
+        logger.debug(`SKIP #${pull.number}: build status is ${buildStatus.state}`);
         return false;
+      }
       return { comment, pull, commit, buildStatus };
     })
   )).filter(Boolean);
 
-  console.log(`Found ${records.length} outstanding failures`);
+  if (records.length) {
+    logger.log(`Found ${records.length} outstanding failures`);
+  } else {
+    logger.debug(`Found ${records.length} outstanding failures`);
+  }
 
   await Promise.all(
     records.map(async record => {
-      console.log(`Re-testing PR #${record.pull.number}`);
+      logger.log(`Re-testing PR #${record.pull.number}`);
       const comment = await createComment(repo, records[0].pull.number, PULL_RETEST_BODY);
+      logger.debug(`Created comment id ${comment.id}`);
       await deleteComment(repo, comment.id);
     })
   );
-
+}
-  /*
+
-
+export default function() {
-  TODO:
+  return ghActionBot().catch(err => {
-
+    logger.error(err);
-  - [x] keep track of seen comment ids, only process new ones
+    return process.exit(1);
-  - [x] check the pr's status and only retest if no longer "Pending"
+  });
-  - [x] add a retest comment
-    - POST /repos/:owner/:repo/issues/:number/comments
-  - [x] delete the retest comment
-  - [ ] delete the build comment
-  - [ ] delete ALL build failure comments
-    - DELETE /repos/:owner/:repo/issues/comments/:comment_id
-
-  */
 }

src/lib/get_pull.mjs

@@ -4,6 +4,7 @@ export default async function getPull(repo, id) {
     id: pull.id,
     url: pull.url,
     number: pull.number,
+    owner: pull.user.login,
     state: pull.state,
     title: pull.title,
     labels: pull.labels.map(label => label.name),

src/lib/logger.mjs

@@ -0,0 +1,38 @@
+/* eslint no-console: 0 */
+const zeroPad = (str, len) => {
+  let output = `${str}`;
+  if (!len || len <= output.length) return str;
+
+  while (output.length < len) {
+    output = `0${output}`;
+  }
+  return output;
+};
+
+const wrapMessage = msg => {
+  const d = new Date();
+  const timestamp = `${[d.getFullYear(), zeroPad(d.getMonth(), 2), zeroPad(d.getDate(), 2)].join(
+    '/'
+  )} ${[zeroPad(d.getHours(), 2), zeroPad(d.getMinutes(), 2), zeroPad(d.getSeconds(), 2)].join(
+    ':'
+  )}`;
+  return `[${timestamp}]: ${msg.join(' ')}`;
+};
+
+const logger = {
+  log(...args) {
+    console.log(wrapMessage(args));
+  },
+  warn(...args) {
+    console.warn(wrapMessage(args));
+  },
+  error(...args) {
+    console.error(wrapMessage(args));
+  },
+  debug(...args) {
+    if (!process.env.DEBUG) return;
+    console.log(wrapMessage(args));
+  },
+};
+
+export default logger;