@enspirit/emb 0.0.6 → 0.0.7

package/dist/src/monorepo/utils/index.d.ts

@@ -1 +1 @@
-export * from './findBuildOrder.js';
+export * from './findRunOrder.js';

package/dist/src/monorepo/utils/index.js

@@ -1 +1 @@
-export * from './findBuildOrder.js';
+export * from './findRunOrder.js';

package/oclif.manifest.json

@@ -14,6 +14,13 @@
           "name": "json",
           "allowNo": false,
           "type": "boolean"
+        },
+        "force": {
+          "char": "f",
+          "description": "Force the deletion of containers & images",
+          "name": "force",
+          "allowNo": false,
+          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
@@ -47,6 +54,14 @@
           "name": "json",
           "allowNo": false,
           "type": "boolean"
+        },
+        "flavor": {
+          "description": "Specify the flavor to use.",
+          "name": "flavor",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
         }
       },
       "hasDynamicHelp": false,
@@ -89,10 +104,10 @@
           "multiple": false,
           "type": "option"
         },
-        "force-recreate": {
+        "force": {
           "char": "f",
-          "description": "Recreate containers even if their configuration and image haven't changed",
-          "name": "force-recreate",
+          "description": "Bypass caches, force the recreation of containers, etc",
+          "name": "force",
           "allowNo": false,
           "type": "boolean"
         }
@@ -118,7 +133,7 @@
       "aliases": [],
       "args": {
         "component": {
-          "description": "List of components to build",
+          "description": "List of components to build (defaults to all)",
           "name": "component",
           "required": false
         }
@@ -142,6 +157,13 @@
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
+        },
+        "dry-run": {
+          "description": "Do not build the components but only produce build meta information",
+          "name": "dry-run",
+          "required": false,
+          "allowNo": false,
+          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
@@ -204,10 +226,12 @@
         "index.js"
       ]
     },
-    "config:print": {
-      "aliases": [],
+    "containers": {
+      "aliases": [
+        "ps"
+      ],
       "args": {},
-      "description": "Print the current config.",
+      "description": "List docker containers.",
       "examples": [
         "<%= config.bin %> <%= command.id %>"
       ],
@@ -219,18 +243,18 @@
           "allowNo": false,
           "type": "boolean"
         },
-        "flavor": {
-          "description": "Specify the flavor to use.",
-          "name": "flavor",
+        "all": {
+          "char": "a",
+          "description": "Retun all containers. By default, only running containers are shown",
+          "name": "all",
           "required": false,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
+          "allowNo": false,
+          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "config:print",
+      "id": "containers",
       "pluginAlias": "@enspirit/emb",
       "pluginName": "@enspirit/emb",
       "pluginType": "core",
@@ -242,16 +266,14 @@
         "src",
         "cli",
         "commands",
-        "config",
-        "print.js"
+        "containers",
+        "index.js"
       ]
     },
-    "containers": {
-      "aliases": [
-        "ps"
-      ],
+    "containers:prune": {
+      "aliases": [],
       "args": {},
-      "description": "List docker containers.",
+      "description": "Prune containers.",
       "examples": [
         "<%= config.bin %> <%= command.id %>"
       ],
@@ -262,19 +284,11 @@
           "name": "json",
           "allowNo": false,
           "type": "boolean"
-        },
-        "all": {
-          "char": "a",
-          "description": "Retun all containers. By default, only running containers are shown",
-          "name": "all",
-          "required": false,
-          "allowNo": false,
-          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "containers",
+      "id": "containers:prune",
       "pluginAlias": "@enspirit/emb",
       "pluginName": "@enspirit/emb",
       "pluginType": "core",
@@ -287,13 +301,13 @@
         "cli",
         "commands",
         "containers",
-        "index.js"
+        "prune.js"
       ]
     },
-    "containers:prune": {
+    "config:print": {
       "aliases": [],
       "args": {},
-      "description": "Prune containers.",
+      "description": "Print the current config.",
       "examples": [
         "<%= config.bin %> <%= command.id %>"
       ],
@@ -304,11 +318,19 @@
           "name": "json",
           "allowNo": false,
           "type": "boolean"
+        },
+        "flavor": {
+          "description": "Specify the flavor to use.",
+          "name": "flavor",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "containers:prune",
+      "id": "config:print",
       "pluginAlias": "@enspirit/emb",
       "pluginName": "@enspirit/emb",
       "pluginType": "core",
@@ -320,8 +342,8 @@
         "src",
         "cli",
         "commands",
-        "containers",
-        "prune.js"
+        "config",
+        "print.js"
       ]
     },
     "images:delete": {
@@ -488,12 +510,12 @@
       "aliases": [],
       "args": {
         "task": {
-          "description": "List of tasks ids to run (eg: component:task)",
+          "description": "List of tasks to run. You can provide either ids or names (eg: component:task or task)",
           "name": "task",
-          "required": false
+          "required": true
         }
       },
-      "description": "Run a task.",
+      "description": "Run tasks.",
       "examples": [
         "<%= config.bin %> <%= command.id %>"
       ],
@@ -507,6 +529,7 @@
         },
         "executor": {
           "char": "x",
+          "description": "Where to run the task. (experimental!)",
           "name": "executor",
           "hasDynamicHelp": false,
           "multiple": false,
@@ -536,5 +559,5 @@
       ]
     }
   },
