Merge pull request #129 from microservices-suite/repo-engineering/universal-cli

Repo engineering/universal cli

Author: GAndanje

.suite-cli/cli/cli.js

@@ -51,6 +51,10 @@ program
   .command('release [package]')
   .description('make a package release and publish simultaneously to npm.If no package is passed then generate:release for changelog is run')
   .action(async (package) => await actionHandlers.releasePackage({ package }));
+program
+  .command('test [package]')
+  .description('run tests')
+  .action(async (package) => await actionHandlers.test({ package }));
 program
   .command('start [components...]')
   .description('Starts specified components (services or apps), or all services in dev mode if -m is not specified')
@@ -169,7 +173,14 @@ program
                 //   find out if this separater works on windows
                 // const project_base = `@${answers.repo_name}-${Date.now()}`
                 const project_base = `@${answers.repo_name}`
-                actionHandlers.scaffoldNewRepo({ answers: { ...answers, project_base, private: true } });
+                actionHandlers.scaffoldNewRepo({
+                  answers: {
+                    ...answers,
+                    project_base,
+                    private: true,
+                    port: parseFloat(answers.port)
+                  }
+                });
               });
             break;
           case 'service':
@@ -188,7 +199,13 @@ program
                 default: getNextAvailablePort({ services: existing_services }),
                 validate: input => input === '' || !isNaN(input) ? true : 'Port must be a number.'
               }
