From be8c503760fe3590904ab331a259641bbfa73d2e Mon Sep 17 00:00:00 2001 From: Sashko Stubailo Date: Thu, 28 Aug 2014 11:14:40 -0700 Subject: [PATCH] Rename mongo-livedata to mongo --- packages/mongo-livedata/package.js | 74 +----------------- packages/mongo/.gitignore | 1 + .../.npm/package/.gitignore | 0 .../.npm/package/README | 0 .../.npm/package/npm-shrinkwrap.json | 0 .../{mongo-livedata => mongo}/allow_tests.js | 0 .../{mongo-livedata => mongo}/collection.js | 0 .../collection_tests.js | 0 .../{mongo-livedata => mongo}/doc_fetcher.js | 0 .../doc_fetcher_tests.js | 0 .../local_collection_driver.js | 0 .../{mongo-livedata => mongo}/mongo_driver.js | 0 .../mongo_livedata_tests.js | 0 .../observe_changes_tests.js | 0 .../observe_multiplex.js | 0 .../oplog_observe_driver.js | 0 .../oplog_tailing.js | 0 .../{mongo-livedata => mongo}/oplog_tests.js | 0 packages/mongo/package.js | 76 +++++++++++++++++++ .../polling_observe_driver.js | 0 .../remote_collection_driver.js | 0 tools/auth.js | 2 +- tools/run-mongo.js | 6 +- tools/uniload.js | 2 +- 24 files changed, 85 insertions(+), 76 deletions(-) create mode 100644 packages/mongo/.gitignore rename packages/{mongo-livedata => mongo}/.npm/package/.gitignore (100%) rename packages/{mongo-livedata => mongo}/.npm/package/README (100%) rename packages/{mongo-livedata => mongo}/.npm/package/npm-shrinkwrap.json (100%) rename packages/{mongo-livedata => mongo}/allow_tests.js (100%) rename packages/{mongo-livedata => mongo}/collection.js (100%) rename packages/{mongo-livedata => mongo}/collection_tests.js (100%) rename packages/{mongo-livedata => mongo}/doc_fetcher.js (100%) rename packages/{mongo-livedata => mongo}/doc_fetcher_tests.js (100%) rename packages/{mongo-livedata => mongo}/local_collection_driver.js (100%) rename packages/{mongo-livedata => mongo}/mongo_driver.js (100%) rename packages/{mongo-livedata => mongo}/mongo_livedata_tests.js (100%) rename packages/{mongo-livedata => mongo}/observe_changes_tests.js (100%) rename packages/{mongo-livedata => mongo}/observe_multiplex.js (100%) rename packages/{mongo-livedata => mongo}/oplog_observe_driver.js (100%) rename packages/{mongo-livedata => mongo}/oplog_tailing.js (100%) rename packages/{mongo-livedata => mongo}/oplog_tests.js (100%) create mode 100644 packages/mongo/package.js rename packages/{mongo-livedata => mongo}/polling_observe_driver.js (100%) rename packages/{mongo-livedata => mongo}/remote_collection_driver.js (100%) diff --git a/packages/mongo-livedata/package.js b/packages/mongo-livedata/package.js index 47048551c5..a4f500987f 100644 --- a/packages/mongo-livedata/package.js +++ b/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"); +}); \ No newline at end of file diff --git a/packages/mongo/.gitignore b/packages/mongo/.gitignore new file mode 100644 index 0000000000..677a6fc263 --- /dev/null +++ b/packages/mongo/.gitignore @@ -0,0 +1 @@ +.build* diff --git a/packages/mongo-livedata/.npm/package/.gitignore b/packages/mongo/.npm/package/.gitignore similarity index 100% rename from packages/mongo-livedata/.npm/package/.gitignore rename to packages/mongo/.npm/package/.gitignore diff --git a/packages/mongo-livedata/.npm/package/README b/packages/mongo/.npm/package/README similarity index 100% rename from packages/mongo-livedata/.npm/package/README rename to packages/mongo/.npm/package/README diff --git a/packages/mongo-livedata/.npm/package/npm-shrinkwrap.json b/packages/mongo/.npm/package/npm-shrinkwrap.json similarity index 100% rename from packages/mongo-livedata/.npm/package/npm-shrinkwrap.json rename to packages/mongo/.npm/package/npm-shrinkwrap.json diff --git a/packages/mongo-livedata/allow_tests.js b/packages/mongo/allow_tests.js similarity index 100% rename from packages/mongo-livedata/allow_tests.js rename to packages/mongo/allow_tests.js diff --git a/packages/mongo-livedata/collection.js b/packages/mongo/collection.js similarity index 100% rename from packages/mongo-livedata/collection.js rename to packages/mongo/collection.js diff --git a/packages/mongo-livedata/collection_tests.js b/packages/mongo/collection_tests.js similarity index 100% rename from packages/mongo-livedata/collection_tests.js rename to packages/mongo/collection_tests.js diff --git a/packages/mongo-livedata/doc_fetcher.js b/packages/mongo/doc_fetcher.js similarity index 100% rename from packages/mongo-livedata/doc_fetcher.js rename to packages/mongo/doc_fetcher.js diff --git a/packages/mongo-livedata/doc_fetcher_tests.js b/packages/mongo/doc_fetcher_tests.js similarity index 100% rename from packages/mongo-livedata/doc_fetcher_tests.js rename to packages/mongo/doc_fetcher_tests.js diff --git a/packages/mongo-livedata/local_collection_driver.js b/packages/mongo/local_collection_driver.js similarity index 100% rename from packages/mongo-livedata/local_collection_driver.js rename to packages/mongo/local_collection_driver.js diff --git a/packages/mongo-livedata/mongo_driver.js b/packages/mongo/mongo_driver.js similarity index 100% rename from packages/mongo-livedata/mongo_driver.js rename to packages/mongo/mongo_driver.js diff --git a/packages/mongo-livedata/mongo_livedata_tests.js b/packages/mongo/mongo_livedata_tests.js similarity index 100% rename from packages/mongo-livedata/mongo_livedata_tests.js rename to packages/mongo/mongo_livedata_tests.js diff --git a/packages/mongo-livedata/observe_changes_tests.js b/packages/mongo/observe_changes_tests.js similarity index 100% rename from packages/mongo-livedata/observe_changes_tests.js rename to packages/mongo/observe_changes_tests.js diff --git a/packages/mongo-livedata/observe_multiplex.js b/packages/mongo/observe_multiplex.js similarity index 100% rename from packages/mongo-livedata/observe_multiplex.js rename to packages/mongo/observe_multiplex.js diff --git a/packages/mongo-livedata/oplog_observe_driver.js b/packages/mongo/oplog_observe_driver.js similarity index 100% rename from packages/mongo-livedata/oplog_observe_driver.js rename to packages/mongo/oplog_observe_driver.js diff --git a/packages/mongo-livedata/oplog_tailing.js b/packages/mongo/oplog_tailing.js similarity index 100% rename from packages/mongo-livedata/oplog_tailing.js rename to packages/mongo/oplog_tailing.js diff --git a/packages/mongo-livedata/oplog_tests.js b/packages/mongo/oplog_tests.js similarity index 100% rename from packages/mongo-livedata/oplog_tests.js rename to packages/mongo/oplog_tests.js diff --git a/packages/mongo/package.js b/packages/mongo/package.js new file mode 100644 index 0000000000..47048551c5 --- /dev/null +++ b/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'); +}); diff --git a/packages/mongo-livedata/polling_observe_driver.js b/packages/mongo/polling_observe_driver.js similarity index 100% rename from packages/mongo-livedata/polling_observe_driver.js rename to packages/mongo/polling_observe_driver.js diff --git a/packages/mongo-livedata/remote_collection_driver.js b/packages/mongo/remote_collection_driver.js similarity index 100% rename from packages/mongo-livedata/remote_collection_driver.js rename to packages/mongo/remote_collection_driver.js diff --git a/tools/auth.js b/tools/auth.js index 9d4a165960..a859538320 100644 --- a/tools/auth.js +++ b/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' ] }); }; diff --git a/tools/run-mongo.js b/tools/run-mongo.js index c21504e85b..188ba55abe 100644 --- a/tools/run-mongo.js +++ b/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( diff --git a/tools/uniload.js b/tools/uniload.js index 2a7569ff8c..3c3fbaf8f1 100644 --- a/tools/uniload.js +++ b/tools/uniload.js @@ -19,7 +19,7 @@ var ROOT_PACKAGES = [ 'meteor', 'minifiers', 'minimongo', - 'mongo-livedata', + 'mongo', 'package-version-parser' ];