@fishawack/lab-env 3.0.0 → 3.1.0

package/CHANGELOG.md

@@ -1,6 +1,15 @@
 ## Changelog
 
-### 3.0.0 (2022-08-17)
+### 3.1.0 (2022-09-08)
+* [Feature] exec command now has the -g flag to prepend the full grunt path
+* [Feature] Diagnosis now has a version number that will prompt for re-run when needed
+* [Change] Bumped core `0.1.0` to `0.2.0`
+* [Bug] rebuild now passes flags after the service
+* [Bug] Specify platform in core build command
+* [Bug] Login to docker during docker before versioning and building images
+* [Misc] Tests now use cli path
+
+### 3.0.0 (2022-09-05)
 * [Feature] Added newly setup AWS accounts to the client prompts on `fw provision`
 * [Feature] Added key/dekey commands
 * [Change] Provisioned environment variables now append client to uniqueify the services created

package/_Test/boilerplate-craftcms.js

@@ -12,17 +12,17 @@ describe('deploy', () => {
 
         execSync(`git -C _Test/_fixtures clone git@bitbucket.org:fishawackdigital/${repo}`, {encoding: 'utf8', stdio: 'inherit'});
 
-        execSync('fw setup', opts);
+        execSync('node ../../../cli.js setup', opts);
 
-        execSync('fw prod', opts);
+        execSync('node ../../../cli.js prod', opts);
     });
     
     it(`All ${repo} tests should pass`, async () => {
-        expect(execSync('fw test', opts)).to.not.equal(Error);
+        expect(execSync('node ../../../cli.js test', opts)).to.not.equal(Error);
     });
 
     after(() => {
-        execSync('fw nuke', opts)
+        execSync('node ../../../cli.js nuke', opts)
 
         execSync(`rm -rf _Test/_fixtures/${repo}`, {encoding: 'utf8', stdio: 'inherit'});
     });

package/_Test/boilerplate-drupal.js

@@ -12,17 +12,17 @@ describe('deploy', () => {
 
         execSync(`git -C _Test/_fixtures clone git@bitbucket.org:fishawackdigital/${repo}`, {encoding: 'utf8', stdio: 'inherit'});
 
-        execSync('fw setup', opts);
+        execSync('node ../../../cli.js setup', opts);
 
-        execSync('fw prod', opts);
+        execSync('node ../../../cli.js prod', opts);
     });
     
     it(`All ${repo} tests should pass`, async () => {
-        expect(execSync('fw test', opts)).to.not.equal(Error);
+        expect(execSync('node ../../../cli.js test', opts)).to.not.equal(Error);
     });
 
     after(() => {
-        execSync('fw nuke', opts)
+        execSync('node ../../../cli.js nuke', opts)
 
         execSync(`rm -rf _Test/_fixtures/${repo}`, {encoding: 'utf8', stdio: 'inherit'});
     });

package/_Test/boilerplate-laravel.js

@@ -12,17 +12,17 @@ describe('deploy', () => {
 
         execSync(`git -C _Test/_fixtures clone git@bitbucket.org:fishawackdigital/${repo}`, {encoding: 'utf8', stdio: 'inherit'});
 
-        execSync('fw setup', opts);
+        execSync('node ../../../cli.js setup', opts);
 
-        execSync('fw prod', opts);
+        execSync('node ../../../cli.js prod', opts);
     });
     
     it(`All ${repo} tests should pass`, async () => {
-        expect(execSync('fw test', opts)).to.not.equal(Error);
+        expect(execSync('node ../../../cli.js test', opts)).to.not.equal(Error);
     });
 
     after(() => {
-        execSync('fw nuke', opts)
+        execSync('node ../../../cli.js nuke', opts)
 
         execSync(`rm -rf _Test/_fixtures/${repo}`, {encoding: 'utf8', stdio: 'inherit'});
     });

package/_Test/boilerplate-wordpress.js

