@jsreport/jsreport-cli 3.2.0 → 3.2.2

package/README.md

@@ -7,6 +7,10 @@ See http://jsreport.net/learn/cli for documentation
 
 ## Changelog
 
+### 3.2.2
+
+- add support for tempDirectory and service name to win-install command
+
 ### 3.2.0
 
 - change the configure command questions to fit better with new `trustUserCode` option

package/lib/commands/configure.js

@@ -143,10 +143,7 @@ exports.handler = async (argv) => {
         type: 'confirm',
         name: 'createExamples',
         message: 'Would you like that we create some default examples for you?',
-        default: true,
-        when: (answers) => {
-          return answers.store === 'fs' || answers.store.indexOf('fs') === 0
-        }
+        default: true
       }
     ]
 

package/lib/commands/win-install.js

@@ -9,6 +9,17 @@ const command = 'win-install'
 exports.command = command
 exports.description = description
 
+exports.builder = (yargs) => {
+  return (
+    yargs
+      .usage('install jsreport as a windows service\njsreport win-install\njsreport win-install --name my-service --tempDirectory=mytemp')
+      .option('name', {
+        description: 'ServiceName',
+        type: 'string'
+      })
+  )
+}
+
 exports.handler = (argv) => {
   return new Promise((resolve, reject) => {
     const verbose = argv.verbose
@@ -50,13 +61,14 @@ exports.handler = (argv) => {
 
       pathToApp = appInfo.path
 
-      if (!appInfo.name) {
-        customError = new Error('To install app as windows service you need to pass "name" in appInfo')
+      serviceName = argv.name || appInfo.name
+      if (!serviceName) {
+        customError = new Error('To install app as windows service you need to pass "name" args or in appInfo')
         customError.cleanState = true
         return reject(customError)
       }
 
-      serviceName = appInfo.name
+      appInfo.name = serviceName
 
       if (appInfo.startcmd) {
         hasEntry = true
@@ -103,9 +115,15 @@ exports.handler = (argv) => {
       winser = Winser({ silent: !verbose, nssmPath: staticPaths.nssm })
     }
 
+    let tempDirectory = process.env.tempDirectory || argv.tempDirectory
+    if (tempDirectory) {
+      tempDirectory = path.isAbsolute(tempDirectory) ? tempDirectory : path.join(pathToApp, tempDirectory)
+    }
+
     winser.install({
       path: pathToApp,
-      autostart: true
+      autostart: true,
+      env: tempDirectory ? [`tempDirectory=${tempDirectory}`] : null
     }, (err) => {
       if (err) {
         const error = new Error('Error while trying to install windows service')

package/lib/commands/win-uninstall.js

@@ -9,6 +9,17 @@ const command = 'win-uninstall'
 exports.command = command
 exports.description = description
 
+exports.builder = (yargs) => {
+  return (
+    yargs
+      .usage('uninstall jsreport windows service\njsreport win-uninstall\njsreport win-uninstall --name my-service')
+      .option('name', {
+        description: 'ServiceName',
+        type: 'string'
+      })
+  )
+}
+
 exports.handler = (argv) => {
   return new Promise((resolve, reject) => {
     const verbose = argv.verbose
@@ -48,13 +59,14 @@ exports.handler = (argv) => {
 
       pathToApp = appInfo.path
 
-      if (!appInfo.name) {
-        customError = new Error('To uninstall windows service for app you need to pass "name" in appInfo')
+      serviceName = argv.name || appInfo.name
+      if (!serviceName) {
+        customError = new Error('To uninstall windows service for app you need to pass "name" in args or in appInfo')
         customError.cleanState = true
         return reject(customError)
       }
 
-      serviceName = appInfo.name
+      appInfo.name = serviceName
     } else {
       pathToApp = cwd
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsreport/jsreport-cli",
-  "version": "3.2.0",
+  "version": "3.2.2",
   "description": "Command line interface for jsreport",
   "keywords": [
     "jsreport",
@@ -70,11 +70,11 @@
     "yargs": "17.3.1"
   },
   "devDependencies": {
-    "@jsreport/jsreport-authentication": "3.3.1",
-    "@jsreport/jsreport-core": "3.6.0",
-    "@jsreport/jsreport-express": "3.4.1",
-    "@jsreport/jsreport-fs-store": "3.2.1",
-    "@jsreport/jsreport-handlebars": "3.1.0",
+    "@jsreport/jsreport-authentication": "3.3.2",
+    "@jsreport/jsreport-core": "3.8.0",
+    "@jsreport/jsreport-express": "3.4.2",
+    "@jsreport/jsreport-fs-store": "3.2.3",
+    "@jsreport/jsreport-handlebars": "3.2.1",
     "cross-env": "5.2.1",
     "execa": "1.0.0",
     "handlebars": "4.7.7",