-  "version": "0.0.6"
+  "version": "0.0.7"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@enspirit/emb",
   "type": "module",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "keywords": ["monorepo", "docker", "taskrunner", "ci", "docker compose", "sentinel", "makefile"],
   "author": "Louis Lambeau <louis.lambeau@enspirit.be>",
   "license": "ISC",
@@ -35,6 +35,7 @@
     "@oclif/plugin-autocomplete": "^3.2.34",
     "@oclif/plugin-help": "^6.2.32",
     "@oclif/plugin-not-found": "^3.2.63",
+    "@oclif/plugin-update": "^4.7.3",
     "@oclif/table": "^0.4.12",
     "ajv": "^8.17.1",
     "colorette": "^2.0.20",
@@ -103,7 +104,8 @@
     "plugins": [
       "@oclif/plugin-help",
       "@oclif/plugin-autocomplete",
-      "@oclif/plugin-not-found"
+      "@oclif/plugin-not-found",
+      "@oclif/plugin-update"
     ],
     "topicSeparator": " ",
     "topics": {

package/dist/src/monorepo/operations/tasks/RunTaskOperation.d.ts

@@ -1,18 +0,0 @@
-import { Writable } from 'node:stream';
-import { TaskInfo } from '../../types.js';
-import { IOperation } from '../../../operations/types.js';
-export declare enum ExecutorType {
-    container = "container",
-    local = "local"
-}
-export type RunTaskOperationParams = {
-    executor: ExecutorType;
-    task: TaskInfo;
-};
-export declare class RunTaskOperation implements IOperation<RunTaskOperationParams, void> {
-    protected out?: Writable | undefined;
-    constructor(out?: Writable | undefined);
-    run(params: RunTaskOperationParams): Promise<void>;
-    private runDocker;
-    private runLocal;
-}

package/dist/src/monorepo/operations/tasks/RunTaskOperation.js

@@ -1,50 +0,0 @@
-import { getContext } from '../../../index.js';
-import { ContainerExecOperation } from '../../../docker/index.js';
-import { ExecuteLocalCommandOperation, GetComponentContainerOperation, } from '../index.js';
-export var ExecutorType;
-(function (ExecutorType) {
-    ExecutorType["container"] = "container";
-    ExecutorType["local"] = "local";
-})(ExecutorType || (ExecutorType = {}));
-export class RunTaskOperation {
-    out;
-    constructor(out) {
-        this.out = out;
-    }
-    async run(params) {
-        switch (params.executor) {
-            case ExecutorType.container: {
-                return this.runDocker(params);
-            }
-            case ExecutorType.local: {
-                return this.runLocal(params);
-            }
-            default: {
-                throw new Error(`Unsupported executor type: ${params.executor}`);
-            }
-        }
-    }
-    async runDocker(params) {
-        const { monorepo } = getContext();
-        if (!params.task.component) {
-            throw new Error(`Support for non-component tasks not implemented`);
-        }
-        const containerInfo = await monorepo.run(new GetComponentContainerOperation(), params.task.component);
-        await monorepo.run(new ContainerExecOperation(this.out), {
-            attachStderr: true,
-            attachStdout: true,
-            container: containerInfo.Id,
-            script: params.task.script,
-        });
-    }
-    async runLocal(params) {
-        const { monorepo } = getContext();
-        const cwd = params.task.component
-            ? monorepo.component(params.task.component).rootdir
-            : monorepo.rootDir;
-        await monorepo.run(new ExecuteLocalCommandOperation(this.out), {
-            script: params.task.script,
-            workingDir: cwd,
-        });
-    }
-}

package/dist/src/monorepo/utils/findBuildOrder.d.ts

@@ -1,2 +0,0 @@
-import { Component } from '../index.js';
-export declare const findBuildOrder: (components: Array<Component>, selection?: Array<string>) => Array<Component>;

package/dist/src/monorepo/utils/findBuildOrder.js

@@ -1,41 +0,0 @@
-import graphlib from 'graphlib';
-const toGraph = (components) => {
-    const graph = new graphlib.Graph();
-    // Add all components as nodes
-    for (const comp of components) {
-        graph.setNode(comp.name);
-    }
-    // Add edges
-    for (const comp of components) {
-        for (const dep of comp.dependencies ?? []) {
-            graph.setEdge(dep.name, comp.name);
-        }
-    }
-    return graph;
-};
-export const findBuildOrder = (components, selection) => {
-    const hash = components.reduce((cmps, cmp) => {
-        cmps[cmp.name] = cmp;
-        return cmps;
-    }, {});
-    const graph = toGraph(components);
-    // Detect cycles
-    const cycles = graphlib.alg.findCycles(graph);
-    if (cycles.length > 0) {
-        throw new Error('Circular dependencies detected: ' + JSON.stringify(cycles));
-    }
-    // Pick nodes that we want to build and rebuild a graph only with these
-    const toBuild = selection || components.map((c) => c.name);
-    const includingDeps = toBuild
-        .reduce((set, name) => {
-        graph.predecessors(name)?.forEach((name) => {
-            set.add(name);
-        });
-        return set;
-    }, new Set(toBuild))
-        .values();
-    const newGraph = toGraph([...includingDeps].map((name) => hash[name]));
-    // Get build order
-    const order = graphlib.alg.topsort(newGraph);
-    return order.map((name) => hash[name]);
-};