@@ -12,17 +12,17 @@ describe('deploy', () => {
 
         execSync(`git -C _Test/_fixtures clone git@bitbucket.org:fishawackdigital/${repo}`, {encoding: 'utf8', stdio: 'inherit'});
 
-        execSync('fw setup', opts);
+        execSync('node ../../../cli.js setup', opts);
 
-        execSync('fw prod', opts);
+        execSync('node ../../../cli.js prod', opts);
     });
     
     it(`All ${repo} tests should pass`, async () => {
-        expect(execSync('fw test', opts)).to.not.equal(Error);
+        expect(execSync('node ../../../cli.js test', opts)).to.not.equal(Error);
     });
 
     after(() => {
-        execSync('fw nuke', opts)
+        execSync('node ../../../cli.js nuke', opts)
 
         execSync(`rm -rf _Test/_fixtures/${repo}`, {encoding: 'utf8', stdio: 'inherit'});
     });

package/_Test/boilerplate.js

@@ -12,17 +12,17 @@ describe('deploy', () => {
 
         execSync(`git -C _Test/_fixtures clone git@bitbucket.org:fishawackdigital/${repo}`, {encoding: 'utf8', stdio: 'inherit'});
 
-        execSync('fw setup', opts);
+        execSync('node ../../../cli.js setup', opts);
 
-        execSync('fw prod', opts);
+        execSync('node ../../../cli.js prod', opts);
     });
     
     it(`All ${repo} tests should pass`, async () => {
-        expect(execSync('fw test', opts)).to.not.equal(Error);
+        expect(execSync('node ../../../cli.js test', opts)).to.not.equal(Error);
     });
 
     after(() => {
-        execSync('fw nuke', opts)
+        execSync('node ../../../cli.js nuke', opts)
 
         execSync(`rm -rf _Test/_fixtures/${repo}`, {encoding: 'utf8', stdio: 'inherit'});
     });

package/_Test/check.js

@@ -0,0 +1,29 @@
+'use strict';
+
+const repo = `newrepo`;
+const opts = {encoding: 'utf8', stdio: 'inherit', cwd: `_Test/_fixtures/${repo}`};
+
+const expect = require('chai').expect;
+const execSync = require('child_process').execSync;
+
+describe('check', () => {
+    before(function(){
+        execSync(`mkdir _Test/_fixtures/${repo} && cd _Test/_fixtures/${repo} && npm init -y`, {encoding: 'utf8', stdio: 'inherit'});
+
+        execSync('node ../../../cli.js install lodash@4.17.15 query-string@7.1.1', opts);
+    });
+    
+    it(`Should flag query-string as non es5 dependency`, () => {
+        expect(execSync('node ../../../cli.js check', {cwd: `_Test/_fixtures/${repo}`}).toString()).to.contain('query-string');
+    });
+
+    it(`Should not flag lodash as es5 dependency`, () => {
+        expect(execSync('node ../../../cli.js check', {cwd: `_Test/_fixtures/${repo}`}).toString()).to.not.contain('lodash');
+    });
+
+    after(() => {
+        execSync('node ../../../cli.js nuke', opts)
+
+        execSync(`rm -rf _Test/_fixtures/${repo}`, {encoding: 'utf8', stdio: 'inherit'});
+    });
+});

package/commands/check.js

