@fishawack/lab-env 4.10.0 → 4.11.1

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 ## Changelog
 
+### 4.11.1 (2023-02-25)
+* [Bug] coerce core version to remove tilde/carats
+
+### 4.11.0 (2023-02-24)
+* [Feature] target now specified in core@1 so it defaults to alpine when building
+* [Change] don't pass -l flag to core@1 connect
+* [Change] dont pass -l login flag to core@1 commands so root $PATH isnt reset
+* [Bug] set CI flag during tests to avoid non tty prompt
+* [Bug] check for core in dependencies too
+* [Bug] allow certain commands to pass through mismatch core
+* [Bug] use full expaned $grunt alias so it isn't needed inside the image as ENV variable
+* [Bug] only set user on connect during exec calls and not run calls
+* [Bug] set -u node on core@1 exec commands
+* [Bug] dont set -l flag on start and test core exec command unless on core@0
+* [Bug] use $DIRNAME on dev build contexts as codebases that use core as partial context for compose file have PWD elsewhere
+* [Bug] commands that automatically prefixed xvfb-run now only do in on core@0
+* [Bug] xvfb-run automated prefix is now only applied to core@0 commands
+
 ### 4.10.0 (2023-02-21)
 * [Feature] Created core@1 image for @fishawack/core projects >= 8
 * [Feature] New env variables for changing lab-env behaviour, FW_DEV, FW_NEXT, FW_FULL, FW_ROOT

package/_Test/_fixtures/core@0/_Build/config/level-0.json

@@ -0,0 +1,4 @@
+{
+    "attributes": {
+	}
+}

package/_Test/_fixtures/core@0/package.json

@@ -0,0 +1,7 @@
+{
+    "name": "lab-env-test-suite-core-0",
+    "version": "1.0.0",
+    "devDependencies": {
+        "@fishawack/core": "7.0.0"
+    }
+}

package/_Test/_fixtures/core@1/_Build/config/level-0.json

@@ -0,0 +1,4 @@
+{
+    "attributes": {
+	}
+}

package/_Test/_fixtures/core@1/package.json

@@ -0,0 +1,7 @@
+{
+    "name": "lab-env-test-suite-core-1",
+    "version": "1.0.0",
+    "devDependencies": {
+        "@fishawack/core": "8.0.0"
+    }
+}

package/_Test/bash.js

@@ -0,0 +1,74 @@
+'use strict';
+
+const expect = require('chai').expect;
+const execSync = require('child_process').execSync;
+
+describe('bash', () => {
+    describe('core@0', () => {
+        const repo = `core@0`;
+        const cwd = {cwd: `_Test/_fixtures/${repo}`};
+        const opts = {encoding: 'utf8', stdio: 'inherit', cwd: cwd.cwd};
+
+        describe('run', () => {
+            it(`Should show correct user when executing commands`, () => {
+                expect(execSync('node ../../../cli.js exec whoami', cwd).toString()).to.contain('root');
+            });
+    
+            it(`Should have cli tools in $PATH`, () => {
+                expect(execSync('node ../../../cli.js exec "env | grep PATH"', cwd).toString()).to.contain('ebcli-virtual-env');
+            });
+        });
+    
+        describe('exec', () => {
+            before(() => {
+                execSync('node ../../../cli.js up -d', opts);
+            });
+    
+            it(`Should show correct user when executing commands`, () => {
+                expect(execSync('node ../../../cli.js exec whoami', cwd).toString()).to.contain('root');
+            });
+    
+            it(`Should have cli tools in $PATH`, () => {
+                expect(execSync('node ../../../cli.js exec "env | grep PATH"', cwd).toString()).to.contain('ebcli-virtual-env');
+            });
+    
+            after(() => {
+                execSync('node ../../../cli.js down', opts);
+            })
+        });
+    });
+
+    describe('core@1', () => {
+        const repo = `core@1`;
+        const cwd = {cwd: `_Test/_fixtures/${repo}`};
+        const opts = {encoding: 'utf8', stdio: 'inherit', cwd: cwd.cwd};
+
+        describe('run', () => {
+            it(`Should show correct user when executing commands`, () => {
+                expect(execSync('node ../../../cli.js exec whoami', cwd).toString()).to.contain('node');
+            });
+    
+            it(`Should have cli tools in $PATH`, () => {
+                expect(execSync('node ../../../cli.js exec "env | grep PATH"', cwd).toString()).to.contain(':/dart-sass/');
+            });
+        });
+    
+        describe('exec', () => {
+            before(() => {
+                execSync('node ../../../cli.js up -d', opts);
+            });
+    
+            it(`Should show correct user when executing commands`, () => {
+                expect(execSync('node ../../../cli.js exec whoami', cwd).toString()).to.contain('node');
+            });
+    
+            it(`Should have cli tools in $PATH`, () => {
+                expect(execSync('node ../../../cli.js exec "env | grep PATH"', cwd).toString()).to.contain(':/dart-sass/');
+            });
+    
+            after(() => {
+                execSync('node ../../../cli.js down', opts);
+            })
+        });
+    });
+});

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'; } && 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);
+        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/clean.js

