INT-1246 Templatize jade templates

INT-1246 eslint: ignore templatize-generated file

Generate templates before check script

Fixing tests local and remote

Use xvfb-maybe

(cherry picked from commit 52d814c)

Author: durran

.eslintignore

@@ -0,0 +1,3 @@
+# Ignore scripts/templatize.js generated file
+src/app/templates.js
+

.gitignore

@@ -6,6 +6,7 @@ node_modules
 .idea/
 *.iml
 .cache*
-
+src/app/templates.js
 src/connect/static-connect.html
 report.json
+.user-data/

package.json

@@ -27,9 +27,11 @@
     "prestart": "node scripts/prestart.js",
     "start": "node scripts/start.js",
     "//": "Run only the fast unit tests",
+    "pretest": "rm -rf .user-data && node scripts/templatize.js",
     "test": "xvfb-maybe node scripts/test.js",
     "prepublish": "node scripts/prepublish.js",
     "postuninstall": "node scripts/postuninstall.js",
+    "precheck": "node scripts/templatize.js",
     "check": "mongodb-js-precommit ./src/app/*.js ./src/app/**/**/*.js ./src/{app/**/*.js,main/**/*.js} ./{scripts,test}/*.js",
     "ci": "npm run test",
     "clean": "npm run postuninstall",
@@ -71,6 +73,7 @@
     "get-object-path": "azer/get-object-path",
     "highlight.js": "^8.9.1",
     "jade": "^1.11.0",
+    "@lukekarrys/jade-runtime": "^1.11.1",
     "jquery": "^2.1.4",
     "keytar": "mongodb-js/node-keytar#node-pre-gyp",
     "less": "^2.6.1",
@@ -80,11 +83,11 @@
     "marky-mark": "^1.2.1",
     "moment": "^2.10.6",
     "mongodb-collection-model": "^0.1.1",
-    "mongodb-connection-model": "^4.0.0",
+    "mongodb-connection-model": "^4.0.2",
     "mongodb-data-service": "^0.0.11",
     "mongodb-database-model": "^0.1.2",
     "mongodb-extended-json": "^1.6.0",
-    "mongodb-instance-model": "^2.1.7",
+    "mongodb-instance-model": "^3.0.0",
     "mongodb-js-metrics": "^1.0.0",
     "mongodb-language-model": "^0.3.3",
     "mongodb-ns": "^1.0.3",
@@ -126,6 +129,7 @@
     "mongodb-runner": "^3.1.15",
     "semver": "^5.1.0",
     "spectron": "^0.34.1",
+    "templatizer": "^2.0.3",
     "which": "^1.2.0",
     "xvfb-maybe": "^0.1.3"
   },

scripts/prepublish.js

@@ -50,6 +50,7 @@ var run = require('electron-installer-run');
 var license = require('electron-license');
 var createCLI = require('mongodb-js-cli');
 var config = require('./config');
+var generateTemplates = require('./templatize');
 
 /**
  * TODO (imlucas) Document and use yargs environment variable support.
@@ -376,6 +377,7 @@ function main() {
       writeVersionFile,
       transformPackageJson,
       installDependencies,
+      generateTemplates,
       removeDevelopmentFiles,
       createApplicationAsar,
       createApplicationZip,

scripts/prestart.js

@@ -36,6 +36,7 @@ var format = require('util').format;
 var run = require('electron-installer-run');
 var checkPython = require('check-python');
 var async = require('async');
+var generateTemplates = require('./templatize');
 
 function checkNpmAndNodejs(done) {
   run('npm', ['version', '--json', '--loglevel', 'error'], {
@@ -77,7 +78,8 @@ function main() {
   cli.spinner('verifying current environment meets requirements');
   async.series([
     checkPython,
-    checkNpmAndNodejs
+    checkNpmAndNodejs,
+    generateTemplates
   ], function(err) {
     cli.abortIfError(err);
     cli.debug('Environment verified as sane!');

scripts/templatize.js

@@ -0,0 +1,24 @@
+var templatizer = require('templatizer');
+var path = require('path');
+var createCLI = require('mongodb-js-cli');
+var cli = createCLI('mongodb-compass:scripts:templatize');
+
+function generateTemplates(done) {
+  var appdir = path.join(__dirname, '..', 'src', 'app');
+  templatizer(appdir, path.join(appdir, 'templates.js'), done);
+}
+
+module.exports = generateTemplates;
+
+function main() {
+  generateTemplates(function() {
+    cli.debug('Generated jade template functions.');
+  });
+}
+
+/**
+ * ## Main
+ */
+if (cli.argv.$0 && cli.argv.$0.indexOf('templatize.js') > -1) {
+  main();
+}

src/app/collection-stats/index.js

@@ -1,9 +1,7 @@
 var AmpersandView = require('ampersand-view');
 var numeral = require('numeral');
-var jade = require('jade');
-var path = require('path');
 
-var indexTemplate = jade.compileFile(path.resolve(__dirname, 'index.jade'));
+var indexTemplate = require('../templates')['collection-stats'].index;
 
 var CollectionStatsView = AmpersandView.extend({
   bindings: {

src/app/connect/authentication.js

@@ -6,12 +6,10 @@
 var AuthenticationOptionCollection = require('./models/authentication-option-collection');
 
 var InputView = require('./input-view');
-var jade = require('jade');
-var path = require('path');
-
-var inputTemplate = jade.compileFile(path.resolve(__dirname, 'input-default.jade'));
 var _ = require('lodash');
 
+var inputTemplate = require('../templates').connect['input-default'];
+
 var NONE = {
   _id: 'NONE',
   title: 'None',

src/app/connect/connect-form-view.js

@@ -5,11 +5,9 @@ var authOptions = require('./authentication');
 var sslOptions = require('./ssl');
 var FilteredCollection = require('ampersand-filtered-subcollection');
 // var debug = require('debug')('mongodb-compass:connect:connect-form-view');
-var jade = require('jade');
-var path = require('path');
 
-var inputTemplate = jade.compileFile(path.resolve(__dirname, 'input-default.jade'));
-var selectTemplate = jade.compileFile(path.resolve(__dirname, 'select-default.jade'));
+var inputTemplate = require('../templates').connect['input-default'];
+var selectTemplate = require('../templates').connect['select-default'];
 
 // create proxy collections that only contains the enabled auth options
 var enabledAuthOptions = new FilteredCollection(authOptions, {

src/app/connect/filereader-view.js

@@ -6,10 +6,9 @@ var dialog = remote.dialog;
 var BrowserWindow = remote.BrowserWindow;
 var format = require('util').format;
 var bindings = require('ampersand-dom-bindings');
-var jade = require('jade');
 var path = require('path');
 
-var fileReaderTemplate = jade.compileFile(path.resolve(__dirname, 'filereader-default.jade'));
+var fileReaderTemplate = require('../templates').connect['filereader-default'];
 var assert = require('assert');
 
 // var debug = require('debug')('mongodb-compass:connect:filereader-view');