koffi 0.9.20 → 0.9.21

package/README.md

@@ -6,6 +6,7 @@
   * [Other platforms](#other-platforms)
 - [Get started](#get-started)
 - [Tests](#tests)
+- [Benchmarks](#benchmarks)
 
 # Introduction
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koffi",
-  "version": "0.9.20",
+  "version": "0.9.21",
   "description": "Fast and simple FFI (foreign function interface) for Node.js",
   "keywords": [
     "foreign",
@@ -28,6 +28,7 @@
   "devDependencies": {
     "chalk": "^4.1.2",
     "ffi-napi": "^4.0.3",
+    "minimatch": "^5.0.1",
     "node-ssh": "^12.0.3",
     "ref-napi": "^3.0.3",
     "ref-struct-di": "^1.1.1"

package/test/test.js

@@ -23,13 +23,14 @@ const util = require('util');
 const { spawn, spawnSync } = require('child_process');
 const { NodeSSH } = require('node-ssh');
 const chalk = require('chalk');
+const minimatch = require('minimatch');
 
 // Globals
 
 let script_dir = null;
 let root_dir = null;
 
-let machines = [];
+let machines = null;
 let accelerate = true;
 let ignore = new Set;
 
@@ -47,6 +48,7 @@ async function main() {
     process.chdir(script_dir);
 
     let command = test;
+    let patterns = [];
 
     // Parse options
     {
@@ -54,19 +56,13 @@ async function main() {
 
         if (process.argv.length >= 3 && process.argv[2][0] != '-') {
             switch (process.argv[2]) {
-                case 'test': { command = test; } break;
-                case 'start': { command = start; } break;
-                case 'stop': { command = stop; } break;
-                case 'info': { command = info; } break;
-                case 'ssh': { command = ssh; } break;
-                case 'reset': { command = reset; } break;
-
-                default: {
-                    throw new Error(`Unknown command '${process.argv[2]}'`);
-                } break;
+                case 'test': { command = test; i++; } break;
+                case 'start': { command = start; i++; } break;
+                case 'stop': { command = stop; i++; } break;
+                case 'info': { command = info; i++; } break;
+                case 'ssh': { command = ssh; i++; } break;
+                case 'reset': { command = reset; i++; } break;
             }
-
-            i++;
         }
 
         for (; i < process.argv.length; i++) {
@@ -102,7 +98,7 @@ async function main() {
                 if (arg.startsWith('__') || arg.match(/[\\/\.]/))
                     throw new Error(`Machine name '${arg} is not valid`);
 
-                machines.push(arg);
+                patterns.push(arg);
             }
         }
     }
@@ -138,15 +134,34 @@ async function main() {
         }
     }
 
-    if (!machines.length) {
-        for (let name in machines_map)
-            machines.push(name);
+    if (patterns.length) {
+        machines = new Set;
+
+        for (let pattern of patterns) {
+            let re = minimatch.makeRe(pattern);
+
+            for (let name in machines_map) {
+                let machine = machines_map[name];
+
+                if (name.match(re) || machine.name.match(re))
+                    machines.add(name);
+            }
+        }
+
+        if (!machines.size) {
+            console.log('Could not match any machine');
+            process.exit(1);
+        }
+    } else {
+        machines = new Set(...Object.keys(machines_map));
 
-        if (!machines.length) {
+        if (!machines.size) {
             console.error('Could not detect any machine');
             process.exit(1);
         }
     }
+
+    machines = Array.from(machines);
     machines = machines.map(name => {
         let machine = machines_map[name];
         if (machine == null) {
@@ -157,6 +172,9 @@ async function main() {
         return machine;
     });
 
+    console.log('Machines:', machines.map(machine => machine.name).join(', '));
+    console.log();
+
     try {
         let success = await command();
         process.exit(!success);