Fix extension logs

Refactor utils.addCommand
This commit is contained in:
Shivam Mathur
2023-01-18 09:00:28 +05:30
parent 6db1a06425
commit bbc65d999a
10 changed files with 94 additions and 69 deletions

27
dist/index.js vendored
View File

@ -127,19 +127,21 @@ async function checkXdebugError(extension, version) {
exports.checkXdebugError = checkXdebugError;
async function addCoverageXdebug(extension, version, os, pipe) {
let script = '\n';
let message = await checkXdebugError(extension, version);
let status = '$cross';
if (!message) {
const error = await checkXdebugError(extension, version);
if (!error) {
script +=
(await extensions.addExtension(':pcov:false', version, os, true)) + pipe;
extension = extension == 'xdebug3' ? 'xdebug' : extension;
script +=
(await extensions.addExtension(extension, version, os, true)) + pipe;
script += await utils.setVariable('xdebug_version', 'php -r "echo phpversion(\'xdebug\');"', os);
message = 'Xdebug $xdebug_version enabled as coverage driver';
status = '$tick';
script +=
(await utils.getCommand(os, 'extension_log')) +
'xdebug "Xdebug $xdebug_version enabled as coverage driver"';
}
else {
script += await utils.addLog('$cross', extension, error, os);
}
script += await utils.addLog(status, extension, message, os);
return script;
}
exports.addCoverageXdebug = addCoverageXdebug;
@ -154,7 +156,9 @@ async function addCoveragePCOV(version, os, pipe) {
(await extensions.addExtension('pcov', version, os, true)) + pipe;
script += (await config.addINIValues('pcov.enabled=1', os, true)) + '\n';
script += await utils.setVariable('pcov_version', 'php -r "echo phpversion(\'pcov\');"', os);
script += await utils.addLog('$tick', 'coverage: pcov', 'PCOV $pcov_version enabled as coverage driver', os);
script +=
(await utils.getCommand(os, 'extension_log')) +
'pcov "PCOV $pcov_version enabled as coverage driver"';
break;
case /5\.[3-6]|7\.0/.test(version):
script += await utils.addLog('$cross', 'pcov', 'PHP 7.1 or newer is required', os);
@ -752,7 +756,7 @@ async function addArchive(data) {
}
exports.addArchive = addArchive;
async function addPackage(data) {
const command = await utils.getCommand(data['os'], 'composertool');
const command = await utils.getCommand(data['os'], 'composer_tool');
const parts = data['repository'].split('/');
const args = await utils.joins(parts[1], data['release'], parts[0] + '/', data['scope']);
return command + args;
@ -1218,7 +1222,12 @@ async function getCommand(os, suffix) {
case 'darwin':
return 'add_' + suffix + ' ';
case 'win32':
return 'Add-' + suffix.charAt(0).toUpperCase() + suffix.slice(1) + ' ';
return ('Add-' +
suffix
.split('_')
.map((part) => part.charAt(0).toUpperCase() + part.slice(1))
.join('') +
' ');
default:
return await log('Platform ' + os + ' is not supported', os, 'error');
}