From 29f221691932c8cb503495f7a342ef30eeb8b0df Mon Sep 17 00:00:00 2001 From: ekatek Date: Mon, 21 Apr 2014 19:02:30 -0700 Subject: [PATCH] rename test-packages back, make catalog slightly more efficient, add remaining versions.json --- packages/check/versions.json | 33 ++++++++++++++++++- packages/deps/versions.json | 35 ++++++++++++++++++++- packages/domutils/versions.json | 35 ++++++++++++++++++++- packages/ejson/versions.json | 34 +++++++++++++++++++- packages/geojson-utils/versions.json | 35 ++++++++++++++++++++- packages/handlebars/versions.json | 38 ++++++++++++++++------ packages/livedata/versions.json | 33 ++++++++++++++++--- packages/liverange/versions.json | 36 ++++++++++++++++++++- packages/logging/versions.json | 33 ++++++++++++++++++- packages/meteor/versions.json | 36 ++++++++++++++++++++- packages/minimongo/versions.json | 35 ++++++++++++++++++--- packages/mongo-livedata/versions.json | 42 +++++++++++++------------ packages/random/versions.json | 35 ++++++++++++++++++++- packages/reactive-dict/versions.json | 34 ++++++++++++++++++-- packages/session/versions.json | 22 +++++++------ packages/spark/versions.json | 37 ++++++++++++++++++---- packages/templating/versions.json | 39 ++++++++++++++++++----- packages/universal-events/versions.json | 34 +++++++++++++++++++- tools/catalog.js | 30 +++++++++--------- tools/commands.js | 4 +-- tools/package-source.js | 3 +- 21 files changed, 572 insertions(+), 91 deletions(-) diff --git a/packages/check/versions.json b/packages/check/versions.json index 92e642aa99..318aa10d73 100644 --- a/packages/check/versions.json +++ b/packages/check/versions.json @@ -1,9 +1,40 @@ { "dependencies": { "meteor": "1.0.0+local", + "check": "1.0.0+local", + "tinytest": "1.0.0+local", "underscore": "1.0.0+local", "ejson": "1.0.0+local", - "json": "1.0.0+local" + "random": "1.0.0+local", + "livedata": "1.0.0+local", + "mongo-livedata": "1.0.0+local", + "json": "1.0.0+local", + "deps": "1.0.0+local", + "logging": "1.0.0+local", + "retry": "1.0.0+local", + "reload": "1.0.0+local", + "minimongo": "1.0.0+local", + "webapp": "1.0.0+local", + "routepolicy": "1.0.0+local", + "audit-argument-checks": "1.0.0+local", + "autopublish": "1.0.0+local", + "facts": "1.0.0+local", + "callback-hook": "1.0.0+local", + "application-configuration": "1.0.0+local", + "insecure": "1.0.0+local", + "binary-heap": "1.0.0+local", + "disable-oplog": "1.0.0+local", + "id-map": "1.0.0+local", + "ordered-dict": "1.0.0+local", + "geojson-utils": "1.0.0+local", + "follower-livedata": "1.0.0+local", + "templating": "1.0.0+local", + "spark": "1.0.0+local", + "handlebars": "1.0.0+local", + "domutils": "1.0.0+local", + "liverange": "1.0.0+local", + "universal-events": "1.0.0+local", + "jquery": "1.0.0+local" }, "plugins": {}, "format": "1.0" diff --git a/packages/deps/versions.json b/packages/deps/versions.json index 1bdeb36895..9c9a7c9ad7 100644 --- a/packages/deps/versions.json +++ b/packages/deps/versions.json @@ -1,7 +1,40 @@ { "dependencies": { "meteor": "1.0.0+local", - "underscore": "1.0.0+local" + "tinytest": "1.0.0+local", + "deps": "1.0.0+local", + "underscore": "1.0.0+local", + "random": "1.0.0+local", + "livedata": "1.0.0+local", + "mongo-livedata": "1.0.0+local", + "check": "1.0.0+local", + "ejson": "1.0.0+local", + "json": "1.0.0+local", + "logging": "1.0.0+local", + "retry": "1.0.0+local", + "reload": "1.0.0+local", + "minimongo": "1.0.0+local", + "webapp": "1.0.0+local", + "routepolicy": "1.0.0+local", + "audit-argument-checks": "1.0.0+local", + "autopublish": "1.0.0+local", + "facts": "1.0.0+local", + "callback-hook": "1.0.0+local", + "application-configuration": "1.0.0+local", + "insecure": "1.0.0+local", + "binary-heap": "1.0.0+local", + "disable-oplog": "1.0.0+local", + "id-map": "1.0.0+local", + "ordered-dict": "1.0.0+local", + "geojson-utils": "1.0.0+local", + "follower-livedata": "1.0.0+local", + "templating": "1.0.0+local", + "spark": "1.0.0+local", + "handlebars": "1.0.0+local", + "domutils": "1.0.0+local", + "liverange": "1.0.0+local", + "universal-events": "1.0.0+local", + "jquery": "1.0.0+local" }, "plugins": {}, "format": "1.0" diff --git a/packages/domutils/versions.json b/packages/domutils/versions.json index 249fc65d27..f6baff1e1b 100644 --- a/packages/domutils/versions.json +++ b/packages/domutils/versions.json @@ -1,8 +1,41 @@ { "dependencies": { "meteor": "1.0.0+local", + "tinytest": "1.0.0+local", + "domutils": "1.0.0+local", + "test-helpers": "1.0.0+local", + "underscore": "1.0.0+local", + "random": "1.0.0+local", + "livedata": "1.0.0+local", + "mongo-livedata": "1.0.0+local", + "check": "1.0.0+local", "jquery": "1.0.0+local", - "underscore": "1.0.0+local" + "deps": "1.0.0+local", + "ejson": "1.0.0+local", + "spark": "1.0.0+local", + "json": "1.0.0+local", + "logging": "1.0.0+local", + "retry": "1.0.0+local", + "reload": "1.0.0+local", + "minimongo": "1.0.0+local", + "webapp": "1.0.0+local", + "routepolicy": "1.0.0+local", + "audit-argument-checks": "1.0.0+local", + "autopublish": "1.0.0+local", + "facts": "1.0.0+local", + "callback-hook": "1.0.0+local", + "application-configuration": "1.0.0+local", + "insecure": "1.0.0+local", + "binary-heap": "1.0.0+local", + "disable-oplog": "1.0.0+local", + "liverange": "1.0.0+local", + "universal-events": "1.0.0+local", + "ordered-dict": "1.0.0+local", + "id-map": "1.0.0+local", + "geojson-utils": "1.0.0+local", + "follower-livedata": "1.0.0+local", + "templating": "1.0.0+local", + "handlebars": "1.0.0+local" }, "plugins": {}, "format": "1.0" diff --git a/packages/ejson/versions.json b/packages/ejson/versions.json index 7315bb4b06..43315bf46c 100644 --- a/packages/ejson/versions.json +++ b/packages/ejson/versions.json @@ -1,8 +1,40 @@ { "dependencies": { "meteor": "1.0.0+local", + "ejson": "1.0.0+local", + "tinytest": "1.0.0+local", + "underscore": "1.0.0+local", "json": "1.0.0+local", - "underscore": "1.0.0+local" + "random": "1.0.0+local", + "livedata": "1.0.0+local", + "mongo-livedata": "1.0.0+local", + "check": "1.0.0+local", + "deps": "1.0.0+local", + "logging": "1.0.0+local", + "retry": "1.0.0+local", + "reload": "1.0.0+local", + "minimongo": "1.0.0+local", + "webapp": "1.0.0+local", + "routepolicy": "1.0.0+local", + "audit-argument-checks": "1.0.0+local", + "autopublish": "1.0.0+local", + "facts": "1.0.0+local", + "callback-hook": "1.0.0+local", + "application-configuration": "1.0.0+local", + "insecure": "1.0.0+local", + "binary-heap": "1.0.0+local", + "disable-oplog": "1.0.0+local", + "id-map": "1.0.0+local", + "ordered-dict": "1.0.0+local", + "geojson-utils": "1.0.0+local", + "follower-livedata": "1.0.0+local", + "templating": "1.0.0+local", + "spark": "1.0.0+local", + "handlebars": "1.0.0+local", + "domutils": "1.0.0+local", + "liverange": "1.0.0+local", + "universal-events": "1.0.0+local", + "jquery": "1.0.0+local" }, "plugins": {}, "format": "1.0" diff --git a/packages/geojson-utils/versions.json b/packages/geojson-utils/versions.json index 1bdeb36895..d6c01a20e8 100644 --- a/packages/geojson-utils/versions.json +++ b/packages/geojson-utils/versions.json @@ -1,7 +1,40 @@ { "dependencies": { "meteor": "1.0.0+local", - "underscore": "1.0.0+local" + "tinytest": "1.0.0+local", + "geojson-utils": "1.0.0+local", + "underscore": "1.0.0+local", + "random": "1.0.0+local", + "livedata": "1.0.0+local", + "mongo-livedata": "1.0.0+local", + "check": "1.0.0+local", + "ejson": "1.0.0+local", + "json": "1.0.0+local", + "deps": "1.0.0+local", + "logging": "1.0.0+local", + "retry": "1.0.0+local", + "reload": "1.0.0+local", + "minimongo": "1.0.0+local", + "webapp": "1.0.0+local", + "routepolicy": "1.0.0+local", + "audit-argument-checks": "1.0.0+local", + "autopublish": "1.0.0+local", + "facts": "1.0.0+local", + "callback-hook": "1.0.0+local", + "application-configuration": "1.0.0+local", + "insecure": "1.0.0+local", + "binary-heap": "1.0.0+local", + "disable-oplog": "1.0.0+local", + "id-map": "1.0.0+local", + "ordered-dict": "1.0.0+local", + "follower-livedata": "1.0.0+local", + "templating": "1.0.0+local", + "spark": "1.0.0+local", + "handlebars": "1.0.0+local", + "domutils": "1.0.0+local", + "liverange": "1.0.0+local", + "universal-events": "1.0.0+local", + "jquery": "1.0.0+local" }, "plugins": {}, "format": "1.0" diff --git a/packages/handlebars/versions.json b/packages/handlebars/versions.json index 33ef585546..e95bd7290c 100644 --- a/packages/handlebars/versions.json +++ b/packages/handlebars/versions.json @@ -1,20 +1,40 @@ { "dependencies": { "meteor": "1.0.0+local", + "tinytest": "1.0.0+local", "underscore": "1.0.0+local", - "spark": "1.0.0+local", "random": "1.0.0+local", + "livedata": "1.0.0+local", + "mongo-livedata": "1.0.0+local", + "check": "1.0.0+local", + "ejson": "1.0.0+local", + "json": "1.0.0+local", + "deps": "1.0.0+local", + "logging": "1.0.0+local", + "retry": "1.0.0+local", + "reload": "1.0.0+local", + "minimongo": "1.0.0+local", + "webapp": "1.0.0+local", + "routepolicy": "1.0.0+local", + "audit-argument-checks": "1.0.0+local", + "autopublish": "1.0.0+local", + "facts": "1.0.0+local", + "callback-hook": "1.0.0+local", + "application-configuration": "1.0.0+local", + "insecure": "1.0.0+local", + "binary-heap": "1.0.0+local", + "disable-oplog": "1.0.0+local", + "id-map": "1.0.0+local", + "ordered-dict": "1.0.0+local", + "geojson-utils": "1.0.0+local", + "follower-livedata": "1.0.0+local", + "templating": "1.0.0+local", + "spark": "1.0.0+local", + "handlebars": "1.0.0+local", "domutils": "1.0.0+local", "liverange": "1.0.0+local", "universal-events": "1.0.0+local", - "ordered-dict": "1.0.0+local", - "deps": "1.0.0+local", - "ejson": "1.0.0+local", - "minimongo": "1.0.0+local", - "jquery": "1.0.0+local", - "json": "1.0.0+local", - "id-map": "1.0.0+local", - "geojson-utils": "1.0.0+local" + "jquery": "1.0.0+local" }, "plugins": {}, "format": "1.0" diff --git a/packages/livedata/versions.json b/packages/livedata/versions.json index 83d73fa35b..19305a19a3 100644 --- a/packages/livedata/versions.json +++ b/packages/livedata/versions.json @@ -1,19 +1,42 @@ { "dependencies": { "meteor": "1.0.0+local", - "check": "1.0.0+local", + "livedata": "1.0.0+local", + "mongo-livedata": "1.0.0+local", + "test-helpers": "1.0.0+local", + "underscore": "1.0.0+local", + "tinytest": "1.0.0+local", "random": "1.0.0+local", + "deps": "1.0.0+local", + "minimongo": "1.0.0+local", + "http": "1.0.0+local", + "check": "1.0.0+local", "ejson": "1.0.0+local", "json": "1.0.0+local", - "underscore": "1.0.0+local", - "deps": "1.0.0+local", "logging": "1.0.0+local", "retry": "1.0.0+local", - "minimongo": "1.0.0+local", + "reload": "1.0.0+local", + "webapp": "1.0.0+local", + "routepolicy": "1.0.0+local", + "audit-argument-checks": "1.0.0+local", + "autopublish": "1.0.0+local", + "facts": "1.0.0+local", "callback-hook": "1.0.0+local", + "application-configuration": "1.0.0+local", + "insecure": "1.0.0+local", + "binary-heap": "1.0.0+local", + "disable-oplog": "1.0.0+local", + "domutils": "1.0.0+local", + "spark": "1.0.0+local", + "jquery": "1.0.0+local", "id-map": "1.0.0+local", "ordered-dict": "1.0.0+local", - "geojson-utils": "1.0.0+local" + "geojson-utils": "1.0.0+local", + "follower-livedata": "1.0.0+local", + "templating": "1.0.0+local", + "liverange": "1.0.0+local", + "universal-events": "1.0.0+local", + "handlebars": "1.0.0+local" }, "plugins": {}, "format": "1.0" diff --git a/packages/liverange/versions.json b/packages/liverange/versions.json index 1bdeb36895..ffe417ac5f 100644 --- a/packages/liverange/versions.json +++ b/packages/liverange/versions.json @@ -1,7 +1,41 @@ { "dependencies": { "meteor": "1.0.0+local", - "underscore": "1.0.0+local" + "tinytest": "1.0.0+local", + "liverange": "1.0.0+local", + "test-helpers": "1.0.0+local", + "domutils": "1.0.0+local", + "underscore": "1.0.0+local", + "jquery": "1.0.0+local", + "random": "1.0.0+local", + "livedata": "1.0.0+local", + "mongo-livedata": "1.0.0+local", + "check": "1.0.0+local", + "deps": "1.0.0+local", + "ejson": "1.0.0+local", + "spark": "1.0.0+local", + "json": "1.0.0+local", + "logging": "1.0.0+local", + "retry": "1.0.0+local", + "reload": "1.0.0+local", + "minimongo": "1.0.0+local", + "webapp": "1.0.0+local", + "routepolicy": "1.0.0+local", + "audit-argument-checks": "1.0.0+local", + "autopublish": "1.0.0+local", + "facts": "1.0.0+local", + "callback-hook": "1.0.0+local", + "application-configuration": "1.0.0+local", + "insecure": "1.0.0+local", + "binary-heap": "1.0.0+local", + "disable-oplog": "1.0.0+local", + "universal-events": "1.0.0+local", + "ordered-dict": "1.0.0+local", + "id-map": "1.0.0+local", + "geojson-utils": "1.0.0+local", + "follower-livedata": "1.0.0+local", + "templating": "1.0.0+local", + "handlebars": "1.0.0+local" }, "plugins": {}, "format": "1.0" diff --git a/packages/logging/versions.json b/packages/logging/versions.json index 92e642aa99..4bacc78905 100644 --- a/packages/logging/versions.json +++ b/packages/logging/versions.json @@ -1,9 +1,40 @@ { "dependencies": { "meteor": "1.0.0+local", + "tinytest": "1.0.0+local", "underscore": "1.0.0+local", "ejson": "1.0.0+local", - "json": "1.0.0+local" + "logging": "1.0.0+local", + "random": "1.0.0+local", + "livedata": "1.0.0+local", + "mongo-livedata": "1.0.0+local", + "check": "1.0.0+local", + "json": "1.0.0+local", + "deps": "1.0.0+local", + "retry": "1.0.0+local", + "reload": "1.0.0+local", + "minimongo": "1.0.0+local", + "webapp": "1.0.0+local", + "routepolicy": "1.0.0+local", + "audit-argument-checks": "1.0.0+local", + "autopublish": "1.0.0+local", + "facts": "1.0.0+local", + "callback-hook": "1.0.0+local", + "application-configuration": "1.0.0+local", + "insecure": "1.0.0+local", + "binary-heap": "1.0.0+local", + "disable-oplog": "1.0.0+local", + "id-map": "1.0.0+local", + "ordered-dict": "1.0.0+local", + "geojson-utils": "1.0.0+local", + "follower-livedata": "1.0.0+local", + "templating": "1.0.0+local", + "spark": "1.0.0+local", + "handlebars": "1.0.0+local", + "domutils": "1.0.0+local", + "liverange": "1.0.0+local", + "universal-events": "1.0.0+local", + "jquery": "1.0.0+local" }, "plugins": {}, "format": "1.0" diff --git a/packages/meteor/versions.json b/packages/meteor/versions.json index ac87db547b..8d2ebb71a1 100644 --- a/packages/meteor/versions.json +++ b/packages/meteor/versions.json @@ -1,7 +1,41 @@ { "dependencies": { + "meteor": "1.0.0+local", "underscore": "1.0.0+local", - "meteor": "1.0.0+local" + "tinytest": "1.0.0+local", + "test-helpers": "1.0.0+local", + "random": "1.0.0+local", + "livedata": "1.0.0+local", + "mongo-livedata": "1.0.0+local", + "check": "1.0.0+local", + "deps": "1.0.0+local", + "ejson": "1.0.0+local", + "domutils": "1.0.0+local", + "spark": "1.0.0+local", + "jquery": "1.0.0+local", + "json": "1.0.0+local", + "logging": "1.0.0+local", + "retry": "1.0.0+local", + "reload": "1.0.0+local", + "minimongo": "1.0.0+local", + "webapp": "1.0.0+local", + "routepolicy": "1.0.0+local", + "audit-argument-checks": "1.0.0+local", + "autopublish": "1.0.0+local", + "facts": "1.0.0+local", + "callback-hook": "1.0.0+local", + "application-configuration": "1.0.0+local", + "insecure": "1.0.0+local", + "binary-heap": "1.0.0+local", + "disable-oplog": "1.0.0+local", + "liverange": "1.0.0+local", + "universal-events": "1.0.0+local", + "ordered-dict": "1.0.0+local", + "id-map": "1.0.0+local", + "geojson-utils": "1.0.0+local", + "follower-livedata": "1.0.0+local", + "templating": "1.0.0+local", + "handlebars": "1.0.0+local" }, "plugins": { "basicFileTypes": {} diff --git a/packages/minimongo/versions.json b/packages/minimongo/versions.json index 3b22a85541..586cf19e28 100644 --- a/packages/minimongo/versions.json +++ b/packages/minimongo/versions.json @@ -1,14 +1,41 @@ { "dependencies": { "meteor": "1.0.0+local", + "minimongo": "1.0.0+local", + "test-helpers": "1.0.0+local", + "tinytest": "1.0.0+local", "underscore": "1.0.0+local", - "json": "1.0.0+local", "ejson": "1.0.0+local", - "id-map": "1.0.0+local", "ordered-dict": "1.0.0+local", - "deps": "1.0.0+local", "random": "1.0.0+local", - "geojson-utils": "1.0.0+local" + "deps": "1.0.0+local", + "json": "1.0.0+local", + "id-map": "1.0.0+local", + "geojson-utils": "1.0.0+local", + "domutils": "1.0.0+local", + "spark": "1.0.0+local", + "jquery": "1.0.0+local", + "livedata": "1.0.0+local", + "mongo-livedata": "1.0.0+local", + "check": "1.0.0+local", + "liverange": "1.0.0+local", + "universal-events": "1.0.0+local", + "logging": "1.0.0+local", + "retry": "1.0.0+local", + "reload": "1.0.0+local", + "webapp": "1.0.0+local", + "routepolicy": "1.0.0+local", + "audit-argument-checks": "1.0.0+local", + "autopublish": "1.0.0+local", + "facts": "1.0.0+local", + "callback-hook": "1.0.0+local", + "application-configuration": "1.0.0+local", + "insecure": "1.0.0+local", + "binary-heap": "1.0.0+local", + "disable-oplog": "1.0.0+local", + "follower-livedata": "1.0.0+local", + "templating": "1.0.0+local", + "handlebars": "1.0.0+local" }, "plugins": {}, "format": "1.0" diff --git a/packages/mongo-livedata/versions.json b/packages/mongo-livedata/versions.json index 3ee2d6afe3..8e4bde0992 100644 --- a/packages/mongo-livedata/versions.json +++ b/packages/mongo-livedata/versions.json @@ -1,39 +1,41 @@ { "dependencies": { "meteor": "1.0.0+local", - "random": "1.0.0+local", - "ejson": "1.0.0+local", - "json": "1.0.0+local", + "mongo-livedata": "1.0.0+local", + "check": "1.0.0+local", + "tinytest": "1.0.0+local", "underscore": "1.0.0+local", + "test-helpers": "1.0.0+local", + "ejson": "1.0.0+local", + "random": "1.0.0+local", + "livedata": "1.0.0+local", + "json": "1.0.0+local", "minimongo": "1.0.0+local", "logging": "1.0.0+local", - "livedata": "1.0.0+local", "deps": "1.0.0+local", "application-configuration": "1.0.0+local", - "check": "1.0.0+local", + "insecure": "1.0.0+local", "binary-heap": "1.0.0+local", + "autopublish": "1.0.0+local", + "disable-oplog": "1.0.0+local", + "webapp": "1.0.0+local", + "facts": "1.0.0+local", + "domutils": "1.0.0+local", + "spark": "1.0.0+local", + "jquery": "1.0.0+local", + "retry": "1.0.0+local", + "reload": "1.0.0+local", + "routepolicy": "1.0.0+local", + "audit-argument-checks": "1.0.0+local", + "callback-hook": "1.0.0+local", "id-map": "1.0.0+local", "ordered-dict": "1.0.0+local", "geojson-utils": "1.0.0+local", - "retry": "1.0.0+local", - "reload": "1.0.0+local", - "webapp": "1.0.0+local", - "routepolicy": "1.0.0+local", - "audit-argument-checks": "1.0.0+local", - "autopublish": "1.0.0+local", - "facts": "1.0.0+local", - "callback-hook": "1.0.0+local", "follower-livedata": "1.0.0+local", - "mongo-livedata": "1.0.0+local", "templating": "1.0.0+local", - "insecure": "1.0.0+local", - "disable-oplog": "1.0.0+local", - "spark": "1.0.0+local", - "handlebars": "1.0.0+local", - "domutils": "1.0.0+local", "liverange": "1.0.0+local", "universal-events": "1.0.0+local", - "jquery": "1.0.0+local" + "handlebars": "1.0.0+local" }, "plugins": {}, "format": "1.0" diff --git a/packages/random/versions.json b/packages/random/versions.json index 1bdeb36895..2498440cd1 100644 --- a/packages/random/versions.json +++ b/packages/random/versions.json @@ -1,7 +1,40 @@ { "dependencies": { "meteor": "1.0.0+local", - "underscore": "1.0.0+local" + "random": "1.0.0+local", + "tinytest": "1.0.0+local", + "underscore": "1.0.0+local", + "livedata": "1.0.0+local", + "mongo-livedata": "1.0.0+local", + "check": "1.0.0+local", + "ejson": "1.0.0+local", + "json": "1.0.0+local", + "deps": "1.0.0+local", + "logging": "1.0.0+local", + "retry": "1.0.0+local", + "reload": "1.0.0+local", + "minimongo": "1.0.0+local", + "webapp": "1.0.0+local", + "routepolicy": "1.0.0+local", + "audit-argument-checks": "1.0.0+local", + "autopublish": "1.0.0+local", + "facts": "1.0.0+local", + "callback-hook": "1.0.0+local", + "application-configuration": "1.0.0+local", + "insecure": "1.0.0+local", + "binary-heap": "1.0.0+local", + "disable-oplog": "1.0.0+local", + "id-map": "1.0.0+local", + "ordered-dict": "1.0.0+local", + "geojson-utils": "1.0.0+local", + "follower-livedata": "1.0.0+local", + "templating": "1.0.0+local", + "spark": "1.0.0+local", + "handlebars": "1.0.0+local", + "domutils": "1.0.0+local", + "liverange": "1.0.0+local", + "universal-events": "1.0.0+local", + "jquery": "1.0.0+local" }, "plugins": {}, "format": "1.0" diff --git a/packages/reactive-dict/versions.json b/packages/reactive-dict/versions.json index bf6ccf6b12..e95bd7290c 100644 --- a/packages/reactive-dict/versions.json +++ b/packages/reactive-dict/versions.json @@ -1,10 +1,40 @@ { "dependencies": { "meteor": "1.0.0+local", + "tinytest": "1.0.0+local", "underscore": "1.0.0+local", - "deps": "1.0.0+local", + "random": "1.0.0+local", + "livedata": "1.0.0+local", + "mongo-livedata": "1.0.0+local", + "check": "1.0.0+local", "ejson": "1.0.0+local", - "json": "1.0.0+local" + "json": "1.0.0+local", + "deps": "1.0.0+local", + "logging": "1.0.0+local", + "retry": "1.0.0+local", + "reload": "1.0.0+local", + "minimongo": "1.0.0+local", + "webapp": "1.0.0+local", + "routepolicy": "1.0.0+local", + "audit-argument-checks": "1.0.0+local", + "autopublish": "1.0.0+local", + "facts": "1.0.0+local", + "callback-hook": "1.0.0+local", + "application-configuration": "1.0.0+local", + "insecure": "1.0.0+local", + "binary-heap": "1.0.0+local", + "disable-oplog": "1.0.0+local", + "id-map": "1.0.0+local", + "ordered-dict": "1.0.0+local", + "geojson-utils": "1.0.0+local", + "follower-livedata": "1.0.0+local", + "templating": "1.0.0+local", + "spark": "1.0.0+local", + "handlebars": "1.0.0+local", + "domutils": "1.0.0+local", + "liverange": "1.0.0+local", + "universal-events": "1.0.0+local", + "jquery": "1.0.0+local" }, "plugins": {}, "format": "1.0" diff --git a/packages/session/versions.json b/packages/session/versions.json index 52a03c908b..003282c3c2 100644 --- a/packages/session/versions.json +++ b/packages/session/versions.json @@ -1,32 +1,34 @@ { "dependencies": { "meteor": "1.0.0+local", - "underscore": "1.0.0+local", - "reactive-dict": "1.0.0+local", - "ejson": "1.0.0+local", + "tinytest": "1.0.0+local", + "session": "1.0.0+local", "deps": "1.0.0+local", "mongo-livedata": "1.0.0+local", - "json": "1.0.0+local", + "underscore": "1.0.0+local", "random": "1.0.0+local", + "livedata": "1.0.0+local", + "check": "1.0.0+local", + "reactive-dict": "1.0.0+local", + "ejson": "1.0.0+local", + "reload": "1.0.0+local", + "json": "1.0.0+local", "minimongo": "1.0.0+local", "logging": "1.0.0+local", - "livedata": "1.0.0+local", "application-configuration": "1.0.0+local", - "check": "1.0.0+local", "insecure": "1.0.0+local", "binary-heap": "1.0.0+local", "autopublish": "1.0.0+local", "disable-oplog": "1.0.0+local", "webapp": "1.0.0+local", "facts": "1.0.0+local", - "id-map": "1.0.0+local", - "ordered-dict": "1.0.0+local", - "geojson-utils": "1.0.0+local", "retry": "1.0.0+local", - "reload": "1.0.0+local", "routepolicy": "1.0.0+local", "audit-argument-checks": "1.0.0+local", "callback-hook": "1.0.0+local", + "id-map": "1.0.0+local", + "ordered-dict": "1.0.0+local", + "geojson-utils": "1.0.0+local", "follower-livedata": "1.0.0+local", "templating": "1.0.0+local", "spark": "1.0.0+local", diff --git a/packages/spark/versions.json b/packages/spark/versions.json index e3bbca9b9c..5720b930a4 100644 --- a/packages/spark/versions.json +++ b/packages/spark/versions.json @@ -1,16 +1,41 @@ { "dependencies": { "meteor": "1.0.0+local", + "tinytest": "1.0.0+local", "underscore": "1.0.0+local", - "random": "1.0.0+local", - "domutils": "1.0.0+local", "liverange": "1.0.0+local", - "universal-events": "1.0.0+local", - "ordered-dict": "1.0.0+local", "deps": "1.0.0+local", - "ejson": "1.0.0+local", + "domutils": "1.0.0+local", + "minimongo": "1.0.0+local", + "random": "1.0.0+local", + "spark": "1.0.0+local", + "test-helpers": "1.0.0+local", "jquery": "1.0.0+local", - "json": "1.0.0+local" + "webapp": "1.0.0+local", + "livedata": "1.0.0+local", + "mongo-livedata": "1.0.0+local", + "check": "1.0.0+local", + "json": "1.0.0+local", + "ejson": "1.0.0+local", + "id-map": "1.0.0+local", + "ordered-dict": "1.0.0+local", + "geojson-utils": "1.0.0+local", + "universal-events": "1.0.0+local", + "application-configuration": "1.0.0+local", + "follower-livedata": "1.0.0+local", + "logging": "1.0.0+local", + "routepolicy": "1.0.0+local", + "retry": "1.0.0+local", + "reload": "1.0.0+local", + "audit-argument-checks": "1.0.0+local", + "autopublish": "1.0.0+local", + "facts": "1.0.0+local", + "callback-hook": "1.0.0+local", + "insecure": "1.0.0+local", + "binary-heap": "1.0.0+local", + "disable-oplog": "1.0.0+local", + "templating": "1.0.0+local", + "handlebars": "1.0.0+local" }, "plugins": {}, "format": "1.0" diff --git a/packages/templating/versions.json b/packages/templating/versions.json index 43a3dc0c54..171fe1cbc7 100644 --- a/packages/templating/versions.json +++ b/packages/templating/versions.json @@ -1,21 +1,44 @@ { "dependencies": { "meteor": "1.0.0+local", - "underscore": "1.0.0+local", - "spark": "1.0.0+local", + "tinytest": "1.0.0+local", + "htmljs": "1.0.0+local", + "templating": "1.0.0+local", "handlebars": "1.0.0+local", - "random": "1.0.0+local", + "underscore": "1.0.0+local", + "test-helpers": "1.0.0+local", "domutils": "1.0.0+local", + "session": "1.0.0+local", + "deps": "1.0.0+local", + "spark": "1.0.0+local", + "minimongo": "1.0.0+local", + "random": "1.0.0+local", + "livedata": "1.0.0+local", + "mongo-livedata": "1.0.0+local", + "check": "1.0.0+local", + "ejson": "1.0.0+local", + "jquery": "1.0.0+local", + "reactive-dict": "1.0.0+local", + "reload": "1.0.0+local", "liverange": "1.0.0+local", "universal-events": "1.0.0+local", "ordered-dict": "1.0.0+local", - "deps": "1.0.0+local", - "ejson": "1.0.0+local", - "minimongo": "1.0.0+local", - "jquery": "1.0.0+local", "json": "1.0.0+local", "id-map": "1.0.0+local", - "geojson-utils": "1.0.0+local" + "geojson-utils": "1.0.0+local", + "logging": "1.0.0+local", + "retry": "1.0.0+local", + "webapp": "1.0.0+local", + "routepolicy": "1.0.0+local", + "audit-argument-checks": "1.0.0+local", + "autopublish": "1.0.0+local", + "facts": "1.0.0+local", + "callback-hook": "1.0.0+local", + "application-configuration": "1.0.0+local", + "insecure": "1.0.0+local", + "binary-heap": "1.0.0+local", + "disable-oplog": "1.0.0+local", + "follower-livedata": "1.0.0+local" }, "plugins": { "compileTemplates": { diff --git a/packages/universal-events/versions.json b/packages/universal-events/versions.json index 9e3e6eed0a..b3bea29f01 100644 --- a/packages/universal-events/versions.json +++ b/packages/universal-events/versions.json @@ -1,9 +1,41 @@ { "dependencies": { "meteor": "1.0.0+local", + "tinytest": "1.0.0+local", + "universal-events": "1.0.0+local", + "test-helpers": "1.0.0+local", "underscore": "1.0.0+local", "domutils": "1.0.0+local", - "jquery": "1.0.0+local" + "spark": "1.0.0+local", + "random": "1.0.0+local", + "livedata": "1.0.0+local", + "mongo-livedata": "1.0.0+local", + "check": "1.0.0+local", + "deps": "1.0.0+local", + "ejson": "1.0.0+local", + "jquery": "1.0.0+local", + "liverange": "1.0.0+local", + "ordered-dict": "1.0.0+local", + "minimongo": "1.0.0+local", + "json": "1.0.0+local", + "logging": "1.0.0+local", + "retry": "1.0.0+local", + "reload": "1.0.0+local", + "webapp": "1.0.0+local", + "routepolicy": "1.0.0+local", + "audit-argument-checks": "1.0.0+local", + "autopublish": "1.0.0+local", + "facts": "1.0.0+local", + "callback-hook": "1.0.0+local", + "application-configuration": "1.0.0+local", + "insecure": "1.0.0+local", + "binary-heap": "1.0.0+local", + "disable-oplog": "1.0.0+local", + "id-map": "1.0.0+local", + "geojson-utils": "1.0.0+local", + "follower-livedata": "1.0.0+local", + "templating": "1.0.0+local", + "handlebars": "1.0.0+local" }, "plugins": {}, "format": "1.0" diff --git a/tools/catalog.js b/tools/catalog.js index 6ee109392f..b4434a1629 100644 --- a/tools/catalog.js +++ b/tools/catalog.js @@ -255,7 +255,6 @@ _.extend(Catalog.prototype, { // problem, we either will have made tools into a star, or we'll // have made Catalog be backed by a real database. var versionId = "local-" + Math.floor(Math.random() * 1000000000); - versionIds[name] = versionId; // Accurate version numbers are of supreme importance, because // we use version numbers (of build-time dependencies such as @@ -308,25 +307,28 @@ _.extend(Catalog.prototype, { source: null, lastUpdated: null, published: null, - isTest: test, + isTest: packageSource.isTest, containsPlugins: packageSource.containsPlugins() }); + + // Test packages are not allowed to have tests. Any time we recurse into + // this function, it will be with test marked as true, so recursion + // will terminate quickly. + if (!test && packageSource.test) { + self.effectiveLocalPackages[packageSource.test] = packageSource.sourceRoot; + initVersionRecordFromSource(packageSource.sourceRoot, packageSource.test, true); + } }; - var versionIds = {}; // name to _id of the created Version record - - // First, we add the records for all the local packages. - _.each(self.effectiveLocalPackages, initVersionRecordFromSource); - - // Sometimes, packages contain test packages. We treat them as separate - // packages. Add those packages to the catalog too. - _.each(packageSources, function (source) { - if (source.test) { - self.effectiveLocalPackages[source.test] = source.sourceRoot; - initVersionRecordFromSource(source.sourceRoot, source.test, true); - } + // Add the records for packages and their tests. With underscore, each only + // runs on the original members of the collection, so it is safe to modify + // effectiveLocalPackages in initPackageSource (to add test packages). + _.each(self.effectiveLocalPackages, function(dir, name) { + initVersionRecordFromSource(dir, name, false /* test-only package? */); }); + // We have entered records for everything, and we are going to build lazily, + // so we are done. if (_setInitialized) self.initialized = true; diff --git a/tools/commands.js b/tools/commands.js index e09eaabb53..137da6b6c1 100644 --- a/tools/commands.js +++ b/tools/commands.js @@ -1273,14 +1273,14 @@ main.registerCommand({ /////////////////////////////////////////////////////////////////////////////// -// test +// test-packages /////////////////////////////////////////////////////////////////////////////// // // Test your local packages. // main.registerCommand({ - name: 'test', + name: 'test-packages', maxArgs: Infinity, options: { port: { type: Number, short: "p", default: 3000 }, diff --git a/tools/package-source.js b/tools/package-source.js index 00438e76df..2d0a06f01d 100644 --- a/tools/package-source.js +++ b/tools/package-source.js @@ -308,7 +308,8 @@ _.extend(PackageSource.prototype, { self.defaultArches = {'os': [options.archName]}; - self.dependencyVersions = options.dependencyVersions || {dependencies: {}, plugins: {}}; + self.dependencyVersions = options.dependencyVersions || + {dependencies: {}, plugins: {}}; }, // Initialize a PackageSource from a package.js-style package directory. Uses