@toa.io/cli 1.0.0-alpha.7 → 1.0.0-alpha.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/cli",
-  "version": "1.0.0-alpha.7",
+  "version": "1.0.0-alpha.9",
   "description": "Toa CLI",
   "author": "temich <tema.gurtovoy@gmail.com>",
   "homepage": "https://github.com/toa-io/toa#readme",
@@ -22,16 +22,16 @@
     "@toa.io/runtime": "*"
   },
   "dependencies": {
-    "@toa.io/console": "1.0.0-alpha.7",
-    "@toa.io/generic": "1.0.0-alpha.7",
-    "@toa.io/kubernetes": "1.0.0-alpha.7",
-    "@toa.io/norm": "1.0.0-alpha.7",
-    "@toa.io/operations": "1.0.0-alpha.7",
-    "@toa.io/yaml": "1.0.0-alpha.7",
+    "@toa.io/console": "1.0.0-alpha.9",
+    "@toa.io/generic": "1.0.0-alpha.9",
+    "@toa.io/kubernetes": "1.0.0-alpha.9",
+    "@toa.io/norm": "1.0.0-alpha.9",
+    "@toa.io/operations": "1.0.0-alpha.9",
+    "@toa.io/yaml": "1.0.0-alpha.9",
     "dotenv": "16.1.1",
     "find-up": "5.0.0",
     "paseto": "3.1.4",
     "yargs": "17.6.2"
   },
-  "gitHead": "4f5ac0bc342d4b7bd469fbe5c74266f050b55c9f"
+  "gitHead": "017a3fa22e8c60654c240f8e55908773d44d4ed1"
 }

package/readme.md

@@ -60,38 +60,6 @@ Credentials specified in the output file are preserved.
 
 > It is recommended to add `.env*` to `.gitignore`.
 
