Improve Logs and tests

lib/utils.js

@@ -58,14 +58,14 @@ exports.asyncForEach = asyncForEach;
  *
  * @param files
  */
-function readFiles74(files) {
+function moveFiles(files) {
     return __awaiter(this, void 0, void 0, function* () {
         yield asyncForEach(files, function (filename) {
             fs.createReadStream(path.join(__dirname, '../src/' + filename)).pipe(fs.createWriteStream(filename.split('/')[1], { mode: 0o755 }));
         });
     });
 }
-exports.readFiles74 = readFiles74;
+exports.moveFiles = moveFiles;
 /**
  * Read the scripts
  *
@@ -79,7 +79,7 @@ function readScript(filename, version, os_version) {
             case 'darwin':
                 switch (version) {
                     case '7.4':
-                        yield readFiles74([
+                        yield moveFiles([
                             'configs/config.yaml',
                             'scripts/xdebug_darwin.sh',
                             'scripts/pcov.sh'
@@ -89,18 +89,17 @@ function readScript(filename, version, os_version) {
                 break;
             case 'linux':
                 let files = ['scripts/phalcon.sh'];
-                yield readFiles74(['scripts/phalcon.sh']);
                 switch (version) {
                     case '7.4':
-                        files.concat(['scripts/xdebug.sh', 'scripts/pcov.sh']);
+                        files = files.concat(['scripts/xdebug.sh', 'scripts/pcov.sh']);
                         break;
                 }
-                yield readFiles74(files);
+                yield moveFiles(files);
                 break;
             case 'win32':
                 switch (version) {
                     case '7.4':
-                        yield readFiles74(['ext/php_pcov.dll']);
+                        yield moveFiles(['ext/php_pcov.dll']);
                         break;
                 }
                 break;
@@ -166,42 +165,68 @@ function INIArray(ini_values_csv) {
     });
 }
 exports.INIArray = INIArray;
-function log(message, os_version, log_type, prefix = '') {
+/**
+ * Function to log a step
+ *
+ * @param message
+ * @param os_version
+ */
+function stepLog(message, os_version) {
     return __awaiter(this, void 0, void 0, function* () {
-        const unix_color = {
+        switch (os_version) {
+            case 'win32':
+                return 'Step-Log "' + message + '"';
+            case 'linux':
+            case 'darwin':
+                return 'step_log "' + message + '"';
+            default:
+                return yield log('Platform ' + os_version + ' is not supported', os_version, 'error');
+        }
+    });
+}
+exports.stepLog = stepLog;
+/**
+ * Function to log a result
+ * @param mark
+ * @param subject
+ * @param message
+ */
+function addLog(mark, subject, message, os_version) {
+    return __awaiter(this, void 0, void 0, function* () {
+        switch (os_version) {
+            case 'win32':
+                return 'Add-Log "' + mark + '" "' + subject + '" "' + message + '"';
+            case 'linux':
+            case 'darwin':
+                return 'add_log "' + mark + '" "' + subject + '" "' + message + '"';
+            default:
+                return yield log('Platform ' + os_version + ' is not supported', os_version, 'error');
+        }
+    });
+}
+exports.addLog = addLog;
+/**
+ * Log to console
+ *
+ * @param message
+ * @param os_version
+ * @param log_type
+ * @param prefix
+ */
+function log(message, os_version, log_type) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const color = {
             error: '31',
             success: '32',
             warning: '33'
         };
-        switch (prefix) {
-            case '':
-                prefix = '';
-                break;
-            default:
-                prefix = prefix + ': ';
-                break;
-        }
         switch (os_version) {
             case 'win32':
-                const color = {
-                    error: 'red',
-                    success: 'green',
-                    warning: 'yellow'
-                };
-                return ("Write-Host '" +
-                    prefix +
-                    message +
-                    "' -ForegroundColor " +
-                    color[log_type]);
+                return ('printf "\\033[' + color[log_type] + ';1m' + message + ' \\033[0m"');
             case 'linux':
             case 'darwin':
             default:
-                return ('echo "\\033[' +
-                    unix_color[log_type] +
-                    ';1m' +
-                    prefix +
-                    message +
-                    '\\033[0m"');
+                return 'echo "\\033[' + color[log_type] + ';1m' + message + '\\033[0m"';
         }
     });
 }
@@ -225,3 +250,22 @@ function getExtensionPrefix(extension) {
     });
 }
 exports.getExtensionPrefix = getExtensionPrefix;
+/**
+ * Function to get the suffix to suppress console output
+ *
+ * @param os_version
+ */
+function suppressOutput(os_version) {
+    return __awaiter(this, void 0, void 0, function* () {
+        switch (os_version) {
+            case 'win32':
+                return ' >$null 2>&1';
+            case 'linux':
+            case 'darwin':
+                return ' >/dev/null 2>&1';
+            default:
+                return yield log('Platform ' + os_version + ' is not supported', os_version, 'error');
+        }
+    });
+}
+exports.suppressOutput = suppressOutput;