Merge pull request #219 from 10gen/keytar-prebuild-windows

🏁 prebuilt keytar

Author: imlucas

.eslintignore

@@ -0,0 +1,3 @@
+build/**
+dist/**
+src/minicharts/d3-tip.js

.evergreen.yml

@@ -63,11 +63,10 @@ functions:
       script: |
         set -ev
         export PATH="${node_path}:$PATH"
-        ${node|node} --version
-        ${npm|npm} --version
+        test -n "${add_environment|}" && export ${add_environment|}
+        ${npm|npm} version --json
         ${npm|npm} config set loglevel error
-        ${npm|npm} config -g list -l
-        ${npm|npm} install
+        ${npm|npm} config -g list
         ${npm|npm} install
 
   # For Windows: retrieve a fake "signtool.exe" which proxies to notary-service,
@@ -104,7 +103,6 @@ functions:
         export SIGNTOOL_PARAMS="yes"
         test -n "${add_environment|}" && export ${add_environment|}
         ${npm|npm} run ci
-        ${npm|npm} run test
 
   "save release":
     command: s3.put
@@ -191,6 +189,7 @@ buildvariants:
     installer_content_type: "application/octet-stream"
     installer_filename: "MongoDBCompassSetup.exe"
     num_cores: $(grep -c ^processor /proc/cpuinfo)
+    add_environment: APPDATA=C:\\Users\\Administrator\\
   tasks:
     *all_tasks
 

gulpfile.js

@@ -126,8 +126,9 @@ gulp.task('watch', function() {
 /**
  * Use browserify to compile the UI js.
  */
+var jadeify = require('jadeify');
 gulp.task('build:js', function() {
-  var bundler = browserify(pkg.browserify).transform('jadeify');
+  var bundler = browserify(pkg.browserify).transform(jadeify);
   if (process.env.NODE_ENV === 'production') {
     return bundler.bundle()
       .on('error', notify('js'))

package.json

@@ -15,24 +15,28 @@
   },
   "dependency-check": {
     "entries": [
-      "./src/index.js"
+      "./src/index.js",
+      "./gulpfile.js",
+      "./tasks/darwin.js",
+      "./tasks/win32.js",
+      "./tasks/linux.js"
     ],
     "ignore": [
-      "app", 
-      "auto-updater", 
-      "bootstrap", 
-      "browser-window", 
+      "app",
+      "auto-updater",
+      "bootstrap",
+      "browser-window",
       "clipboard",
-      "crash-reporter", 
-      "dialog", 
-      "electron-squirrel-startup", 
-      "font-awesome", 
-      "glob", 
-      "ipc", 
-      "jade", 
-      "keytar", 
-      "menu", 
-      "octicons", 
+      "crash-reporter",
+      "dialog",
+      "electron-squirrel-startup",
+      "font-awesome",
+      "glob",
+      "ipc",
+      "jade",
+      "keytar",
+      "menu",
+      "octicons",
       "scout-server"
     ]
   },
@@ -58,7 +62,7 @@
     "start": "gulp dev",
     "release": "gulp release",
     "test": "mocha",
-    "ci": "npm run check && npm run release",
+    "ci": "npm run check && npm test && npm run release",
     "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"
   },
@@ -72,13 +76,13 @@
   "dependencies": {
     "debug": "^2.2.0",
     "electron-squirrel-startup": "^0.1.4",
-    "keytar": "^3.0.0",
+    "keytar": "mongodb-js/node-keytar",
     "localforage": "^1.3.0",
     "mongodb-collection-model": "^0.1.1",
     "mongodb-connection-model": "^3.0.7",
     "mongodb-instance-model": "^1.0.2",
-    "mongodb-ns": "^1.0.1",
     "mongodb-js-metrics": "^0.2.2",
+    "mongodb-ns": "^1.0.1",
     "ms": "^0.7.1",
     "node-notifier": "^4.3.1",
     "scout-server": "http://bin.mongodb.org/js/scout-server/v0.4.6/scout-server-0.4.6.tar.gz"
@@ -113,7 +117,7 @@
     "electron-installer-squirrel-windows": "^0.4.0",
     "electron-packager": "^5.1.1",
     "eslint": "^1.9.0",
-    "eslint-config-mongodb-js": "^1.0.5",
+    "eslint-config-mongodb-js": "^1.0.6",
     "event-stream": "^3.3.2",
     "figures": "^1.4.0",
     "font-awesome": "https://github.com/FortAwesome/Font-Awesome/archive/v4.4.0.tar.gz",
@@ -136,7 +140,7 @@
     "moment": "^2.10.6",
     "mongodb-extended-json": "^1.5.3",
     "mongodb-js-fmt": "^0.0.3",
-    "mongodb-js-precommit": "^0.2.4",
+    "mongodb-js-precommit": "^0.2.8",
     "mongodb-language-model": "^0.3.3",
     "mongodb-schema": "^3.3.1",
     "mousetrap": "^1.5.3",
@@ -155,6 +159,7 @@
     "vinyl-buffer": "^1.0.0",
     "vinyl-source-stream": "^1.1.0",
     "watchify": "^3.6.0",
+    "which": "^1.2.0",
     "xor-it": "^1.0.1"
   }
 }