@@ -7,7 +7,7 @@ module.exports = [
     'cleans out dependencies',
     yargs => {},
     argv => {
-        execSync(`${_.docker} ${_.run}c "git clean -xfd node_modules/ 2>/dev/null || true"`, _.opts);
+        execSync(`${_.docker} ${_.run} -c "git clean -xfd node_modules/ 2>/dev/null || true"`, _.opts);
 
         if(_.platform === "laravel" || _.platform === "drupal" || _.platform === "craftcms"){
             execSync(`${_.docker} ${_.method} php bash -lc "git clean -xfd vendor/ 2>/dev/null || true"`, _.opts);

package/commands/connect.js

@@ -11,5 +11,18 @@ module.exports = [
                 default: 'core'
             });
     },
-    argv => execSync(`${_.docker} ${_.method} ${argv.container} bash -l`, _.opts)
+    argv => {
+        let run = ' -l';
+        let user = '';
+        // Don't login on core@1 so /etc/profile isn't loaded and $PATH reset (likely don't need to login on anything other than core@0 but need test suite to check)
+        if(argv.container === "core" && process.env.VERSION === "1"){
+            run = '';
+            
+            if(_.running){
+                user = ' -u node';
+            }
+        }
+
+        execSync(`${_.docker} ${_.method}${user} ${argv.container} bash${run}`, _.opts);
+    }
 ];

package/commands/content.js

@@ -6,5 +6,5 @@ module.exports = [
     'content', 
     'pulls any external content and assets into the repo', 
     yargs => {}, 
-    argv => execSync(`${_.docker} ${_.run}c "npm run content"`, _.opts)
+    argv => execSync(`${_.docker} ${_.run} -c "npm run content"`, _.opts)
 ];

package/commands/deploy.js

@@ -10,7 +10,7 @@ module.exports = [
         if(_.platform === "laravel" || _.platform === "wordpress" || _.platform === "drupal" || _.platform === "craftcms"){
             _.up(() => execSync(`source ${__dirname}/../intercept.sh && /bin/bash ./_Scripts/deploy.sh`, _.opts));
         } else {
-            execSync(`${_.docker} ${_.run}c "xvfb-run npm run deploy"`, _.opts);
+            execSync(`${_.docker} ${_.run} -c "${(process.env.VERSION === "0") ? 'xvfb-run ' : ''}npm run deploy"`, _.opts);
         }
     }
 ];

package/commands/docker/mocha.js

@@ -6,5 +6,5 @@ module.exports = [
     'mocha',
     false,
     yargs => {},
-    argv => execSync(`${_.docker} ${_.run}c "xvfb-run npm run mocha"`, _.opts)
+    argv => execSync(`${_.docker} ${_.run} -c "${(process.env.VERSION === "0") ? 'xvfb-run ' : ''}npm run mocha"`, _.opts)
 ];