-### replay
-
-[Replay](/extensions/sampling/docs/replay.md) samples. Reports in [TAP](https://testanything.org)
-format.
-
-<dl>
-<dt><code>toa replay [paths...]</code></dt>
-<dd>
-<code>paths</code> Path(s) to Component(s) or a Context (default <code>.</code>).<br/>
-<code>--component &lt;id&gt;</code> Replay samples for a specified component <code>id</code>.<br/>
-<code>--integration</code> Replay integration tests only.<br/>
-<code>--autonomous</code> Replay autonomous tests only.<br/>
-<code>--operation &lt;name&gt;</code> Replay samples for specified operation.<br/>
-<code>--title &lt;regexp&gt;</code> Regexp to match sample titles.<br/>
-<code>--dock</code> Run in Docker. Applicable only for component samples.
-</dd>
-</dl>
-
-#### Examples
-
-```shell
-$ toa replay
-$ toa replay ./path/to/component
-$ toa replay ./components/a ./components/b --dock
-$ toa replay ./components/*
-$ toa replay ./path/to/context
-$ toa replay --title "should add numbers"
-```
-
-If the path is a Context root (containing `context.toa.yaml` file), samples for components within
-the Context will be found and replayed sequentially.
-
 ### export manifest
 
 <dl>

package/src/handlers/docker/build.js

@@ -14,8 +14,9 @@ async function build (contextPath, componentPatterns) {
   await registry.build()
 
   const composition = context.compositions[0].name
+  const base = context.registry.base === undefined ? '' : context.registry.base + '/'
 
-  return `${context.registry.base === undefined ? '' : context.registry.base + '/'}${context.name}/composition-${composition}`
+  return `${base}${context.name}/composition-${composition}`
 }
 
 async function createContext (contextPath, componentPatterns) {
@@ -24,10 +25,13 @@ async function createContext (contextPath, componentPatterns) {
   const paths = componentPatterns.map((pattern) => find.components(pattern))
   const components = await loadComponents(paths)
   const rnd = newid().substring(0, 6)
-  const name = 'replay-' + rnd
+  const name = 'temp-' + rnd
 
   context.name += '-' + rnd
-  context.compositions = [{ name, components }]
+  context.compositions = [{
+    name,
+    components
+  }]
 
   return context
 }

package/src/commands/replay.js

@@ -1,66 +0,0 @@
-// noinspection JSCheckFunctionSignatures
-
-'use strict'
-
-const { replay } = require('../handlers/replay')
-
-/*
-!!! OPTIONS MUST BE SYNCHRONIZED WITH ../handlers/.replay/args !!!
- */
-
-const builder = (yargs) => {
-  yargs
-    .positional('paths', {
-      type: 'string',
-      desc: 'Paths to components or context',
-      default: '.'
-    })
-    .option('component', {
-      alias: 'c',
-      type: 'string',
-      group: 'Command options:',
-      describe: 'Replay samples for specified component'
-    })
-    .option('autonomous', {
-      alias: 'a',
-      type: 'boolean',
-      group: 'Command options:',
-      describe: 'Replay autonomous tests only'
-    })
-    .option('integration', {
-      alias: 'i',
-      type: 'boolean',
-      group: 'Command options:',
-      describe: 'Replay integration tests only'
-    })
-    .option('operation', {
-      alias: 'o',
-      type: 'string',
-      group: 'Command options:',
-      describe: 'Replay samples for specified operation'
-    })
-    .option('title', {
-      alias: 't',
-      type: 'string',
-      group: 'Command options:',
-      describe: 'Replay samples with titles matching given regexp'
-    })
-    .option('dock', {
-      alias: 'd',
-      type: 'boolean',
-      default: false,
-      group: 'Command options:',
-      describe: 'Replay inside Docker container'
-    })
-    .option('context', {
-      group: 'Command options:',
-      type: 'string',
-      desc: 'Path to the Context (used with --dock)',
-      default: '.'
-    })
-}
-
-exports.command = 'replay [paths...]'
-exports.desc = 'Replay samples'
-exports.builder = builder
-exports.handler = replay

package/src/handlers/replay.js

@@ -1,64 +0,0 @@
-'use strict'
-
-const { pick } = require('@toa.io/generic')
-const { context, components } = require('@toa.io/userland/samples')
-
-const find = require('../util/find')
-const docker = require('./docker')
-
-/**
- * @param {Record<string, string | string[] | boolean>} argv
- * @return {Promise<void>}
- */
-async function replay (argv) {
-  if (argv.dock) return dock(argv)
-
-  /** @type {boolean} */
-  let ok
-
-  const paths = find.components(argv.paths, true)
-
-  /** @type {toa.samples.suite.Options} */
-  const options = {
-    component: argv.component,
-    autonomous: argv.autonomous,
-    integration: argv.integration,
-    operation: argv.operation,
-    title: argv.title,
-    runner: { bail: true }
-  }
-
-  if (paths !== null) {
-    ok = await components(paths, options)
-  } else {
-    // no components found, checking context
-    const path = find.context(argv.paths[0], true)
-
-    if (path === null) throw new Error('Neither components nor context found in ' + argv.paths.join(','))
-
-    ok = await context(path, options)
-  }
-
-  const message = (ok ? GREEN + 'PASSED' : RED + 'FAILED') + RESET
-
-  // print after tap's output
-  process.on('beforeExit', () => console.log(message))
-}
-
-/**
- * @param {Record<string, string | string[] | boolean>} argv
- * @return {Promise<void>}
- */
-async function dock (argv) {
-  const repository = await docker.build(argv.context, argv.paths)
-  const args = pick(argv, ['component', 'operation', 'integration', 'title'])
-  const command = docker.command('toa replay *', args)
-
-  await docker.run(repository, command, argv.env)
-}
-
-const GREEN = '\x1b[32m'
-const RED = '\x1b[31m'
-const RESET = '\x1b[0m'
-
-exports.replay = replay