Added --skip-install option to import cmds. Fixes #226 (#227)

* Added --skip-install option to import cmds. Closes #226

* WIP #226 fixed typo

Author: brollb

bin/webgme-import-addon

@@ -13,6 +13,7 @@ var manager = new AddonManager();
 program.arguments('<name> <project>')
     .option('-d,--dev', 'Import component for dev use only')
     .option('-n,--package-name [pkg-name]', 'Set installed package name (in package.json)')
+    .option('-s,--skip-install', 'Import addon from existing dependency')
     .action(function(name, project) {
         program.name = name;
         program.project = project;

bin/webgme-import-decorator

@@ -13,6 +13,7 @@ var manager = new DecoratorManager();
 program.arguments('<name> <project>')
     .option('-d,--dev', 'Import component for dev use only')
     .option('-p,--package-name [pkg-name]', 'Set installed package name (in package.json)')
+    .option('-s,--skip-install', 'Import decorator from existing dependency')
     .action(function(name, project) {
         program.name = name;
         program.project = project;

bin/webgme-import-layout

@@ -13,6 +13,7 @@ var manager = new LayoutManager();
 program.arguments('<name> <project>')
     .option('-d,--dev', 'Import component for dev use only')
     .option('-p,--package-name [pkg-name]', 'Set installed package name (in package.json)')
+    .option('-s,--skip-install', 'Import layout from existing dependency')
     .action(function(name, project) {
         program.name = name;
         program.project = project;

bin/webgme-import-plugin

@@ -13,6 +13,7 @@ var manager = new PluginManager();
 program.arguments('<name> <project>')
     .option('-d,--dev', 'Import component for dev use only')
     .option('-p,--package-name [pkg-name]', 'Set installed package name (in package.json)')
+    .option('-s,--skip-install', 'Import plugin from existing dependency')
     .action(function(name, project) {
         program.name = name;
         program.project = project;

bin/webgme-import-router

@@ -13,6 +13,7 @@ var manager = new RouterManager();
 program.arguments('<name> <project>')
     .option('-d,--dev', 'Import component for dev use only')
     .option('-p,--package-name [pkg-name]', 'Set installed package name (in package.json)')
+    .option('-s,--skip-install', 'Import router from existing dependency')
     .action(function(name, project) {
         program.name = name;
         program.project = project;

bin/webgme-import-seed

@@ -11,6 +11,7 @@ var manager = new SeedManager();
 program.arguments('<name> <project>')
     .option('-d,--dev', 'Import component for dev use only')
     .option('-p,--package-name [pkg-name]', 'Set installed package name (in package.json)')
+    .option('-s,--skip-install', 'Import seed from existing dependency')
     .action(function(name, project) {
         program.name = name;
         program.project = project;

bin/webgme-import-viz

@@ -13,6 +13,7 @@ var manager = new VisualizerManager();
 program.arguments('<name> <project>')
     .option('-d,--dev', 'Import component for dev use only')
     .option('-p,--package-name [pkg-name]', 'Set installed package name (in package.json)')
+    .option('-s,--skip-install', 'Import visualizer from existing dependency')
     .action(function(name, project) {
         program.name = name;
         program.project = project;

src/ComponentManager.js

@@ -123,8 +123,7 @@ ComponentManager.prototype.rm = function(args, callback) {
 };
 
 ComponentManager.prototype.import = function(args, callback) {
-    var self = this,
-        project,
+    var project,
         componentName,
         pkgPath,
         pkgContent,
@@ -134,54 +133,70 @@ ComponentManager.prototype.import = function(args, callback) {
         job;
 
     if (!(args.name && args.project)) {
-        return this._logger.error(`Usage: webgme import ${this._name} [${this._name}] [project]`);
+        let err = new Error('missing required "name" or "project"');
+        this._logger.error(err.message);
+        return callback(err);
     }
     componentName = args.name;
     project = args.project;
-    cmd = args.dev ?
-        `npm install ${project} --save-dev`:
-        `npm install ${project} --save`;
 
     // Add the project to the package.json
     var pkgProject = args.packageName || utils.getPackageName(project);
     this._logger.info(`Adding ${componentName} from ${pkgProject}`);
 
     // Add the component to the webgme config component paths
     // FIXME: Call this without --save then later save it
-    job = spawn(cmd, {cwd: projectRoot});
+    if (args.skipInstall) {
+        this._addComponentFromProject(componentName, pkgProject, callback);
+    } else {
+        this._installProject(project, args.dev, (err, result) => {
+            this._addComponentFromProject(componentName, pkgProject, callback);
+        });
+    }
+};
+
+ComponentManager.prototype._addComponentFromProject = function(name, project, callback) {
+    let info = {
+        name: name,
+        pkg: project
+    };
+
+    return this._getJsonForConfig(info, (err, configObject) => {
+        if (err) {
+            this._logger.error(err);
+            return callback(err);
+        }
+
+        var config = utils.getConfig();
+        config.dependencies[this._group][name] = configObject;
+        utils.saveConfig(config);
+
+        // Update the webgme config file from
+        // the cli's config
+        utils.updateWebGMEConfig();
+        configObject.id = name;
+        return callback(null, configObject);
+    });
+};
+
+ComponentManager.prototype._installProject = function(projectName, isDev, callback) {
+    let projectRoot = utils.getRootPath();
+    let cmd = isDev ?
+        `npm install ${projectName} --save-dev`:
+        `npm install ${projectName} --save`;
+    let job = spawn(cmd, {cwd: projectRoot});
 
     this._logger.info(cmd);
     this._logger.writeStream(job.stdout);
     this._logger.errorStream(job.stderr);
 
-    job.on('close', function(code) {
-        var err,
-            info = {
-                name: componentName,
-                pkg: pkgProject
-            };
-        self._logger.info('npm exited with: '+code);
+    job.on('close', code => {
+        this._logger.info(`npm exited with: ${code}`);
         if (code === 0) {  // Success!
-            self._getJsonForConfig(info, function(err, configObject) {
-                if (err) {
-                    self._logger.error(err);
-                    return callback(err);
-                }
-
-                var config = utils.getConfig();
-                config.dependencies[self._group][componentName] = configObject;
-                utils.saveConfig(config);
-
-                // Update the webgme config file from 
-                // the cli's config
-                utils.updateWebGMEConfig();
-                configObject.id = componentName;
-                return callback(null, configObject);
-            });
-
+            return callback(null);
         } else {
-            err = 'Could not find project (' + project + ') !';
-            self._logger.error(err);
+            let err = `Could not find project (${projectName})!`;
+            this._logger.error(err);
             return callback(err);
         }
     });