@fishawack/lab-env 1.6.3 → 1.7.0

package/CHANGELOG.md

@@ -1,5 +1,8 @@
 ## Changelog
 
+### 1.7.0 (2021-10-13)
+* [Feature] Can now detect and process drupal 9 builds
+
 ### 1.6.3 (2021-09-16)
 * [Bug] Fixed mySql volume path now syntax has been deprecated
 

package/_Test/boilerplate-drupal.js

@@ -0,0 +1,29 @@
+'use strict';
+
+const repo = `lab-env_boilerplate-drupal`;
+const opts = {encoding: 'utf8', stdio: 'inherit', cwd: `_Test/_fixtures/${repo}`};
+
+const expect = require('chai').expect;
+const execSync = require('child_process').execSync;
+
+describe('deploy', () => {
+    before(function(){
+        this.timeout(60000 * 10);
+
+        execSync(`git clone git@bitbucket.org:fishawackdigital/boilerplate-drupal _Test/_fixtures/${repo}`, {encoding: 'utf8', stdio: 'inherit'});
+
+        execSync('fw setup', opts);
+
+        execSync('fw prod', opts);
+    });
+    
+    it('All boilerplate-drupal tests should pass', async () => {
+        expect(execSync('fw test', opts)).to.not.equal(Error);
+    });
+
+    after(() => {
+        execSync('fw nuke', opts)
+
+        execSync(`rm -rf _Test/_fixtures/${repo}`, {encoding: 'utf8', stdio: 'inherit'});
+    });
+});

package/_Test/boilerplate-laravel.js

@@ -0,0 +1,29 @@
+'use strict';
+
+const repo = `lab-env_boilerplate-laravel`;
+const opts = {encoding: 'utf8', stdio: 'inherit', cwd: `_Test/_fixtures/${repo}`};
+
+const expect = require('chai').expect;
+const execSync = require('child_process').execSync;
+
+describe('deploy', () => {
+    before(function(){
+        this.timeout(60000 * 10);
+
+        execSync(`git clone git@bitbucket.org:fishawackdigital/boilerplate-laravel _Test/_fixtures/${repo}`, {encoding: 'utf8', stdio: 'inherit'});
+
+        execSync('fw setup', opts);
+
+        execSync('fw prod', opts);
+    });
+    
+    it('All boilerplate-laravel tests should pass', async () => {
+        expect(execSync('fw test', opts)).to.not.equal(Error);
+    });
+
+    after(() => {
+        execSync('fw nuke', opts)
+
+        execSync(`rm -rf _Test/_fixtures/${repo}`, {encoding: 'utf8', stdio: 'inherit'});
+    });
+});

package/_Test/boilerplate-wordpress.js

@@ -0,0 +1,29 @@
+'use strict';
+
+const repo = `lab-env_boilerplate-wordpress`;
+const opts = {encoding: 'utf8', stdio: 'inherit', cwd: `_Test/_fixtures/${repo}`};
+
+const expect = require('chai').expect;
+const execSync = require('child_process').execSync;
+
+describe('deploy', () => {
+    before(function(){
+        this.timeout(60000 * 10);
+
+        execSync(`git clone git@bitbucket.org:fishawackdigital/boilerplate-wordpress _Test/_fixtures/${repo}`, {encoding: 'utf8', stdio: 'inherit'});
+
+        execSync('fw setup', opts);
+
+        execSync('fw prod', opts);
+    });
+    
+    it('All boilerplate-wordpress tests should pass', async () => {
+        expect(execSync('fw test', opts)).to.not.equal(Error);
+    });
+
+    after(() => {
+        execSync('fw nuke', opts)
+
+        execSync(`rm -rf _Test/_fixtures/${repo}`, {encoding: 'utf8', stdio: 'inherit'});
+    });
+});

package/_Test/boilerplate.js

@@ -0,0 +1,29 @@
+'use strict';
+
+const repo = `lab-env_boilerplate`;
+const opts = {encoding: 'utf8', stdio: 'inherit', cwd: `_Test/_fixtures/${repo}`};
+
+const expect = require('chai').expect;
+const execSync = require('child_process').execSync;
+
+describe('deploy', () => {
+    before(function(){
+        this.timeout(60000 * 10);
+
+        execSync(`git clone git@bitbucket.org:fishawackdigital/boilerplate _Test/_fixtures/${repo}`, {encoding: 'utf8', stdio: 'inherit'});
+
+        execSync('fw setup', opts);
+
+        execSync('fw prod', opts);
+    });
+    
+    it('All boilerplate tests should pass', async () => {
+        expect(execSync('fw test', opts)).to.not.equal(Error);
+    });
+
+    after(() => {
+        execSync('fw nuke', opts)
+
+        execSync(`rm -rf _Test/_fixtures/${repo}`, {encoding: 'utf8', stdio: 'inherit'});
+    });
+});

