@caweb/cli 1.0.5 → 1.1.0

package/bin/caweb

@@ -1,20 +1,6 @@
 #!/usr/bin/env node
-'use strict';
 
-// Remove 'node' and the name of the script from the arguments.
-let command = process.argv.slice( 2 );
-// Default to help text when they aren't running any commands.
-if ( ! command.length ) {
-	command = [ '--help' ];
-}
-
-// Rather than just executing the current CLI we will attempt to find a local version
-// and execute that one instead. This prevents users from accidentally using the
-// global CLI when a potentially different local version is expected.
-const localPath = require.resolve( '@caweb/cli/lib/cli.js', {
-	paths: [ process.cwd(), __dirname ],
-} );
-const cli = require( localPath )();
+import cli from '../lib/cli.js';
 
-// Now we can execute the CLI with the given command.
-cli.parse( command );
+// Default to help text when they aren't running any commands.
+cli().parse( ! process.argv.length ? [ '--help' ] : process.argv );

package/lib/caweb.js

@@ -1,29 +1,30 @@
-'use strict';
 /**
  * External dependencies
  */
-const retry = require( '@wordpress/env/lib/retry' );
+import retry from '@wordpress/env/lib/retry.js';
 
 /**
  * Internal dependencies
  */
-const { CAWEB_OPTIONS } = require('./options');
-const { runDockerCmds } = require('./docker');
-const { isMultisite } = require('./wordpress');
-const { configureDivi } = require('./divi');
+import { CAWEB_OPTIONS } from'./options.js';
+import { runCLICmds } from'./docker.js';
+import { isMultisite } from'./wordpress.js';
+import { configureDivi } from'./divi.js';
 
 /**
  * Activates the CAWeb Theme for the WordPress Environment if it's installed.
  * 
  * @param {string}		environment   Which environment to activate the theme on.
  * @param {WPConfig} 	config	      The wp-env config object.
+ * @param {Object}   	spinner A CLI spinner which indicates progress.
  */
 async function activateCAWeb(
 	environment,
-	config
+	config,
+	spinner
 ){
 
-	const isMulti = await isMultisite( environment, config );
+	const isMulti = await isMultisite( environment, config , spinner);
 
 	let cmds = ['wp theme is-installed CAWeb'];
 
@@ -33,10 +34,11 @@ async function activateCAWeb(
 		cmds.push( 'wp theme activate CAWeb' );
 	}
 
-	return await runDockerCmds(
+	return await runCLICmds(
 		environment,
 		cmds,
-		config
+		config,
+		spinner
 	);
 
 }
@@ -56,8 +58,7 @@ async function configureCAWeb( environment, config, spinner ) {
 	const isThemeActivated = await activateCAWeb( environment, config );
 
 	const {
-		DESIGN_SYSTEM_ENABLED,
-		WP_PERMALINK
+		DESIGN_SYSTEM_ENABLED
 	} = config.env[ environment ].config
 
 	// if our theme is active.
@@ -87,10 +88,11 @@ async function configureCAWeb( environment, config, spinner ) {
 		}
 		
 		// Execute theme option commands.
-		await runDockerCmds(
+		await runCLICmds(
 			environment,
 			themeOptions,
-			config
+			config,
+			spinner
 		);
 
 		// Make Divi WordPress Configurations.
@@ -106,20 +108,21 @@ async function configureCAWeb( environment, config, spinner ) {
 		
 	// Activate Design System plugin
 	if( undefined !== DESIGN_SYSTEM_ENABLED && DESIGN_SYSTEM_ENABLED ){
-		await runDockerCmds(
+		await runCLICmds(
 			environment,
 			[
 				'wp plugin is-installed design-system-wordpress', 
 				'wp plugin activate design-system-wordpress'
 			],
-			config
+			config,
+			spinner
 		)
 	}
 	
 	
 }
 
-module.exports = {
+export {
 	activateCAWeb,
 	configureCAWeb,
 };

package/lib/cli.js

@@ -1,153 +1,211 @@
-'use strict';
 /**
  * External dependencies
  */
-const wpenv_cli = require('@wordpress/env/lib/cli');
+//const wpenv_cli = require('@wordpress/env/lib/cli');
 
-const chalk = require( 'chalk' );
-const ora = require( 'ora' );
-let yargs = require( 'yargs' );
-const terminalLink = require( 'terminal-link' );
-const { execSync } = require( 'child_process' );
+import path from 'node:path';
+import chalk from 'chalk';
+import parseXdebugMode from '@wordpress/env/lib/parse-xdebug-mode.js';
+import fs from 'fs-extra';
+import terminalLink from  'terminal-link';
+import { Command, Argument, Option } from 'commander';
 
 /**
  * Internal dependencies
  */
-const pkg = require( '../package.json' );
-const env = require( './commands' );
-const parseXdebugMode = require( '@wordpress/env/lib/parse-xdebug-mode' );
+import * as env from './commands/index.js';
+import {
+	wpPrimary,
+	wpGreen,
+	wpYellow,
+	wpRed,
+	withSpinner
+} from './spinner.js';
 
-// Colors.
-const boldWhite = chalk.bold.white;
-const wpPrimary = boldWhite.bgHex( '#00669b' );
-const wpGreen = boldWhite.bgHex( '#4ab866' );
-const wpRed = boldWhite.bgHex( '#d94f4f' );
-const wpYellow = boldWhite.bgHex( '#f0b849' );
+const localPath = path.resolve( path.join(process.cwd(), 'node_modules/@caweb/cli/package.json') )
+const pkg = JSON.parse( await fs.readFile(localPath) );
+const program = new Command();
 
-// Spinner.
-const withSpinner =
-	( command ) =>
-	( ...args ) => {
-		const spinner = ora().start();
-		args[ 0 ].spinner = spinner;
-		let time = process.hrtime();
-		return command( ...args ).then(
-			( message ) => {
-				time = process.hrtime( time );
-				spinner.succeed(
-					`${ message || spinner.text } (in ${ time[ 0 ] }s ${ (
-						time[ 1 ] / 1e6
-					).toFixed( 0 ) }ms)`
-				);
-				process.exit( 0 );
-			},
-			( error ) => {
-				if( error ){
-					// Error is an unknown error. That means there was a bug in our code.
-					spinner.fail(
-						typeof error === 'string' ? error : error.message
-					);
-					// Disable reason: Using console.error() means we get a stack trace.
-					console.error( error );
-					process.exit( 1 );
-				}else{
-					spinner.fail( 'An unknown error occurred.' );
-					process.exit( 1 );
-				}
-			}
-		);
-	};
+export default function cli() {
+	const envArg = new Argument('[environment]', 'Which environment to use.')
+		.choices([
+			'development', 
+			'tests', 
+			'all'
+		])
+		.default('development');
 
-module.exports = function cli() {
-	yargs = wpenv_cli();
+	const containerArg = new Argument('<container>', 'The underlying Docker service to run the command on.')
+		.choices([
+			'mysql',
+			'tests-mysql',
+			'wordpress',
+			'tests-wordpress',
+			'cli',
+			'tests-cli',
+		])
+		.default('development');
 
-	// we are overwriting the default wp-env start command with our own.
-	yargs.command(
-		'start',
-		false,
-		( args ) => {
-			args.option( 'update', {
-				type: 'boolean',
-				describe:
-					'Download source updates and apply WordPress configuration.',
-				default: false,
-			} );
-			args.option( 'xdebug', {
-				describe:
-					'Enables Xdebug. If not passed, Xdebug is turned off. If no modes are set, uses "debug". You may set multiple Xdebug modes by passing them in a comma-separated list: `--xdebug=develop,coverage`. See https://xdebug.org/docs/all_settings#mode for information about Xdebug modes.',
-				coerce: parseXdebugMode,
-				type: 'string',
-			} );
-			args.option( 'scripts', {
-				type: 'boolean',
-				describe: 'Execute any configured lifecycle scripts.',
-				default: true,
-			} );
-			args.option( 'bare', {
-				type: 'boolean',
-				describe: 'True if excluding any downloads from CAWeb, use this if you want to use a local version of the CAWeb Theme, Configurations will still be applied.',
-				default: false,
-			} );
-			args.option( 'multisite', {
-				alias: 'm',
-				type: 'boolean',
-				describe: 'True if converting to multisite.',
-				default: false,
-			} );
-			args.option( 'subdomain', {
-				type: 'boolean',
-				describe: "If passed, the network will use subdomains, instead of subdirectories. Doesn't work with 'localhost', make sure to set Port to 80.",
-				default: false,
-			} );
-		},
-		withSpinner( env.start )
-	);
+	program
+		.name(wpPrimary( 'caweb'))
+		.usage( wpYellow( '<command>' ) )
+		.description('Command Line Interface utilized by CAWebPublishing to accomplish several tasks.')
+		.version( pkg.version )
+		.option(
+			'--debug',
+			'Enable debug output.',
+			false
+		)
+		.allowUnknownOption(true)
+		.configureHelp({ 
+			sortSubcommands: true,
+			sortOptions: true,
+			showGlobalOptions: true,
+		})
+		.addHelpCommand(false)
 
-	// Shell Terminal Command.
-	yargs.command(
-		'shell [environment]',
-		'Open shell terminal in WordPress environment.', 
-		(args) => {
-			args.positional( 'environment', {
-				type: 'string',
-				describe: "Which environment to open terminal in.",
-				choices: [ 'development', 'tests' ],
-				default: 'development',
-			} );
-		}, 
-		withSpinner( env.shell )
-	)
+	// Start command.
+	program.command('start')
+		.description(
+			wpGreen(
+				chalk`Starts two CAWebPublishing WordPress instances\ndevelopment on port ${ terminalLink( '8888', 'http://localhost:8888' ) } (override with WP_ENV_PORT)\ntests on port {bold.underline ${ terminalLink( '8889', 'http://localhost:8889' ) }} (override with WP_ENV_TESTS_PORT).\nAfter first install, use the '--update' flag to download updates to mapped sources and to re-apply CAWeb configuration options.`
+			)
+		)
+		.option( 
+			'--update',
+			'Download source updates and apply WordPress configuration.',
+			false
+		)
+		.option( 
+			'--xdebug <mode>',
+			'Enables Xdebug. If not passed, Xdebug is turned off. If no modes are set, uses "debug". You may set multiple Xdebug modes by passing them in a comma-separated list: `--xdebug=develop,coverage`. See https://xdebug.org/docs/all_settings#mode for information about Xdebug modes.',
+		)
+		.option( 
+			'--scripts', 
+			'Execute any configured lifecycle scripts.',
+			true
+		)
+		.option(
+			'--bare',
+			'True if excluding any downloads from CAWeb, use this if you want to use a local version of the CAWeb Theme, Configurations will still be applied.',
+			false
+		)
+		.option(
+			'-m, --multisite',
+			'True if converting to multisite.',
+			false
+		)
+		.option(
+			'--subdomain',
+			"If passed, the network will use subdomains, instead of subdirectories. Doesn't work with 'localhost', make sure to set Port to 80.",
+			false
+		)
+		.allowUnknownOption(true)
+		.action( withSpinner(env.start) )
 
-	// Update Plugin Command.
-	yargs.command(
-		'update-plugins [environment]',
-		'Updates all plugins in the WordPress environment.', 
-		(args) => {
-			args.positional( 'environment', {
-				type: 'string',
-				describe: "Which environment to update.",
-				choices: [ 'development', 'tests' ],
-				default: 'development',
-			} );
-		}, 
-		withSpinner( env.updatePlugins )
-	)
+	// Destroy Command.
+	program.command('destroy')
+		.description(
+			wpRed(
+				'Deletes docker containers, volumes, and networks associated with the CAWebPublishing instances and removes local files.'
+			)
+		)
+		.option( 
+			'--scripts', 
+			'Execute any configured lifecycle scripts.',
+			true
+		)
+		.allowUnknownOption(true)
+		.action( withSpinner(env.destroy) )
 
-	// Test Command.
-	/*yargs.command(
-		'test [environment]',
-		'Test commands on a WordPress environment', 
-		(args) => {
-			args.positional( 'environment', {
-				type: 'string',
-				describe: "Which environment to test in.",
-				choices: [ 'development', 'tests' ],
-				default: 'development',
-			} );
-			
-		}, 
-		withSpinner( env.test )
-	)*/
+	// Shell Command.
+	program.command('shell')
+		.description('Open shell terminal in WordPress environment.')
+		.addArgument(envArg)
+		.allowUnknownOption(true)
+		.action( withSpinner(env.shell) )
+
+	// Stop Command.
+	program.command('stop')
+		.description(
+			wpRed(
+				'Stops running WordPress for development and tests and frees the ports.'
+			)
+		)
+		.allowUnknownOption(true)
+		.action( withSpinner(env.stop) )
+
+	// Clean Command.
+	program.command('clean')
+		.description(
+			wpYellow( 'Cleans the WordPress databases.' )
+		)
+		.addArgument(envArg)
+		.option( 
+			'--scripts', 
+			'Execute any configured lifecycle scripts.',
+			true
+		)
+		.allowUnknownOption(true)
+		.action( withSpinner(env.clean) )
 	
-	return yargs;
+	// Logs Command.
+	program.command('logs')
+		.description(
+			'Displays PHP and Docker logs for given WordPress environment.'
+		)
+		.addArgument(envArg)
+		.option( 
+			'--no-watch', 
+			'Stops watching for logs in realtime.',
+			true
+		)
+		.allowUnknownOption(true)
+		.action( withSpinner(env.logs) )
+	
+		
+	// Run Command.
+	program.command('run')
+		.description(
+			'Runs an arbitrary command in one of the underlying Docker containers. A double dash can be used to pass arguments to the container without parsing them. This is necessary if you are using an option that is defined below. You can use `bash` to open a shell session and both `composer` and `phpunit` are available in all WordPress and CLI containers. WP-CLI is also available in the CLI containers.'
+		)
+		.addArgument(containerArg)
+		.argument('[command...]', 'The command to run.')
+		.option( 
+			'--env-cwd', 
+			"The command's working directory inside of the container. Paths without a leading slash are relative to the WordPress root.",
+			'.'
+		)
+		.allowUnknownOption(true)
+		.action( withSpinner(env.run) )
+
+		
+	// Install Path Command.
+	program.command('install-path')
+		.description('Get the path where all of the environment files are stored. This includes the Docker files, WordPress, PHPUnit files, and any sources that were downloaded.')
+		.allowUnknownOption(true)
+		.action( withSpinner(env.installPath) )
+
+	// Update Plugins Command.
+	program.command('update-plugins')
+		.description('Updates all plugins in the WordPress environment.')
+		.argument('[slug]', 'Plugin slug to update.', 'all')
+		.addOption(new Option('--environment <env>', 'Which environment to use.').choices(['development', 'tests']).default('development'))
+		.allowUnknownOption(true)
+		.action( withSpinner(env.updatePlugins) )
+
+	// Test Command.
+	// Ensure this is commented out.
+	program.command('test')
+		.description('Test commands on a WordPress environment')
+		.addArgument(envArg)
+		.option( 
+			'--scripts', 
+			'Execute any configured lifecycle scripts.',
+			true
+		)
+		.allowUnknownOption(true)
+		.action(withSpinner(env.test))
+
+	return program;
 };

package/lib/commands/destroy.js

@@ -0,0 +1,66 @@
+import path from 'node:path';
+import loadConfig from '@wordpress/env/lib/config/load-config.js';
+import { spawn } from 'node:child_process';
+import { v2 as dockerCompose } from 'docker-compose';
+
+import { default as wpEnvDestroy } from '@wordpress/env/lib/commands/destroy.js';
+
+/**
+ * Internal dependencies
+ */
+
+/**
+ * Promisified dependencies
+ */
+
+/**
+ * Starts the development server.
+ * 
+ * @param {Object}  options
+ * @param {Object}  options.spinner A CLI spinner which indicates progress.
+ * @param {boolean} options.scripts Indicates whether or not lifecycle scripts should be executed.
+ * @param {boolean} options.debug   True if debug mode is enabled.
+ * 
+ */
+export default async function destroy({
+	spinner,
+	scripts,
+	debug,
+}) {
+
+	await wpEnvDestroy({spinner, scripts, debug });
+
+	// wp-env destroy completed successfully if spinner.text reads.
+	if( 'Removed WordPress environment.' === spinner.text ){
+		spinner.text = "Cleaning up...";
+		
+		// Stop phpMyAdmin as well
+		// wp-env doesn't destroy the phpmyadmin image so we have to do it ourselves.
+		await new Promise( (resolve, reject) => {
+			const childProc = spawn(
+				'docker',
+				[
+					'image',
+					'rm',
+					'phpmyadmin'
+				],
+				{ stdio: 'ignore' },
+				spinner
+			);
+
+			childProc.on( 'error', reject );
+			childProc.on( 'exit', ( code ) => {
+				// Code 130 is set if the user tries to exit with ctrl-c before using
+				// ctrl-d (so it is not an error which should fail the script.)
+				if ( code === 0 || code === 130 ) {
+					resolve();
+				} else {
+					reject( `Command failed with exit code ${ code }` );
+				}
+			} );
+		});
+		spinner.text = "Removed WordPress environment.'";
+
+	}
+
+}

package/lib/commands/index.js

@@ -1,20 +1,40 @@
-'use strict';
 /**
  * External dependencies
  */
 
+/**
+ * These are default wp-env commands. No need to overwrite these commands
+ */
+import clean from '@wordpress/env/lib/commands/clean.js';
+import logs from '@wordpress/env/lib/commands/logs.js';
+import run from '@wordpress/env/lib/commands/run.js';
+import installPath from '@wordpress/env/lib/commands/install-path.js';
+
 /**
  * Internal dependencies
  */
-const shell = require('./shell')
-const start = require('./start')
-const test = require( './test' );
+import shell from './shell.js';
+import updatePlugins from './tasks/update-plugins.js'
 
-const tasks = require('./tasks');
+import test from './test.js';
 
-module.exports = {
-	shell,
+/**
+ * These are default wp-env commands, we overwrite these commands so we can run additional steps.
+ */
+import start from './start.js';
+import destroy from './destroy.js';
+import stop from './stop.js';
+
+
+export {
+	clean,
+	logs,
+	run,
+	installPath,
 	start,
+	stop,
+	destroy,
 	test,
-	...tasks
-};
+	shell,
+	updatePlugins
+}

package/lib/commands/shell.js

@@ -1,8 +1,7 @@
-'use strict';
 /**
  * External dependencies
  */
-const run = require( '@wordpress/env/lib/commands/run' );
+import run from '@wordpress/env/lib/commands/run.js';
 
 /**
  * Internal dependencies
@@ -16,7 +15,7 @@ const run = require( '@wordpress/env/lib/commands/run' );
  * @param {boolean} options.environment   Which environment to open terminal in.
  * @param {boolean} options.debug   True if debug mode is enabled.
  */
-module.exports = async function shell({
+export default async function shell({
 	spinner,
 	environment,
 	debug