Merge pull request #4 from OpenframeProject/install-plugin

Install plugin

Author: jmwohl

src/controller.js

@@ -218,10 +218,12 @@ fc.connect = function(userId) {
             resolve();
         }
 
+        // XXX - POTENTIAL BUG - catch plugin init error separately, otherwise a new frame is created.
         frame
             .fetch()
             .then(function() {
                 debug('ready to init...');
+                // initPlugins now always resolves, is never rejected
                 return pm.initPlugins(frame.state.plugins, fc.pluginApi);
             })
             .then(readyToConnect)
@@ -380,7 +382,13 @@ fc.pluginApi = {
         return fc.pubsub;
     },
     // access to the Swagger rest client
-    rest: rest.client
+    getRest: function() {
+        return rest.client;
+    },
+    // access to the frame model reference
+    getFrame: function() {
+        return frame;
+    }
 };
 
 /**

src/plugin-manager.js

@@ -82,14 +82,18 @@ pm.initPlugins = function(plugins, ofPluginApi) {
     var promises = [],
         key;
 
-    // add each plugin to package.json
-    for (key in plugins) {
-        if (plugins.hasOwnProperty(key)) {
-            promises.push(_initPlugin(key, ofPluginApi));
+    return new Promise((resolve, reject) => {
+        // add each plugin to package.json
+        for (key in plugins) {
+            if (plugins.hasOwnProperty(key)) {
+                promises.push(_initPlugin(key, ofPluginApi));
+            }
         }
-    }
 
-    return Promise.all(promises);
+        Promise.all(promises)
+            .then(resolve)
+            .catch(resolve);
+    });
 };
 
 /**
@@ -108,7 +112,7 @@ pm.initPlugins = function(plugins, ofPluginApi) {
  */
 function _installPlugin(package_name, version, force) {
     debug('installPlugin', package_name, version);
-    var cmd = 'npm install -g ' + package_name;
+    var cmd = 'npm install ' + package_name;
     if (version) {
         cmd += '@'+version;
     }