src/app.js

@@ -237,9 +237,9 @@ var Application = View.extend({
 });
 
 var params = qs.parse(window.location.search.replace('?', ''));
-var connection_id = params.connection_id;
+var connectionId = params.connection_id;
 var state = new Application({
-  connection_id: connection_id
+  connection_id: connectionId
 });
 
 /**
@@ -296,7 +296,7 @@ app.extend({
     domReady(function() {
       state.render();
 
-      if (!connection_id) {
+      if (!connectionId) {
         // Not serving a part of the app which uses the client,
         // so we can just start everything up now.
         state.startRouter();
@@ -306,10 +306,10 @@ app.extend({
       app.statusbar.show('Retrieving connection details...');
 
       state.connection = new Connection({
-        _id: connection_id
+        _id: connectionId
       });
 
-      debug('looking up connection `%s`...', connection_id);
+      debug('looking up connection `%s`...', connectionId);
       getConnection(state.connection, function(err) {
         if (err) {
           state.onFatalError('fetch connection', err);

src/models/scout-client-mixin.js

@@ -30,7 +30,7 @@ module.exports = {
       if (err) {
         return options.error({}, 'error', err.message);
       }
-      raf(function call_scout_client_success() {
+      raf(function onScoutClientSuccess() {
         options.success(res, 'success', res);
       });
     };

src/models/selectable-collection-mixin.js

@@ -61,7 +61,7 @@ module.exports = {
     if (model.selected) {
       return false;
     }
-    raf(function selectable_mark_selected() {
+    raf(function selectableMarkModelSelected() {
       var current = this.selected;
       if (current) {
         current.selected = false;

src/models/sync/keychain.js

@@ -5,14 +5,7 @@ var inherits = require('util').inherits;
 var _ = require('lodash');
 var Base = require('./base');
 
-var keytar;
-
-try {
-  keytar = window.require('keytar');
-} catch (e) {
-  debug('keytar unavailable!  passwords will not be stored!');
-}
-
+var keytar = window.require('keytar');
 /**
  * Securely get, add, replace, and delete passwords via the OS keychain
  * using GitHub's [keytar](http://npm.im/keytar). The OS keychains are:

src/models/user.js

@@ -12,12 +12,12 @@ var User = Model.extend({
     created_at: 'date',
     avatar_url: 'string',
     company_name: 'string'
-    // github_username: 'string',
-    /**
-     * `public_repos + public_gists + followers + following`
-     */
-    // github_score: 'number',
-    // github_last_activity_at: 'date'
+  // github_username: 'string',
+  /**
+   * `public_repos + public_gists + followers + following`
+   */
+  // github_score: 'number',
+  // github_last_activity_at: 'date'
   },
   sync: sync.exec.bind(sync)
 });

tasks/linux.js

@@ -1,3 +1,4 @@
+/* eslint no-console:0 */
 var path = require('path');
 var pkg = require(path.resolve(__dirname, '../package.json'));
 var fs = require('fs');