1.3.0

also show error when comment isn't deleted

CHANGELOG.md

@@ -1,12 +1,9 @@
 ### Changelog
 
-#### [v1.3.2](https://git.w33ble.com/w33ble/gh-action-bot/compare/v1.3.1...v1.3.2) (25 October 2018)
-- fix: correct month in log output [`07288be`](https://git.w33ble.com/w33ble/gh-action-bot/commit/07288bee33d6861aa53e88e856174868f37b1fd5)
-
-#### [v1.3.1](https://git.w33ble.com/w33ble/gh-action-bot/compare/v1.2.1...v1.3.1) (23 October 2018)
-- feat: add a clean command [`f3773f7`](https://git.w33ble.com/w33ble/gh-action-bot/commit/f3773f7ee7c0de42997a5b19cc5ee215da3f06ec)
-- feat: track processed, comments [`31b55fc`](https://git.w33ble.com/w33ble/gh-action-bot/commit/31b55fc7c2d7042e428a12f04124e1c4cd63fd28)
-- docs: add clean script to readme [`b728b8e`](https://git.w33ble.com/w33ble/gh-action-bot/commit/b728b8ef50ee1a9b79f79ccc6b27f4acaf669d15)
+#### [v1.3.0](https://git.w33ble.com/w33ble/gh-action-bot/compare/v1.2.1...v1.3.0) (23 October 2018)
+- feat: add a clean command [`e8e252f`](https://git.w33ble.com/w33ble/gh-action-bot/commit/e8e252f73c315663a6cc79336c914615bdfe1ad5)
+- chroe: user logger on force errors [`41d7905`](https://git.w33ble.com/w33ble/gh-action-bot/commit/41d79051f8550f428ea41505ab4740caa0509e93)
+- docs: add clean script to readme [`a8800d1`](https://git.w33ble.com/w33ble/gh-action-bot/commit/a8800d1593f5cbd4fb5a90a895bcc88aa004e892)
 
 #### [v1.2.1](https://git.w33ble.com/w33ble/gh-action-bot/compare/v1.2.0...v1.2.1) (23 October 2018)
 - feat: add more debugging output [`3db973f`](https://git.w33ble.com/w33ble/gh-action-bot/commit/3db973febc5387605279f7855976a4ec431f0362)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gh-action-bot",
-  "version": "1.3.2",
+  "version": "1.3.0",
   "private": true,
   "description": "Action bot for Github",
   "main": "index",

src/clean.mjs

@@ -21,7 +21,9 @@ async function forceRetest() {
   comments
     .filter(comment => bodyRegexp.test(comment.body) && comment.owner === COMMENT_ACTOR)
     .forEach(async comment => {
-      await deleteComment(repo, comment.id);
+      const res = await deleteComment(repo, comment.id);
+      if (res) logger.debug(`Comment ${comment.id} deleted`);
+      else logger.error(new Error(`Failed to remove comment ${comment.id}`));
     });
 }
 

src/force.mjs

@@ -1,7 +1,7 @@
 import dotenv from 'dotenv';
 import logger from './lib/logger.mjs';
 import createRepo from './lib/create_repo.mjs';
-import createPullComment from './lib/create_pull_comment.mjs';
+import { createComment, deleteComment } from './lib/comments.mjs';
 
 dotenv.config();
 
@@ -14,7 +14,10 @@ async function forceRetest() {
   }
 
   const repo = createRepo(ownerRepo);
-  await createPullComment(repo, prNumber, PULL_RETEST_BODY, { delete: true });
+  const comment = await createComment(repo, prNumber, PULL_RETEST_BODY);
+  const res = await deleteComment(repo, comment.id);
+  if (res) logger.debug(`Comment ${comment.id} deleted`);
+  else logger.error(new Error(`Failed to remove comment ${comment.id}`));
 }
 
 forceRetest().catch(err => logger.error(err));

src/index.mjs

@@ -5,7 +5,7 @@ import getComments from './lib/get_comments.mjs';
 import getPull from './lib/get_pull.mjs';
 import getCommits from './lib/get_commits.mjs';
 import getCommitStatus from './lib/get_commit_status.mjs';
-import createPullComment from './lib/create_pull_comment.mjs';
+import { createComment, deleteComment } from './lib/comments.mjs';
 import History from './lib/history.mjs';
 
 // load env vars from .env file
@@ -31,16 +31,11 @@ async function ghActionBot() {
   const comments = (await getComments(repo, {
     body: new RegExp(COMMENT_BODY_REGEXP, COMMENT_BODY_REGEXP_FLAGS),
     actor: COMMENT_ACTOR,
-  })).filter(comment => !history.get(comment.id)); // skip comments already processed
-
-  if (comments.length) logger.debug(`Found ${comments.length} comments to process`);
+  })).filter(comment => !history.get(comment.id));
 
   // read pull data
   const pulls = (await Promise.all(
     comments.map(async comment => {
-      // keep track of comments that have been processed
-      history.add(comment);
-
       const pull = await getPull(repo, comment.number);
 
       if (pull.state !== 'open') {
@@ -80,9 +75,12 @@ async function ghActionBot() {
   }
 
   await Promise.all(
-    records.map(record =>
-      createPullComment(repo, record.pull.number, PULL_RETEST_BODY, { delete: true })
-    )
+    records.map(async record => {
+      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);
+    })
   );
 }
 

src/lib/comments.mjs

@@ -1,12 +1,7 @@
-import logger from './logger.mjs';
-
 export async function createComment(repo, issueId, body) {
   return repo.issues(issueId).comments.create({ body });
 }
 
 export async function deleteComment(repo, commentId) {
-  const res = await repo.issues.comments(commentId).remove();
-  if (res) logger.debug(`Comment ${commentId} deleted`);
-  else logger.error(new Error(`Failed to remove comment ${commentId}`));
-  return res;
+  return repo.issues.comments(commentId).remove();
 }

src/lib/create_pull_comment.mjs

@@ -1,19 +0,0 @@
-import logger from './logger.mjs';
-import { createComment, deleteComment } from './comments.mjs';
-
-const sleep = async ms => new Promise(resolve => setTimeout(resolve, ms));
-
-export default async function createPullComment(repo, number, body, opts = {}) {
-  logger.log(`Adding comment to PR #${number}`);
-  const comment = await createComment(repo, number, body);
-  logger.debug(`Created comment id ${comment.id}`);
-
-  const options = Object.assign({ delete: false, delay: 250 }, opts);
-
-  if (options.delete) {
-    await sleep(options.delay);
-    await deleteComment(repo, comment.id);
-  }
-
-  return comment.id;
-}

src/lib/logger.mjs

@@ -11,7 +11,7 @@ const zeroPad = (str, len) => {
 
 const getTimestamp = () => {
   const d = new Date();
-  return `${[d.getFullYear(), zeroPad(d.getMonth() + 1, 2), zeroPad(d.getDate(), 2)].join('/')} ${[
+  return `${[d.getFullYear(), zeroPad(d.getMonth(), 2), zeroPad(d.getDate(), 2)].join('/')} ${[
     zeroPad(d.getHours(), 2),
     zeroPad(d.getMinutes(), 2),
     zeroPad(d.getSeconds(), 2),