Merge pull request #133 from 10gen/INT-420_auth_dialog_REMIX

INT-420 auth dialog remix

Author: kangas

docs/tutorials/npm-link.md

@@ -0,0 +1,82 @@
+# How to `npm link`
+
+Say `~/scout-ci` is your work projects folder.
+First, grab the money module as the first step in
+any debugging adventure is adding a `console.log`
+somewhere just to know you're env is setup.
+
+```bash
+mkdir -p ~/scout-ci;
+cd ~/scout-ci;
+git clone [email protected]:mongodb-js/mongodb-connection-model.git;
+cd mongodb-connection-model;
+npm link;
+cd ../;
+git clone [email protected]:10gen/scout-server.git;
+cd scout-server;
+git checkout -t origin/auth;
+npm link;
+npm link mongodb-connection-model;
+cd ../;
+git clone [email protected]:10gen/scout-client.git;
+cd scout-client;
+git checkout -t origin/auth;
+npm link;
+npm link scout-server;
+npm link mongodb-connection-model;
+npm install [email protected];
+./node_modules/.bin/zuul --electron -- test/*.test.js;
+```
+
+Yay.  Not so bad.  Yes, that did take a bit of time BUT
+next week we be removing aNd updating a tonnnnn of dependencies.
+Deep breaths :)
+
+Soooooo now let's run some tests!  Please open a new doc
+in google drive because I need to give you a list of
+all the places where your print out will need to be correcte...
+
+Nah! Just run:
+
+```bash
+npm start;
+```
+
+So yeah you know... one command?! big whoop! What could that possibly do?
+
+- Starts a mongodb deployment using the same tooling the nodejs
+ driver does (ht @Judah)
+- Starts up `scout-server` if one not already running
+- [zuul](http://npm.im/zuul) watches your changes to this dir and
+ your tests, deps, src and rebuilds your src maps, code coverage,
+ starts up Chrome and loads your test harness... But, yeah, that
+  was a ton of deps... :)
+
+> @todo (imlucas): How to use Chrome Devtools to Debug Failing or Flakey
+> Tests like Dan Pasette [sneak peak](https://cldup.com/745nt7Jca_-1200x1200.png)
+
+What's that you say?  You think their might be something in server
+you want to be able to change and have it reloaded automatically?
+And when you're connecting to a cluster?
+And... on the latest unstable release of the kernel?
+
+Press `ctrl+c`.
+
+```bash
+cd ../scout-server;
+DEBUG=* MONGODB_VERSION=unstable MONGODB_TOPOLOGY=cluster npm start;
+```
+
+Open another terminal window and start up the client tests... oh?  
+But in electron? Using the same artifacts we use to build the app  
+on our end?  Well.... gee I dunno... Might take a littl.... BOOM!
+
+```bash
+cd ~/scout-ci;
+cd ~/scout-client;
+npm install [email protected];
+./node_modules/.bin/zuul --electron -- test/*.test.js;
+```
+
+> @todo (imlucas): How to use localtunnel to test real-world
+> latency between NYC and Sydney w/o filing a JIRA.

gulpfile.js

@@ -24,13 +24,15 @@ var shell = require('gulp-shell');
 var del = require('del');
 var sequence = require('run-sequence');
 var watch = require('gulp-watch');
-// var livereload = require('gulp-livereload');
 var notify = require('./tasks/notify');
 var pkg = require('./package.json');
 
 // Platform specific tasks
 var platform = require(path.join(__dirname, 'tasks', process.platform));
 
+// Where we'll put everything so it runs in Electron.
+// var DEST = path.join(platform.RESOURCES, 'app');
+
 /**
  * # release
  *

package.json

@@ -65,9 +65,12 @@
     "url": "git://github.com/10gen/scout.git"
   },
   "dependencies": {
+    "ampersand-form-view": "^5.1.1",
+    "ampersand-input-view": "^5.0.0",
     "debug": "^2.2.0",
-    "scout-server": "http://bin.mongodb.org/js/scout-server/v0.1.0/scout-server-0.1.0.tar.gz",
-    "electron-squirrel-startup": "^0.1.2"
+    "electron-squirrel-startup": "^0.1.2",
+    "mongodb-connection-model": "0.0.2",
+    "scout-server": "http://bin.mongodb.org/js/scout-server/v0.2.1/scout-server-0.2.1.tar.gz"
   },
   "devDependencies": {
     "ampersand-app": "^1.0.4",
@@ -128,8 +131,9 @@
     "run-sequence": "^1.1.2",
     "run-series": "^1.1.2",
     "scout-brain": "http://bin.mongodb.org/js/scout-brain/v0.0.2/scout-brain-0.0.2.tar.gz",
-    "scout-client": "http://bin.mongodb.org/js/scout-client/v0.0.5/scout-client-0.0.5.tar.gz",
+    "scout-client": "http://bin.mongodb.org/js/scout-client/v0.1.2/scout-client-0.1.2.tar.gz",
     "stream-combiner2": "^1.0.2",
+    "uuid": "^2.0.1",
     "vinyl-buffer": "^1.0.0",
     "vinyl-source-stream": "^1.1.0",
     "watchify": "^3.2.3"

scripts/ci.sh

@@ -0,0 +1,57 @@
+#!/usr/bin/env bash
+
+# What version of the kernel to download
+# and use when running tests.
+# @see http://npm.im/mongodb-version-manager
+export MONGODB_VERSION='unstable';
+
+# Topology of the kernel to test against.
+#
+#   standalone|replicaset|cluster
+#
+# @see http://npm.im/mongodb-runner
+export MONGODB_TOPOLOGY='replicaset';
+
+rm -rf ~/scout-ci;
+mkdir -p ~/scout-ci;
+cd ~/scout-ci;
+
+# First test the connection-model which is the basis.
+# it provides a gaurantee to everything else that
+# it will talk to the driver correctly.
+# If we're talking to the driver correctly,
+# the driver has already been heavily tested
+# for all auth scenarios.
+git clone [email protected]:mongodb-js/mongodb-connection-model.git;
+cd mongodb-connection-model;
+npm link && npm test;
+cd ../;
+
+# Is scout-server using connection-model correctly?
+git clone [email protected]:10gen/scout-server.git;
+cd scout-server;
+git checkout -t origin/auth;
+npm install;
+npm link mongodb-connection-model;
+npm test;
+npm link;
+cd ../;
+
+# Is the client using the connection-model
+# correctly when talking to the server?
+git clone [email protected]:10gen/scout-client.git;
+cd scout-client;
+git checkout -t origin/auth;
+npm link;
+npm link scout-server;
+npm link mongodb-connection-model;
+npm test;
+
+# @todo (imlucas): Is the connection dialog in Compass
+# and the app in general using scout-client correctly?
+# 1. Pulls the branch for compass
+# 2. build it
+# 3. npm link's the deps above
+# 4. fires up `chromedriver`
+# 5. fill in connect dialog with creds for each test deployment on Cloud Manager
+# 6. do we get a list of namespaces after connecting

scripts/repl.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+cd ./dist/MongoDB\ Compass-darwin-x64/MongoDB\ Compass.app/Contents/Resources/app;
+npm install --log-level error;
+
+DEBUG='*' \
+  ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 \
+  ../../MacOS/Electron \
+  -e "require('repl').start({terminal: true, prompt: 'compass> '});";

scripts/server.sh

@@ -0,0 +1,3 @@
+DEBUG=* \
+ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 \
+./dist/MongoDB\ Compass-darwin-x64/MongoDB\ Compass.app/Contents/MacOS/Electron ./dist/MongoDB\ Compass-darwin-x64/MongoDB\ Compass.app/Contents/Resources/app/node_modules/scout-server/bin/scout-server-worker.js

src/app.js

@@ -1,6 +1,9 @@
 var pkg = require('../package.json');
 var app = require('ampersand-app');
 app.extend({
+  // @todo (imlucas) Move to config
+  // `scout-server` to point at.
+  endpoint: 'http://localhost:29017',
   meta: {
     'App Version': pkg.version
   }
@@ -145,9 +148,9 @@ var Application = View.extend({
 });
 
 var params = qs.parse(window.location.search.replace('?', ''));
-var uri = params.uri || 'mongodb://localhost:27017';
+var connection_id = params.connection_id;
 var state = new Application({
-  uri: uri
+  connection_id: connection_id
 });
 
 var QueryOptions = require('./models/query-options');
@@ -156,23 +159,41 @@ var MongoDBInstance = require('./models/mongodb-instance');
 var Router = require('./router');
 var Statusbar = require('./statusbar');
 
+function start() {
+  state.router = new Router();
+  domReady(state._onDOMReady.bind(state));
+}
+
 app.extend({
   client: null,
   init: function() {
-    state.statusbar = new Statusbar();
-    this.connection = new Connection();
-    this.connection.use(uri);
-    this.queryOptions = new QueryOptions();
-    this.volatileQueryOptions = new QueryOptions();
-    this.instance = new MongoDBInstance();
-
     // feature flags
     this.features = {
       querybuilder: true
     };
+    state.statusbar = new Statusbar();
 
-    state.router = new Router();
-
+    if (connection_id) {
+      state.connection = new Connection({
+        _id: connection_id
+      });
+
+
+      debug('looking up connection `%s`...', connection_id);
+      state.connection.fetch({
+        success: function() {
+          debug('got connection `%j`...', state.connection.serialize());
+          app.client = getOrCreateClient(app.endpoint, state.connection.serialize());
+
+          state.queryOptions = new QueryOptions();
+          state.volatileQueryOptions = new QueryOptions();
+          state.instance = new MongoDBInstance();
+          start();
+        }
+      });
+    } else {
+      start();
+    }
     // set up ipc
     ipc.on('message', state.onMessageReceived.bind(this));
   },
@@ -185,20 +206,37 @@ Object.defineProperty(app, 'statusbar', {
   }
 });
 
-Object.defineProperty(app, 'client', {
+Object.defineProperty(app, 'instance', {
   get: function() {
-    return getOrCreateClient({
-      seed: app.connection.uri
-    });
+    return state.instance;
   }
 });
-app.init();
 
-function render_app() {
-  state._onDOMReady();
-}
+Object.defineProperty(app, 'queryOptions', {
+  get: function() {
+    return state.queryOptions;
+  }
+});
 
-domReady(render_app);
+Object.defineProperty(app, 'volatileQueryOptions', {
+  get: function() {
+    return state.volatileQueryOptions;
+  }
+});
+
+Object.defineProperty(app, 'connection', {
+  get: function() {
+    return state.connection;
+  }
+});
+
+Object.defineProperty(app, 'router', {
+  get: function() {
+    return state.router;
+  }
+});
+
+app.init();
 
 // expose app globally for debugging purposes
 window.app = app;