@caweb/cli 1.0.4 → 1.0.5

package/lib/commands/start.js

@@ -115,16 +115,6 @@ module.exports = async function start({
 			await sleep( 4000 );
 		}
 
-		// Make additional WordPress Configurations.
-		await Promise.all( [
-			retry( () => configureWordPress( 'development', config, spinner, multisite, subdomain ), {
-				times: 2,
-			} ),
-			retry( () => configureWordPress( 'tests', config, spinner, multisite, subdomain ), {
-				times: 2,
-			} )
-		] );
-
 		// Download any resources required for CAWeb.
 		if( ! bare ){
 			await downloadSources({spinner, config});
@@ -136,6 +126,28 @@ module.exports = async function start({
 			yaml.dump( buildDockerComposeConfig(workDirectoryPath) )
 		);
 
+		// We need to bring the WordPress and CLI instances up again so they pick up
+		// any config changes that may have been added to the docker-compose.override.yml.
+		await dockerCompose.upMany(
+			[
+				'wordpress', 'tests-wordpress',
+				'cli', 'tests-cli'
+			], {
+			cwd: workDirectoryPath,
+			commandOptions: ['--build', '--force-recreate'],
+			log: debug
+		})
+
+		// Make additional WordPress Configurations.
+		await Promise.all( [
+			retry( () => configureWordPress( 'development', config, spinner, multisite, subdomain ), {
+				times: 2,
+			} ),
+			retry( () => configureWordPress( 'tests', config, spinner, multisite, subdomain ), {
+				times: 2,
+			} )
+		] );
+
 		// Make CAWeb WordPress Configurations.
 		await Promise.all( [
 			retry( () => configureCAWeb( 'development', config, spinner ), {
@@ -149,13 +161,9 @@ module.exports = async function start({
 		// Start phpMyAdmin Service.
 		spinner.text = 'Starting phpMyAdmin Service';
 
-		// We need to bring the WordPress instances up again so they pick up
-		// any config changes that may have been added to the docker-compose.override.yml.
 		await dockerCompose.upMany(
 			[
 				'phpmyadmin','tests-phpmyadmin',
-				'wordpress', 'tests-wordpress',
-				'cli', 'tests-cli'
 			], {
 			cwd: workDirectoryPath,
 			commandOptions: ['--build', '--force-recreate'],

package/lib/commands/test.js

@@ -10,6 +10,7 @@ const dockerCompose = require( 'docker-compose' );
 const loadConfig = require( '@wordpress/env/lib/config/load-config' );
 const run = require('@wordpress/env/lib/commands/run');
 const getHostUser = require( '@wordpress/env/lib/get-host-user' );
+const yaml = require( 'js-yaml' );
 
 /**
  * Internal dependencies
@@ -17,7 +18,7 @@ const getHostUser = require( '@wordpress/env/lib/get-host-user' );
 const {
 	runDockerCmds, 
 } = require('../docker');
-
+ 
 const { 
 	buildWPEnvConfig, 
 	buildDockerComposeConfig 
@@ -66,9 +67,14 @@ module.exports = async function test({
 		const {WP_PERMALINK} = config.env[ environment ].config
 		const { workDirectoryPath} = config;
 		const {name} = getHostUser();
-
+		const containerName = path.basename(workDirectoryPath) + ('tests' === environment ? '-tests' : '') + '-cli';
+		//const containerID = await execSync(`docker ps -qf "name=${containerName}"`).toString().trim();
+	
 		spinner.text = "Testing code...";
-		
+			
+
+		spinner.text = 'Completed Testing code...'
+
 		/*
 		let result = await runDockerCmds(
 			environment,
@@ -83,7 +89,6 @@ module.exports = async function test({
 		}
 		*/
 
-		spinner.text = 'Completed Testing code...'
 
 	} catch(error) {
 		console.log(error)

package/lib/configs.js

@@ -4,8 +4,15 @@
 const path = require( 'path' );
 const fs = require('fs-extra');
 const pkg = require( '../package.json' );
+const yaml = require( 'js-yaml' );
+const getHostUser = require( '@wordpress/env/lib/get-host-user' );
 
 
+/**
+ * Promisified dependencies
+ */
+const { writeFile } = fs.promises;
+
 /**
  * Build .wp-env.json
  * 
@@ -44,6 +51,11 @@ const buildWPEnvConfig = (bare, multisite) => {
  * @returns object
  */
 const buildDockerComposeConfig = (workDirectoryPath) => {
+	const {name} = getHostUser();
+    
+    // generate cli config file for cli containers.
+    generateCLIConfig(workDirectoryPath);
+
     let dockerConfig = {
         version: '3.7',
         services: {
@@ -68,6 +80,32 @@ const buildDockerComposeConfig = (workDirectoryPath) => {
                     MEMORY_LIMIT: '5G',
                     MAX_EXECUTION_TIME: 7200
                 }
+            },
+            cli: {
+                build: {
+                    context: '.',
+                    dockerfile: 'CLI.Dockerfile'
+                },
+                volumes: [ path.join(workDirectoryPath, 'config.yml')  + `:/home/${name}/.wp-cli/config.yml`  ]
+            },
+            "tests-cli": {
+                build: {
+                    context: '.',
+                    dockerfile: 'Tests-CLI.Dockerfile'
+                },
+                volumes: [ path.join(workDirectoryPath, 'config.yml')  + `:/home/${name}/.wp-cli/config.yml`]
+            },
+            wordpress: {
+                build: {
+                    context: '.',
+                    dockerfile: 'WordPress.Dockerfile'
+                }
+            },
+            "tests-wordpress": {
+                build: {
+                    context: '.',
+                    dockerfile: 'Tests-WordPress.Dockerfile'
+                }
             }
         }
       
@@ -87,40 +125,56 @@ const buildDockerComposeConfig = (workDirectoryPath) => {
 
     // Add extra volumes to WordPress instances.
     if( extraVolumes.length ){
-
         dockerConfig.services.wordpress = {
-            build: {
-                context: '.',
-                dockerfile: 'WordPress.Dockerfile'
-            },
-            volumes: extraVolumes,
+            ...dockerConfig.services.wordpress,
+            volumes: [
+                ...extraVolumes
+            ],
         };
         dockerConfig.services.cli = {
-            build: {
-                context: '.',
-                dockerfile: 'CLI.Dockerfile'
-            },
-            volumes: extraVolumes,
+            ...dockerConfig.services.cli,
+            volumes: [
+                ...dockerConfig.services.cli.volumes,
+                ...extraVolumes
+            ],
         };
         dockerConfig.services['tests-wordpress'] = {
-            build: {
-                context: '.',
-                dockerfile: 'Tests-WordPress.Dockerfile'
-            },
-            volumes: extraVolumes,
+            ...dockerConfig.services['tests-wordpress'],
+            volumes: [
+                ...extraVolumes
+            ],
         };
         dockerConfig.services['tests-cli'] = {
-            build: {
-                context: '.',
-                dockerfile: 'Tests-CLI.Dockerfile'
-            },
-            volumes: extraVolumes,
+            ...dockerConfig.services['tests-cli'],
+            volumes: [
+                ...dockerConfig.services['tests-cli'].volumes,
+                ...extraVolumes
+            ],
         };
+
     }
 
     return dockerConfig;
 }
 
+/**
+ * Generate config.yml
+ * 
+ * @param {string}  workDirectoryPath Path to the work directory located in ~/.wp-env.
+ * 
+ * @returns void
+ */
+async function generateCLIConfig(workDirectoryPath){
+    const yml = {
+        path: '/var/www/html',
+        apache_modules: ['mod_rewrite']
+    };
+
+    await writeFile(
+        path.join(workDirectoryPath, 'config.yml'),
+        yaml.dump(yml));
+}
+
 module.exports = {
     buildWPEnvConfig,
     buildDockerComposeConfig

package/lib/wordpress.js

@@ -1,7 +1,6 @@
 'use strict';
 const { writeFile } = require('fs-extra');
 const path = require( 'path' );
-const getHostUser = require( '@wordpress/env/lib/get-host-user' );
 const { execSync } = require( 'child_process' );
 
 /**
@@ -133,13 +132,6 @@ async function configureWordPress(environment, config, spinner, multisite, subdo
 		WP_PERMALINK
 	} = config.env[ environment ].config
 
-	const {name} = getHostUser();
-	
-	const containerName = path.basename(workDirectoryPath) + ('tests' === environment ? '-tests' : '') + '-cli';
-	const containerID = await execSync(`docker ps -qf "name=${containerName}"`).toString().trim();
-
-	// Add cli config.yml to cli container.
-	await execSync(`docker exec ${containerID} mkdir -p /home/${name}/.wp-cli/ && docker cp ./lib/config.yml ${containerID}:/home/${name}/.wp-cli/config.yml`);
 
 	// Convert to multisite if flag was passed.
 	if( multisite ){

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@caweb/cli",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "CAWebPublishing Command Line Interface.",
   "main": "lib/env.js",
   "files": [

package/lib/config.yml

@@ -1,3 +0,0 @@
-path: /var/www/html
-apache_modules:
-  - mod_rewrite