@toa.io/cli 0.1.1-dev.3 → 0.2.0-alpha.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/cli",
-  "version": "0.1.1-dev.3",
+  "version": "0.2.0-alpha.4+5884c85",
   "description": "Toa CLI",
   "author": "temich <tema.gurtovoy@gmail.com>",
   "homepage": "https://github.com/toa-io/toa#readme",
@@ -11,10 +11,7 @@
   "bugs": {
     "url": "https://github.com/toa-io/toa/issues"
   },
-  "main": "package.json",
-  "bin": {
-    "toa": "bin/toa"
-  },
+  "main": "src/program.js",
   "publishConfig": {
     "access": "public"
   },
@@ -25,5 +22,5 @@
     "find-up": "5.0.0",
     "yargs": "17.2.1"
   },
-  "gitHead": "8f1e4d0fd8defeb7cb59ae0e8cc291c6e7623abc"
+  "gitHead": "5884c8590499e85e701c41e54b9d20a47e8a4ec5"
 }

package/src/commands/deploy/export.js

@@ -9,10 +9,14 @@ const builder = (yargs) => {
       desc: 'Path to context',
       default: '.'
     })
-    .usage('Usage: toa deploy export /path/to/context')
+    .positional('target', {
+      type: 'string',
+      desc: 'Export target path'
+    })
+    .usage('Usage: toa deploy export /path/to/context /export/path')
 }
 
-exports.command = 'export [path]'
-exports.desc = 'Export context deployment'
+exports.command = 'export [path] [target]'
+exports.desc = 'Export context deployment chart'
 exports.builder = builder
 exports.handler = dump

package/src/commands/deploy.js

@@ -9,6 +9,14 @@ const builder = (yargs) => {
       desc: 'Path to context',
       default: '.'
     })
+    .option('dry', {
+      boolean: true,
+      desc: 'Dry run'
+    })
+    .option('no-wait', {
+      boolean: true,
+      desc: 'Disable waiting for deployment ready state'
+    })
     .usage('Usage: toa deploy /path/to/context')
     .commandDir('./deploy')
 }

package/src/handlers/compose.js

@@ -5,7 +5,10 @@ const boot = require('@toa.io/boot')
 const { manifest: find } = require('../util/find')
 
 async function compose (argv) {
-  const paths = [...new Set(argv.paths.map(find))]
+  const paths = find(argv.paths)
+
+  if (paths === undefined) throw new Error(`No components found in ${argv.paths}`)
+
   const composition = await boot.composition(paths, argv)
 
   await composition.connect()

package/src/handlers/deploy/export.js

@@ -8,7 +8,7 @@ const { context: find } = require('../../util/find')
 const dump = async (argv) => {
   const context = find(argv.path)
   const deployment = await boot.deployment(context)
-  const path = await deployment.export()
+  const path = await deployment.export(argv.target)
 
   console.log(path)
 }

package/src/handlers/deploy.js

@@ -5,10 +5,15 @@ const boot = require('@toa.io/boot')
 const { context: find } = require('../util/find')
 
 const deploy = async (argv) => {
-  const context = find(argv.path)
-  const deployment = await boot.deployment(context)
+  const path = find(argv.path)
+  const deployment = await boot.deployment(path)
 
-  await deployment.install()
+  const options = {
+    wait: argv['no-wait'] !== true,
+    dry: argv.dry === true
+  }
+
+  await deployment.install(options)
 }
 
 exports.deploy = deploy

package/src/program.js

@@ -6,19 +6,18 @@ const { console } = require('@toa.io/gears')
 const { version } = require('../package.json')
 
 yargs(process.argv.slice(2))
+  .parserConfiguration({
+    'boolean-negation': false
+  })
   .middleware((argv) => {
-    if (argv.log === undefined) {
-      if (process.env.TOA_ENV === 'dev') argv.log = 'info'
-      else argv.log = 'warn'
-    }
+    if (argv.log === undefined) argv.log = 'info'
 
     console.level(argv.log)
   })
   .fail((msg, err) => {
     const actual = err || new Error(msg)
 
-    if (process.env.TOA_ENV === 'dev') console.log(actual)
-    else console.error(actual.message)
+    console.error(process.env.TOA_ENV === 'local' ? actual : actual.message)
 
     process.exit(actual.exitCode > 0 ? actual.exitCode : 1)
   })

package/src/util/find.js

@@ -4,11 +4,17 @@ const { dirname, resolve } = require('node:path')
 const findUp = require('find-up')
 
 const find = (from = '.', filename) => {
-  const path = findUp.sync(filename, { cwd: resolve(process.cwd(), from) })
+  if (from instanceof Array) {
+    const found = new Set(from.map((path) => find(path, filename)))
+
+    found.delete(undefined)
 
-  if (path === undefined) throw new Error(`File ${filename} not found in ${from}`)
+    return found.size > 0 ? [...found] : undefined
+  }
+
+  const path = findUp.sync(filename, { cwd: resolve(process.cwd(), from) })
 
-  return dirname(path)
+  return path === undefined ? undefined : dirname(path)
 }
 
 const manifest = (from = '.') => find(from, MANIFEST)

package/bin/toa

@@ -1,4 +0,0 @@
-#!/usr/bin/env node
-'use strict'
-
-require('../src/program')