Run pull.sh with pm2 when webhooked

64json · 64json · commit fca60ef1d8a2 · 2018-12-14T05:47:14.000-05:00
diff --git a/bin/pull b/bin/pull
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
 git fetch &&
+! git diff-index --quiet origin/master &&
 git reset --hard origin/master &&
-npm --production=false install &&
+npm install &&
 npm run build
diff --git a/package.json b/package.json
@@ -9,6 +9,8 @@
     "build": "npm run build:frontend && npm run build:backend",
     "build:frontend": "NODE_ENV=production node ./node_modules/webpack/bin/webpack --bail --progress --config webpack.frontend.config.js",
     "build:backend": "NODE_ENV=production node ./node_modules/webpack/bin/webpack --bail --progress --config webpack.backend.config.js",
+    "pull": "NODE_ENV=development ./bin/pull",
+    "pm2": "npm run pull ; npm start",
     "lint": "./node_modules/.bin/eslint --fix src"
   },
   "repository": {
diff --git a/src/backend/common/util.js b/src/backend/common/util.js
@@ -14,14 +14,6 @@ const execute = (command, cwd, { stdout = process.stdout, stderr = process.stder
   if (stderr) child.stderr.pipe(stderr);
 });
 
-const spawn = (command, args, cwd, { stdout = process.stdout, stderr = process.stderr } = {}) => new Promise((resolve, reject) => {
-  if (!cwd) return reject(new Error('CWD Not Specified'));
-  const child = child_process.spawn(command, args, { cwd });
-  child.on('close', code => code ? reject(new Error(`Process exited with code: ${code}`)) : resolve());
-  if (stdout) child.stdout.pipe(stdout);
-  if (stderr) child.stderr.pipe(stderr);
-});
-
 const createKey = name => name.toLowerCase().trim().replace(/[^\w \-]/g, '').replace(/ /g, '-');
 
 const isDirectory = dirPath => fs.lstatSync(dirPath).isDirectory();
@@ -43,7 +35,6 @@ const getDescription = files => {
 
 export {
   execute,
-  spawn,
   createKey,
   isDirectory,
   listFiles,
diff --git a/src/backend/controllers/algorithms.js b/src/backend/controllers/algorithms.js
@@ -3,7 +3,7 @@ import fs from 'fs-extra';
 import { execute } from '/common/util';
 import webhook from '/common/webhook';
 import hierarchy from '/common/hierarchy';
-import { NotFoundError } from '../common/error';
+import { NotFoundError } from '/common/error';
 
 const router = express.Router();
 
diff --git a/src/backend/index.js b/src/backend/index.js
@@ -1,12 +1,10 @@
-import path from 'path';
 import express from 'express';
 import morgan from 'morgan';
 import cookieParser from 'cookie-parser';
 import bodyParser from 'body-parser';
 import * as controllers from '/controllers';
 import { ClientError, ForbiddenError, NotFoundError, UnauthorizedError } from '/common/error';
 import webhook from '/common/webhook';
-import { spawn } from '/common/util';
 import hierarchy from '/common/hierarchy';
 
 const app = express();
@@ -32,11 +30,10 @@ app.use((err, req, res, next) => {
 });
 app.hierarchy = hierarchy;
 
-const rootPath = path.resolve(__dirname, '..', '..');
 webhook.on('algorithm-visualizer', event => {
   switch (event) {
     case 'push':
-      spawn('sh', ['./bin/pull.sh'], rootPath).then(() => process.exit(0));
+      process.exit(0);
       break;
   }
 });