package/commands/execute.js

@@ -26,7 +26,7 @@ module.exports = [
             });
     },
     argv => {
-        const prep = argv.g ? '$grunt ' : ' ';
-        execSync(`${_.docker} ${_.run}c "${argv.d ? 'xvfb-run ' : ''}${prep}${argv.command.join(prep)}"`, _.opts)
+        const prep = argv.g ? 'npx grunt --gruntfile node_modules/@fishawack/core/Gruntfile.js ' : ' ';
+        execSync(`${_.docker} ${_.run} -c "${argv.d ? 'xvfb-run ' : ''}${prep}${argv.command.join(prep)}"`, _.opts)
     }
 ];

package/commands/install.js

@@ -11,5 +11,5 @@ module.exports = [
                 default: ''
             });
     },
-    argv => execSync(`${_.docker} ${_.run}c "npm install ${argv.package.join(' ')}"`, _.opts)
+    argv => execSync(`${_.docker} ${_.run} -c "npm install ${argv.package.join(' ')}"`, _.opts)
 ];

package/commands/npm.js

@@ -11,5 +11,5 @@ module.exports = [
                 default: ''
             });
     },
-    argv => execSync(`${_.docker} ${_.run}c "npm ${argv.command.join(' ')}"`, _.opts)
+    argv => execSync(`${_.docker} ${_.run} -c "npm ${argv.command.join(' ')}"`, _.opts)
 ];

package/commands/production.js

@@ -6,5 +6,5 @@ module.exports = [
     ['production', 'prod'],
     'builds for production',
     yargs => {},
-    argv => execSync(`${_.docker} ${_.run}c "xvfb-run npm run production"`, _.opts)
+    argv => execSync(`${_.docker} ${_.run} -c "${(process.env.VERSION === "0") ? 'xvfb-run ' : ''}npm run production"`, _.opts)
 ];

package/commands/regenerate.js

@@ -7,7 +7,7 @@ module.exports = [
     'regenerates dependency lock files',
     yargs => {},
     argv => {
-        execSync(`${_.docker} ${_.run}c "rm package-lock.json; git clean -xfd node_modules/ 2>/dev/null || true; npm install"`, _.opts);
+        execSync(`${_.docker} ${_.run} -c "rm package-lock.json; git clean -xfd node_modules/ 2>/dev/null || true; npm install"`, _.opts);
 
         if(_.platform === "laravel" || _.platform === "drupal" || _.platform === "craftcms"){
             execSync(`${_.docker} ${_.method} php bash -lc "rm composer.lock; git clean -xfd vendor/ 2>/dev/null || true; composer install"`, _.opts)

package/commands/reinstall.js

@@ -7,7 +7,7 @@ module.exports = [
     'installs fresh dependencies',
     yargs => {},
     argv => {
-        execSync(`${_.docker} ${_.run}c "npm ci || npm i"`, _.opts);
+        execSync(`${_.docker} ${_.run} -c "npm ci || npm i"`, _.opts);
         
         if(_.platform === "laravel" || _.platform === "drupal" || _.platform === "craftcms"){
             execSync(`${_.docker} ${_.method} php bash -lc "composer install"`, _.opts);

package/commands/run.js

@@ -24,5 +24,5 @@ module.exports = [
             });
         }
     },
-    argv => execSync(`${_.docker} ${_.run}c "${argv.d ? 'xvfb-run ' : ''}npm run ${argv.command} -- -- ${argv.flags.join(' ')}"`, _.opts)
+    argv => execSync(`${_.docker} ${_.run} -c "${argv.d ? 'xvfb-run ' : ''}npm run ${argv.command} -- -- ${argv.flags.join(' ')}"`, _.opts)
 ];

package/commands/setup.js

@@ -10,7 +10,7 @@ module.exports = [
         if(_.platform === "laravel" || _.platform === "wordpress" || _.platform === "drupal" || _.platform === "craftcms"){
             _.up(() => execSync(`source ${__dirname}/../intercept.sh && /bin/bash ./_Scripts/setup.sh`, _.opts));
         } else {
-            execSync(`${_.docker} ${_.run}c "npm run setup"`, _.opts);
+            execSync(`${_.docker} ${_.run} -c "npm run setup"`, _.opts);
         }
     }
 ];

package/commands/start.js

@@ -15,9 +15,19 @@ module.exports = [
         _.ports.get();
         
         if(_.platform === "laravel" || _.platform === "wordpress" || _.platform === "drupal" || _.platform === "craftcms"){
-            _.up(() => execSync(`${_.docker} ${_.exec} core bash -lc "npm start -- -- ${argv.flags.join(' ')}" 2>/dev/null`, _.opts));
+            _.up(() => {
+                let run = ' -l';
+                let user = '';
+                // Don't login on core@1 so /etc/profile isn't loaded and $PATH reset (likely don't need to login on anything other than core@0 but need test suite to check)
+                if(process.env.VERSION === "1"){
+                    run = '';
+                    user = ' -u node';
+                }
+                
+                execSync(`${_.docker} ${_.exec}${user} core bash${run} -c "npm start -- -- ${argv.flags.join(' ')}" 2>/dev/null`, _.opts);
+            });
         } else {
-            execSync(`${_.docker} ${_.run}c "npm start -- -- ${argv.flags.join(' ')}" 2>/dev/null`, _.opts);
+            execSync(`${_.docker} ${_.run} -c "npm start -- -- ${argv.flags.join(' ')}" 2>/dev/null`, _.opts);
         }
     }
 ];