package/cli.js

@@ -1,5 +1,7 @@
 #!/usr/bin/env node
 
+process.env.CWD = process.cwd();
+
 const _ = require('./globals.js');
 
 const updateNotifier = require('update-notifier');
@@ -19,9 +21,8 @@ const args = hideBin(process.argv);
     process.env.PORT = await getPort({port: getPort.makeRange(3000, 3100)});
     process.env.PORT_OPT = +process.env.PORT + 1;
     process.env.REPO = _.repo;
-    process.env.CWD = process.cwd();
 
-    if(_.platform === "laravel" || _.platform === "wordpress"){
+    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)});
     }
@@ -37,7 +38,15 @@ const args = hideBin(process.argv);
         let commands = ['start', 'watch', 'setup', 'content', 'production', 'test', 'deploy', 'reinstall', 'install', 'uninstall', 'run', 'check', 'clean', 'nuke', 'regenerate', 'connect', 'execute', 'origin', 'npm'];
 
         if(_.platform === "laravel"){
-            commands.push('artisan', 'composer', 'php');
+            commands.push('artisan');
+        }
+
+        if(_.platform === "drupal"){
+            commands.push('drush');
+        }
+
+        if(_.platform === "laravel" || _.platform === "drupal"){
+            commands.push('composer', 'php');
         }
 
         commands.forEach(d => cli.command(...require(`./commands/${d}.js`)));

package/commands/clean.js

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

package/commands/create/libs/vars.js

@@ -62,6 +62,10 @@ module.exports.templates = [
         "name": "boilerplate-laravel",
         "type": "boilerplate"
     },
