datagrok-tools 4.12.27 → 4.13.0

package/bin/commands/test.js

@@ -24,7 +24,7 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
 
 function test(args) {
   var options = Object.keys(args).slice(1);
-  var commandOptions = ['host', 'csv', 'gui', 'catchUnhandled', 'platform', 'core', 'report', 'skip-build', 'skip-publish', 'path', 'record', 'verbose', 'benchmark'];
+  var commandOptions = ['host', 'package', 'csv', 'gui', 'catchUnhandled', 'platform', 'core', 'report', 'skip-build', 'skip-publish', 'path', 'record', 'verbose', 'benchmark'];
   var nArgs = args['_'].length;
   var curDir = process.cwd();
   var grokDir = _path["default"].join(_os["default"].homedir(), '.grok');
@@ -32,10 +32,6 @@ function test(args) {
   if (nArgs > 1 || options.length > commandOptions.length || options.length > 0 && !options.every(function (op) {
     return commandOptions.includes(op);
   })) return false;
-  if (!utils.isPackageDir(curDir)) {
-    color.error('File `package.json` not found. Run the command from the package directory');
-    return false;
-  }
   if (!_fs["default"].existsSync(confPath)) {
     color.error("File `".concat(confPath, "` not found. Run `grok config` to set up the config file"));
     return false;
@@ -55,16 +51,25 @@ function test(args) {
     process.env.HOST = config["default"];
     console.log('Environment variable `HOST` is set to', config["default"]);
   }
-  var packageData = JSON.parse(_fs["default"].readFileSync(_path["default"].join(curDir, 'package.json'), {
-    encoding: 'utf-8'
-  }));
-  if (packageData.name) {
-    process.env.TARGET_PACKAGE = utils.kebabToCamelCase(utils.removeScope(packageData.name));
-    console.log('Environment variable `TARGET_PACKAGE` is set to', process.env.TARGET_PACKAGE);
+  if (args["package"]) {
+    process.env.TARGET_PACKAGE = utils.kebabToCamelCase(args["package"]);
   } else {
-    color.error('Invalid package name. Set the `name` field in `package.json`');
-    return false;
+    if (!utils.isPackageDir(curDir)) {
+      color.error('File `package.json` not found. Run the command from the package directory or specify plugin using \'--package\' option');
+      return false;
+    } else {
+      var packageData = JSON.parse(_fs["default"].readFileSync(_path["default"].join(curDir, 'package.json'), {
+        encoding: 'utf-8'
+      }));
+      if (packageData.name) {
+        process.env.TARGET_PACKAGE = utils.kebabToCamelCase(packageData.name);
+      } else {
+        color.error('Invalid package name. Set the `name` field in `package.json`');
+        return false;
+      }
+    }
   }
+  console.log('Environment variable `TARGET_PACKAGE` is set to', process.env.TARGET_PACKAGE);
   if (args.platform && process.env.TARGET_PACKAGE !== 'ApiTests') {
     color.error('--platform flag can only be used in the ApiTests package');
     return false;
@@ -73,11 +78,17 @@ function test(args) {
     color.error('--core flag can only be used in the DevTools package');
     return false;
   }
-  if (args['skip-build']) {
-    if (args['skip-publish']) test();else publish(test);
-  } else build(args['skip-publish'] ? test : function () {
-    return publish(test);
-  });
+  if (args['skip-publish'] || args["package"]) {
+    test();
+  } else {
+    if (args['skip-build']) {
+      publish(test);
+    } else {
+      build(function () {
+        return publish(test);
+      });
+    }
+  }
   function build(callback) {
     (0, _child_process.exec)('npm run build', function (err, stdout, stderr) {
       color.info("Building package...");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "datagrok-tools",
-  "version": "4.12.27",
+  "version": "4.13.0",
   "description": "Utility to upload and publish packages to Datagrok",
   "homepage": "https://github.com/datagrok-ai/public/tree/master/tools#readme",
   "dependencies": {