@fishawack/lab-env 1.10.0 → 1.12.1

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 ## Changelog
 
+### 1.12.1 (2021-11-26)
+* [Bug] Pass along errors thrown in new _.up function so commands correctly come to a stop when errors are thrown
+
+### 1.12.0 (2021-11-17)
+* [Feature] Test for watertight-node-auto access
+* [Feature] Test for multiple ssh keys
+
+### 1.11.0 (2021-10-26)
+* [Feature] Show ports on up command if -v flag given
+* [Feature] Added compose command
+* [Change] If ports are already running then grab what they are from docker ps
+* [Change] Show ports on all projects when fw start called
+* [Bug] Fixed typo throwing r is not defined warning
+
+### 1.10.1 (2021-10-26)
+* [Feature] Added a script command
+
 ### 1.10.0 (2021-10-26)
 * [Change] Drupal now uses apache instead of nginx
 * [Change] Custom php docker image for Drupal with mysql client installed

package/cli.js

@@ -10,22 +10,15 @@ updateNotifier({pkg, updateCheckInterval: 0}).notify();
 
 const execSync = require('child_process').execSync;
 
-const getPort = require('get-port');
-
 const yargs = require('yargs/yargs');
 const { hideBin } = require('yargs/helpers');
 
 const args = hideBin(process.argv);
 
 (async () => {
-    process.env.PORT = await getPort({port: getPort.makeRange(3000, 3100)});
-    process.env.PORT_OPT = +process.env.PORT + 1;
     process.env.REPO = _.repo;
-
-    if(_.platform === "laravel" || _.platform === "wordpress" || _.platform === "drupal"){
-        process.env.PORT_WEB = await getPort({port: getPort.makeRange(8000, 8100)});
-        process.env.PORT_DB = await getPort({port: getPort.makeRange(3306, 3406)});
-    }
+    
+    await _.ports.set();
 
     try{
         let cli = yargs(args)
@@ -35,7 +28,7 @@ const args = hideBin(process.argv);
             });
         
         // Repo commands
-        let commands = ['start', 'watch', 'setup', 'content', 'production', 'test', 'deploy', 'reinstall', 'install', 'uninstall', 'run', 'check', 'clean', 'nuke', 'regenerate', 'connect', 'execute', 'origin', 'npm'];
+        let commands = ['start', 'watch', 'setup', 'content', 'production', 'test', 'deploy', 'reinstall', 'install', 'uninstall', 'run', 'check', 'clean', 'nuke', 'regenerate', 'connect', 'execute', 'origin', 'npm', 'script'];
 
         if(_.platform === "laravel"){
             commands.push('artisan');
@@ -52,7 +45,7 @@ const args = hideBin(process.argv);
         commands.forEach(d => cli.command(...require(`./commands/${d}.js`)));
 
         // Docker commands
-        ['build', 'config', 'down', 'mocha', 'rebuild', 'up', 'volumes'].forEach(d => cli.command(...require(`./commands/docker/${d}.js`)));
+        ['build', 'config', 'down', 'mocha', 'rebuild', 'up', 'volumes', 'compose'].forEach(d => cli.command(...require(`./commands/docker/${d}.js`)));
 
         // Create commands
         ['new', 'diagnose', 'delete'].forEach(d => cli.command(...require(`./commands/create/cmds/${d}.js`)));

package/commands/create/cmds/diagnose.js

@@ -44,6 +44,10 @@ module.exports = [
             while(!await test.egnyte() || !await egnyte.check()){
                 await guide.egnyte();
             };
+
+            while(!await test.watertight()){
+                await guide.watertight();
+            }
     
             if(preset === "permanent"){
                 while(!await test.misc()){

package/commands/create/services/guide.js

@@ -293,4 +293,20 @@ module.exports.key = async () => {
     } else {
         throw('');
     }
+}
+
+module.exports.watertight = async () => {
+    let inputs = await inquirer.prompt([
+        {
+            type: 'confirm',
+            name: 'confirm',
+            message: 'Re-run watertight check? (ensure your ssh key is uploaded to bitbucket)',
+            default: true
+        }
+    ]);
+
+    if(inputs.confirm){
+    } else {
+        throw('');
+    }
 }

package/commands/create/services/test.js

@@ -1,8 +1,10 @@
 const os = require('os');
 const fs = require('fs');
+const glob = require("glob");
 
 const utils = require('../libs/utilities');
 const vars = require('../libs/vars');
+const { execSync, exec } = require('child_process');
 
 module.exports.targets = async () => {
     // Check targets folder exists
@@ -127,12 +129,31 @@ module.exports.ssh = async () => {
 
 module.exports.key = async () => {
     // Check misc.json exists
-    let spinner = new utils.Spinner('Looking for id_rsa file in .ssh');
-
+    let spinner = new utils.Spinner('Looking for id_rsa key in .ssh');
+    
     if (fs.existsSync(`${os.homedir()}/.ssh/id_rsa`)) {
-        spinner.update('Found \'id_rsa\' file');
+        spinner.update('Found \'id_rsa\' key');
+        return true;
+    } else if (glob.sync(`${os.homedir()}/.ssh/**/*.pub`).length) {
+        spinner.update('Found multiple ssh keys');
         return true;
     } else {
-        spinner.update('Could not find \'id_rsa\' file', 'fail');
+        spinner.update('Could not find \'id_rsa\' key', 'fail');
+    }
+}
+
+module.exports.watertight = async () => {
+    // Check misc.json exists
+    let spinner = new utils.Spinner('Testing access to watertight-node-auto repository');
+
+    try{
+        !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()));
+
+        spinner.update('Successfully accessed watertight-node-auto repository');
+        return true;
+    } catch(e){
+        spinner.update('Could not access watertight-node-auto repository', 'fail');
+    } finally{
+        execSync('rm -rf ./.tmp/watertight-node-auto', {stdio: 'pipe'});
     }
 }

package/commands/docker/compose.js

@@ -0,0 +1,15 @@
+const _ = require('../../globals.js');
+
+const execSync = require('child_process').execSync;
+
+module.exports = [
+    'compose [command...]',
+    false,
+    yargs => {
+        yargs.positional('command', {
+                describe: 'command to run',
+                default: ''
+            });
+    },
+    argv => execSync(`${_.docker} ${argv.command.join(' ')}`, _.opts)
+];

package/commands/docker/up.js

@@ -10,6 +10,16 @@ module.exports = [
                 describe: 'flags to pass',
                 default: ''
             });
+
+        yargs.option('verbose', {
+                alias: 'v',
+                describe: 'Show breakdown of packages',
+                type: 'boolean'
+            });
     },
-    argv => execSync(`${_.docker} up ${argv.flags.join(' ')}`, _.opts)
+    argv => {
+        if(argv.v) _.ports.get();
+
+        execSync(`${_.docker} up ${argv.flags.join(' ')}`, _.opts);
+    }
 ];

package/commands/script.js

@@ -0,0 +1,16 @@
+const _ = require('../globals.js');
+
+const execSync = require('child_process').execSync;
+
+module.exports = [
+    'script <script>',
+    'Runs a bash script from the _Scripts directory',
+    yargs => {
+        yargs.positional('script', {
+                describe: 'script to run (exlude extension)'
+            });
+    },
+    argv => {
+        _.up(() => execSync(`source ${__dirname}/../intercept.sh && /bin/bash ./_Scripts/${argv.script}.sh`, _.opts));
+    }
+];

package/commands/setup.js

@@ -8,14 +8,7 @@ module.exports = [
     yargs => {},
     argv => {
         if(_.platform === "laravel" || _.platform === "wordpress" || _.platform === "drupal"){
-            _.up(
-                () => execSync(`source ${__dirname}/../intercept.sh && /bin/bash ./_Scripts/setup.sh`, _.opts), 
-                e => {
-                    if(e.status !== 130 && e.status !== 131 && e.status !== 1){
-                        console.log(e.message);
-                    }
-                }
-            );
+            _.up(() => execSync(`source ${__dirname}/../intercept.sh && /bin/bash ./_Scripts/setup.sh`, _.opts));
         } else {
             execSync(`${_.docker} ${_.run}c "npm run setup"`, _.opts);
         }

package/commands/start.js

@@ -12,17 +12,10 @@ module.exports = [
             });
     },
     argv => {
+        _.ports.get();
+        
         if(_.platform === "laravel" || _.platform === "wordpress" || _.platform === "drupal"){
-            _.ports();
-
-            _.up(
-                () => execSync(`${_.docker} ${_.exec} core bash -lc "npm start -- -- ${argv.flags.join(' ')}" 2>/dev/null`, _.opts),
-                e => {
-                    if(e.status !== 130 && e.status !== 131 && e.status !== 1){
-                        console.log(e);
-                    }      
-                }
-            );
+            _.up(() => execSync(`${_.docker} ${_.exec} core bash -lc "npm start -- -- ${argv.flags.join(' ')}" 2>/dev/null`, _.opts));
         } else {
             execSync(`${_.docker} ${_.run}c "npm start -- -- ${argv.flags.join(' ')}" 2>/dev/null`, _.opts);
         }

package/globals.js

@@ -2,6 +2,7 @@ const execSync = require('child_process').execSync;
 const path = require('path');
 const { lstatSync, readdirSync, copyFileSync, existsSync } = require('fs');
 const semver = require('semver');
+const getPort = require('get-port');
 
 const isDirectory = source => lstatSync(source).isDirectory();
 const getDirectories = source => readdirSync(source).map(name => path.join(source, name)).filter(isDirectory);
@@ -15,6 +16,7 @@ var method;
 var run;
 var exec;
 var running;
+var services;
 var opts = {encoding: 'utf8', stdio: 'inherit', shell: '/bin/bash'};
 
 try{
@@ -70,7 +72,8 @@ if(platform === 'laravel'){
     docker = `docker-compose -f ${__dirname}/core/${process.env.VERSION}/docker-compose.yml -p ${repo}`;
 }
 
-running = execSync(`${docker} ps --services --filter "status=running"`, {encoding: 'utf8'}).trim().length;
+services = execSync(`${docker} ps --services --filter "status=running"`, {encoding: 'utf8'});
+running = services.trim().length;
 exec = `exec ${process.env.CI_BUILD_ID ? '-T' : ''}`;
 method = running ? exec : 'run --rm --service-ports';
 run = `${method} core bash -l`;
@@ -86,12 +89,43 @@ module.exports = {
     exec,
     running,
     opts,
-    ports(){
-        console.table({
-            core: {port: +process.env.PORT},
-            web: {port: +process.env.PORT_WEB},
-            mysql: {port: +process.env.PORT_DB}
-        });
+    ports: {
+        async set(){
+            if(!running){
+                process.env.PORT = await getPort({port: getPort.makeRange(3000, 3100)});
+                process.env.PORT_OPT = +process.env.PORT + 1;
+        
+                if(platform === "laravel" || platform === "wordpress" || platform === "drupal"){
+                    process.env.PORT_WEB = await getPort({port: getPort.makeRange(8000, 8100)});
+                    process.env.PORT_DB = await getPort({port: getPort.makeRange(3306, 3406)});
+                }
+            } else {
+                try{
+                    let env = execSync(`${docker} exec -T core env`, {encoding: 'utf8'});
+                    let ports = env.split('\n').reduce((obj, d) => { obj[d.split('=')[0]] = d.split('=')[1]; return obj; }, {});
+                
+                    process.env.PORT = ports.PORT;
+                    process.env.PORT_OPT = ports.PORT_OPT;
+            
+                    if(platform === "laravel" || platform === "wordpress" || platform === "drupal"){
+                        process.env.PORT_WEB = ports.PORT_WEB;
+                        process.env.PORT_DB = ports.PORT_DB;
+                    }
+                } catch(e){
+                    console.log(e.message);
+
+                    process.exit(1);
+                }
+            }
+        },
+        get(){
+            let ports = { core: {port: +process.env.PORT} };
+
+            if(+process.env.PORT_WEB) ports.web = {port: +process.env.PORT_WEB};
+            if(+process.env.PORT_DB) ports.db = {port: +process.env.PORT_DB};
+
+            console.table(ports);
+        }
     },
     up(cb, err){
         if(!running) execSync(`lab-env up -d`, opts);
@@ -99,7 +133,7 @@ module.exports = {
         try{
             cb();
         } catch(e){
-            if(err) err(r);
+            throw(e);
         } finally{
             if(!running) execSync(`lab-env down`, opts);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fishawack/lab-env",
-  "version": "1.10.0",
+  "version": "1.12.1",
   "description": "Docker manager for FW",
   "main": "cli.js",
   "scripts": {
@@ -24,6 +24,7 @@
     "axios": "0.21.1",
     "chalk": "4.1.0",
     "get-port": "5.1.1",
+    "glob": "7.1.7",
     "inquirer": "8.1.2",
     "ora": "5.4.1",
     "semver": "7.3.4",