package/commands/test.js

@@ -8,7 +8,15 @@ module.exports = [
     yargs => {},
     argv => {
         _.up(() => {
-            execSync(`${_.docker} ${_.exec} core bash -lc "xvfb-run npm run test"`, _.opts);
+            let run = ' -l';
+            let user = '';
+            // Don't login on core@1 so /etc/profile isn't loaded and $PATH reset (likely don't need to login on anything other than core@0 but need test suite to check)
+            if(process.env.VERSION === "1"){
+                run = '';
+                user = ' -u node';
+            }
+            
+            execSync(`${_.docker} ${_.exec}${user} core bash${run} -c "${(process.env.VERSION === "0") ? 'xvfb-run ' : ''}npm run test"`, _.opts);
 
             if(_.platform === "laravel"){
                 execSync(`${_.docker} ${_.exec} php bash -lc "php artisan test"`, _.opts);

package/commands/uninstall.js

@@ -11,5 +11,5 @@ module.exports = [
                 default: ''
             });
     },
-    argv => execSync(`${_.docker} ${_.run}c "npm uninstall ${argv.package.join(' ')}"`, _.opts)
+    argv => execSync(`${_.docker} ${_.run} -c "npm uninstall ${argv.package.join(' ')}"`, _.opts)
 ];

package/commands/watch.js

@@ -14,7 +14,7 @@ module.exports = [
         ){
             console.log("Watch command not supported in this project");
         } else {
-            execSync(`${_.docker} ${_.run}c "$grunt browserSync watch" 2>/dev/null`, _.opts)
+            execSync(`${_.docker} ${_.run} -c "$grunt browserSync watch" 2>/dev/null`, _.opts)
         }
     }
 ];

package/core/0/docker-compose-dev.yml

@@ -2,4 +2,4 @@ version: "3.8"
 services:
   core:
     build: 
-      context: ./
+      context: $DIRNAME/core/0

package/core/1/docker-compose-dev.yml

@@ -2,4 +2,5 @@ version: "3.8"
 services:
   core:
     build: 
-      context: ./
+      context: $DIRNAME/core/1
+      target: ${FW_CORE_1_TARGET:-alpine}

package/globals.js

