@jsreport/jsreport-cli 3.0.0-beta.2 → 3.1.1

package/lib/commands/init.js

@@ -1,77 +1,76 @@
-'use strict'
-
-const path = require('path')
-const fs = require('fs')
-const initializeApp = require('./_initializeApp')
-
-const description = 'Initializes the current working directory to start a jsreport application (server.js, *.config.json and package.json)'
-const command = 'init'
-
-exports.command = command
-exports.description = description
-
-exports.builder = (yargs) => {
-  const examples = getExamples(`jsreport ${command}`)
-
-  examples.forEach((examp) => {
-    yargs.example(examp[0], examp[1])
-  })
-
-  const commandOptions = {
-    target: {
-      alias: 't',
-      description: 'Target path in which the init is going to execute',
-      type: 'string'
-    }
-  }
-
-  const options = Object.keys(commandOptions)
-
-  return (
-    yargs
-      .usage(
-        [
-          `${description}\n`,
-          `Usage:\n\njsreport ${command} [versionToInstall]\n`,
-          'If no jsreport installation was found we will try to install the version of',
-          'jsreport specified in `versionToInstall` and if it is not specified we will try to install the latest version'
-        ].join('\n')
-      )
-      .positional('versionToInstall', {
-        type: 'string',
-        description: 'Specific jsreport version to install'
-      })
-      .group(options, 'Command options:')
-      .options(commandOptions)
-  )
-}
-
-exports.handler = (argv) => {
-  const logger = argv.context.logger
-  let cwd = argv.context.cwd
-  let versionToInstall
-
-  if (argv._ && argv._[1]) {
-    versionToInstall = argv._[1]
-  }
-
-  if (argv.target != null) {
-    cwd = path.resolve(cwd, argv.target)
-    fs.mkdirSync(cwd, { recursive: true })
-  }
-
-  return initializeApp(
-    cwd,
-    logger,
-    false,
-    versionToInstall,
-    typeof argv.context.customInstall === 'function' ? argv.context.customInstall : undefined
-  )
-}
-
-function getExamples (command) {
-  return [
-    [`${command}`, 'Initializes and install the latest jsreport'],
-    [`${command} 2.5.0`, 'Initializes and install jsreport version 2.5.0']
-  ]
-}
+const path = require('path')
+const fs = require('fs')
+const initializeApp = require('./_initializeApp')
+
+const description = 'Initializes the current working directory to start a jsreport application (server.js, *.config.json and package.json)'
+const command = 'init'
+const positionalArgs = '[versionToInstall]'
+
+exports.command = `${command} ${positionalArgs}`
+exports.description = description
+
+exports.builder = (yargs) => {
+  const examples = getExamples(`jsreport ${command}`)
+
+  examples.forEach((examp) => {
+    yargs.example(examp[0], examp[1])
+  })
+
+  const commandOptions = {
+    target: {
+      alias: 't',
+      description: 'Target path in which the init is going to execute',
+      type: 'string'
+    }
+  }
+
+  const options = Object.keys(commandOptions)
+
+  return (
+    yargs
+      .usage(
+        [
+          `${description}\n`,
+          `Usage:\n\njsreport ${command} [versionToInstall]\n`,
+          'If no jsreport installation was found we will try to install the version of',
+          'jsreport specified in `versionToInstall` and if it is not specified we will try to install the latest version'
+        ].join('\n')
+      )
+      .positional('versionToInstall', {
+        type: 'string',
+        description: 'Specific jsreport version to install'
+      })
+      .group(options, 'Command options:')
+      .options(commandOptions)
+  )
+}
+
+exports.handler = (argv) => {
+  const logger = argv.context.logger
+  let cwd = argv.context.cwd
+  let versionToInstall
+
+  if (argv && argv.versionToInstall != null) {
+    versionToInstall = argv.versionToInstall
+  }
+
+  if (argv.target != null) {
+    cwd = path.resolve(cwd, argv.target)
+    fs.mkdirSync(cwd, { recursive: true })
+  }
+
+  return initializeApp(
+    cwd,
+    logger,
+    false,
+    versionToInstall,
+    typeof argv.context.customInstall === 'function' ? argv.context.customInstall : undefined
+  )
+}
+
+function getExamples (command) {
+  return [
+    [`${command}`, 'Initializes and install the latest jsreport'],
+    [`${command} 2.5.0`, 'Initializes and install jsreport version 2.5.0']
+  ]
+}

package/lib/commands/kill.js

