d3ployer 0.0.8 → 0.0.10

package/dist/config.js

@@ -68,14 +68,32 @@ export function defineConfig(input) {
             };
         }
     }
-    return {
-        rootDir: '',
-        ...input,
-        packageManager: {
+    let packageManager;
+    if (input.packageManager === false) {
+        packageManager = false;
+    }
+    else {
+        packageManager = {
             manager: 'npm',
             productionOnly: true,
             ...input.packageManager,
-        },
+        };
+    }
+    let dockerCompose;
+    if (input.dockerCompose === false) {
+        dockerCompose = false;
+    }
+    else {
+        dockerCompose = {
+            configFiles: undefined,
+            ...input.dockerCompose,
+        };
+    }
+    return {
+        rootDir: '',
+        ...input,
+        packageManager,
+        dockerCompose,
         servers,
         tasks,
         scenarios,

package/dist/def.d.ts

@@ -27,6 +27,9 @@ export interface SymlinkConfig {
     path: string;
     target: string;
 }
+export type DockerComposeConfig = {
+    configFiles: string[];
+};
 export interface LogsConfig {
     time?: number;
 }
@@ -86,7 +89,7 @@ export interface DeployerConfig {
     symlinks?: SymlinkConfig[];
     packageManager?: PackageManagerConfig | false;
     pm2?: boolean;
-    dockerCompose?: boolean;
+    dockerCompose?: DockerComposeConfig | false;
     logs?: LogsConfig | false;
     tasks?: Record<string, TaskDef>;
     scenarios?: Record<string, ScenarioDef>;

package/dist/defaultTasks.js

@@ -146,18 +146,38 @@ const pm2SetupTask = async (ctx) => {
     await ctx.run('pm2 start pm2.config.* --update-env');
     await ctx.run('pm2 save');
 };
+function buildDockerComposeTestCmd(dockerComposeConfig) {
+    if (dockerComposeConfig === false) {
+        return 'false';
+    }
+    const configFiles = dockerComposeConfig.configFiles ?? [
+        'docker-compose.yml',
+        'docker-compose.yaml',
+        'compose.yml',
+        'compose.yaml',
+    ];
+    const testCmdPart = configFiles.map(f => `-f ${f}`);
+    return `test ${testCmdPart.join(' -o ')}`;
+}
 const dockerSetupSkip = async (ctx) => {
     if (ctx.config.dockerCompose === false) {
         return 'Docker Compose disabled';
     }
-    const composeExists = await ctx.test('test -f docker-compose.yml -o -f docker-compose.yaml -o -f compose.yml -o -f compose.yaml');
+    const testCmd = buildDockerComposeTestCmd(ctx.config.dockerCompose);
+    const composeExists = await ctx.test(testCmd);
     if (!composeExists) {
         return 'Docker Compose config not found';
     }
     return false;
 };
 const dockerSetupTask = async (ctx) => {
-    await ctx.run('docker compose up -d --build --remove-orphans');
+    if (ctx.config.dockerCompose === false) {
+        return;
+    }
+    const configFiles = ctx.config.dockerCompose?.configFiles ?? [];
+    const options = configFiles.map(f => `-f ${f}`).join(' ');
+    await ctx.run(`docker compose ${options} down --remove-orphans`);
+    await ctx.run(`docker compose ${options} up -d --build`);
 };
 const clearTargetTask = async (ctx, ph) => {
     const confirmed = await confirm({
@@ -177,34 +197,46 @@ const printDeploymentTask = async (ctx, ph) => {
     console.log(chalk.cyan('Directory size'));
     await ctx.run('du -hd 1 .');
 };
-const streamLogsSkip = async (ctx) => {
+const logsStreamSkip = async (ctx) => {
     if (ctx.config.logs === false) {
         return 'Logs streaming disabled';
     }
     const hasPm2 = ctx.config.pm2 !== false && await ctx.test('test -f pm2.config.*');
-    const hasDocker = ctx.config.dockerCompose !== false
-        && await ctx.test('test -f docker-compose.yml -o -f docker-compose.yaml -o -f compose.yml -o -f compose.yaml');
+    let hasDocker = false;
+    if (ctx.config.dockerCompose) {
+        const testCmd = buildDockerComposeTestCmd(ctx.config.dockerCompose);
+        hasDocker = await ctx.test(testCmd);
+    }
     if (!hasPm2 && !hasDocker) {
         return 'No PM2 or Docker Compose detected';
     }
     return false;
 };
-const streamLogsTask = async (ctx) => {
+const logsStreamTask = async (ctx) => {
     const logsConfig = {
         time: 3,
         ...ctx.config.logs,
     };
     const time = logsConfig.time;
-    const hasPm2 = ctx.config.pm2 !== false && await ctx.test('test -f pm2.config.*');
-    const hasDocker = ctx.config.dockerCompose !== false
-        && await ctx.test('test -f docker-compose.yml -o -f docker-compose.yaml -o -f compose.yml -o -f compose.yaml');
+    const hasPm2 = ctx.config.pm2 !== false
+        && await ctx.test('test -f pm2.config.*');
+    let hasDocker = false;
+    if (ctx.config.dockerCompose !== false) {
+        const testCmd = buildDockerComposeTestCmd(ctx.config.dockerCompose);
+        hasDocker = await ctx.test(testCmd);
+    }
     if (hasPm2) {
+        const pm2ConfigRaw = await ctx.run('cat pm2.config.*', { printOutput: false });
+        const nameMatch = pm2ConfigRaw.stdout.match(/name: ['"](?<name>.+?)['"]/);
+        const name = nameMatch.groups?.name ?? 'all';
         console.log(chalk.cyan(`Streaming PM2 logs for ${time}s...`));
-        await ctx.run(`timeout ${time} pm2 logs || true`, { printOutput: true, ignoreError: true });
+        await ctx.run(`timeout ${time} pm2 logs "${name}" || true`, { printOutput: true, ignoreError: true });
     }
-    else if (hasDocker) {
+    else if (hasDocker && ctx.config.dockerCompose) {
+        const configFiles = ctx.config.dockerCompose.configFiles ?? [];
+        const options = configFiles.map(f => `-f ${f}`).join(' ');
         console.log(chalk.cyan(`Streaming Docker Compose logs for ${time}s...`));
-        await ctx.run(`timeout ${time} docker compose logs --tail=50 -f || true`, {
+        await ctx.run(`timeout ${time} docker compose ${options} logs --tail=10 -f || true`, {
             printOutput: true,
             ignoreError: true,
         });
@@ -249,10 +281,10 @@ export const defaultTasks = {
         name: 'Print deployment info',
         task: printDeploymentTask,
     },
-    streamLogs: {
-        name: 'Stream logs',
-        skip: streamLogsSkip,
-        task: streamLogsTask,
+    logsStream: {
+        name: 'Logs stream',
+        skip: logsStreamSkip,
+        task: logsStreamTask,
     },
 };
 export const defaultScenarios = {
@@ -265,7 +297,7 @@ export const defaultScenarios = {
             'pm2:setup',
             'docker:setup',
             'print:deployment',
-            'stream:logs',
+            'logs:stream',
         ],
     },
 };

package/dist/runner.js

@@ -173,13 +173,6 @@ export function resolveTaskDefs(taskNames, allTasks) {
         return [name, def];
     });
 }
-const listrOptions = {
-    concurrent: false,
-    renderer: 'simple',
-    rendererOptions: {
-        clearOutput: true,
-    },
-};
 function buildServerListr(serverName, server, config, tasks) {
     return new Listr([
         {
@@ -203,7 +196,6 @@ function buildServerListr(serverName, server, config, tasks) {
                 ctx.taskCtx.taskConfig = taskDef.config;
                 return taskDef.task(ctx.taskCtx, ctx.ph);
             },
-            options: listrOptions,
         })),
         {
             task: async (ctx) => {
@@ -212,7 +204,10 @@ function buildServerListr(serverName, server, config, tasks) {
                 }
             },
         },
-    ], listrOptions);
+    ], {
+        concurrent: false,
+        renderer: 'simple',
+    });
 }
 export async function runScenario(config, scenarioName, serverNames) {
     const scenarioDef = config.scenarios?.[scenarioName];
@@ -226,8 +221,10 @@ export async function runScenario(config, scenarioName, serverNames) {
     const listr = new Listr(servers.map(([name, server]) => ({
         title: chalk.bgMagenta.black(` ${name} (${server.host}) `),
         task: () => buildServerListr(name, server, config, tasks),
-        options: listrOptions,
-    })), listrOptions);
+    })), {
+        concurrent: false,
+        renderer: 'simple',
+    });
     await listr.run();
 }
 export async function runTask(config, taskName, serverNames) {
@@ -241,7 +238,9 @@ export async function runTask(config, taskName, serverNames) {
     const listr = new Listr(servers.map(([name, server]) => ({
         title: chalk.bgMagenta.black(` ${name} (${server.host}) `),
         task: () => buildServerListr(name, server, config, [[taskName, taskDef]]),
-        options: listrOptions,
-    })), listrOptions);
+    })), {
+        concurrent: false,
+        renderer: 'simple',
+    });
     await listr.run();
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "d3ployer",
-    "version": "0.0.8",
+    "version": "0.0.10",
     "license": "MIT",
     "type": "module",
     "bin": {