+    {
+        "name": "boilerplate-drupal",
+        "type": "boilerplate"
+    },
     {
         "name": "sprinkle-base",
         "type": "framework",

package/commands/deploy.js

@@ -7,7 +7,7 @@ module.exports = [
     'deploys the repo',
     yargs => {},
     argv => {
-        if(_.platform === "laravel" || _.platform === "wordpress"){
+        if(_.platform === "laravel" || _.platform === "wordpress" || _.platform === "drupal"){
             execSync(`lab-env up -d`, _.opts);
 
             // Run deploy.sh directly as other containers need to run not just node/core

package/commands/docker/volumes.js

@@ -9,19 +9,30 @@ module.exports = [
             'node_modules'
         ];
 
-        if(_.platform === "laravel" || _.platform === "wordpress"){
+        if(_.platform === "laravel" || _.platform === "wordpress" || _.platform === "drupal"){
             volumes.push(
                 'mysql'
             );
         }
+
+        if(_.platform === "drupal"){
+            volumes.push(
+                'drupal'
+            );
+        }
         
         if(_.platform === "laravel"){
             volumes.push(
-                'vendor',
                 'redis'
             );
         }
 
+        if(_.platform === "laravel" || _.platform === "drupal"){
+            volumes.push(
+                'vendor'
+            );
+        }
+
         console.log(`${volumes.map(d => `${_.repo_safe}_${d}`).join('\n')}`);
     }
 ];

package/commands/drush.js

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

package/commands/regenerate.js

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

package/commands/reinstall.js

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

package/commands/setup.js

@@ -7,7 +7,7 @@ module.exports = [
     'runs the initial setup',
     yargs => {},
     argv => {
-        if(_.platform === "laravel" || _.platform === "wordpress"){
+        if(_.platform === "laravel" || _.platform === "wordpress" || _.platform === "drupal"){
             execSync(`lab-env up -d`, _.opts);
 
             // Run setup.sh directly as other containers need to run not just node/core

package/commands/start.js

@@ -12,7 +12,7 @@ module.exports = [
             });
     },
     argv => {
-        if(_.platform === "laravel" || _.platform === "wordpress"){
+        if(_.platform === "laravel" || _.platform === "wordpress" || _.platform === "drupal"){
             _.ports();
             
             execSync(`lab-env up -d`, _.opts);

package/drupal/9/docker-compose.yml

@@ -0,0 +1,59 @@
+services:
+  mysql:
+    image: mysql:5.7
+    networks:
+      - default
+    environment:
+      - MYSQL_ROOT_PASSWORD=password
+      - MYSQL_DATABASE=${DB_DATABASE}
+      - MYSQL_USER=${DB_USERNAME}
+      - MYSQL_PASSWORD=${DB_PASSWORD}
+    ports:
+      - "${PORT_DB:-3306}:3306"
+    volumes:
+      - mysql:/var/lib/mysql
+  nginx:
+    image: nginx:1.19
+    networks:
+      - default
+    volumes:
+      - $CWD/:/app
+      - ./nginx/nginx.conf:/etc/nginx/conf.d/default.conf
+      - $CWD/themes:/app/web/themes
+      - $CWD/modules:/app/web/modules
+      - $CWD/sites:/app/web/sites
+      - $CWD/profiles:/app/web/profiles
+      - drupal:/app/web
+    ports:
+      - "${PORT_WEB:-8000}:80"
+  php:
+    image: chialab/php:7.3-fpm
+    init: true
+    working_dir: /app
+    networks:
+      - default
+    env_file:
+      - $CWD/.env
+    volumes:
+      - $CWD/:/app
+      - ./php/custom.ini:/usr/local/etc/php/conf.d/custom.ini
+      - $CWD/themes:/app/web/themes
+      - $CWD/modules:/app/web/modules
+      - $CWD/sites:/app/web/sites
+      - $CWD/profiles:/app/web/profiles
+      - vendor:/app/vendor
+      - drupal:/app/web
+  core:
+    volumes:
+      - drupal:/app/web
+
+networks:
+  default:
+    driver: "bridge"
+volumes:
+  vendor:
+    driver: "local"
+  mysql:
+    driver: "local"
+  drupal:
+    driver: "local"

package/drupal/9/nginx/nginx.conf

@@ -0,0 +1,37 @@
+server {
+	listen         80 default_server;
+    listen         [::]:80 default_server;
+	root           /app/web;
+
+    add_header X-Frame-Options "SAMEORIGIN";
+    add_header X-XSS-Protection "1; mode=block";
+    add_header X-Content-Type-Options "nosniff";
+
+    index index.php;
+
+    charset utf-8;
+
+    location / {
+        try_files $uri $uri/ /index.php?$query_string;
+    }
+
+    location = /favicon.ico { access_log off; log_not_found off; }
+    location = /robots.txt  { access_log off; log_not_found off; }
+
+    error_page 404 /index.php;
+
+    location ~ \.php$ {
+		fastcgi_pass	php:9000;
+		include         fastcgi_params;
+		fastcgi_param   SCRIPT_FILENAME    $document_root$fastcgi_script_name;
+		fastcgi_param   SCRIPT_NAME        $fastcgi_script_name;
+    }
+
+    location ~ \.(bmp|cur|gif|ico|jpe?g|png|svgz?|webp|pdf|dzi)$ {    
+        add_header Access-Control-Allow-Origin *;  
+    }
+
+    location ~ /\.(?!well-known).* {
+        deny all;
+    }
+}

package/drupal/9/php/custom.ini

@@ -0,0 +1 @@
+memory_limit = -1

package/globals.js

@@ -30,6 +30,8 @@ try{ wordpress = existsSync(path.join(process.cwd(), 'themes/')); } catch(e){}
 
 if(composer && composer.require && composer.require['laravel/framework']){
     platform = 'laravel';
+} else if(composer && composer.require && composer.require['drupal/core-recommended']){
+    platform = 'drupal';
 } else if(wordpress) {
     platform = 'wordpress';
 } else {
@@ -57,6 +59,12 @@ if(platform === 'laravel'){
     }
 
     docker = `docker-compose --env-file ${path.join(process.cwd(), '.env')} -f ${__dirname}/wordpress/5.7.2/docker-compose.yml -f ${__dirname}/core/${process.env.VERSION}/docker-compose.yml -p ${repo}`;
+} else if(platform === "drupal"){
+    if(!existsSync(path.join(process.cwd(), '.env'))){
+        copyFileSync(path.join(process.cwd(), '.env.example'), path.join(process.cwd(), '.env'));
+    }
+    
+    docker = `docker-compose --env-file ${path.join(process.cwd(), '.env')} -f ${__dirname}/drupal/9/docker-compose.yml -f ${__dirname}/core/${process.env.VERSION}/docker-compose.yml -p ${repo}`;
 } else  {
     docker = `docker-compose -f ${__dirname}/core/${process.env.VERSION}/docker-compose.yml -p ${repo}`;
 }

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@fishawack/lab-env",
-  "version": "1.6.3",
+  "version": "1.7.0",
   "description": "Docker manager for FW",
   "main": "cli.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 0",
+    "test": "mocha _Test/*.js --timeout 120s --bail",
     "preversion": "npm test",
     "postversion": "git push && git push --tags && npm publish",
     "postpublish": "git checkout development && git merge master && git push"
@@ -29,5 +29,9 @@
     "semver": "7.3.4",
     "update-notifier": "5.1.0",
     "yargs": "16.2.0"
+  },
+  "devDependencies": {
+    "chai": "4.3.4",
+    "mocha": "9.1.2"
   }
 }