@@ -1,86 +1,85 @@
-'use strict'
-
-const description = 'Kill a daemon jsreport process'
-const command = 'kill'
-
-exports.command = command
-exports.description = description
-
-exports.builder = (yargs) => {
-  return (
-    yargs
-      .usage(
-        [
-          `${description}\n`,
-          `Usage:\n\njsreport ${command} [uidOrpid]\n`,
-          'If uid or pid is not specified we will try to kill a daemon process that was started from CWD'
-        ].join('\n')
-      )
-      .positional('uidOrpid', {
-        type: 'string',
-        description: 'Process id or uid of the instance to kill'
-      })
-  )
-}
-
-exports.handler = async (argv) => {
-  const context = argv.context
-  const logger = context.logger
-  const cwd = context.cwd
-  const workerSockPath = context.workerSockPath
-  const daemonHandler = context.daemonHandler
-
-  let identifier
-  let processInfo
-
-  if (argv._ && argv._[1]) {
-    identifier = argv._[1]
-  }
-
-  if (!identifier) {
-    logger.info('searching for daemon process in:', cwd)
-
-    logger.debug('looking for previously daemonized process in:', workerSockPath, 'cwd:', cwd)
-
-    processInfo = await daemonHandler.findProcessByCWD(workerSockPath, cwd)
-  } else {
-    logger.info('searching for daemon process with id:', identifier)
-
-    processInfo = await daemonHandler.findProcessByUidOrPid(workerSockPath, identifier)
-  }
-
-  if (!processInfo) {
-    let customError
-
-    if (!identifier) {
-      customError = new Error(`there is no active daemon process in: ${cwd}`)
-    } else {
-      customError = new Error(`there is no active daemon with id: ${identifier}`)
-    }
-
-    // makes the cli to print clean error (without stack trace)
-    customError.cleanState = true
-
-    throw customError
-  }
-
-  if (!identifier) {
-    logger.debug('daemon process found in:', workerSockPath, 'cwd:', cwd, 'pid:', processInfo.pid)
-  } else {
-    logger.debug('daemon process found in:', workerSockPath, 'id:', identifier, 'pid:', processInfo.pid)
-  }
-
-  logger.debug('killing daemon process.. uid:', processInfo.uid, 'pid:', processInfo.pid)
-
-  try {
-    await daemonHandler.kill(processInfo)
-
-    logger.info(`daemon process (pid: ${processInfo.pid}) killed successfully`)
-  } catch (e) {
-    const error = new Error('Error while trying to kill daemon process')
-    error.originalError = e
-    throw error
-  }
-
-  return processInfo
-}
+const description = 'Kill a daemon jsreport process'
+const command = 'kill'
+const positionalArgs = '[uidOrpid]'
+
+exports.command = `${command} ${positionalArgs}`
+exports.description = description
+
+exports.builder = (yargs) => {
+  return (
+    yargs
+      .usage(
+        [
+          `${description}\n`,
+          `Usage:\n\njsreport ${command} [uidOrpid]\n`,
+          'If uid or pid is not specified we will try to kill a daemon process that was started from CWD'
+        ].join('\n')
+      )
+      .positional('uidOrpid', {
+        type: 'string',
+        description: 'Process id or uid of the instance to kill'
+      })
+  )
+}
+
+exports.handler = async (argv) => {
+  const context = argv.context
+  const logger = context.logger
+  const cwd = context.cwd
+  const workerSockPath = context.workerSockPath
+  const daemonHandler = context.daemonHandler
+
+  let identifier
+  let processInfo
+
+  if (argv && argv.uidOrpid != null) {
+    identifier = argv.uidOrpid
+  }
+
+  if (!identifier) {
+    logger.info('searching for daemon process in:', cwd)
+
+    logger.debug('looking for previously daemonized process in:', workerSockPath, 'cwd:', cwd)
+
+    processInfo = await daemonHandler.findProcessByCWD(workerSockPath, cwd)
+  } else {
+    logger.info('searching for daemon process with id:', identifier)
+
+    processInfo = await daemonHandler.findProcessByUidOrPid(workerSockPath, identifier)
+  }
+
+  if (!processInfo) {
+    let customError
+
+    if (!identifier) {
+      customError = new Error(`there is no active daemon process in: ${cwd}`)
+    } else {
+      customError = new Error(`there is no active daemon with id: ${identifier}`)
+    }
+
+    // makes the cli to print clean error (without stack trace)
+    customError.cleanState = true
+
+    throw customError
+  }
+
+  if (!identifier) {
+    logger.debug('daemon process found in:', workerSockPath, 'cwd:', cwd, 'pid:', processInfo.pid)
+  } else {
+    logger.debug('daemon process found in:', workerSockPath, 'id:', identifier, 'pid:', processInfo.pid)
+  }
+
+  logger.debug('killing daemon process.. uid:', processInfo.uid, 'pid:', processInfo.pid)
+
+  try {
+    await daemonHandler.kill(processInfo)
+
+    logger.info(`daemon process (pid: ${processInfo.pid}) killed successfully`)
+  } catch (e) {
+    const error = new Error('Error while trying to kill daemon process')
+    error.originalError = e
+    throw error
+  }
+
+  return processInfo
+}