@@ -77,18 +77,20 @@ if(composer && composer.require && composer.require['laravel/framework']){
 }
 
 const versions = getDirectories(path.resolve(__dirname, './core')).map(d => path.basename(d)).sort((a, b) => +a - +b);
-const version = pkg && pkg.devDependencies && ((pkg.devDependencies['@fishawack/core'] || pkg.devDependencies['@fishawack/config-grunt']) || pkg.name === '@fishawack/core' && pkg.version);
+const version = semver.coerce(pkg && ((pkg.devDependencies && (pkg.devDependencies['@fishawack/core'] || pkg.devDependencies['@fishawack/config-grunt'])) || (pkg.dependencies && (pkg.dependencies['@fishawack/core'] || pkg.dependencies['@fishawack/config-grunt'])) || pkg.name === '@fishawack/core' && pkg.version))?.version;
 
 if(process.env.FW_NEXT){
     process.env.VERSION = versions[versions.length - 1];
 } else if(semver.satisfies(version, '<=7.24.0')){
     process.env.VERSION = '0';
-} else if(semver.satisfies(version, '<=8')) {
+} else if(semver.satisfies(version, '8.x')) {
     process.env.VERSION = '1';
 } else {
-    if(!args.find(d => d === '--force')){
-        console.log(`${utilities.colorize(`@fishawack/core`, 'title')} and ${utilities.colorize(`@fishawack/lab-env`, 'title')} have mismatching versions.\n\nRun ${utilities.colorize(`npm i -g @fishawack/lab-env@latest`, 'success')} or pass ${utilities.colorize(`--force`, 'warning')} to continue.`);
-        process.exit(1);
+    if(args[0] !== 'diag' && args[0] !== 'diagnose' && args[0] !== 'origin' && args[0] !== '--version' && args[0] !== '--help' && args[0] !== 'new' && args[0] !== 'key' && args[0] !== 'dekey'){
+        if(!args.find(d => d === '--force')){
+            console.log(`${utilities.colorize(`@fishawack/core`, 'title')} and ${utilities.colorize(`@fishawack/lab-env`, 'title')} have mismatching versions.\n\nRun ${utilities.colorize(`npm i -g @fishawack/lab-env@latest`, 'success')} or pass ${utilities.colorize(`--force`, 'warning')} to continue.`);
+            process.exit(1);
+        }
     }
     
     // Default to latest image when outside of known core versions
@@ -98,6 +100,7 @@ if(process.env.FW_NEXT){
 // Map full image or alpine
 if(process.env.FW_FULL){
     process.env.FW_CORE_1_IMAGE = "fishawack/lab-env-core-1";
+    process.env.FW_CORE_1_TARGET = "full";
 }
 
 var core = `-f ${__dirname}/core/${process.env.VERSION}/docker-compose.yml`;
@@ -155,7 +158,9 @@ try{
     running = services.trim().length;
     exec = `exec ${process.env.CI_BUILD_ID ? '-T' : ''}`;
     method = running ? exec : 'run --rm --service-ports';
-    run = `${method} core bash -l`;
+    // Set user on exec command using core@1
+    // Login on core@0 so .bash_profile is loaded
+    run = `${method} ${(running && process.env.VERSION === "1") ? '-u node ' : ''}core bash${(process.env.VERSION === "0") ? ' -l' : ''}`;
 } catch(e){
     if(args.find(d => d === '--debug')){
         console.log(utilities.colorize(e.stderr, 'error'));

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@fishawack/lab-env",
-  "version": "4.10.0",
+  "version": "4.11.1",
   "description": "Docker manager for FW",
   "main": "cli.js",
   "scripts": {
-    "test": "rm -rf _Test/_fixtures/boilerplate*; mocha _Test/*.js --timeout 1200s --bail",
+    "test": "rm -rf _Test/_fixtures/boilerplate*; CI_BUILD_ID=true mocha _Test/*.js --timeout 1200s --bail",
     "preversion": "npm test",
     "postversion": "git push && git push --tags && npm publish",
     "postpublish": "git checkout development && git merge master && git push"