@@ -13,7 +13,7 @@ module.exports = [
             });
     },
     argv => {
-        execSync(`${_.docker} ${_.run}c "check-dependencies ${argv.v ? '' : '&>/dev/null'} && echo -e '\\033[0;32mNpm deps OK\\033[0m' || { echo -e '\\033[0;31mNpm deps missing or outdated\\033[0m'; }"`, _.opts);
+        execSync(`${_.docker} ${_.run}c "check-dependencies ${argv.v ? '' : '&>/dev/null'} && echo -e '\\033[0;32mNpm deps OK\\033[0m' || { echo -e '\\033[0;31mNpm deps missing or outdated\\033[0m'; } && are-you-es5 check . && echo -e '\\033[0;32mNpm-ES5 compatibility OK\\033[0m' || { echo -e '\\033[0;31mNpm-ES5 incompatibilities detected\\033[0m'; }"`, _.opts);
 
         if(_.platform === "laravel" || _.platform === "drupal" || _.platform === "craftcms"){
             execSync(`${_.docker} ${_.method} php bash -lc "composer install --dry-run ${argv.v ? '' : '2>&1'} | grep -q 'Nothing to install, update or remove' && echo -e '\\033[0;32mComposer deps OK\\033[0m' || echo -e '\\033[0;31mComposer deps missing or outdated\\033[0m'"`, _.opts);

package/commands/create/cmds/dekey.js

@@ -2,15 +2,12 @@ const _ = require('../../../globals.js');
 const utilities = require('../libs/utilities');
 const inquirer = require('inquirer');
 const aws = require('../services/aws/index.js');
-const fs = require('fs');
-const os = require('os');
 
 module.exports = [
     'dekey',
     false,
     yargs => {},
     async argv => {
-        let config = JSON.parse(fs.readFileSync(`${os.homedir()}/.lab-env`, {encoding: 'utf8'}));
         let users = [];
         let clients =  [];
 
@@ -24,14 +21,14 @@ module.exports = [
         ]);
 
         if(answer.check){
-            users = config.users.map(d => d.username);
+            users = _.config.users.map(d => d.username);
         } else {
             answer = await inquirer.prompt([
                 {
                     type: 'checkbox',
                     name: 'users',
                     message: 'Select users',
-                    choices: config.users.map(d => d.username)
+                    choices: _.config.users.map(d => d.username)
                 }
             ]);   
 

package/commands/create/cmds/diagnose.js

@@ -4,6 +4,10 @@ const egnyte = require("../services/egnyte");
 const gitlab = require("../services/gitlab");
 const guide = require("../services/guide");
 const test = require("../services/test");
+const _ = require('../../../globals.js');
+const path = require('path');
+const {writeFileSync} = require('fs');
+const os = require('os');
 
 module.exports = [
     ['diagnose', 'diag'],
@@ -73,6 +77,12 @@ module.exports = [
     
                 await bitbucket.remove(userRepoName);
             }
+            
+            // Update diagnosis version in ~/.lab-env config file
+            if(_.config.diagnosis !== _.diagnosis){
+                _.config.diagnosis = _.diagnosis;
+                writeFileSync(path.join(os.homedir(), '', '.lab-env'), JSON.stringify(_.config, null, 4));
+            }
         } catch(e){
             if(e.message){
                 console.log(`\nError: ${e.message}`);

package/commands/create/cmds/key.js

@@ -2,15 +2,12 @@ const _ = require('../../../globals.js');
 const utilities = require('../libs/utilities');
 const inquirer = require('inquirer');
 const aws = require('../services/aws/index.js');
-const fs = require('fs');
-const os = require('os');
 
 module.exports = [
     'key',
     false,
     yargs => {},
     async argv => {
-        let config = JSON.parse(fs.readFileSync(`${os.homedir()}/.lab-env`, {encoding: 'utf8'}));
         let users = [];
         let clients =  [];
 
@@ -24,14 +21,14 @@ module.exports = [
         ]);
 
         if(answer.check){
-            users = config.users.map(d => d.username);
+            users = _.config.users.map(d => d.username);
         } else {
             answer = await inquirer.prompt([
                 {
                     type: 'checkbox',
                     name: 'users',
                     message: 'Select users',
-                    choices: config.users.map(d => d.username)
+                    choices: _.config.users.map(d => d.username)
                 }
             ]);   
 

package/commands/create/libs/utilities.js

@@ -8,6 +8,8 @@ const colorize = module.exports.colorize = (str, type) => {
     switch (type) {
         case 'success':
             return chalk.green(str);
+        case 'warning':
+            return chalk.yellow(str);
         case 'error':
             return chalk.red(str);
         case 'title':

package/commands/docker/rebuild.js

@@ -11,5 +11,5 @@ module.exports = [
                 default: ''
             });
     },
-    argv => execSync(`${_.docker} build ${argv.image} --no-cache`, _.opts)
+    argv => execSync(`${_.docker} build --no-cache ${argv.image}`, _.opts)
 ];

package/commands/execute.js

@@ -16,6 +16,15 @@ module.exports = [
                 describe: 'Run with a virtual display',
                 type: 'boolean'
             });
+
+        yargs.option('grunt', {
+                alias: 'g',
+                describe: 'Execute a grunt command',
+                type: 'boolean'
+            });
     },
-    argv => execSync(`${_.docker} ${_.run}c "${argv.d ? 'xvfb-run ' : ''}${argv.command.join(' ')}"`, _.opts)
+    argv => {
+        const prep = argv.g ? '$grunt ' : ' ';
+        execSync(`${_.docker} ${_.run}c "${argv.d ? 'xvfb-run ' : ''}${prep}${argv.command.join(prep)}"`, _.opts)
+    }
 ];

package/core/{0.1.0 → 0.2.0}/Dockerfile

@@ -37,6 +37,9 @@ RUN npm install grunt-cli -g
 # Install package.json checker
 RUN npm install check-dependencies -g
 
+# Install node_modules checker
+RUN npm install are-you-es5 -g
+
 # Install imagemagick
 RUN apt-get update && apt-get install -y imagemagick
 
@@ -105,7 +108,7 @@ RUN apt-get update
 
 # Specific chrome version
 # Check available versions here: https://www.ubuntuupdates.org/package/google_chrome/stable/main/base/google-chrome-stable
-ARG CHROME_VERSION="87.0.4280.141-1"
+ARG CHROME_VERSION="105.0.5195.102-1"
 RUN wget --no-verbose -O /tmp/chrome.deb http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${CHROME_VERSION}_amd64.deb
 RUN apt install -y /tmp/chrome.deb
 
@@ -185,10 +188,11 @@ npm(){(\n\
         sed -i \'s/watchTask: true,/watchTask: true,watchOptions: { usePolling: true },port: process.env.PORT || 3000, ui: {port: +process.env.PORT_OPT || 3001},/g\' $PWD/node_modules/@fishawack/core/_Tasks/options/browserSync.js 2>/dev/null || true\n\
         sed -i \'s/watchTask: true,/watchTask: true,watchOptions: { usePolling: true },port: process.env.PORT || 3000, ui: {port: +process.env.PORT_OPT || 3001},/g\' $PWD/node_modules/@fishawack/config-grunt/_Tasks/options/browserSync.js 2>/dev/null || true\n\
         echo "Overwrite webdriver browsers to fix them to specific browser versions"\n\
-        sed -i \'s/exports.config = {.*/exports.config = { seleniumArgs: { drivers: {chrome: { version: "87.0.4280.88" },firefox: { version: "0.28.0" }} },/\' $PWD/node_modules/@fishawack/core/wdio.conf.js 2>/dev/null || true\n\
-        sed -i \'s/exports.config = {.*/exports.config = { seleniumArgs: { drivers: {chrome: { version: "87.0.4280.88" },firefox: { version: "0.28.0" }} },/\' $PWD/node_modules/@fishawack/config-grunt/wdio.conf.js 2>/dev/null || true\n\
+        sed -i \'s/exports.config = {.*/exports.config = { seleniumArgs: { drivers: {chrome: { version: "105.0.5195.52" },firefox: { version: "0.28.0" }} },/\' $PWD/node_modules/@fishawack/core/wdio.conf.js 2>/dev/null || true\n\
+        sed -i \'s/exports.config = {.*/exports.config = { seleniumArgs: { drivers: {chrome: { version: "105.0.5195.52" },firefox: { version: "0.28.0" }} },/\' $PWD/node_modules/@fishawack/config-grunt/wdio.conf.js 2>/dev/null || true\n\
+        sed -i \'s/87.0.4280.88/105.0.5195.52/\' $PWD/node_modules/@fishawack/core/wdio.conf.js 2>/dev/null || true\n\
         sed -i \'s/puppeteer.launch({headless: true}).*/puppeteer.launch({headless: true, args: [ "--no-sandbox", "--disable-setuid-sandbox", "--disable-dev-shm-usage" ]}).then(async browser => {/\' $PWD/node_modules/sprinkle/bin/commands/screenshots.js 2>/dev/null || true\n\
-        npx --no-install selenium-standalone --singleDriverInstall=chrome install --drivers.chrome.version=87.0.4280.88 2>/dev/null || true\n\
+        npx --no-install selenium-standalone --singleDriverInstall=chrome install --drivers.chrome.version=105.0.5195.52 2>/dev/null || true\n\
         npx --no-install selenium-standalone --singleDriverInstall=firefox install --drivers.firefox.version=0.28.0 2>/dev/null || true\n\
         export OVERRIDE=true\n\
     else\n\

package/core/CHANGELOG.md

@@ -1,4 +1,8 @@
 ## Changelog
 
+### 0.2.0 (2022-09-08)
+* [Feature] are-you-es5 dependency now globally installed with npm
+* [Fix] core now points to google-chrome 105 now that 87 is no longer available to download through the image
+
 ### 0.1.0 (2022-05-27)
 * [Feature] Added aws-cli@2 to core container

package/core/package.json

@@ -1,9 +1,10 @@
 {
   "name": "core",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "lab-env docker config for the @fishawack/core npm module",
   "scripts": {
-    "postversion": "mv ./*/ ./$npm_package_version && docker build ./*/ -t fishawack/core:$npm_package_version -t fishawack/core:latest && docker push fishawack/core:$npm_package_version && docker push fishawack/core:latest && git add . && git commit -m 'Bumped core to $npm_package_version'"
+    "preversion": "docker login",
+    "postversion": "mv ./*/ ./$npm_package_version && docker build ./*/ -t fishawack/core:$npm_package_version --platform linux/amd64 -t fishawack/core:latest && docker push fishawack/core:$npm_package_version && docker push fishawack/core:latest && git add . && git commit -m 'Bumped core to $npm_package_version'"
   },
   "author": "Mike Mellor",
   "license": "ISC"

package/globals.js

@@ -1,15 +1,19 @@
 const execSync = require('child_process').execSync;
 const path = require('path');
-const { lstatSync, readdirSync, copyFileSync, existsSync } = require('fs');
+const { lstatSync, readdirSync, copyFileSync, existsSync, readFileSync } = require('fs');
 const semver = require('semver');
 const getPort = require('get-port');
 const utilities = require('./commands/create/libs/utilities');
+const os = require('os');
+const { hideBin } = require('yargs/helpers');
+const args = hideBin(process.argv);
 
 process.env.DIRNAME = __dirname;
 
 const isDirectory = source => lstatSync(source).isDirectory();
 const getDirectories = source => readdirSync(source).map(name => path.join(source, name)).filter(isDirectory);
 
+var config;
 var repo;
 var platform;
 var pkg;
@@ -21,8 +25,24 @@ var exec;
 var running;
 var services;
 var branch;
+var diagnosis = '1.0.0';
 var opts = {encoding: 'utf8', stdio: 'inherit', shell: '/bin/bash'};
 
+try{
+    config = JSON.parse(readFileSync(`${os.homedir()}/.lab-env`, {encoding: 'utf8'}));
+} catch(e){
+    config = {};
+}
+
+if(args[0] !== 'diag' && args[0] !== 'diagnose'){
+    if(!config.diagnosis || semver.diff(config.diagnosis, diagnosis) === 'major'){
+        console.log(`${utilities.colorize(`@fishawack/lab-env`, 'title')} diagnosis is ${utilities.colorize(`outdated`, 'error')}.\n\nRun ${utilities.colorize(`fw diagnose`, 'success')} to reconfigure.`);
+        process.exit(1);
+    } else if(semver.diff(config.diagnosis, diagnosis) !== null){
+        console.log(`${utilities.colorize(`@fishawack/lab-env`, 'title')} diagnosis is ${utilities.colorize(`outdated`, 'warning')}.\n\nRun ${utilities.colorize(`fw diagnose`, 'success')} to reconfigure.`);
+    }
+}
+
 try{
     branch = process.env.BRANCH || process.env.CI_COMMIT_REF_NAME || require('git-branch').sync();
 } catch(e){
@@ -117,6 +137,8 @@ try{
 }
 
 module.exports = {
+    config,
+    diagnosis,
     services,
     platform,
     repo,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fishawack/lab-env",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "description": "Docker manager for FW",
   "main": "cli.js",
   "scripts": {