Merge branch '7491-no-kexec-2' into release-1.4.0.1

.travis.yml

@@ -6,7 +6,6 @@ cache:
     - "dev_bundle"
     - ".meteor"
     - ".babel-cache"
-install: ./meteor --get-ready
 script: TEST_PACKAGES_EXCLUDE="less" ./packages/test-in-console/run.sh
 sudo: false
 env:

History.md

@@ -29,6 +29,10 @@
   2.6 up. Mongo 2.4 has now reached end-of-life
   (https://www.mongodb.com/support-policy), and is no longer supported.
 
+  If you are setting `MONGO_OPLOG_URL`, especially in production, ensure you are
+  passing in the `replicaSet` argument (see [#7450]
+    (https://github.com/meteor/meteor/issues/7450))
+
 * Custom Mongo options can now be specified using the
   `Mongo.setConnectionOptions(options)` API.
   [#7277](https://github.com/meteor/meteor/pull/7277)

packages/meteor-tool/package.js

@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.4.0'
+  version: '1.4.0-1-rc.2'
 });
 
 Package.includeTool();

scripts/admin/meteor-release-experimental.json

@@ -1,6 +1,6 @@
 {
  "track": "METEOR",
- "version": "1.4-rc.2",
+ "version": "1.4.0.1-rc.2",
  "recommended": false,
  "official": false,
  "description": "Meteor"

tools/cli/main.js

@@ -493,6 +493,14 @@ var springboard = function (rel, options) {
     }).await());
   }
 
+  // On OSX, there is a bug in node 4 when launching out to a node 0.10 process
+  // This should be fixed in the next release of node (we should then revert
+  // this change) https://github.com/meteor/meteor/issues/7491
+  if (process.platform === 'darwin') {
+    newArgv.unshift('-q', '/dev/null', executable);
+    executable = 'script';
+  }
+
   // Now exec; we're not coming back.
   require('kexec')(executable, newArgv);
   throw Error('exec failed?');

tools/isobuild/bundler.js

@@ -2312,7 +2312,7 @@ var writeSiteArchive = Profile("bundler writeSiteArchive", function (
 
       builder.write('README', { data: new Buffer(
 `This is a Meteor application bundle. It has only one external dependency:
-Node.js 0.10.40 or newer. To run the application:
+Node.js 4.4.7 or newer. To run the application:
 
   $ (cd programs/server && npm install)
   $ export MONGO_URL='mongodb://user:password@host:port/databasename'

tools/isobuild/package-source.js

@@ -1361,21 +1361,16 @@ _.extend(PackageSource.prototype, {
 
   _inferFileOptions(relPath, {arch, isApp}) {
     const fileOptions = {};
-    const isAnyTest = global.testCommandMetadata &&
-      (global.testCommandMetadata.isTest ||
-       global.testCommandMetadata.isAppTest);
+    const isTest = global.testCommandMetadata
+      && global.testCommandMetadata.isTest;
+    const isAppTest = global.testCommandMetadata
+      && global.testCommandMetadata.isAppTest;
+    const isTestFile = (isTest || isAppTest) && isTestFilePath(relPath);
 
-    if (isAnyTest) {
-      if (isTestFilePath(relPath)) {
-        // When running tests, test files should not be loaded lazily.
-        return fileOptions;
-      }
-
-      // If running in test mode (`meteor test`), all files other than
-      // test files should be loaded lazily.
-      if (global.testCommandMetadata.isTest) {
-        fileOptions.lazy = true;
-      }
+    // If running in test mode (`meteor test`), all files other than
+    // test files should be loaded lazily.
+    if (isTest && !isTestFile) {
+      fileOptions.lazy = true;
     }
 
     const dirs = files.pathDirname(relPath).split(files.pathSep);
@@ -1392,7 +1387,8 @@ _.extend(PackageSource.prototype, {
         return fileOptions;
       }
 
-      if (isApp && dir === "imports") {
+      // Files in `imports/` should be lazily loaded *apart* from tests
+      if (isApp && dir === "imports" && !isTestFile) {
         fileOptions.lazy = true;
       }
 

tools/packaging/tropohouse.js

@@ -299,6 +299,12 @@ _.extend(exports.Tropohouse.prototype, {
   // XXX: Error handling.
   _downloadBuildToTempDir: function (versionInfo, buildRecord) {
     var url = buildRecord.build.url;
+    
+    // Override the download domain name and protocol if METEOR_WAREHOUSE_URLBASE
+    // provided.
+    if (process.env.METEOR_WAREHOUSE_URLBASE) {
+      url = url.replace(/^[a-zA-Z]+:\/\/[^\/]+/, process.env.METEOR_WAREHOUSE_URLBASE);
+    }
 
     // XXX: We use one progress for download & untar; this isn't ideal:
     // it relies on extractTarGz being fast and not reporting any progress.