Release 1.6

.eslintrc.yml

@@ -39,9 +39,6 @@ parserOptions:
     templateStrings: true
     unicodeCodePointEscapes: true
 rules:
-  arrow-parens:
-  - 2
-  - as-needed
   array-bracket-spacing:
   - 2
   - never
@@ -58,7 +55,6 @@ rules:
   comma-style:
   - 2
   - last
-  complexity: [1, 9]
   computed-property-spacing:
   - 2
   - never
@@ -290,4 +286,4 @@ rules:
   newline-per-chained-call: 0
   class-methods-use-this: 0
   no-empty-function: 0
-  sort-imports: [2, { memberSyntaxSortOrder: ['none', 'all', 'multiple', 'single'], ignoreCase: true  }]
+  sort-imports: 0

CHANGELOG.md

@@ -514,7 +514,7 @@ Big thanks to @shaiamir for his work on the shared proxy.
 - Change mongo version
 - Validates `mup.js` and displays problems found in it
 - Update message is clearer and more colorful
-- `uploadProgressBar` is part of default `mup.js`
+- `enableUploadProgressBar` is part of default `mup.js`
 - Add trailing commas to mup.js (@ffxsam)
 - Improve message when settings.json is not found or is invalid
 - Loads and parses settings.json before building the app

docs/docs.md

