Rename mongo-livedata to mongo

packages/mongo-livedata/package.js

@@ -1,76 +1,8 @@
-// XXX We should revisit how we factor MongoDB support into (1) the
-// server-side node.js driver [which you might use independently of
-// livedata, after all], (2) minimongo [ditto], and (3) Collection,
-// which is the class that glues the two of them to Livedata, but also
-// is generally the "public interface for newbies" to Mongo in the
-// Meteor universe. We want to allow the components to be used
-// independently, but we don't want to overwhelm the user with
-// minutiae.
-
 Package.describe({
-  summary: "Adaptor for using MongoDB and Minimongo over DDP",
+  summary: "Moved to the mongo package",
   version: '1.0.3'
 });
 
-Npm.depends({
-  mongodb: "https://github.com/meteor/node-mongodb-native/tarball/cbd6220ee17c3178d20672b4a1df80f82f97d4c1"
-});
-
 Package.on_use(function (api) {
-  api.use(['random', 'ejson', 'json', 'underscore', 'minimongo', 'logging',
-           'livedata', 'tracker', 'application-configuration'],
-          ['client', 'server']);
-  api.use('check', ['client', 'server']);
-
-  // Binary Heap data structure is used to optimize oplog observe driver
-  // performance.
-  api.use('binary-heap', 'server');
-
-  // Allow us to detect 'insecure'.
-  api.use('insecure', {weak: true});
-
-  // Allow us to detect 'autopublish', and publish collections if it's loaded.
-  api.use('autopublish', 'server', {weak: true});
-
-  // Allow us to detect 'disable-oplog', which turns off oplog tailing for your
-  // app even if it's configured in the environment. (This package will be
-  // probably be removed before 1.0.)
-  api.use('disable-oplog', 'server', {weak: true});
-
-  // defaultRemoteCollectionDriver gets its deployConfig from something that is
-  // (for questionable reasons) initialized by the webapp package.
-  api.use('webapp', 'server', {weak: true});
-
-  // If the facts package is loaded, publish some statistics.
-  api.use('facts', 'server', {weak: true});
-
-  api.use('callback-hook', 'server');
-
-  // Stuff that should be exposed via a real API, but we haven't yet.
-  api.export('MongoInternals', 'server');
-  // For tests only.
-  api.export('MongoTest', 'server', {testOnly: true});
-
-  api.add_files(['mongo_driver.js', 'oplog_tailing.js',
-                 'observe_multiplex.js', 'doc_fetcher.js',
-                 'polling_observe_driver.js','oplog_observe_driver.js'],
-                'server');
-  api.add_files('local_collection_driver.js', ['client', 'server']);
-  api.add_files('remote_collection_driver.js', 'server');
-  api.add_files('collection.js', ['client', 'server']);
-});
-
-Package.on_test(function (api) {
-  api.use('mongo-livedata');
-  api.use('check');
-  api.use(['tinytest', 'underscore', 'test-helpers', 'ejson', 'random',
-           'livedata']);
-  // XXX test order dependency: the allow_tests "partial allow" test
-  // fails if it is run before mongo_livedata_tests.
-  api.add_files('mongo_livedata_tests.js', ['client', 'server']);
-  api.add_files('allow_tests.js', ['client', 'server']);
-  api.add_files('collection_tests.js', ['client', 'server']);
-  api.add_files('observe_changes_tests.js', ['client', 'server']);
-  api.add_files('oplog_tests.js', 'server');
-  api.add_files('doc_fetcher_tests.js', 'server');
-});
+  api.imply("mongo");
+});

packages/mongo/.gitignore

@@ -0,0 +1 @@
+.build*

packages/mongo/package.js

