@fishawack/lab-env 4.39.0-beta.6 → 4.39.0-beta.8

package/commands/create/services/aws/index.js

@@ -116,29 +116,39 @@ module.exports.static = async (
 module.exports.staticTerminate = async (name, account, repo, branch, id) => {
     try {
         await module.exports.s3.emptyS3Bucket(name, account);
-    } catch (e) {}
+    } catch {
+        /* empty */
+    }
 
     try {
         await module.exports.s3.removeS3Bucket(name, account);
-    } catch (e) {}
+    } catch {
+        /* empty */
+    }
 
     try {
         await module.exports.cloudfront.removeCloudFrontDistribution(
             id,
             account,
         );
-    } catch (e) {}
+    } catch {
+        /* empty */
+    }
 
     try {
         await module.exports.cloudfront.removeCloudFrontFunction(name, account);
-    } catch (e) {}
+    } catch {
+        /* empty */
+    }
 
     try {
         await module.exports.cloudfront.removeCloudFrontFunction(
             module.exports.slug(`${repo}-response`, account, branch),
             account,
         );
-    } catch (e) {}
+    } catch {
+        /* empty */
+    }
 };
 
 module.exports.fullstack = async (
@@ -181,14 +191,18 @@ module.exports.fullstack = async (
             repo,
             account,
         );
-    } catch (e) {}
+    } catch {
+        /* empty */
+    }
 
     let hasKeyPair = false;
 
     try {
         await module.exports.ec2.getKeyPair("id_rsa_prev", account);
         hasKeyPair = true;
-    } catch (e) {}
+    } catch {
+        /* empty */
+    }
 
     // LetsEncrypt CN records are limited to 64 chars so use only the hash from the generated name
     const CNAMEPrefix = `fw-auto-${name.split("-")[name.split("-").length - 1]}`;
@@ -270,27 +284,37 @@ module.exports.fullstackTerminate = async (name, account, repo, branch) => {
 
     try {
         await module.exports.iam.removeIAMUser(s3Slug, account);
-    } catch (e) {}
+    } catch {
+        /* empty */
+    }
 
     try {
         await module.exports.s3.emptyS3Bucket(s3Slug, account);
-    } catch (e) {}
+    } catch {
+        /* empty */
+    }
 
     try {
         await module.exports.s3.removeS3Bucket(s3Slug, account);
-    } catch (e) {}
+    } catch {
+        /* empty */
+    }
 
     try {
         await module.exports.elasticbeanstalk.removeElasticBeanstalkEnvironment(
             name,
             account,
         );
-    } catch (e) {}
+    } catch {
+        /* empty */
+    }
 
     try {
         await module.exports.elasticbeanstalk.removeElasticBeanstalkApplication(
             repo,
             account,
         );
-    } catch (e) {}
+    } catch {
+        /* empty */
+    }
 };

package/commands/create/services/aws/s3.js