@@ -139,7 +139,7 @@ module.exports = {
       // make deploys more reliable and easier to troubleshoot
       prepareBundle: true,
 
-      // (optional, default is false) Uses the new docker image builder
+      // (optional, default is true) Uses the new docker image builder
       // during Prepare bundle. When enabled,
       // Prepare Bundle is much faster
       useBuildKit: true,
@@ -236,12 +236,7 @@ module.exports = {
     // lets you define which port to check after the deploy process, if it
     // differs from the meteor port you are serving
     // (like meteor behind a proxy/firewall) (optional)
-    deployCheckPort: 80,
-
-    // Shows progress bar while uploading bundle to server
-    // You might need to disable it on CI servers
-    // (optional, default is false)
-    enableUploadProgressBar: true
+    deployCheckPort: 80
   },
 
   // (optional) Use built-in mongodb. Remove it to use a remote MongoDB

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mup",
-  "version": "1.5.9",
+  "version": "1.6.0-beta.5",
   "description": "Production Quality Meteor Deployments",
   "main": "lib/index.js",
   "repository": {

src/__tests__/plugin-api.unit.js

@@ -169,7 +169,7 @@ describe('PluginAPI', () => {
 
   describe('_normalizeConfig', () => {
     it('should copy meteor object to app', () => {
-      const expected = { meteor: { path: '../' }, app: { type: 'meteor', path: '../', docker: { image: 'kadirahq/meteord', imagePort: 3000, stopAppDuringPrepareBundle: true } } };
+      const expected = { meteor: { path: '../' }, app: { type: 'meteor', path: '../', docker: { image: 'zodern/meteor:0.6.1-root', imagePort: 3000, stopAppDuringPrepareBundle: true } } };
       const config = { meteor: { path: '../' } };
       const result = api._normalizeConfig(config);
 

src/check-setup.js

@@ -0,0 +1,89 @@
+/* eslint-disable no-labels */
+const crypto = require('crypto');
+const fs = require('fs');
+
+const checkers = [];
+
+export function registerChecker(checker) {
+  checkers.push(checker);
+}
+
+function createKey(keyConfig = {}) {
+  const finalConfig = {
+    ...keyConfig
+  };
+  if (finalConfig.scripts) {
+    finalConfig.scripts = finalConfig.scripts.map(
+      path => fs.readFileSync(path, 'utf-8')
+    );
+  }
+
+  return crypto.createHash('sha256')
+    .update(JSON.stringify(finalConfig))
+    .digest('base64');
+}
+
+export async function checkSetup(pluginApi) {
+  const checks = await Promise.all(checkers.map(checker => checker(pluginApi)));
+
+  console.time('setup check');
+  const bySession = new Map();
+  checks.flat().forEach(check => {
+    let keyHash = createKey(check.setupKey);
+
+    check.sessions.forEach(session => {
+      const config = bySession.get(session) || {
+        keyHashes: {},
+        services: [],
+        containers: []
+      };
+
+      config.keyHashes[check.name] = keyHash;
+      config.services.push(...check.services || []);
+      config.containers.push(...check.containers || []);
+      bySession.set(session, config);
+    });
+  });
+
+  const promises = [];
+
+  bySession.forEach((config, session) => {
+    const promise = new Promise(resolve => {
+      session.executeScript(
+        pluginApi.resolvePath(__dirname, './tasks/assets/check-setup.sh'),
+        {
+          vars: config
+        },
+        (err, code) => {
+          resolve(!err && code === 0);
+        }
+      );
+    });
+    promises.push(promise);
+  });
+
+  const result = await Promise.all(promises);
+  console.timeEnd('setup check');
+
+
+  return result.every(upToDate => upToDate);
+}
+
+export async function updateSetupKeys(api) {
+  const checks = await Promise.all(checkers.map(checker => checker(api)));
+
+  // TODO: parallelize this
+  for (const check of checks.flat()) {
+    const setupKeyHash = createKey(check.setupKey);
+
+    for (const session of check.sessions) {
+      // TODO: handle errors. Should retry, and after 3 tries give up
+      // Shouldn't throw since if the command fails mup will simply setup
+      // again next time
+      await api.runSSHCommand(
+        session,
+        `sudo mkdir -p /opt/.mup-setup && sudo echo "${setupKeyHash}" > /opt/.mup-setup/${check.name}.txt`
+      );
+    }
+  }
+}

src/index.js

@@ -40,7 +40,7 @@ if (config.hooks) {
 }
 
 function commandWrapper(pluginName, commandName) {
-  return function() {
+  return async function() {
     // Runs in parallel with command
     checkUpdates([
       { name: pkg.name, path: require.resolve('../package.json') },
@@ -52,6 +52,8 @@ function commandWrapper(pluginName, commandName) {
     const api = new MupAPI(process.cwd(), filteredArgv, yargs.argv);
     let potentialPromise;
 
+    await api.loadServerGroups();
+
     try {
       potentialPromise = api.runCommand(`${pluginName}.${commandName}`);
     } catch (e) {

src/load-plugins.js

@@ -9,7 +9,9 @@ import registerCommand from './commands';
 import { registerHook } from './hooks';
 import { registerPreparer } from './prepare-config';
 import { registerScrubber } from './scrub-config';
+import { registerServerSource } from './server-sources';
 import { registerSwarmOptions } from './swarm-options';
+import { registerChecker } from './check-setup';
 import resolveFrom from 'resolve-from';
 
 const log = debug('mup:plugin-loader');
@@ -72,7 +74,14 @@ export function locatePluginDir(name, configPath, appPath) {
 function registerPlugin(plugin) {
   if (plugin.module.commands) {
     Object.keys(plugin.module.commands).forEach(key => {
-      registerCommand(plugin.name, key, plugin.module.commands[key]);
+      let command = plugin.module.commands[key];
+      registerCommand(
+        // The __plugin option can be used to change the top-level command
+        // the command is added to
+        command.__plugin || plugin.name,
+        key,
+        plugin.module.commands[key]
+      );
     });
   }
   if (plugin.module.hooks) {
@@ -95,6 +104,14 @@ function registerPlugin(plugin) {
   if (plugin.module.swarmOptions) {
     registerSwarmOptions(plugin.module.swarmOptions);
   }
+  if (plugin.module.serverSources) {
+    for (const [type, config] of Object.entries(plugin.module.serverSources)) {
+      registerServerSource(type, config);
+    }
+  }
+  if (plugin.module.checkSetup) {
+    registerChecker(plugin.module.checkSetup);
+  }
 }
 
 export function loadPlugins(plugins) {

src/nodemiral.js

@@ -63,13 +63,18 @@ function createCallback(cb, varsMapper) {
       return cb(err);
     }
     if (code > 0) {
-      const message = `
-      ------------------------------------STDERR------------------------------------
-      ${logs.stderr.substring(logs.stderr.length - 4200)}
-      ------------------------------------STDOUT------------------------------------
-      ${logs.stdout.substring(logs.stdout.length - 4200)}
-      ------------------------------------------------------------------------------
-      `;
+      let message = '';
+      if (!logs.stderr.length && logs.stdout.length) {
+        message = logs.stdout.substring(logs.stdout.length - 8400);
+      } else {
+        message = `
+        ------------------------------------STDERR------------------------------------
+        ${logs.stderr.substring(logs.stderr.length - 4200)}
+        ------------------------------------STDOUT------------------------------------
+        ${logs.stdout.substring(logs.stdout.length - 4200)}
+        ------------------------------------------------------------------------------
+        `;
+      }
 
       return cb(new Error(message));
     }
@@ -82,8 +87,24 @@ function createCallback(cb, varsMapper) {
   };
 }
 
+// TODO: running hooks should be an option for executeScript instead of
+// a separate task
+async function runDuringHooks(session, options, callback) {
+  console.dir(options);
+  const pluginApi = options._getMupApi();
+  // console.dir(pluginApi);
+  try {
+    await pluginApi._runDuringHooks(options.hookName, session);
+  } catch (e) {
+    return callback(e);
+  }
+
+  callback();
+}
+
 nodemiral.registerTask('copy', copy);
 nodemiral.registerTask('executeScript', executeScript);
+nodemiral.registerTask('_runHook', runDuringHooks);
 
 const oldApplyTemplate = nodemiral.session.prototype._applyTemplate;
 // Adds support for using include with ejs