Merge pull request #177 from 10gen/update-deps

Update deps + 👕 0 check errors

Author: kangas

.eslintrc

@@ -1,6 +1,9 @@
 {
-  "env": {
-    "mocha": true
-  },
-  "extends": "mongodb-js/node"
+  "extends": [
+    "mongodb-js/node",
+    "mongodb-js/browser"
+  ],
+  "rules": {
+    "camelcase": 1
+  }
 }

package.json

@@ -57,8 +57,8 @@
     "release": "gulp release",
     "test": "mocha",
     "ci": "npm run check && npm run release",
-    "check": "mongodb-js-precommit",
-    "fmt": "mongodb-js-fmt src/{**/*.js,*.js}"
+    "check": "mongodb-js-precommit ./*.js src/{**/*.js,*.js} test/{**/*.js,*.js} tasks/*.js",
+    "fmt": "mongodb-js-fmt ./*.js src/{**/*.js,*.js} test/{**/*.js,*.js} tasks/*.js"
   },
   "pre-commit": [
     "check"
@@ -73,9 +73,9 @@
     "ampersand-rest-collection": "^5.0.0",
     "debug": "^2.2.0",
     "electron-squirrel-startup": "^0.1.4",
-    "mongodb-collection-model": "^0.1.0",
-    "mongodb-connection-model": "^3.0.4",
-    "mongodb-instance-model": "^0.2.3",
+    "mongodb-collection-model": "^0.1.1",
+    "mongodb-connection-model": "^3.0.6",
+    "mongodb-instance-model": "^1.0.1",
     "mongodb-ns": "^1.0.0",
     "scout-server": "http://bin.mongodb.org/js/scout-server/v0.4.0/scout-server-0.4.0.tar.gz"
   },
@@ -88,31 +88,30 @@
     "ampersand-model": "^6.0.2",
     "ampersand-router": "^3.0.2",
     "ampersand-sync-localforage": "^0.1.1",
-    "ampersand-view": "^8.0.1",
+    "ampersand-view": "^9.0.0",
     "ampersand-view-switcher": "^2.0.0",
     "backoff": "^2.4.1",
     "bootstrap": "https://github.com/twbs/bootstrap/archive/v3.3.5.tar.gz",
-    "browserify": "^11.2.0",
+    "browserify": "^12.0.1",
     "bugsnag-js": "^2.4.8",
     "chalk": "^1.1.1",
     "d3": "^3.5.6",
     "del": "^2.0.2",
     "domready": "^1.0.8",
     "electron-installer-dmg": "^0.1.0",
     "electron-installer-squirrel-windows": "^0.4.0",
-    "electron-packager": "^5.1.0",
-    "eslint": "^1.6.0",
-    "eslint-config-mongodb-js": "^0.1.6",
-    "event-stream": "^3.3.1",
+    "electron-packager": "^5.1.1",
+    "eslint-config-mongodb-js": "^1.0.5",
+    "event-stream": "^3.3.2",
     "figures": "^1.4.0",
     "font-awesome": "https://github.com/FortAwesome/Font-Awesome/archive/v4.4.0.tar.gz",
     "glob": "^5.0.15",
     "gulp": "^3.9.0",
     "gulp-jade": "^1.1.0",
     "gulp-less": "^3.0.3",
-    "gulp-shell": "^0.5.0",
+    "gulp-shell": "^0.5.1",
     "gulp-sourcemaps": "^1.6.0",
-    "gulp-util": "^3.0.6",
+    "gulp-util": "^3.0.7",
     "gulp-watch": "^4.3.5",
     "gulp-webserver": "^0.9.1",
     "jade": "^1.11.0",
@@ -123,26 +122,26 @@
     "merge-stream": "^1.0.0",
     "mocha": "^2.3.3",
     "moment": "^2.10.6",
-    "mongodb-extended-json": "^1.5.2",
+    "mongodb-extended-json": "^1.5.3",
     "mongodb-js-fmt": "^0.0.3",
