Merge pull request #73 from OperationSpark/72-remove-svn-dependency

Fix Tests

Author: harveysanders

.devcontainer/devcontainer.json

@@ -0,0 +1,29 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/javascript-node
+{
+	"name": "Node.js",
+	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+	"image": "mcr.microsoft.com/devcontainers/javascript-node:1-20-bullseye",
+	"customizations": {
+		"vscode": {
+			"extensions": [
+				"esbenp.prettier-vscode"
+			]
+		}
+	}
+
+	// Features to add to the dev container. More info: https://containers.dev/features.
+	// "features": {},
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	// "postCreateCommand": "yarn install",
+
+	// Configure tool-specific properties.
+	// "customizations": {},
+
+	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+	// "remoteUser": "root"
+}

.eslintrc.js

@@ -3,7 +3,7 @@ module.exports = {
   plugins: ['import'],
   rules: {
     // enable additional rules
-    quotes: ['error', 'single'],
+    quotes: ['error', 'single', { "avoidEscape": true }],
     semi: ['error', 'always'],
 
     // disable rules from base configurations
@@ -15,7 +15,7 @@ module.exports = {
     'func-names': 'off',
     'consistent-return': 'off',
     'prefer-arrow-callback': 'off',
-    'arrow-parens': 'as-needed',
+    'arrow-parens': 'off',
     // Windows friendly -- does not show errors on every line of every file
     'no-unused-vars': 1,
     'linebreak-style': 0

.github/dependabot.yml

@@ -0,0 +1,12 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for more information:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+# https://containers.dev/guide/dependabot
+
+version: 2
+updates:
+ - package-ecosystem: "devcontainers"
+   directory: "/"
+   schedule:
+     interval: weekly

.github/workflows/ci.yml

@@ -1,12 +1,12 @@
 name: Ci
-on: [push, pull_request]
+on: [pull_request, workflow_dispatch]
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: "16"
+          node-version: "20"
       - run: npm ci
       - run: npm test

.gitignore

@@ -43,4 +43,5 @@ test/files/environment/projects
 .secrets
 
 user
-auth
+auth
+.env*

.prettierrc

@@ -0,0 +1,21 @@
+{
+  "arrowParens": "avoid",
+  "bracketSpacing": true,
+  "endOfLine": "lf",
+  "insertPragma": false,
+  "singleAttributePerLine": false,
+  "bracketSameLine": false,
+  "jsxBracketSameLine": false,
+  "jsxSingleQuote": false,
+  "printWidth": 80,
+  "proseWrap": "preserve",
+  "quoteProps": "as-needed",
+  "requirePragma": false,
+  "semi": true,
+  "singleQuote": true,
+  "tabWidth": 2,
+  "trailingComma": "none",
+  "useTabs": false,
+  "embeddedLanguageFormatting": "auto",
+  "parser": "babel"
+}

config.json

@@ -17,4 +17,4 @@
             "enterPartnerName": "Enter the GitHub username of your partner (you can ask them to type it)"}
     },
     "userAgent": "opspark"
-}
+}

controller/github.js

@@ -4,13 +4,11 @@ const util = require('util');
 const prompt = require('inquirer').prompt;
 const mkdirp = require('mkdirp');
 const fsJson = require('fs-json')();
-const octonode = require('octonode');
-const rp = require('request-promise');
+
 const exec = require('child_process').exec;
 
 const env = require('./env');
 const config = require('../config.json');
-const janitor = require('./janitor');
 const {
   createGithubToken,
   deleteGithubToken,
@@ -95,6 +93,12 @@ function promptForUserInfo() {
 
 module.exports.promptForUserInfo = promptForUserInfo;
 
+/**
+ *
+ * @param {object} auth
+ * @param {string} auth.token GitHub Personal Access Token
+ * @returns {Promise<{token: string}>}
+ */
 function writeAuth(auth) {
   deleteAuth();
   console.log(clc.yellow('Writing auth. . .'));
@@ -137,8 +141,10 @@ function writeUser(auth) {
         const { id, message } = JSON.parse(stdout);
         if (err) {
           rej(err);
+          return;
         } else if (message) {
           rej(message);
+          return;
         }
         ensureApplicationDirectory();
         fsJson.saveSync(userFilePath, {
@@ -291,17 +297,14 @@ function grabLocalAuthToken() {
 
 module.exports.grabLocalAuthToken = grabLocalAuthToken;
 
-function deauthorizeUser() {
-  return new Promise(function (res, rej) {
-    promptForUserInfo()
-      // .then(deleteAuth)
-      .then(deleteUserInfo)
-      .then(() => {
-        console.log(clc.blue('Successfully logged out!'));
-        res(true);
-      })
-      .catch(err => rej(`${err}`.red));
-  });
+async function deauthorizeUser() {
+  try {
+    deleteUserInfo();
+    console.log(clc.blue('Successfully logged out!'));
+    return true;
+  } catch (error) {
+    return Promise.reject(clc.red(`${error}`));
+  }
 }
 
 module.exports.deauthorizeUser = deauthorizeUser;
@@ -336,6 +339,10 @@ function deleteUser() {
 
 module.exports.deleteUser = deleteUser;
 
+// TODO: Should be async
+/**
+ * Deletes the auth and user files.
+ */
 function deleteUserInfo() {
   console.log(clc.red('Deleting files. . .'));
   deleteAuth();

controller/greenlight.js

@@ -2,11 +2,11 @@ const clc = require('cli-color');
 const rp = require('request-promise');
 
 const github = require('./github');
+const { devGreenlightHost, isDevMode } = require('../dev-config');
 
-// TODO: Switch URI for live version
-const LOCALHOST = 'http://localhost:3000';
 const GREENLIGHT = 'https://greenlight.operationspark.org';
-const URI = GREENLIGHT;
+// TODO: Switch URI for live version
+const URI = isDevMode ? devGreenlightHost : GREENLIGHT;
 
 module.exports.URI = URI;
 

controller/helpers.js

@@ -5,7 +5,7 @@ module.exports.execAsync = function execAsync(cmd) {
   return new Promise((res, rej) => {
     exec(cmd, (err, stdout, stderr) => {
       if (err) return rej(err);
-      return res(stdout, stderr);
+      return res({ stdout, stderr });
     });
   });
 };
@@ -27,7 +27,12 @@ module.exports.createGithubToken = function (username, password, note) {
   return `curl -u "${username}:${password}" -d '{"scopes":["public_repo", "repo", "gist"],"note":"${note}","note_url":"https://www.npmjs.com/package/opspark"}' https://api.github.com/authorizations`;
 };
 
-module.exports.deleteGithubToken = function (username, password, userAgent, authID) {
+module.exports.deleteGithubToken = function (
+  username,
+  password,
+  userAgent,
+  authID
+) {
   return `curl -X "DELETE" -u "${username}:${password}" -A "${userAgent}" -H "Accept: application/json" https://api.github.com/authorizations/${authID}`;
 };
 
@@ -63,11 +68,11 @@ module.exports.readGistHelper = function (url) {
   return `curl ${url}`;
 };
 
-module.exports.installProjectDependenciesCmd = function(directory) {
+module.exports.installProjectDependenciesCmd = function (directory) {
   return `npm install --prefix ${directory} --loglevel=error`;
 };
 
-module.exports.removeProjectTestsCmd = function(directory) {
+module.exports.removeProjectTestsCmd = function (directory) {
   return `rm -rf ${directory}/test`;
 };