Implement building app distributables using pear build

cmd/build.js

@@ -0,0 +1,45 @@
+'use strict'
+const path = require('bare-path')
+const { outputter, print, InputError } = require('./iface')
+const parse = require('../lib/parse')
+
+const output = outputter('build', {
+  starting: ({ platform, arch, key, dir }) => `Starting build for pear://${key} on ${platform}-${arch} in ${dir}`,
+  dumping: ({ key, dir }) => `Dumping ${key} into ${dir}`,
+  initializing: () => 'Initializing...',
+  cmakeListsCreated: () => '  Generated CMakeLists.txt from package.json',
+  cmakeListsExists: () => '  Using existing CMakeLists.txt',
+  installingBareDev: () => 'Installing bare-dev to build directory...',
+  bareDevExistsInApp: () => '  bare-dev is already installed in build directory',
+  bareDevExistsInPath: () => '  bare-dev is already installed globally',
+  bareDevInstalled: () => '  bare-dev installed to build directory',
+  configuring: () => 'Configuring...',
+  building: () => 'Building...',
+  done: ({ key, dir }) => `Build complete for pear://${key} in ${dir}`,
+  error: ({ code, stack }) => `Build Error (code: ${code || 'none'}) ${stack}`,
+  stdout: (data) => `  ${data?.trimEnd()?.split('\n')?.join('\n  ')}`,
+  stderr: (data) => `  ${data?.trimEnd()?.split('\n')?.join('\n  ')}`
+})
+
+module.exports = (ipc) => async function build (args) {
+  try {
+    const { _: [passedKey, buildDirArg], json } = parse.args(args, { boolean: ['json'] })
+
+    const key = parse.runkey(passedKey)?.key?.z32
+    if (!key) throw new InputError(passedKey ? `Key "${passedKey}" is not valid` : 'Key must be specified')
+    if (!buildDirArg) throw new InputError('Build directory must be specified')
+
+    const dir = path.resolve(buildDirArg)
+
+    await output(json, ipc.build({ key, dir }))
+  } catch (err) {
+    if (err instanceof InputError) {
+      ipc.userData.usage.output('build')
+      print(err.message, false)
+    } else {
+      console.error(err)
+    }
+  } finally {
+    await ipc.close()
+  }
+}

cmd/iface.js

