@mirta/cli 0.4.1 → 0.4.3

package/dist/deploy.mjs

@@ -1,8 +1,8 @@
 import chalk from 'chalk';
 import { isString, isNumber } from '@mirta/basics';
-import { D as DEFAULT_SSH_USERNAME, K as KNOWN_SSH_PORT, e as expandHomeDir, a as resolveSubpath, i as isExistsAsync, r as resolveConfigAsync } from './resolve.mjs';
+import { D as DEFAULT_SSH_USERNAME, K as KNOWN_SSH_PORT, e as expandHomeDir, r as resolveConfigAsync } from './resolve.mjs';
 import { loadEnv as loadEnv$1 } from '@mirta/env-loader';
-import { l as logger, t, r as runCommandAsync, S as STDIO_INTERACTIVE, a as assertNoParseErrors, e as STDIO_CAPTURE_ERRORS } from './index.mjs';
+import { l as logger, t, r as runCommandAsync, S as STDIO_INTERACTIVE, a as assertNoParseErrors, e as STDIO_CAPTURE_ERRORS, f as STDIO_CAPTURE_OUTPUT } from './index.mjs';
 import { resolveWorkspaceContextAsync } from '@mirta/workspace';
 import 'node:fs/promises';
 import 'node:os';
@@ -304,15 +304,6 @@ const DEFAULT_SSH_KEY_TTL = '15m';
  **/
 async function runRsyncAsync(options) {
     const { connection, mapping, toGroup, cwd, isDryRun, } = options;
-    const from = resolveSubpath(cwd, mapping.from);
-    if (!await isExistsAsync(from)) {
-        logger.step(t('deploy.sourceNotExists', {
-            source: from,
-        }));
-        // Файлы могут отсутствовать, это допустимо.
-        return;
-    }
-    const to = `${connection.username}@${connection.hostname}:${mapping.to}/`;
     const args = [];
     const sshParts = [];
     if (connection.port && connection.port !== KNOWN_SSH_PORT)
@@ -327,7 +318,7 @@ async function runRsyncAsync(options) {
     // -O: не обновлять время на директориях
     args.push('-rtzgO');
     if (isDryRun)
-        args.unshift('--dry-run', '--itemize-changes');
+        args.push('--dry-run', '--itemize-changes');
     if (mapping.cleanup)
         args.push('--delete');
     mapping.exclude?.forEach((pattern) => {
@@ -338,7 +329,8 @@ async function runRsyncAsync(options) {
     });
     if (toGroup)
         args.push('--groupmap', `*:${toGroup}`);
-    args.push(from, to);
+    const to = `${connection.username}@${connection.hostname}:${mapping.to}`;
+    args.push(mapping.from, to);
     logger.step(t('deploy.transmitting', {
         from: mapping.from,
         to: mapping.to,
@@ -487,7 +479,7 @@ async function hasEntryAsync(fingerprint, context) {
         env: {
             SSH_AUTH_SOCK,
         },
-        stdio: STDIO_CAPTURE_ERRORS,
+        stdio: STDIO_CAPTURE_OUTPUT,
         doneCodes: [0, 1], // 0 = есть ключи, 1 = нет ключей
     });
     if (response.code === 1)
@@ -554,7 +546,7 @@ async function hasTokenAsync(path, context) {
 async function addTokenAsync(path, context) {
     const args = ['-q'];
     if (context.ttl)
-        args.push('-t', context.ttl.toString());
+        args.push('-t', context.ttl);
     args.push('-s', path);
     await context.runAsync('ssh-add', args, {
         env: {

package/dist/index.mjs

@@ -100,7 +100,7 @@ const levelPriority = [
  * @since 0.4.0
  *
  **/
-let targetLevel = 0;
+let targetLevel = 1;
 /**
  * Проверяет, должно ли сообщение быть залогировано, исходя из текущего уровня.
  *
@@ -738,6 +738,9 @@ const commonOptions = {
         type: 'boolean',
         short: 'h',
     },
+    debug: {
+        type: 'boolean',
+    },
 };
 async function run() {
     const args = createStagedArgs(process.argv.slice(2));
@@ -754,6 +757,8 @@ async function run() {
         console.log(getHelpMessage());
         return;
     }
+    if (argv.debug)
+        logger.setLevel('debug');
     const module = await resolveRunnerAsync(positionals[0]);
     await module.runAsync(runnerArgs);
 }
@@ -782,4 +787,4 @@ run().catch((e) => {
     process.exit(1);
 });
 
-export { STDIO_INTERACTIVE as S, assertNoParseErrors as a, assertIsSyncedWithRemoteAsync as b, assertWorkflowResultAsync as c, checkIsInWorkTreeAsync as d, STDIO_CAPTURE_ERRORS as e, getRepositoryDetails as g, logger as l, prompts as p, runCommandAsync as r, t };
+export { STDIO_INTERACTIVE as S, assertNoParseErrors as a, assertIsSyncedWithRemoteAsync as b, assertWorkflowResultAsync as c, checkIsInWorkTreeAsync as d, STDIO_CAPTURE_ERRORS as e, STDIO_CAPTURE_OUTPUT as f, getRepositoryDetails as g, logger as l, prompts as p, runCommandAsync as r, t };

package/dist/resolve.mjs

@@ -402,13 +402,13 @@ var defaultConfig = defineConfig({
         mappings: {
             'wb-rules-es5': [
                 {
-                    from: 'dist/es5/wb-rules-modules',
-                    to: '/mnt/data/etc/wb-rules-modules',
+                    from: 'dist/es5/wb-rules-modules/',
+                    to: '/mnt/data/etc/wb-rules-modules/',
                     cleanup: true,
                 },
                 {
-                    from: 'dist/es5/wb-rules',
-                    to: '/mnt/data/etc/wb-rules',
+                    from: 'dist/es5/wb-rules/',
+                    to: '/mnt/data/etc/wb-rules/',
                     cleanup: true,
                     protect: ['alarms.conf'],
                 },
@@ -454,4 +454,4 @@ async function resolveConfigAsync(rootDir, path) {
     };
 }
 
-export { DEFAULT_SSH_USERNAME as D, KNOWN_SSH_PORT as K, resolveSubpath as a, expandHomeDir as e, isExistsAsync as i, resolveConfigAsync as r };
+export { DEFAULT_SSH_USERNAME as D, KNOWN_SSH_PORT as K, expandHomeDir as e, resolveConfigAsync as r };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mirta/cli",
   "description": "🛠️ Mirta Framework - the CLI",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "license": "Unlicense",
   "keywords": [
     "cli",
@@ -48,12 +48,12 @@
     "prompts": "^2.4.2",
     "semver": "^7.7.3",
     "jsonc-parser": "^3.3.1",
-    "@mirta/i18n": "0.4.1",
-    "@mirta/basics": "0.4.1",
-    "@mirta/env-loader": "0.4.1",
-    "@mirta/staged-args": "0.4.1",
-    "@mirta/package": "0.4.1",
-    "@mirta/workspace": "0.4.1"
+    "@mirta/env-loader": "0.4.3",
+    "@mirta/basics": "0.4.3",
+    "@mirta/i18n": "0.4.3",
+    "@mirta/staged-args": "0.4.3",
+    "@mirta/package": "0.4.3",
+    "@mirta/workspace": "0.4.3"
   },
   "devDependencies": {
     "@types/semver": "^7.7.1"