@@ -154,6 +154,7 @@ module.exports.emptyS3Bucket = async (bucket, account) => {
     const client = createClient(S3Client, account);
 
     await Spinner.prototype.simple(`Emptying s3 bucket`, () => {
+        // eslint-disable-next-line no-async-promise-executor
         return new Promise(async (resolve, reject) => {
             try {
                 let ContinuationToken = null;

package/commands/create/services/bitbucket.js

@@ -18,7 +18,7 @@ module.exports.check = async () => {
         }
 
         return true;
-    } catch (error) {
+    } catch {
         spinner.update(
             `Failed to communicate with ${misc.bitbucket.workspace} on Bitbucket.`,
             "fail",
@@ -41,7 +41,7 @@ module.exports.remove = async (slug) => {
         } else {
             throw "";
         }
-    } catch (error) {
+    } catch {
         spinner.update(`Failed to delete ${slug} on Bitbucket.`, "fail");
     }
 };
@@ -98,14 +98,14 @@ module.exports.fork = async (slug, template) => {
         }
 
         return true;
-    } catch (error) {
+    } catch {
         spinner.update(`Failed to create ${slug} on Bitbucket.`, "fail");
 
         return false;
     }
 };
 
-module.exports.enablePipelines = async (slug, config) => {
+module.exports.enablePipelines = async (slug) => {
     let spinner = new Spinner(`Enabling pipelines for ${slug}`);
 
     try {

package/commands/create/services/egnyte.js

@@ -25,7 +25,7 @@ module.exports.request = async (username, password, host) => {
             !(await new Promise((resolve, reject) => {
                 exec(
                     `curl -I -k --ftp-ssl --ftp-pasv -u "${username.replace("$", "\\$")}:${password}" ftp://${host}`,
-                    (error, stdout, stderr) => {
+                    (error, stdout) => {
                         if (error) {
                             reject(error);
                             return;
@@ -42,7 +42,7 @@ module.exports.request = async (username, password, host) => {
         }
 
         return true;
-    } catch (error) {
+    } catch {
         spinner.update(`Failed to communicate with Egnyte.`, "fail");
 
         return false;

package/commands/create/services/gitlab.js

@@ -13,7 +13,7 @@ module.exports.check = async () => {
                 await new Promise((resolve, reject) => {
                     exec(
                         `curl -H "Content-Type:application/json" http://${misc.gitlab.workspace}/api/v4/users?private_token=${misc.gitlab.token}`,
-                        (error, stdout, stderr) => {
+                        (error, stdout) => {
                             if (error) {
                                 reject(error);
                                 return;
@@ -33,7 +33,7 @@ module.exports.check = async () => {
         }
 
         return true;
-    } catch (error) {
+    } catch {
         spinner.update(
             `Failed to communicate with ${misc.gitlab.workspace} on Gitlab.`,
             "fail",

package/commands/create/services/guide.js

@@ -1,17 +1,17 @@
 const inquirer = require("inquirer");
 const { homedir } = require("os");
 const { mkdirSync, writeFileSync, readFileSync } = require("fs");
-const { encode } = require("../libs/utilities");
+const { encode, Spinner } = require("../libs/utilities");
 const {
     urls,
     apis,
-    misc: creds_misc,
+    misc: credsMisc,
     bitbucketApi,
     headers,
-    ftppass: creds_ftppass,
+    ftppass: credsFtppass,
     creds,
     presets,
-    global_modules,
+    globalModules,
 } = require("../libs/vars");
 const { execSync } = require("child_process");
 
@@ -75,7 +75,7 @@ module.exports.bitbucket = async ({ confirm }) => {
                 type: "input",
                 name: "username",
                 message: "What is your bitbucket username? (e.g. mmellor)",
-                default: creds_misc.bitbucket && creds_misc.bitbucket.username,
+                default: credsMisc.bitbucket && credsMisc.bitbucket.username,
                 validate: (input) =>
                     input.trim().length > 0 ||
                     "Username cannot be an empty string",
@@ -83,7 +83,7 @@ module.exports.bitbucket = async ({ confirm }) => {
             {
                 type: "password",
                 name: "password",
-                default: creds_misc.bitbucket && creds_misc.bitbucket.password,
+                default: credsMisc.bitbucket && credsMisc.bitbucket.password,
                 message: "What is your bitbucket password? (e.g. password1234)",
                 validate: (input) =>
                     input.trim().length > 0 ||
@@ -103,7 +103,7 @@ module.exports.bitbucket = async ({ confirm }) => {
             }),
         );
 
-        creds_misc.bitbucket = file.bitbucket = { ...inputs };
+        credsMisc.bitbucket = file.bitbucket = { ...inputs };
         apis.bbWorkspaceAPI = `${bitbucketApi}/${inputs.workspace}`;
         headers.bbHeaders = encode(inputs.username, inputs.password);
         urls.bitbucketSSH = `git@bitbucket.org:${inputs.workspace}`;
@@ -137,7 +137,7 @@ module.exports.gitlab = async ({ confirm }) => {
                 name: "token",
                 message:
                     "What is your gitlab token? (e.g. puhQmpZGooQyLCa5LhTg)",
-                default: (creds_misc.gitlab && creds_misc.gitlab.token) || null,
+                default: (credsMisc.gitlab && credsMisc.gitlab.token) || null,
                 validate: (input) =>
                     input.trim().length > 0 ||
                     "Password cannot be an empty string",
@@ -156,7 +156,7 @@ module.exports.gitlab = async ({ confirm }) => {
             }),
         );
 
-        creds_misc.gitlab = file.gitlab = { ...inputs };
+        credsMisc.gitlab = file.gitlab = { ...inputs };
 
         writeFileSync(
             `${homedir()}/targets/misc.json`,
@@ -210,8 +210,8 @@ module.exports.egnyte = async ({ confirm }) => {
                 message:
                     "What is your egnyte username? (e.g. mmellor$fishawack)",
                 default:
-                    (creds_ftppass["ftp-fishawack.egnyte.com"] &&
-                        creds_ftppass["ftp-fishawack.egnyte.com"].username) ||
+                    (credsFtppass["ftp-fishawack.egnyte.com"] &&
+                        credsFtppass["ftp-fishawack.egnyte.com"].username) ||
                     null,
                 validate: (input) =>
                     input.trim().length > 0 ||
@@ -222,8 +222,8 @@ module.exports.egnyte = async ({ confirm }) => {
                 name: "password",
                 message: "What is your egnyte password? (e.g. password1234)",
                 default:
-                    (creds_ftppass["ftp-fishawack.egnyte.com"] &&
-                        creds_ftppass["ftp-fishawack.egnyte.com"].password) ||
+                    (credsFtppass["ftp-fishawack.egnyte.com"] &&
+                        credsFtppass["ftp-fishawack.egnyte.com"].password) ||
                     null,
                 validate: (input) =>
                     input.trim().length > 0 ||
@@ -247,7 +247,7 @@ module.exports.egnyte = async ({ confirm }) => {
         );
 
         creds.egnyte =
-            creds_ftppass["ftp-fishawack.egnyte.com"] =
+            credsFtppass["ftp-fishawack.egnyte.com"] =
             file["ftp-fishawack.egnyte.com"] =
                 { ...inputs };
 
@@ -431,6 +431,7 @@ module.exports.watertight = async ({ confirm }) => {
           ]);
 
     if (inputs.confirm) {
+        /* empty */
     } else {
         throw "";
     }
@@ -455,23 +456,29 @@ module.exports.gitconfig = async ({ confirm }) => {
     }
 };
 
-module.exports.global_modules = async ({ confirm }) => {
+module.exports.globalModules = async ({ confirm }) => {
     let inputs = confirm
         ? { confirm }
         : await inquirer.prompt([
               {
                   type: "confirm",
                   name: "confirm",
-                  message: `Install required global dependencies? ${global_modules.map((d) => `${d.package}@${d.version}`).join(", ")}`,
+                  message: `Install required global dependencies? ${globalModules.map((d) => `${d.package}@${d.version}`).join(", ")}`,
                   default: true,
               },
           ]);
 
     if (inputs.confirm) {
-        for (let i = 0; i < global_modules.length; i++) {
-            const { package, version } = global_modules[i];
+        let spinner;
 
-            execSync(`npm install -g ${package}@${version}`);
+        for (let i = 0; i < globalModules.length; i++) {
+            const { package: packageName, version } = globalModules[i];
+
+            spinner = new Spinner(`Installing ${packageName}@${version}`);
+
+            execSync(`npm install -g ${packageName}@${version}`);
+
+            spinner.update(`Installed ${packageName}@${version}`);
         }
     } else {
         throw "";

package/commands/create/services/test.js

@@ -193,13 +193,13 @@ module.exports.watertight = async () => {
         !(await new Promise((resolve, reject) =>
             exec(
                 "git clone --bare git@bitbucket.org:fishawackdigital/watertight-node-auto ./.tmp/watertight-node-auto",
-                (error, stdout, stderr) => (error ? reject(error) : resolve()),
+                (error) => (error ? reject(error) : resolve()),
             ),
         ));
 
         spinner.update("Successfully accessed watertight-node-auto repository");
         return true;
-    } catch (e) {
+    } catch {
         spinner.update(
             "Could not access watertight-node-auto repository",
             "fail",
@@ -221,20 +221,20 @@ module.exports.gitconfig = async () => {
     }
 };
 
-module.exports.global_modules = async () => {
+module.exports.globalModules = async () => {
     // Get list of all globally installed node modules
     let spinner = new utils.Spinner(
         "Retrieving a list of all globally installed node_modules",
     );
 
-    let global_modules;
+    let globalModules;
 
     try {
         const stdout = execSync("npm ls -g --depth=0 --json", {
             encoding: "utf8",
         });
         const data = JSON.parse(stdout);
-        global_modules = data.dependencies || {};
+        globalModules = data.dependencies || {};
 
         spinner.update("Global node_module list retrieved");
     } catch (error) {
@@ -244,19 +244,21 @@ module.exports.global_modules = async () => {
         );
     }
 
-    for (let i = 0; i < vars.global_modules.length; i++) {
-        const { package, version } = vars.global_modules[i];
+    for (let i = 0; i < vars.globalModules.length; i++) {
+        const { package: packageName, version } = vars.globalModules[i];
 
         spinner = new utils.Spinner(
-            `Checking ${package}@${version} is installed`,
+            `Checking ${packageName}@${version} is installed`,
         );
 
-        if (semver.satisfies(global_modules[package]?.version, `=${version}`)) {
+        if (
+            semver.satisfies(globalModules[packageName]?.version, `=${version}`)
+        ) {
             spinner.update(
-                `Package: ${package}@${global_modules[package]?.version} found`,
+                `Package: ${packageName}@${globalModules[packageName]?.version} found`,
             );
         } else {
-            spinner.update(`Could not find ${package}@${version}`, "fail");
+            spinner.update(`Could not find ${packageName}@${version}`, "fail");
             return false;
         }
     }

package/commands/deploy.js

@@ -5,8 +5,8 @@ const execSync = require("child_process").execSync;
 module.exports = [
     "deploy",
     "deploys the repo",
-    (yargs) => {},
-    (argv) => {
+    () => {},
+    () => {
         if (
             _.platform === "laravel" ||
             _.platform === "wordpress" ||

package/commands/docker/config.js

@@ -5,6 +5,6 @@ const execSync = require("child_process").execSync;
 module.exports = [
     "config",
     false,
-    (yargs) => {},
-    (argv) => execSync(`${_.docker} config`, _.opts),
+    () => {},
+    () => execSync(`${_.docker} config`, _.opts),
 ];

package/commands/docker/down.js

@@ -5,6 +5,6 @@ const execSync = require("child_process").execSync;
 module.exports = [
     "down",
     false,
-    (yargs) => {},
-    (argv) => execSync(`${_.docker} down`, _.opts),
+    () => {},
+    () => execSync(`${_.docker} down`, _.opts),
 ];

package/commands/docker/mocha.js

@@ -1,12 +1,10 @@
 const _ = require("../../globals.js");
 
-const execSync = require("child_process").execSync;
-
 module.exports = [
     "mocha",
     false,
-    (yargs) => {},
-    (argv) =>
+    () => {},
+    () =>
         _.command(
             "core",
             `${process.env.VERSION === "0" ? "xvfb-run " : ""}npm run mocha`,

package/commands/docker/volumes.js

@@ -3,8 +3,8 @@ const _ = require("../../globals.js");
 module.exports = [
     "volumes",
     false,
-    (yargs) => {},
-    (argv) => {
+    () => {},
+    () => {
         console.log(`${_.volumes.join("\n")}`);
     },
 ];

package/commands/lint.js

@@ -3,12 +3,36 @@ const execSync = require("child_process").execSync;
 const _ = require("../globals.js");
 
 module.exports = [
-    "lint",
+    "lint [linters]",
     "runs code style, javascript, scss & php linting",
-    (yargs) => {},
-    (argv) =>
-        execSync("npx prettier --check .", {
-            encoding: "utf8",
-            stdio: "inherit",
-        }),
+    (yargs) => {
+        yargs.positional("linters", {
+            describe: "linters to run",
+            default: "js css php style",
+        });
+
+        yargs.option("fix", {
+            describe: "Attempt to fix issues",
+            type: "boolean",
+        });
+    },
+    (argv) => {
+        if (argv.linters.includes("style")) {
+            execSync(`prettier ${argv.fix ? "--write" : "--check"} .`, _.opts);
+        }
+
+        if (argv.linters.includes("js")) {
+            execSync(
+                `eslint '**/*.{js,vue}' --no-error-on-unmatched-pattern${argv.fix ? " --fix" : ""}`,
+                _.opts,
+            );
+        }
+
+        if (argv.linters.includes("css")) {
+            execSync(
+                `stylelint '**/*.{scss,css}' --allow-empty-input${argv.fix ? " --fix" : ""}`,
+                _.opts,
+            );
+        }
+    },
 ];

package/commands/nuke.js

@@ -5,13 +5,15 @@ const execSync = require("child_process").execSync;
 module.exports = [
     "nuke",
     "cleans out all files not tracked by git",
-    (yargs) => {},
-    (argv) => {
+    () => {},
+    () => {
         execSync(`git clean -xfd`, _.opts);
 
         // Remove all virtual volumes
         try {
             execSync(`docker volume rm ${_.volumes.join(" ")}`, _.opts);
-        } catch (e) {}
+        } catch {
+            /* empty */
+        }
     },
 ];

package/commands/origin.js

@@ -7,8 +7,8 @@ const chalk = require("chalk");
 module.exports = [
     "origin",
     "add gitlab as a second remote",
-    (yargs) => {},
-    (argv) => {
+    () => {},
+    () => {
         try {
             let misc = require(
                 path.join(require("os").homedir(), "targets", "misc.json"),
@@ -43,7 +43,7 @@ module.exports = [
                         .replace(/[^\w ]+/g, "")
                         .replace(/ +/g, "-");
                     fullpath = `${group}/${_.repo}`;
-                } catch (e) {
+                } catch {
                     console.log(`Can't connect to ${url.bitbucket}`);
                     return;
                 }

package/commands/production.js

@@ -3,8 +3,8 @@ const _ = require("../globals.js");
 module.exports = [
     ["production", "prod"],
     "builds for production",
-    (yargs) => {},
-    (argv) =>
+    () => {},
+    () =>
         _.command(
             "core",
             `${process.env.VERSION === "0" ? "xvfb-run " : ""}npm run production`,

package/commands/regenerate.js

@@ -3,8 +3,8 @@ const _ = require("../globals.js");
 module.exports = [
     ["regenerate", "regen"],
     "regenerates dependency lock files",
-    (yargs) => {},
-    (argv) => {
+    () => {},
+    () => {
         _.command(
             "core",
             `rm package-lock.json; git clean -xfd node_modules/ 2>/dev/null || true; npm install`,

package/commands/reinstall.js

@@ -3,8 +3,8 @@ const _ = require("../globals.js");
 module.exports = [
     ["reinstall", "ci"],
     "installs fresh dependencies",
-    (yargs) => {},
-    (argv) => {
+    () => {},
+    () => {
         _.command("core", `npm ci || npm i`);
 
         if (

package/commands/setup.js

@@ -5,8 +5,8 @@ const execSync = require("child_process").execSync;
 module.exports = [
     "setup",
     "runs the initial setup",
-    (yargs) => {},
-    (argv) => {
+    () => {},
+    () => {
         if (
             _.platform === "laravel" ||
             _.platform === "wordpress" ||

package/commands/test.js

@@ -3,8 +3,8 @@ const _ = require("../globals.js");
 module.exports = [
     "test",
     "run tests",
-    (yargs) => {},
-    (argv) => {
+    () => {},
+    () => {
         _.up(() => {
             _.command(
                 "core",

package/commands/watch.js

@@ -3,8 +3,8 @@ const _ = require("../globals.js");
 module.exports = [
     "watch",
     "watch",
-    (yargs) => {},
-    (argv) => {
+    () => {},
+    () => {
         if (
             _.pkg.name === "sprinkle-base" ||
             _.pkg.name === "@fishawack/sprinkle-base" ||

package/commands/wp.js

@@ -1,7 +1,5 @@
 const _ = require("../globals.js");
 
-const execSync = require("child_process").execSync;
-
 module.exports = [
     ["wp [command...]", "wordpress"],
     "run wp-cli command",