-    "mongodb-js-precommit": "^0.2.2",
-    "mongodb-language-model": "^0.2.3",
+    "mongodb-js-precommit": "^0.2.4",
+    "mongodb-language-model": "^0.3.0",
     "mongodb-schema": "^3.3.0",
     "mousetrap": "^1.5.3",
     "node-notifier": "^4.3.1",
     "numeral": "^1.5.3",
     "octicons": "https://github.com/github/octicons/archive/v3.1.0.tar.gz",
     "pluralize": "^1.2.1",
-    "pre-commit": "^1.1.1",
+    "pre-commit": "^1.1.2",
     "qs": "^5.2.0",
     "raf": "^3.1.0",
     "run-sequence": "^1.1.4",
     "run-series": "^1.1.4",
     "scout-client": "http://bin.mongodb.org/js/scout-client/v0.4.0/scout-client-0.4.0.tar.gz",
-    "stream-combiner2": "^1.0.2",
+    "stream-combiner2": "^1.1.1",
     "uuid": "^2.0.1",
     "vinyl-buffer": "^1.0.0",
     "vinyl-source-stream": "^1.1.0",
-    "watchify": "^3.4.0"
+    "watchify": "^3.6.0"
   }
 }

src/.eslintrc

@@ -344,8 +344,8 @@ var ConnectView = View.extend({
       // `Untitled (\d)` connections, increment a counter
       // on them like every MS Office does.
       var untitleds = _.chain(this.connections.models)
-        .filter(function(model) {
-          return _.startsWith(model.name, 'Untitled (');
+        .filter(function(m) {
+          return _.startsWith(m.name, 'Untitled (');
         })
         .sort('name')
         .value();

src/connect/index.js

@@ -1,19 +1,6 @@
 var app = require('app');
 var Menu = require('menu');
 
-var menu = (function() {
-  return {
-    init: function(window) {
-      /* eslint-disable no-extra-parens */
-      var menu = (process.platform == 'darwin')
-        ? darwinMenu(window) : nonDarwinMenu(window);
-      /* eslint-enable no-extra-parens */
-      menu = Menu.buildFromTemplate(menu);
-      Menu.setApplicationMenu(menu);
-    }
-  };
-}());
-
 // menus
 function darwinMenu(window) {
   return [
@@ -158,7 +145,7 @@ function darwinMenu(window) {
       ]
     }
   ];
-};
+}
 
 function nonDarwinMenu(window) {
   return [
@@ -204,6 +191,21 @@ function nonDarwinMenu(window) {
       ]
     }
   ];
-};
+}
+
+var menu = (function() {
+  return {
+    init: function(window) {
+      var m;
+      if (process.platform === 'darwin') {
+        m = darwinMenu(window);
+      } else {
+        m = nonDarwinMenu(window);
+      }
+      m = Menu.buildFromTemplate(m);
+      Menu.setApplicationMenu(m);
+    }
+  };
+}());
 
-module.exports = menu;
+module.exports = menu;

src/electron/menu.js

@@ -12,7 +12,7 @@
 var fs = require('fs');
 var path = require('path');
 var app = require('app');
-var child_process = require('child_process');
+var spawn = require('child_process').spawn;
 var debug = require('debug')('scout:electron:scout-server-ctl');
 
 // Where we'll keep the process id.