-            ]).then((answers) => actionHandlers.scaffoldNewService({ answers: { ...answers, private: true } }))
+            ]).then((answers) => actionHandlers.scaffoldNewService({
+              answers: {
+                ...answers,
+                private: true,
+                port: parseFloat(answers.port)
+              }
+            }))
             break;
           case 'library':
             prompt([

.suite-cli/cli/scripts/commands/test.cmd.js

@@ -0,0 +1,6 @@
+
+const { test } = require('../scripts.module')
+
+module.exports = async ({ package }) => {
+    test({ package });
+};

.suite-cli/cli/scripts/index.js

@@ -22,3 +22,4 @@ module.exports.scaffoldNewRepo = require('./commands/scaffoldNewRepo.cmd');
 module.exports.releasePackage = require('./commands/releasePackage.cmd');
 module.exports.scaffoldNewService = require('./commands/scaffoldNewService.cmd');
 module.exports.scaffoldNewLibrary = require('./commands/scaffoldNewLibrary.cmd');
+module.exports.test = require('./commands/test.cmd');

.suite-cli/cli/scripts/scripts.module.js

@@ -360,56 +360,8 @@ const startAll = async ({ options }) => {
     // case -v(--vanilla)
     // TODO: run services with nodemon in dev mode otherwise PM2
     // runVanillaServices({ services: [], mode: options.mode })
-
 }
 
-// /**
-//  * Starts services with nodemon in development mode by default, otherwise with PM2.
-//  * @param {Object} options - Environment settings for running the services.
-//  * @param {string[]} options.serviceDirectories - List of service directories under `options.microservicesDir`.
-//  * @param {string} options.microservicesDir - The root directory of the services.
-//  * @param {string} [options.mode='dev'] - The environment mode for running the services. Defaults to 'dev'.
-//  * @returns {void} Starts the services and logs their startup status.
-//  */
-// const spinVanillaServices = async ({ serviceDirectories, microservicesDir, mode = 'dev' }) => {
-//     const spinner = ora('Starting all services in ' + mode + ' mode...').start();
-
-//     try {
-//         // Simulate delay before starting services
-//         await delay(1);
-
-//         await Promise.all(serviceDirectories.map(async (dir) => {
-//             const serviceSpinner = ora('Starting service concurrently in: ' + dir).start();
-//             const processes = await exec(`yarn ${mode}`, { cwd: join(microservicesDir, dir) }, async (error, stdout, stderr) => {
-//                 if (error) {
-//                     const errorMessage = getErrorMessage(error, dir, microservicesDir);
-//                     serviceSpinner.fail(errorMessage);
-//                 } else {
-//                     serviceSpinner.succeed(`Service in directory ${dir} started successfully`);
-//                 }
-//             });
-//             processes.stdout.on('data', data => {
-//                 const output = data.toString();
-//                 // Check if the output contains the "yarn run" message
-//                 if (!output.includes('yarn run')) {
-//                     // Stop the spinner before printing the output
-//                     serviceSpinner.stop();
-//                     spinner.succeed(output);
-//                     // Restart the spinner after printing the output
-//                     // serviceSpinner.start();
-//                 }
-//             });
-//         }));
-
-//         spinner.succeed(`service${serviceDirectories.length > 0 ? 's' : ''} started successfully: ${serviceDirectories}`);
-//     } catch (error) {
-//         spinner.fail('An error occurred while starting services');
-//         console.error(error);
-//         exit(1);
-//     }
-// };
-
-
 /**
  * Starts services with nodemon in development mode by default, otherwise with PM2.
  * @param {Object} options - Environment settings for running the services.
@@ -441,9 +393,10 @@ const spinVanillaServices = async ({ serviceDirectories, microservicesDir, mode
             });
 
             child.stderr.on('data', (data) => {
-                const output = data.toString();
+                let output = data.toString();
+                output = output.split(':')
                 // Handle stderr output
-                spinner.fail(`Error in service ${dir}: ${output.trim()}`);
+                console.log(`${output[0]}: ${dir}: ${output[1]}`);
             });
 
             child.on('close', (code) => {
@@ -465,28 +418,6 @@ const spinVanillaServices = async ({ serviceDirectories, microservicesDir, mode
     }
 };
 
-const getErrorMessage = (error, dir, microservicesDir) => {
-    const errorMessageParts = error.message.split('\n');
-    let errorMessage = '';
-    if (errorMessageParts[1]) {
-        if (errorMessageParts[1].startsWith('error Command') && errorMessageParts[1].endsWith('not found.')) {
-            errorMessage = `Missing script at ${dir}${sep}package.json: ${errorMessageParts[1].match(/"(.*?)"/)[1]}`;
-        } else if (errorMessageParts[1].startsWith('error There are more than one workspace')) {
-            errorMessage = errorMessageParts[1].replace('error ', '');
-        } else if (errorMessageParts[1].includes('Unknown workspace')) {
-            if (existsSync(`${microservicesDir}/${dir}/package.json`)) {
-                errorMessage = 'Wrong workspace naming';
-            } else {
-                errorMessage = `Missing package.json @microservices-suite${sep}${dir}`;
-            }
-        } else {
-            errorMessage = error.message;
-        }
-    }
-    return errorMessage;
-};
-
-
 /**
  * 
  * @param {Object} options Environment to run the 
@@ -1387,12 +1318,9 @@ const addProjectConfigs = ({ project_root, answers }) => {
 
 // Function to get the next available port
 const getNextAvailablePort = ({ services }) => {
-    const usedPorts = services.map(service => service.port);
-    let port = 9001;
-    while (usedPorts.includes(port)) {
-        port++;
-    }
-    return port;
+    const usedPorts = services.map(service => service.port).sort((a, b) => a - b);
+    let last_port = usedPorts[usedPorts.length - 1] || 9000
+    return last_port + 1;
 };
 
 const getExistingServices = ({ currentDir }) => {
@@ -1411,8 +1339,40 @@ const registerServiceWithSuiteJson = ({ root_dir, name, port }) => {
         config.services = [];
     }
     config.services.push({ name, port });
+
+    // keep the services ordered by port
+    config.services.sort((a, b) => a.port - b.port);
     writeFile(configPath, JSON.stringify(config, null, 2), 'utf8');
 }
+
+/**
+ * Releases a package or generates a release for the workspace.
+ * @async
+ * @param {Object} options - Options for releasing the package.
+ * @param {string} options.package - The name of the package to release (optional).
+ * @returns {Promise<void>} A Promise that resolves when the release process is completed.
+ */
+const test = async ({ package }) => {
+    let rootDir = cwd();
+    if (!package) {
+        rootDir = generatRootPath({ currentDir: cwd() });
+    }
+    try {
+        const package_json_path = join(rootDir, 'package.json');
+
+        // Read the package.json file
+        const { workspace_name } = retrieveWorkSpaceName({ package_json_path });
+        if (package) {
+            logInfo({ message: `Looking for package: ${workspace_name}/${package}` });
+            await executeCommand('yarn', ['workspace', `${workspace_name}/${package}`, 'test'], { stdio: 'inherit', shell: true });
+        } else {
+            await executeCommand('yarn', ['test'], { cwd: rootDir, stdio: 'inherit', shell: true });
+        }
+    } catch (error) {
+        ora().fail('Command failed to run');
+    }
+}
+
 const readFileContent = ({ path }) => { }
 module.exports = {
     generateDirectoryPath,
@@ -1441,5 +1401,6 @@ module.exports = {
     scaffoldNewService,
     scaffoldNewLibrary,
     getNextAvailablePort,
-    getExistingServices
+    getExistingServices,
+    test
 }