@@ -60,19 +60,20 @@ function indicator (value, type = 'success') {
 }
 
 const outputter = (cmd, taggers = {}) => async (json, stream, state = {}) => {
+  let error = null
   try {
     for await (const { tag, data = {} } of stream) {
       if (json) {
         print(JSON.stringify({ cmd, tag, data }))
         continue
       }
-      if (tag === 'error') {
-        const err = new Error(data.message)
-        err.sidecarCode = data.code
-        err.sidecarStack = data.stack
-        throw err
+      let result = null
+      try {
+        result = typeof taggers[tag] === 'function' ? taggers[tag](data, state) : (taggers[tag] || false)
+      } catch (err) {
+        error = err
+        break
       }
-      let result = typeof taggers[tag] === 'function' ? taggers[tag](data, state) : (taggers[tag] || false)
       if (result === undefined) continue
       if (typeof result === 'string') result = { output: 'print', message: result }
       if (result === false) {
@@ -87,6 +88,8 @@ const outputter = (cmd, taggers = {}) => async (json, stream, state = {}) => {
   } catch (err) {
     if (err.sidecarCode === 'ERR_BARE_CORE') print(err.message, -1)
     else if (err.code === 'E_MUX_REMOTE') throw (err.remote || err)
+  } finally {
+    if (error) throw error // eslint-disable-line no-unsafe-finally
   }
 }
 

cmd/index.js

@@ -5,8 +5,10 @@ const seed = require('./seed')
 const release = require('./release')
 const info = require('./info')
 const dump = require('./dump')
+const shift = require('./shift')
 const sidecar = require('./sidecar')
 const run = require('./run')
+const build = require('./build')
 const parse = require('../lib/parse')
 const { CHECKOUT } = require('../lib/constants')
 
@@ -70,7 +72,8 @@ module.exports = async (ipc) => {
   cmd.add('launch', launch) // launch is legacy alias for run
   cmd.add('info', info(ipc))
   cmd.add('dump', dump(ipc))
-  cmd.add('build', build)
+  cmd.add('build', build(ipc))
+  cmd.add('shift', shift(ipc))
   cmd.add('sidecar', (args) => sidecar(ipc)(args))
 
   await cmd.run(argv)
@@ -79,7 +82,5 @@ module.exports = async (ipc) => {
     return run(ipc)(args)
   }
 
-  function build () { throw new Error('Not Implemented: build') }
-
   return ipc
 }

cmd/info.js

@@ -1,6 +1,8 @@
 'use strict'
 const parse = require('../lib/parse')
 const { outputter, print } = require('./iface')
+const os = require('bare-os')
+const { isAbsolute, resolve } = require('bare-path')
 
 const keys = ({ content, discovery, project }) => `
  keys         hex
@@ -36,14 +38,28 @@ const output = outputter('info', {
 module.exports = (ipc) => async function info (args) {
   try {
     const flags = parse.args(args, {
-      boolean: ['json']
+      boolean: ['json', 'changelog', 'full-changelog', 'metadata', 'key']
     })
-    const { _, json } = flags
-    const [key] = _
-    const isKey = key ? parse.runkey(key).key !== null : false
+    const { _, json, changelog, 'full-changelog': full, metadata, key: showKey, keys } = flags
+    const [from] = _
+    let [, dir = ''] = _
+    const isKey = from ? parse.runkey(from).key !== null : false
+    const channel = isKey ? null : from
+    const key = isKey ? from : null
     if (key && isKey === false) throw new Error('Key "' + key + '" is not valid')
-    const id = Bare.pid
-    await output(json, ipc.info({ id, key }))
+
+    if (isAbsolute(dir) === false) dir = dir ? resolve(os.cwd(), dir) : os.cwd()
+
+    await output(json, ipc.info({
+      key,
+      channel,
+      dir,
+      showKey,
+      keys,
+      metadata,
+      changelog,
+      full
+    }))
   } catch (err) {
     ipc.userData.usage.output('info', false)
     print(err.message, false)

cmd/shift.js

@@ -0,0 +1,42 @@
+'use strict'
+const { outputter, print, InputError } = require('./iface')
+const parse = require('../lib/parse')
+
+const output = outputter('shift', {
+  moving: ({ src, dst, force }) => `Moving user application storage\n\nFrom: ${src}\nTo: ${dst}\n${force ? '\nForce flag used, overwriting existing application storage.' : ''}`,
+  complete: ({ from, to }) => `Moved\n\nFrom: ${from}\nTo: ${to}\n\nShift Complete`,
+  error: ({ code, stack, message }) => {
+    if (code === 'ERR_EXISTS' || code === 'ERR_NOENT') throw Object.assign(new Error(message), { code })
+    return `Shift Error (code: ${code || 'none'}) ${stack}`
+  }
+})
+
+module.exports = (ipc) => async function shift (args) {
+  try {
+    const { _, force, json } = parse.args(args, {
+      boolean: ['force', 'json']
+    })
+    const [src, dst] = _
+
+    if (!src || parse.runkey(src.toString()).key === null) {
+      throw new InputError('A source application key must be specified.')
+    }
+
+    if (!dst || parse.runkey(dst.toString()).key === null) {
+      throw new InputError('A destination application key must be specified.')
+    }
+
+    await output(json, ipc.shift({ src, dst, force }))
+  } catch (err) {
+    if (err instanceof InputError || err.code === 'ERR_INVALID_FLAG' || err.code === 'ERR_EXISTS' || err.code === 'ERR_NOENT') {
+      print(err.message, false)
+      ipc.userData.usage.output('shift')
+    } else {
+      print('An error occured', false)
+      console.error(err)
+    }
+    Bare.exit(1)
+  } finally {
+    await ipc.close()
+  }
+}

cmd/usage.js

@@ -69,17 +69,21 @@ module.exports = ({ fork, length, key }) => {
   `
 
   const info = ansi.bold(cmd + ' info')
-  const infoArgs = ansi.bold('[key]')
+  const infoArgs = ansi.bold('[channel|key]')
   const infoBrief = 'Read project information.'
   const infoExplain = `${info} ${infoArgs}
 
     ${infoBrief}
 
-    Supply a key to view application info
+    Supply a key or channel to view application information.
 
-    Without a key pear info shows Pear info
+    Supply no argument to view platform information.
 
-    --json          Newline delimited JSON output
+    --changelog       View changelog only
+    --full-changelog  Full record of changes
+    --metadata        View metadata only
+    --key             View key only
+    --json            Newline delimited JSON output
   `
 
   const dump = ansi.bold(cmd + ' dump')
@@ -140,6 +144,29 @@ module.exports = ({ fork, length, key }) => {
     --verbose|-v  Additional output
   `
 
+  const shift = ansi.bold(cmd + ' shift')
+  const shiftArgs = ansi.bold('<src-key> <dst-key> [--force]')
+  const shiftBrief = 'Advanced. Move storage between apps.'
+  const shiftExplain = `${shift} ${shiftArgs}
+
+    ${shiftBrief}
+
+    --force    Overwrite existing application storage if present
+    --json     Newline delimited JSON output
+  `
+
+  const build = ansi.bold(cmd + ' build')
+  const buildArgs = ansi.bold('<key> <dir>')
+  const buildBrief = 'Build project distributable.'
+  const buildExplain = `${build} ${buildArgs}
+
+    ${buildBrief}
+
+    Creates a distributable per host OS at given dir from application key.
+
+    --json     Newline delimited JSON output
+  `
+
   const sidecar = ansi.bold(cmd + ' sidecar')
   const sidecarBrief = 'Advanced. Run sidecar in terminal.'
   const sidecarExplain = `${sidecar}
@@ -203,6 +230,8 @@ module.exports = ({ fork, length, key }) => {
     dump: dumpExplain,
     run: runExplain,
     seed: seedExplain,
+    shift: shiftExplain,
+    build: buildExplain,
     sidecar: sidecarExplain,
     help: helpExplain,
     output,
@@ -216,6 +245,8 @@ module.exports = ({ fork, length, key }) => {
     ${release} ${ansi.sep} ${dedot(releaseBrief)}
     ${info} ${ansi.sep} ${dedot(infoBrief)}
     ${dump} ${ansi.sep} ${dedot(dumpBrief)}
+    ${build} ${ansi.sep} ${dedot(buildBrief)}
+    ${shift} ${ansi.sep} ${dedot(shiftBrief)}
     ${sidecar} ${ansi.sep} ${dedot(sidecarBrief)}
     ${versions} ${ansi.sep} ${dedot(versionsBrief)}
 
@@ -229,6 +260,8 @@ ${footer}`,
     ${releaseExplain}
     ${infoExplain}
     ${dumpExplain}
+    ${buildExplain}
+    ${shiftExplain}
     ${sidecarExplain}
     ${versionsExplain}
     ${helpExplain}