@@ -67,8 +67,8 @@ var killIfRunning = function(done) {
     debug('killing existing pid', pid);
     try {
       process.kill(pid, 'SIGTERM');
-    } catch (err) {
-      if (err.code === 'ESRCH') {
+    } catch (e) {
+      if (e.code === 'ESRCH') {
         debug('orphaned pid file');
       }
     }
@@ -92,7 +92,7 @@ module.exports.start = function(done) {
     // not!  `child_process.exec` has space escape issues
     // but not `child_process.spawn`!
     debug('spawning: `%s %s`...', process.execPath, BIN);
-    var server = child_process.spawn(process.execPath, [BIN], {
+    var server = spawn(process.execPath, [BIN], {
       env: {
         ATOM_SHELL_INTERNAL_RUN_AS_NODE: '1',
         RESOURCES_PATH: process.resourcesPath

src/electron/scout-server-ctl.js

@@ -67,17 +67,22 @@ module.exports.create = function(opts) {
   // makes the application a single instance application
   // see "app.makeSingleInstance" in https://github.com/atom/electron/blob/master/docs/api/app.md
   var shouldQuit = app.makeSingleInstance(function(commandLine, workingDirectory) {
-  // Someone tried to run a second instance, we should focus our window
+    debug('Someone tried to run a second instance! We should focus our window', {
+      commandLine: commandLine,
+      workingDirectory: workingDirectory
+    });
     if (_window) {
-      if (_window.isMinimized()) _window.restore();
+      if (_window.isMinimized()) {
+        _window.restore();
+      }
       _window.focus();
     }
     return true;
   });
 
   if (shouldQuit) {
     app.quit();
-    return;
+    return null;
   }
 
   _window.loadUrl(opts.url);

src/electron/window-manager.js

@@ -1,13 +1,11 @@
+/* eslint no-use-before-define: 1, one-var: 1, no-else-return: 1, no-unused-vars: 1, eqeqeq: 1, no-shadow: 1, yoda: 1, consistent-return: 1, one-var: 1 */
 // d3.tip
 // Copyright (c) 2013 Justin Palmer
 //
 // Tooltips for d3.js SVG visualizations
 
 (function(root, factory) {
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module with d3 as a dependency.
-    define(['d3'], factory);
-  } else if (typeof module === 'object' && module.exports) {
+  if (typeof module === 'object' && module.exports) {
     // CommonJS
     module.exports = function(d3) {
       d3.tip = factory(d3);
@@ -18,18 +16,17 @@
     root.d3.tip = factory(root.d3);
   }
 }(this, function(d3) {
-
   // Public - contructs a new tooltip
   //
   // Returns a tip
   return function() {
-    var direction = d3_tip_direction,
-      offset = d3_tip_offset,
-      html = d3_tip_html,
-      node = initNode(),
-      svg = null,
-      point = null,
-      target = null;
+    var direction = d3_tip_direction;
+    var offset = d3_tip_offset;
+    var html = d3_tip_html;
+    var node = initNode();
+    var svg = null;
+    var point = null;
+    var target = null;
 
     function tip(vis) {
       svg = getSVGNode(vis);
@@ -349,5 +346,4 @@
 
     return tip;
   };
-
 }));

src/minicharts/d3-tip.js

@@ -1,3 +1,4 @@
+/* eslint no-use-before-define:1 */
 var d3 = require('d3');
 var _ = require('lodash');
 var $ = require('jquery');
@@ -309,7 +310,7 @@ var minicharts_d3fns_date = function() {
 
       raf(function() {
         var chartWidth = width / (upperRatio + 1) - upperMargin;
-        var chart = many()
+        var manyChart = many()
           .width(chartWidth)
           .height(upperBarBottom)
           .options({
@@ -323,13 +324,13 @@ var minicharts_d3fns_date = function() {
             },
             view: options.view
           });
-        weekdayContainer.call(chart);
+        weekdayContainer.call(manyChart);
       });
 
       var hourContainer = g.select('g.hour').data([hours]);
       raf(function() {
         var chartWidth = width / (upperRatio + 1) * upperRatio - upperMargin;
-        var chart = many()
+        var manyChart = many()
           .width(chartWidth)
           .height(upperBarBottom)
           .options({
@@ -342,7 +343,7 @@ var minicharts_d3fns_date = function() {
             },
             view: options.view
           });
-        hourContainer.call(chart);
+        hourContainer.call(manyChart);
       });
     });
   }

src/minicharts/d3fns/date.js

@@ -1,3 +1,4 @@
+/* eslint no-use-before-define:1 */
 var d3 = require('d3');
 var _ = require('lodash');
 var $ = require('jquery');