@@ -0,0 +1,76 @@
+// XXX We should revisit how we factor MongoDB support into (1) the
+// server-side node.js driver [which you might use independently of
+// livedata, after all], (2) minimongo [ditto], and (3) Collection,
+// which is the class that glues the two of them to Livedata, but also
+// is generally the "public interface for newbies" to Mongo in the
+// Meteor universe. We want to allow the components to be used
+// independently, but we don't want to overwhelm the user with
+// minutiae.
+
+Package.describe({
+  summary: "Adaptor for using MongoDB and Minimongo over DDP",
+  version: '1.0.3'
+});
+
+Npm.depends({
+  mongodb: "https://github.com/meteor/node-mongodb-native/tarball/cbd6220ee17c3178d20672b4a1df80f82f97d4c1"
+});
+
+Package.on_use(function (api) {
+  api.use(['random', 'ejson', 'json', 'underscore', 'minimongo', 'logging',
+           'livedata', 'tracker', 'application-configuration'],
+          ['client', 'server']);
+  api.use('check', ['client', 'server']);
+
+  // Binary Heap data structure is used to optimize oplog observe driver
+  // performance.
+  api.use('binary-heap', 'server');
+
+  // Allow us to detect 'insecure'.
+  api.use('insecure', {weak: true});
+
+  // Allow us to detect 'autopublish', and publish collections if it's loaded.
+  api.use('autopublish', 'server', {weak: true});
+
+  // Allow us to detect 'disable-oplog', which turns off oplog tailing for your
+  // app even if it's configured in the environment. (This package will be
+  // probably be removed before 1.0.)
+  api.use('disable-oplog', 'server', {weak: true});
+
+  // defaultRemoteCollectionDriver gets its deployConfig from something that is
+  // (for questionable reasons) initialized by the webapp package.
+  api.use('webapp', 'server', {weak: true});
+
+  // If the facts package is loaded, publish some statistics.
+  api.use('facts', 'server', {weak: true});
+
+  api.use('callback-hook', 'server');
+
+  // Stuff that should be exposed via a real API, but we haven't yet.
+  api.export('MongoInternals', 'server');
+  // For tests only.
+  api.export('MongoTest', 'server', {testOnly: true});
+
+  api.add_files(['mongo_driver.js', 'oplog_tailing.js',
+                 'observe_multiplex.js', 'doc_fetcher.js',
+                 'polling_observe_driver.js','oplog_observe_driver.js'],
+                'server');
+  api.add_files('local_collection_driver.js', ['client', 'server']);
+  api.add_files('remote_collection_driver.js', 'server');
+  api.add_files('collection.js', ['client', 'server']);
+});
+
+Package.on_test(function (api) {
+  api.use('mongo-livedata');
+  api.use('check');
+  api.use(['tinytest', 'underscore', 'test-helpers', 'ejson', 'random',
+           'livedata']);
+  // XXX test order dependency: the allow_tests "partial allow" test
+  // fails if it is run before mongo_livedata_tests.
+  api.add_files('mongo_livedata_tests.js', ['client', 'server']);
+  api.add_files('allow_tests.js', ['client', 'server']);
+  api.add_files('collection_tests.js', ['client', 'server']);
+  api.add_files('observe_changes_tests.js', ['client', 'server']);
+  api.add_files('oplog_tests.js', 'server');
+  api.add_files('doc_fetcher_tests.js', 'server');
+});

tools/auth.js

@@ -17,7 +17,7 @@ var auth = exports;
 
 var getLoadedPackages = function () {
   return uniload.load({
-    packages: [ 'meteor', 'livedata', 'mongo-livedata' ]
+    packages: [ 'meteor', 'livedata', 'mongo' ]
   });
 };
 

tools/run-mongo.js

@@ -369,10 +369,10 @@ var launchMongo = function (options) {
 
   var initiateReplSetAndWaitForReady = function () {
     try {
-      // Load mongo-livedata so we'll be able to talk to it.
+      // Load mongo so we'll be able to talk to it.
       var mongoNpmModule = uniload.load({
-        packages: [ 'mongo-livedata' ]
-      })['mongo-livedata'].MongoInternals.NpmModule;
+        packages: [ 'mongo' ]
+      })['mongo'].MongoInternals.NpmModule;
 
       // Connect to the intended primary and start a replset.
       var db = new mongoNpmModule.Db(

tools/uniload.js

@@ -19,7 +19,7 @@ var ROOT_PACKAGES = [
   'meteor',
   'minifiers',
   'minimongo',
-  'mongo-livedata',
+  'mongo',
   'package-version-parser'
 ];