From 99a57a5e7c6ef5f95b690f2431049aacd6f71d62 Mon Sep 17 00:00:00 2001 From: Sashko Stubailo Date: Mon, 29 Sep 2014 21:57:19 -0700 Subject: [PATCH 01/18] Bump docs version number --- docs/client/docs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/client/docs.js b/docs/client/docs.js index cb5af85a8d..6d8f7db1b1 100644 --- a/docs/client/docs.js +++ b/docs/client/docs.js @@ -1,6 +1,6 @@ Template.headline.helpers({ release: function () { - return Meteor.release ? "0.9.3" : "(checkout)"; + return Meteor.release ? "0.9.4-pre.1" : "(checkout)"; } }); From 283b57894dd172ef60728416308d6b0c0cbd35c9 Mon Sep 17 00:00:00 2001 From: Sashko Stubailo Date: Mon, 29 Sep 2014 23:01:33 -0700 Subject: [PATCH 02/18] Update todos app --- examples/todos/.meteor/versions | 2 +- .../platforms/ios/mdg-todos/mdg-todos-Info.plist | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/todos/.meteor/versions b/examples/todos/.meteor/versions index f3ef6cec20..ae1b2a7b21 100644 --- a/examples/todos/.meteor/versions +++ b/examples/todos/.meteor/versions @@ -26,7 +26,7 @@ insecure@1.0.0 iron:core@0.3.4 iron:dynamic-template@0.4.1 iron:layout@0.4.1 -iron:router@0.9.3 +iron:router@0.9.4 jquery@1.0.0 json@1.0.0 less@1.0.8 diff --git a/examples/todos/cordova-build-override/platforms/ios/mdg-todos/mdg-todos-Info.plist b/examples/todos/cordova-build-override/platforms/ios/mdg-todos/mdg-todos-Info.plist index 3a2475c0ac..4495066ecc 100644 --- a/examples/todos/cordova-build-override/platforms/ios/mdg-todos/mdg-todos-Info.plist +++ b/examples/todos/cordova-build-override/platforms/ios/mdg-todos/mdg-todos-Info.plist @@ -72,10 +72,10 @@ UISupportedInterfaceOrientations + UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeRight - UIInterfaceOrientationPortrait UISupportedInterfaceOrientations~ipad From e3e9d9e3d720b6f714acd4a08a2316a2cb5dc4e1 Mon Sep 17 00:00:00 2001 From: Sashko Stubailo Date: Mon, 29 Sep 2014 23:40:12 -0700 Subject: [PATCH 03/18] Bump version number for release --- .../admin/meteor-release-experimental.json | 4 +- .../old/app-with-private/.meteor/versions | 40 +++++++++---------- .../packages/test-package/versions.json | 2 +- .../old/app-with-public/.meteor/versions | 40 +++++++++---------- tools/tests/old/empty-app/.meteor/versions | 40 +++++++++---------- 5 files changed, 63 insertions(+), 63 deletions(-) diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json index ba83955fca..c8f6d6d67e 100644 --- a/scripts/admin/meteor-release-experimental.json +++ b/scripts/admin/meteor-release-experimental.json @@ -1,7 +1,7 @@ { "track": "METEOR", - "version": "0.9.3-rc8", + "version": "0.9.4-pre.0", "recommended": false, "official": false, - "description": "A release candidate of Meteor 0.9.3." + "description": "A preview of Meteor 0.9.4." } diff --git a/tools/tests/old/app-with-private/.meteor/versions b/tools/tests/old/app-with-private/.meteor/versions index ccf68bf3e3..1be8ec2b70 100644 --- a/tools/tests/old/app-with-private/.meteor/versions +++ b/tools/tests/old/app-with-private/.meteor/versions @@ -1,53 +1,53 @@ application-configuration@1.0.2 autopublish@1.0.0 -autoupdate@1.1.0 +autoupdate@1.1.1 base64@1.0.0 binary-heap@1.0.0 blaze-tools@1.0.0 -blaze@2.0.0 +blaze@2.0.1 boilerplate-generator@1.0.0 callback-hook@1.0.0 -check@1.0.0 +check@1.0.1 ctl-helper@1.0.3 ctl@1.0.1 -ddp@1.0.8 -deps@1.0.3 -ejson@1.0.2 +ddp@1.0.9 +deps@1.0.4 +ejson@1.0.3 fastclick@1.0.0 follower-livedata@1.0.1 geojson-utils@1.0.0 -html-tools@1.0.0 +html-tools@1.0.1 htmljs@1.0.1 -http@1.0.5 +http@1.0.6 id-map@1.0.0 insecure@1.0.0 jquery@1.0.0 json@1.0.0 -livedata@1.0.9 +livedata@1.0.10 logging@1.0.3 -meteor-platform@1.1.0 -meteor@1.1.0 +meteor-platform@1.1.1 +meteor@1.1.1 minifiers@1.1.0 minimongo@1.0.3 mobile-status-bar@1.0.0 -mongo@1.0.5 +mongo@1.0.6 observe-sequence@1.0.2 ordered-dict@1.0.0 random@1.0.0 -reactive-dict@1.0.2 -reactive-var@1.0.1 +reactive-dict@1.0.3 +reactive-var@1.0.2 reload@1.1.0 retry@1.0.0 routepolicy@1.0.1 -session@1.0.1 +session@1.0.2 spacebars-compiler@1.0.2 -spacebars@1.0.1 -standard-app-packages@1.0.1 -templating@1.0.6 +spacebars@1.0.2 +standard-app-packages@1.0.2 +templating@1.0.7 test-package@1.0.0 tracker@1.0.2 -ui@1.0.2 +ui@1.0.3 underscore@1.0.0 url@1.0.0 webapp-hashing@1.0.0 -webapp@1.1.1 +webapp@1.1.2 diff --git a/tools/tests/old/app-with-private/packages/test-package/versions.json b/tools/tests/old/app-with-private/packages/test-package/versions.json index e17d0dd6ea..3eca5b90d2 100644 --- a/tools/tests/old/app-with-private/packages/test-package/versions.json +++ b/tools/tests/old/app-with-private/packages/test-package/versions.json @@ -2,7 +2,7 @@ "dependencies": [ [ "meteor", - "1.1.0" + "1.1.1" ], [ "underscore", diff --git a/tools/tests/old/app-with-public/.meteor/versions b/tools/tests/old/app-with-public/.meteor/versions index cc05d015b5..a7a8e06306 100644 --- a/tools/tests/old/app-with-public/.meteor/versions +++ b/tools/tests/old/app-with-public/.meteor/versions @@ -1,53 +1,53 @@ application-configuration@1.0.2 autopublish@1.0.0 -autoupdate@1.1.0 +autoupdate@1.1.1 base64@1.0.0 binary-heap@1.0.0 blaze-tools@1.0.0 -blaze@2.0.0 +blaze@2.0.1 boilerplate-generator@1.0.0 callback-hook@1.0.0 -check@1.0.0 +check@1.0.1 ctl-helper@1.0.3 ctl@1.0.1 -ddp@1.0.8 -deps@1.0.3 -ejson@1.0.2 +ddp@1.0.9 +deps@1.0.4 +ejson@1.0.3 fastclick@1.0.0 follower-livedata@1.0.1 geojson-utils@1.0.0 -html-tools@1.0.0 +html-tools@1.0.1 htmljs@1.0.1 -http@1.0.5 +http@1.0.6 id-map@1.0.0 insecure@1.0.0 jquery@1.0.0 json@1.0.0 -livedata@1.0.9 +livedata@1.0.10 logging@1.0.3 -meteor-platform@1.1.0 -meteor@1.1.0 +meteor-platform@1.1.1 +meteor@1.1.1 minifiers@1.1.0 minimongo@1.0.3 mobile-status-bar@1.0.0 -mongo@1.0.5 +mongo@1.0.6 observe-sequence@1.0.2 ordered-dict@1.0.0 preserve-inputs@1.0.0 random@1.0.0 -reactive-dict@1.0.2 -reactive-var@1.0.1 +reactive-dict@1.0.3 +reactive-var@1.0.2 reload@1.1.0 retry@1.0.0 routepolicy@1.0.1 -session@1.0.1 +session@1.0.2 spacebars-compiler@1.0.2 -spacebars@1.0.1 -standard-app-packages@1.0.1 -templating@1.0.6 +spacebars@1.0.2 +standard-app-packages@1.0.2 +templating@1.0.7 tracker@1.0.2 -ui@1.0.2 +ui@1.0.3 underscore@1.0.0 url@1.0.0 webapp-hashing@1.0.0 -webapp@1.1.1 +webapp@1.1.2 diff --git a/tools/tests/old/empty-app/.meteor/versions b/tools/tests/old/empty-app/.meteor/versions index 02cf1a2181..61b6d0d4ba 100644 --- a/tools/tests/old/empty-app/.meteor/versions +++ b/tools/tests/old/empty-app/.meteor/versions @@ -1,50 +1,50 @@ application-configuration@1.0.2 -autoupdate@1.1.0 +autoupdate@1.1.1 base64@1.0.0 binary-heap@1.0.0 blaze-tools@1.0.0 -blaze@2.0.0 +blaze@2.0.1 boilerplate-generator@1.0.0 callback-hook@1.0.0 -check@1.0.0 +check@1.0.1 ctl-helper@1.0.3 ctl@1.0.1 -ddp@1.0.8 -deps@1.0.3 -ejson@1.0.2 +ddp@1.0.9 +deps@1.0.4 +ejson@1.0.3 fastclick@1.0.0 follower-livedata@1.0.1 geojson-utils@1.0.0 -html-tools@1.0.0 +html-tools@1.0.1 htmljs@1.0.1 -http@1.0.5 +http@1.0.6 id-map@1.0.0 jquery@1.0.0 json@1.0.0 -livedata@1.0.9 +livedata@1.0.10 logging@1.0.3 -meteor-platform@1.1.0 -meteor@1.1.0 +meteor-platform@1.1.1 +meteor@1.1.1 minifiers@1.1.0 minimongo@1.0.3 mobile-status-bar@1.0.0 -mongo@1.0.5 +mongo@1.0.6 observe-sequence@1.0.2 ordered-dict@1.0.0 random@1.0.0 -reactive-dict@1.0.2 -reactive-var@1.0.1 +reactive-dict@1.0.3 +reactive-var@1.0.2 reload@1.1.0 retry@1.0.0 routepolicy@1.0.1 -session@1.0.1 +session@1.0.2 spacebars-compiler@1.0.2 -spacebars@1.0.1 -standard-app-packages@1.0.1 -templating@1.0.6 +spacebars@1.0.2 +standard-app-packages@1.0.2 +templating@1.0.7 tracker@1.0.2 -ui@1.0.2 +ui@1.0.3 underscore@1.0.0 url@1.0.0 webapp-hashing@1.0.0 -webapp@1.1.1 +webapp@1.1.2 From c48a1284f8d3e1a6dd5c3e2b01166842d34f9293 Mon Sep 17 00:00:00 2001 From: Sashko Stubailo Date: Mon, 29 Sep 2014 23:41:17 -0700 Subject: [PATCH 04/18] Script to bump all version numbers --- scripts/admin/bump-all-version-numbers.js | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 scripts/admin/bump-all-version-numbers.js diff --git a/scripts/admin/bump-all-version-numbers.js b/scripts/admin/bump-all-version-numbers.js new file mode 100644 index 0000000000..863c15620b --- /dev/null +++ b/scripts/admin/bump-all-version-numbers.js @@ -0,0 +1,20 @@ +var fs = require("fs"); +var _ = require("../../packages/underscore/underscore.js")._; + +var filenames = _.rest(process.argv, 2); + +_.each(filenames, function (name) { + var content = fs.readFileSync(name, {encoding: "utf-8"}); + + match = content.match(/\d+\.\d+\.\d+/); + if (match) { + var versionNumber = match[0]; + var s = versionNumber.split("."); + s[2] = (parseInt(s[2], 10) + 1) + ""; + var incremented = s.join(".") + "-pre.0"; + + content = content.replace(versionNumber, incremented); + + fs.writeFileSync(name, content); + } +}); From 6273527450a1e8fae1dde9aa9a899b32252b597c Mon Sep 17 00:00:00 2001 From: Nick Martin Date: Mon, 29 Sep 2014 23:42:32 -0700 Subject: [PATCH 05/18] Fix velocity test command for new parsedUrl (e7037b72) --- tools/commands.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/commands.js b/tools/commands.js index d949ed4e79..f69ee6fb31 100644 --- a/tools/commands.js +++ b/tools/commands.js @@ -318,8 +318,8 @@ function doRunCommand (options) { // // NOTE: this calls process.exit() when testing is done. if (options['test']){ - var serverUrl = "http://" + (parsedHostPort.host || "localhost") + - ":" + parsedHostPort.port; + var serverUrl = "http://" + (parsedUrl.host || "localhost") + + ":" + parsedUrl.port; var velocity = require('./run-velocity.js'); velocity.runVelocity(serverUrl); } From eecc272e4ad9f7a0caaa579889a179bd7f39eec8 Mon Sep 17 00:00:00 2001 From: Sashko Stubailo Date: Mon, 29 Sep 2014 23:44:50 -0700 Subject: [PATCH 06/18] Bump every single package version number due to a change in compilation --- packages/accounts-base/package.js | 2 +- packages/accounts-facebook/package.js | 2 +- packages/accounts-github/package.js | 2 +- packages/accounts-google/package.js | 2 +- packages/accounts-meetup/package.js | 2 +- packages/accounts-meteor-developer/package.js | 2 +- packages/accounts-oauth/package.js | 2 +- packages/accounts-password/package.js | 2 +- packages/accounts-twitter/package.js | 2 +- packages/accounts-ui-unstyled/package.js | 2 +- packages/accounts-ui/package.js | 2 +- packages/accounts-weibo/package.js | 2 +- packages/appcache/package.js | 2 +- packages/application-configuration/package.js | 2 +- packages/audit-argument-checks/package.js | 2 +- packages/autopublish/package.js | 2 +- packages/autoupdate/package.js | 2 +- packages/base64/package.js | 2 +- packages/binary-heap/package.js | 2 +- packages/blaze-tools/package.js | 2 +- packages/blaze/package.js | 2 +- packages/boilerplate-generator/package.js | 2 +- packages/browser-policy-common/package.js | 2 +- packages/browser-policy-content/package.js | 2 +- packages/browser-policy-framing/package.js | 2 +- packages/browser-policy/package.js | 2 +- packages/callback-hook/package.js | 2 +- packages/check/package.js | 2 +- packages/code-prettify/package.js | 2 +- packages/coffeescript-test-helper/package.js | 2 +- packages/coffeescript/package.js | 2 +- packages/constraint-solver/package.js | 2 +- packages/ctl-helper/package.js | 2 +- packages/ctl/package.js | 2 +- packages/ddp/package.js | 2 +- packages/deps/package.js | 2 +- packages/dev-bundle-fetcher/package.js | 2 +- packages/disable-oplog/package.js | 2 +- packages/ejson/package.js | 2 +- packages/email/package.js | 2 +- packages/facebook/package.js | 2 +- packages/facts/package.js | 2 +- packages/fastclick/package.js | 2 +- packages/follower-livedata/package.js | 2 +- packages/force-ssl/package.js | 2 +- packages/geojson-utils/package.js | 2 +- packages/github/package.js | 2 +- packages/google/package.js | 2 +- packages/handlebars/package.js | 2 +- packages/html-tools/package.js | 2 +- packages/htmljs/package.js | 2 +- packages/http/package.js | 2 +- packages/id-map/package.js | 2 +- packages/insecure/package.js | 2 +- packages/jquery-history/package.js | 2 +- packages/jquery-layout/package.js | 2 +- packages/jquery-waypoints/package.js | 2 +- packages/jquery/package.js | 2 +- packages/js-analyze-tests/package.js | 2 +- packages/js-analyze/package.js | 2 +- packages/json/package.js | 2 +- packages/jsparse/package.js | 2 +- packages/less/package.js | 2 +- packages/livedata/package.js | 2 +- packages/localstorage/package.js | 2 +- packages/logging/package.js | 2 +- packages/markdown/package.js | 2 +- packages/meetup/package.js | 2 +- packages/meteor-developer/package.js | 2 +- packages/meteor-platform/package.js | 2 +- packages/meteor-tool/package.js | 2 +- packages/meteor/package.js | 2 +- packages/meyerweb-reset/package.js | 2 +- packages/minifiers/package.js | 2 +- packages/minimongo/package.js | 2 +- packages/mobile-status-bar/package.js | 2 +- packages/mongo-livedata/package.js | 2 +- packages/mongo/package.js | 2 +- packages/oauth-encryption/package.js | 2 +- packages/oauth/package.js | 2 +- packages/oauth1/package.js | 2 +- packages/oauth2/package.js | 2 +- packages/observe-sequence/package.js | 2 +- packages/ordered-dict/package.js | 2 +- packages/package-stats-opt-out/package.js | 2 +- packages/package-version-parser/package.js | 2 +- packages/preserve-inputs/package.js | 2 +- packages/random/package.js | 2 +- packages/reactive-dict/package.js | 2 +- packages/reactive-var/package.js | 2 +- packages/reload-safetybelt/package.js | 2 +- packages/reload/package.js | 2 +- packages/retry/package.js | 2 +- packages/routepolicy/package.js | 2 +- packages/service-configuration/package.js | 2 +- packages/session/package.js | 2 +- packages/sha/package.js | 2 +- packages/showdown/package.js | 2 +- packages/spacebars-compiler/package.js | 2 +- packages/spacebars-tests/package.js | 2 +- packages/spacebars/package.js | 2 +- packages/spiderable/package.js | 2 +- packages/srp/package.js | 2 +- packages/standard-app-packages/package.js | 2 +- packages/star-translate/package.js | 2 +- packages/startup/package.js | 2 +- packages/stylus/package.js | 2 +- packages/templating/package.js | 2 +- packages/test-helpers/package.js | 2 +- packages/test-in-browser/package.js | 2 +- packages/test-in-console/package.js | 2 +- packages/test-server-tests-in-console-once/package.js | 2 +- packages/tinytest/package.js | 2 +- packages/tracker/package.js | 2 +- packages/twitter/package.js | 2 +- packages/ui/package.js | 2 +- packages/underscore-tests/package.js | 2 +- packages/underscore/package.js | 2 +- packages/url/package.js | 2 +- packages/webapp-hashing/package.js | 2 +- packages/webapp/package.js | 2 +- packages/weibo/package.js | 2 +- 122 files changed, 122 insertions(+), 122 deletions(-) diff --git a/packages/accounts-base/package.js b/packages/accounts-base/package.js index 43ab8ba651..73a9b5b199 100644 --- a/packages/accounts-base/package.js +++ b/packages/accounts-base/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "A user account system", - version: "1.1.1" + version: "1.1.2-pre.0" }); Package.on_use(function (api) { diff --git a/packages/accounts-facebook/package.js b/packages/accounts-facebook/package.js index 51f5a393b9..f87178fe51 100644 --- a/packages/accounts-facebook/package.js +++ b/packages/accounts-facebook/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Login service for Facebook accounts", - version: "1.0.1" + version: "1.0.2-pre.0" }); Package.on_use(function(api) { diff --git a/packages/accounts-github/package.js b/packages/accounts-github/package.js index 52c9d85382..19938f223f 100644 --- a/packages/accounts-github/package.js +++ b/packages/accounts-github/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Login service for Github accounts", - version: "1.0.1" + version: "1.0.2-pre.0" }); Package.on_use(function(api) { diff --git a/packages/accounts-google/package.js b/packages/accounts-google/package.js index ab2030cce0..34199a3f2c 100644 --- a/packages/accounts-google/package.js +++ b/packages/accounts-google/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Login service for Google accounts", - version: "1.0.1" + version: "1.0.2-pre.0" }); Package.on_use(function(api) { diff --git a/packages/accounts-meetup/package.js b/packages/accounts-meetup/package.js index 50c97ee8e2..2c00981d40 100644 --- a/packages/accounts-meetup/package.js +++ b/packages/accounts-meetup/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Login service for Meetup accounts", - version: "1.0.1" + version: "1.0.2-pre.0" }); Package.on_use(function(api) { diff --git a/packages/accounts-meteor-developer/package.js b/packages/accounts-meteor-developer/package.js index 0a3d4ba456..81b0a7ae45 100644 --- a/packages/accounts-meteor-developer/package.js +++ b/packages/accounts-meteor-developer/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Login service for Meteor developer accounts", - version: "1.0.1" + version: "1.0.2-pre.0" }); Package.on_use(function (api) { diff --git a/packages/accounts-oauth/package.js b/packages/accounts-oauth/package.js index 5b96dca11e..6fa04527a8 100644 --- a/packages/accounts-oauth/package.js +++ b/packages/accounts-oauth/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Common code for OAuth-based login services", - version: "1.1.1" + version: "1.1.2-pre.0" }); Package.on_use(function (api) { diff --git a/packages/accounts-password/package.js b/packages/accounts-password/package.js index b010e1e15e..e459938cc1 100644 --- a/packages/accounts-password/package.js +++ b/packages/accounts-password/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Password support for accounts", - version: "1.0.2" + version: "1.0.3-pre.0" }); Package.on_use(function(api) { diff --git a/packages/accounts-twitter/package.js b/packages/accounts-twitter/package.js index d7245c626a..4a5861f3ad 100644 --- a/packages/accounts-twitter/package.js +++ b/packages/accounts-twitter/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Login service for Twitter accounts", - version: "1.0.1" + version: "1.0.2-pre.0" }); Package.on_use(function(api) { diff --git a/packages/accounts-ui-unstyled/package.js b/packages/accounts-ui-unstyled/package.js index 0581c958f2..d877677bca 100644 --- a/packages/accounts-ui-unstyled/package.js +++ b/packages/accounts-ui-unstyled/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Unstyled version of login widgets", - version: "1.1.2" + version: "1.1.3-pre.0" }); Package.on_use(function (api) { diff --git a/packages/accounts-ui/package.js b/packages/accounts-ui/package.js index c0ec3e1060..5ad708c366 100644 --- a/packages/accounts-ui/package.js +++ b/packages/accounts-ui/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Simple templates to add login widgets to an app", - version: "1.1.1" + version: "1.1.2-pre.0" }); Package.on_use(function (api) { diff --git a/packages/accounts-weibo/package.js b/packages/accounts-weibo/package.js index 7ea33c78d3..3c1715520c 100644 --- a/packages/accounts-weibo/package.js +++ b/packages/accounts-weibo/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Login service for Sina Weibo accounts", - version: "1.0.1" + version: "1.0.2-pre.0" }); Package.on_use(function(api) { diff --git a/packages/appcache/package.js b/packages/appcache/package.js index e9cf6fbb47..d220d31eac 100644 --- a/packages/appcache/package.js +++ b/packages/appcache/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Enable the application cache in the browser", - version: "1.0.1" + version: "1.0.2-pre.0" }); Package.on_use(function (api) { diff --git a/packages/application-configuration/package.js b/packages/application-configuration/package.js index 00fcaab78b..aac511e59a 100644 --- a/packages/application-configuration/package.js +++ b/packages/application-configuration/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Interaction with the configuration sources for your apps", - version: '1.0.2' + version: '1.0.3-pre.0' }); Package.on_use(function (api) { diff --git a/packages/audit-argument-checks/package.js b/packages/audit-argument-checks/package.js index 82d3f179e6..55c98f39f8 100644 --- a/packages/audit-argument-checks/package.js +++ b/packages/audit-argument-checks/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Try to detect inadequate input sanitization", - version: '1.0.0' + version: '1.0.1-pre.0' }); // This package is empty; its presence is detected by livedata. diff --git a/packages/autopublish/package.js b/packages/autopublish/package.js index 5972821efc..a57bca78e3 100644 --- a/packages/autopublish/package.js +++ b/packages/autopublish/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Publish the entire database to all clients", - version: '1.0.0' + version: '1.0.1-pre.0' }); // This package is empty; its presence is detected by livedata and diff --git a/packages/autoupdate/package.js b/packages/autoupdate/package.js index f4a1cc61a9..5df4d4c97a 100644 --- a/packages/autoupdate/package.js +++ b/packages/autoupdate/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Update the client when new client code is available", - version: '1.1.1' + version: '1.1.2-pre.0' }); Cordova.depends({ diff --git a/packages/base64/package.js b/packages/base64/package.js index 94f34a7e75..327d1785f9 100644 --- a/packages/base64/package.js +++ b/packages/base64/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Base64 encoding and decoding", - version: '1.0.0' + version: '1.0.1-pre.0' }); Package.on_use(function (api) { diff --git a/packages/binary-heap/package.js b/packages/binary-heap/package.js index 92f3655ce5..855c984914 100644 --- a/packages/binary-heap/package.js +++ b/packages/binary-heap/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Binary Heap datastructure implementation", - version: '1.0.0' + version: '1.0.1-pre.0' }); Package.on_use(function (api) { diff --git a/packages/blaze-tools/package.js b/packages/blaze-tools/package.js index 905c728fb8..90eacc19e1 100644 --- a/packages/blaze-tools/package.js +++ b/packages/blaze-tools/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Compile-time tools for Blaze", - version: '1.0.0' + version: '1.0.1-pre.0' }); Package.on_use(function (api) { diff --git a/packages/blaze/package.js b/packages/blaze/package.js index 9ee28c57c7..62a5709a3b 100644 --- a/packages/blaze/package.js +++ b/packages/blaze/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Meteor Reactive Templating library", - version: '2.0.1' + version: '2.0.2-pre.0' }); Package.on_use(function (api) { diff --git a/packages/boilerplate-generator/package.js b/packages/boilerplate-generator/package.js index 7de74b2ac0..1350f7b7f1 100644 --- a/packages/boilerplate-generator/package.js +++ b/packages/boilerplate-generator/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Generates the boilerplate html from program's manifest", - version: '1.0.0' + version: '1.0.1-pre.0' }); Package.on_use(function (api) { diff --git a/packages/browser-policy-common/package.js b/packages/browser-policy-common/package.js index b89239a4c5..852a5c6343 100644 --- a/packages/browser-policy-common/package.js +++ b/packages/browser-policy-common/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Common code for browser-policy packages", - version: "1.0.0" + version: "1.0.1-pre.0" }); Package.on_use(function (api) { diff --git a/packages/browser-policy-content/package.js b/packages/browser-policy-content/package.js index 06fb6843dd..30e4db72ce 100644 --- a/packages/browser-policy-content/package.js +++ b/packages/browser-policy-content/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Configure content security policies", - version: "1.0.1" + version: "1.0.2-pre.0" }); Package.on_use(function (api) { diff --git a/packages/browser-policy-framing/package.js b/packages/browser-policy-framing/package.js index 54230b0a48..453c6132f4 100644 --- a/packages/browser-policy-framing/package.js +++ b/packages/browser-policy-framing/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Restrict which websites can frame your app", - version: "1.0.1" + version: "1.0.2-pre.0" }); Package.on_use(function (api) { diff --git a/packages/browser-policy/package.js b/packages/browser-policy/package.js index 38f44df757..db189a93f3 100644 --- a/packages/browser-policy/package.js +++ b/packages/browser-policy/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Configure security policies enforced by the browser", - version: "1.0.1" + version: "1.0.2-pre.0" }); Package.on_use(function (api) { diff --git a/packages/callback-hook/package.js b/packages/callback-hook/package.js index a3c102d8a3..e7f61c2f02 100644 --- a/packages/callback-hook/package.js +++ b/packages/callback-hook/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Register callbacks on a hook", - version: '1.0.0' + version: '1.0.1-pre.0' }); Package.on_use(function (api) { diff --git a/packages/check/package.js b/packages/check/package.js index 25e7d54aff..fc18119e29 100644 --- a/packages/check/package.js +++ b/packages/check/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Check whether a value matches a pattern", - version: '1.0.1' + version: '1.0.2-pre.0' }); Package.on_use(function (api) { diff --git a/packages/code-prettify/package.js b/packages/code-prettify/package.js index a08f4bb35e..b9954199b2 100644 --- a/packages/code-prettify/package.js +++ b/packages/code-prettify/package.js @@ -8,7 +8,7 @@ var path = Npm.require('path'); Package.describe({ summary: "Syntax highlighting of code, from Google", - version: "1.0.0" + version: "1.0.1-pre.0" }); // XXX this code dumps symbols into the global namespace (directly diff --git a/packages/coffeescript-test-helper/package.js b/packages/coffeescript-test-helper/package.js index 6db17febaa..3a3279d8a2 100644 --- a/packages/coffeescript-test-helper/package.js +++ b/packages/coffeescript-test-helper/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Used by the coffeescript package's tests", - version: "1.0.0" + version: "1.0.1-pre.0" }); Package.on_use(function (api) { diff --git a/packages/coffeescript/package.js b/packages/coffeescript/package.js index f58a5125df..1f21f7869b 100644 --- a/packages/coffeescript/package.js +++ b/packages/coffeescript/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Javascript dialect with fewer braces and semicolons", - version: "1.0.3" + version: "1.0.4-pre.0" }); Package._transitional_registerBuildPlugin({ diff --git a/packages/constraint-solver/package.js b/packages/constraint-solver/package.js index e75a7b3d8a..ea6fc33940 100644 --- a/packages/constraint-solver/package.js +++ b/packages/constraint-solver/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Given the set of the constraints, picks a satisfying configuration", - version: "1.0.14" + version: "1.0.15-pre.0" }); Npm.depends({ diff --git a/packages/ctl-helper/package.js b/packages/ctl-helper/package.js index 4c2a5f8237..04aa8dcbea 100644 --- a/packages/ctl-helper/package.js +++ b/packages/ctl-helper/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Helpers for control programs", - version: "1.0.3" + version: "1.0.4-pre.0" }); Npm.depends({optimist: '0.6.0'}); diff --git a/packages/ctl/package.js b/packages/ctl/package.js index 8327b253a2..5454d34e4d 100644 --- a/packages/ctl/package.js +++ b/packages/ctl/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Default control program for an application", - version: "1.0.1" + version: "1.0.2-pre.0" }); Package.on_use(function (api) { diff --git a/packages/ddp/package.js b/packages/ddp/package.js index 286b5a84a8..cc07180152 100644 --- a/packages/ddp/package.js +++ b/packages/ddp/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Meteor's latency-compensated distributed data framework", - version: '1.0.9' + version: '1.0.10-pre.0' }); // We use 'faye-websocket' for connections in server-to-server DDP, mostly diff --git a/packages/deps/package.js b/packages/deps/package.js index d09e55e5f2..67e66803aa 100644 --- a/packages/deps/package.js +++ b/packages/deps/package.js @@ -2,7 +2,7 @@ Package.describe({ summary: "Deprecated: Use the 'tracker' package instead.", - version: '1.0.4' + version: '1.0.5-pre.0' }); Package.on_use(function (api) { diff --git a/packages/dev-bundle-fetcher/package.js b/packages/dev-bundle-fetcher/package.js index 2b5924bce4..f4e467a843 100644 --- a/packages/dev-bundle-fetcher/package.js +++ b/packages/dev-bundle-fetcher/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "A shell script for downloading the Meteor dev bundle", - version: "1.0.0" + version: "1.0.1-pre.0" }); Package.on_use(function (api) { diff --git a/packages/disable-oplog/package.js b/packages/disable-oplog/package.js index 190f00becd..01493d74f2 100644 --- a/packages/disable-oplog/package.js +++ b/packages/disable-oplog/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Disables oplog tailing", - version: '1.0.0' + version: '1.0.1-pre.0' }); // This package is empty; its presence is detected by mongo-livedata. diff --git a/packages/ejson/package.js b/packages/ejson/package.js index 25c2496f78..4fd66c0beb 100644 --- a/packages/ejson/package.js +++ b/packages/ejson/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Extended and Extensible JSON library", - version: '1.0.3' + version: '1.0.4-pre.0' }); Package.on_use(function (api) { diff --git a/packages/email/package.js b/packages/email/package.js index 9c3676f95b..bebbad43ca 100644 --- a/packages/email/package.js +++ b/packages/email/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Send email messages", - version: "1.0.3" + version: "1.0.4-pre.0" }); Npm.depends({ diff --git a/packages/facebook/package.js b/packages/facebook/package.js index 969a5fde67..6441345515 100644 --- a/packages/facebook/package.js +++ b/packages/facebook/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Facebook OAuth flow", - version: "1.1.0" + version: "1.1.1-pre.0" }); Package.on_use(function(api) { diff --git a/packages/facts/package.js b/packages/facts/package.js index 1288ea21ee..7099bc7c51 100644 --- a/packages/facts/package.js +++ b/packages/facts/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Publish internal app statistics", - version: '1.0.1' + version: '1.0.2-pre.0' }); Package.on_use(function (api) { diff --git a/packages/fastclick/package.js b/packages/fastclick/package.js index d9c0ffc62c..5877e2ec18 100644 --- a/packages/fastclick/package.js +++ b/packages/fastclick/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Faster touch events on mobile", - version: '1.0.0' + version: '1.0.1-pre.0' }); Package.on_use(function (api) { diff --git a/packages/follower-livedata/package.js b/packages/follower-livedata/package.js index fa76b74599..cb01c14866 100644 --- a/packages/follower-livedata/package.js +++ b/packages/follower-livedata/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Maintain a connection to the leader of an election set", - version: '1.0.1' + version: '1.0.2-pre.0' }); Package.on_use(function (api) { diff --git a/packages/force-ssl/package.js b/packages/force-ssl/package.js index 9a5f97c67e..765f2eb261 100644 --- a/packages/force-ssl/package.js +++ b/packages/force-ssl/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Require this application to use HTTPS", - version: "1.0.1" + version: "1.0.2-pre.0" }); Package.on_use(function (api) { diff --git a/packages/geojson-utils/package.js b/packages/geojson-utils/package.js index a6fd288bf6..71705c4777 100644 --- a/packages/geojson-utils/package.js +++ b/packages/geojson-utils/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: 'GeoJSON utility functions (from https://github.com/maxogden/geojson-js-utils)', - version: '1.0.0' + version: '1.0.1-pre.0' }); Package.on_use(function (api) { diff --git a/packages/github/package.js b/packages/github/package.js index 31316f5b28..bf47cbeff8 100644 --- a/packages/github/package.js +++ b/packages/github/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Github OAuth flow", - version: "1.1.0" + version: "1.1.1-pre.0" }); Package.on_use(function(api) { diff --git a/packages/google/package.js b/packages/google/package.js index 34d7a1134b..ff5426638d 100644 --- a/packages/google/package.js +++ b/packages/google/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Google OAuth flow", - version: "1.1.0" + version: "1.1.1-pre.0" }); Package.on_use(function(api) { diff --git a/packages/handlebars/package.js b/packages/handlebars/package.js index 7eaa993660..3cf0b6fa87 100644 --- a/packages/handlebars/package.js +++ b/packages/handlebars/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Deprecated", - version: '1.0.0' + version: '1.0.1-pre.0' }); Package.on_use(function (api) { diff --git a/packages/html-tools/package.js b/packages/html-tools/package.js index a3bddf7e6e..840324e82d 100644 --- a/packages/html-tools/package.js +++ b/packages/html-tools/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Standards-compliant HTML tools", - version: '1.0.1' + version: '1.0.2-pre.0' }); Package.on_use(function (api) { diff --git a/packages/htmljs/package.js b/packages/htmljs/package.js index 6991a88873..1c65880f2d 100644 --- a/packages/htmljs/package.js +++ b/packages/htmljs/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Small library for expressing HTML trees", - version: '1.0.1' + version: '1.0.2-pre.0' }); Package.on_use(function (api) { diff --git a/packages/http/package.js b/packages/http/package.js index a7a9688456..bf4b2763e6 100644 --- a/packages/http/package.js +++ b/packages/http/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Make HTTP calls to remote servers", - version: '1.0.6' + version: '1.0.7-pre.0' }); Npm.depends({request: "2.33.0"}); diff --git a/packages/id-map/package.js b/packages/id-map/package.js index 244903b87d..6604924c95 100644 --- a/packages/id-map/package.js +++ b/packages/id-map/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Dictionary data structure allowing non-string keys", - version: '1.0.0' + version: '1.0.1-pre.0' }); Package.on_use(function (api) { diff --git a/packages/insecure/package.js b/packages/insecure/package.js index 374b4386fd..cc929176b8 100644 --- a/packages/insecure/package.js +++ b/packages/insecure/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Allow all database writes by default", - version: '1.0.0' + version: '1.0.1-pre.0' }); // This package is empty; its presence is detected by mongo-livedata. diff --git a/packages/jquery-history/package.js b/packages/jquery-history/package.js index 3d542b5e7d..13eccdc623 100644 --- a/packages/jquery-history/package.js +++ b/packages/jquery-history/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "pushState module from the jQuery project", - version: "1.0.0" + version: "1.0.1-pre.0" }); Package.on_use(function (api) { diff --git a/packages/jquery-layout/package.js b/packages/jquery-layout/package.js index 6c4695fe80..9654945d83 100644 --- a/packages/jquery-layout/package.js +++ b/packages/jquery-layout/package.js @@ -3,7 +3,7 @@ Package.describe({ summary: "Easily create arbitrary multicolumn layouts", - version: "1.0.1" + version: "1.0.2-pre.0" }); Package.on_use(function (api) { diff --git a/packages/jquery-waypoints/package.js b/packages/jquery-waypoints/package.js index 1eaf08bf83..59fcf1b02c 100644 --- a/packages/jquery-waypoints/package.js +++ b/packages/jquery-waypoints/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Run a function when the user scrolls past an element", - version: "1.0.0" + version: "1.0.1-pre.0" }); Package.on_use(function (api) { diff --git a/packages/jquery/package.js b/packages/jquery/package.js index 04953e7c78..a4f1ed38d3 100644 --- a/packages/jquery/package.js +++ b/packages/jquery/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Manipulate the DOM using CSS selectors", - version: '1.0.0' + version: '1.0.1-pre.0' }); Package.on_use(function (api) { diff --git a/packages/js-analyze-tests/package.js b/packages/js-analyze-tests/package.js index dd69736358..cb1e6915c1 100644 --- a/packages/js-analyze-tests/package.js +++ b/packages/js-analyze-tests/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Tests for JavaScript code analysis for Meteor", - version: "1.0.0" + version: "1.0.1-pre.0" }); // The tests are in a separate package so that it is possible to compile diff --git a/packages/js-analyze/package.js b/packages/js-analyze/package.js index be352670b6..3435afa874 100644 --- a/packages/js-analyze/package.js +++ b/packages/js-analyze/package.js @@ -4,7 +4,7 @@ Package.describe({ summary: "JavaScript code analysis for Meteor", - version: '1.0.2' + version: '1.0.3-pre.0' }); // Use some packages from the Esprima project. If it turns out we need these on diff --git a/packages/json/package.js b/packages/json/package.js index e675db59ea..2bb417aad2 100644 --- a/packages/json/package.js +++ b/packages/json/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Provides JSON.stringify and JSON.parse for older browsers", - version: '1.0.0' + version: '1.0.1-pre.0' }); // We need to figure out how to serve this file only to browsers that don't have diff --git a/packages/jsparse/package.js b/packages/jsparse/package.js index 47d7323e8d..64cdeb1e21 100644 --- a/packages/jsparse/package.js +++ b/packages/jsparse/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Full-featured JavaScript parser", - version: "1.0.0" + version: "1.0.1-pre.0" }); Package.on_use(function (api) { diff --git a/packages/less/package.js b/packages/less/package.js index b91d138822..41e6b69f22 100644 --- a/packages/less/package.js +++ b/packages/less/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "The dynamic stylesheet language", - version: "1.0.9" + version: "1.0.10-pre.0" }); Package._transitional_registerBuildPlugin({ diff --git a/packages/livedata/package.js b/packages/livedata/package.js index 37ba2b791d..73a5444985 100644 --- a/packages/livedata/package.js +++ b/packages/livedata/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Moved to the 'ddp' package", - version: '1.0.10' + version: '1.0.11-pre.0' }); Package.on_use(function (api) { diff --git a/packages/localstorage/package.js b/packages/localstorage/package.js index 47f71bae37..430bf50a4b 100644 --- a/packages/localstorage/package.js +++ b/packages/localstorage/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Simulates local storage on IE 6,7 using userData", - version: "1.0.0" + version: "1.0.1-pre.0" }); Package.on_use(function (api) { diff --git a/packages/logging/package.js b/packages/logging/package.js index 6ee7a8b2bf..52216f0c27 100644 --- a/packages/logging/package.js +++ b/packages/logging/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Logging facility.", - version: '1.0.3' + version: '1.0.4-pre.0' }); Npm.depends({ diff --git a/packages/markdown/package.js b/packages/markdown/package.js index 037e5df0d7..403000bc4f 100644 --- a/packages/markdown/package.js +++ b/packages/markdown/package.js @@ -2,7 +2,7 @@ Package.describe({ summary: "Markdown-to-HTML processor", - version: "1.0.1" + version: "1.0.2-pre.0" }); Package.on_use(function (api) { diff --git a/packages/meetup/package.js b/packages/meetup/package.js index 28525e1453..48cbc3ae96 100644 --- a/packages/meetup/package.js +++ b/packages/meetup/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Meetup OAuth flow", - version: "1.1.0" + version: "1.1.1-pre.0" }); Package.on_use(function(api) { diff --git a/packages/meteor-developer/package.js b/packages/meteor-developer/package.js index cc9c596ecf..d18d420fa7 100644 --- a/packages/meteor-developer/package.js +++ b/packages/meteor-developer/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Meteor developer accounts OAuth flow", - version: "1.1.0" + version: "1.1.1-pre.0" }); Package.on_use(function (api) { diff --git a/packages/meteor-platform/package.js b/packages/meteor-platform/package.js index ca8f719143..bca25194cf 100644 --- a/packages/meteor-platform/package.js +++ b/packages/meteor-platform/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Include a standard set of Meteor packages in your app", - version: '1.1.1' + version: '1.1.2-pre.0' }); Package.on_use(function(api) { diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js index 79841eda32..f657ac42c2 100644 --- a/packages/meteor-tool/package.js +++ b/packages/meteor-tool/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "The Meteor command-line tool", - version: '1.0.32' + version: '1.0.33-pre.0' }); Package.includeTool(); diff --git a/packages/meteor/package.js b/packages/meteor/package.js index 3ee822b01a..4cc4105f8e 100644 --- a/packages/meteor/package.js +++ b/packages/meteor/package.js @@ -2,7 +2,7 @@ Package.describe({ summary: "Core Meteor environment", - version: '1.1.1' + version: '1.1.2-pre.0' }); Package._transitional_registerBuildPlugin({ diff --git a/packages/meyerweb-reset/package.js b/packages/meyerweb-reset/package.js index d085c8f487..aef7a0258f 100644 --- a/packages/meyerweb-reset/package.js +++ b/packages/meyerweb-reset/package.js @@ -3,7 +3,7 @@ // encourage this pattern. Maybe another solution would be better. Package.describe({ summary: "reset.css v2.0 from http://meyerweb.com/eric/tools/css/reset/", - version: "1.0.0" + version: "1.0.1-pre.0" }); Package.on_use(function (api) { diff --git a/packages/minifiers/package.js b/packages/minifiers/package.js index 276aaf620d..2e704ba612 100644 --- a/packages/minifiers/package.js +++ b/packages/minifiers/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "JavaScript and CSS minifiers", - version: "1.1.0" + version: "1.1.1-pre.0" }); Npm.depends({ diff --git a/packages/minimongo/package.js b/packages/minimongo/package.js index 0e7541e837..6a1c958e73 100644 --- a/packages/minimongo/package.js +++ b/packages/minimongo/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Meteor's client-side datastore: a port of MongoDB to Javascript", - version: '1.0.3' + version: '1.0.4-pre.0' }); Package.on_use(function (api) { diff --git a/packages/mobile-status-bar/package.js b/packages/mobile-status-bar/package.js index 3761f410b0..df35ed01a8 100644 --- a/packages/mobile-status-bar/package.js +++ b/packages/mobile-status-bar/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Good defaults for the mobile status bar", - version: "1.0.0" + version: "1.0.1-pre.0" }); Package.onUse(function(api) { diff --git a/packages/mongo-livedata/package.js b/packages/mongo-livedata/package.js index 3b8ff9d7ca..b014b7bc1c 100644 --- a/packages/mongo-livedata/package.js +++ b/packages/mongo-livedata/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Moved to the 'mongo' package", - version: '1.0.5' + version: '1.0.6-pre.0' }); Package.on_use(function (api) { diff --git a/packages/mongo/package.js b/packages/mongo/package.js index 8c3f067839..0b7c063db2 100644 --- a/packages/mongo/package.js +++ b/packages/mongo/package.js @@ -9,7 +9,7 @@ Package.describe({ summary: "Adaptor for using MongoDB and Minimongo over DDP", - version: '1.0.6' + version: '1.0.7-pre.0' }); Npm.depends({ diff --git a/packages/oauth-encryption/package.js b/packages/oauth-encryption/package.js index 3102c76e76..ca33c530d2 100644 --- a/packages/oauth-encryption/package.js +++ b/packages/oauth-encryption/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Encrypt account secrets stored in the database", - version: '1.0.0' + version: '1.0.1-pre.0' }); Package.on_use(function (api) { diff --git a/packages/oauth/package.js b/packages/oauth/package.js index 91750deefb..4c6d70006b 100644 --- a/packages/oauth/package.js +++ b/packages/oauth/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Common code for OAuth-based services", - version: "1.1.0" + version: "1.1.1-pre.0" }); Package.on_use(function (api) { diff --git a/packages/oauth1/package.js b/packages/oauth1/package.js index 21323088a2..309d7c1569 100644 --- a/packages/oauth1/package.js +++ b/packages/oauth1/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Common code for OAuth1-based login services", - version: "1.1.0" + version: "1.1.1-pre.0" }); Package.on_use(function (api) { diff --git a/packages/oauth2/package.js b/packages/oauth2/package.js index 5c991d005b..a46a06e224 100644 --- a/packages/oauth2/package.js +++ b/packages/oauth2/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Common code for OAuth2-based login services", - version: "1.1.0" + version: "1.1.1-pre.0" }); Package.on_use(function (api) { diff --git a/packages/observe-sequence/package.js b/packages/observe-sequence/package.js index 183608db7f..ea90c50bad 100644 --- a/packages/observe-sequence/package.js +++ b/packages/observe-sequence/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Observe changes to various sequence types such as arrays, cursors and objects", - version: "1.0.2" + version: "1.0.3-pre.0" }); Package.on_use(function (api) { diff --git a/packages/ordered-dict/package.js b/packages/ordered-dict/package.js index fd4b091de4..8312cb41e4 100644 --- a/packages/ordered-dict/package.js +++ b/packages/ordered-dict/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Ordered traversable dictionary with a mutable ordering", - version: '1.0.0' + version: '1.0.1-pre.0' }); Package.on_use(function (api) { diff --git a/packages/package-stats-opt-out/package.js b/packages/package-stats-opt-out/package.js index 02116f94f7..3981a9653a 100644 --- a/packages/package-stats-opt-out/package.js +++ b/packages/package-stats-opt-out/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Opt out of sending package stats", - version: '1.0.0' + version: '1.0.1-pre.0' }); Package.on_use(function (api) { diff --git a/packages/package-version-parser/package.js b/packages/package-version-parser/package.js index bcceef05a4..65d5248696 100644 --- a/packages/package-version-parser/package.js +++ b/packages/package-version-parser/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Parses Meteor Smart Package version string", - version: "2.0.0" + version: "2.0.1-pre.0" }); Npm.depends({ diff --git a/packages/preserve-inputs/package.js b/packages/preserve-inputs/package.js index 128c7da687..b474e8c921 100644 --- a/packages/preserve-inputs/package.js +++ b/packages/preserve-inputs/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Deprecated package (now empty)", - version: "1.0.0" + version: "1.0.1-pre.0" }); Package.on_use(function (api) { diff --git a/packages/random/package.js b/packages/random/package.js index 144969d93f..a79fe421cc 100644 --- a/packages/random/package.js +++ b/packages/random/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Random number generator and utilities", - version: '1.0.0' + version: '1.0.1-pre.0' }); Package.on_use(function (api) { diff --git a/packages/reactive-dict/package.js b/packages/reactive-dict/package.js index f65d64130b..990876ba5b 100644 --- a/packages/reactive-dict/package.js +++ b/packages/reactive-dict/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Reactive dictionary", - version: '1.0.3' + version: '1.0.4-pre.0' }); Package.on_use(function (api) { diff --git a/packages/reactive-var/package.js b/packages/reactive-var/package.js index 11c3408386..9cff50d64f 100644 --- a/packages/reactive-var/package.js +++ b/packages/reactive-var/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Reactive variable", - version: '1.0.2' + version: '1.0.3-pre.0' }); Package.on_use(function (api) { diff --git a/packages/reload-safetybelt/package.js b/packages/reload-safetybelt/package.js index e9b3e44b5a..ceac2098f4 100644 --- a/packages/reload-safetybelt/package.js +++ b/packages/reload-safetybelt/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Reload safety belt for multi-server deployments", - version: '1.0.0' + version: '1.0.1-pre.0' }); Package.on_use(function (api) { diff --git a/packages/reload/package.js b/packages/reload/package.js index 6035956915..1d72ba380d 100644 --- a/packages/reload/package.js +++ b/packages/reload/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Reload the page while preserving application state.", - version: '1.1.0' + version: '1.1.1-pre.0' }); Package.on_use(function (api) { diff --git a/packages/retry/package.js b/packages/retry/package.js index 8e548107f0..2c487c22fa 100644 --- a/packages/retry/package.js +++ b/packages/retry/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Retry logic with exponential backoff", - version: '1.0.0' + version: '1.0.1-pre.0' }); Package.on_use(function (api) { diff --git a/packages/routepolicy/package.js b/packages/routepolicy/package.js index fe29339c2b..ce6780ac8f 100644 --- a/packages/routepolicy/package.js +++ b/packages/routepolicy/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "route policy declarations", - version: '1.0.1' + version: '1.0.2-pre.0' }); Package.on_use(function (api) { diff --git a/packages/service-configuration/package.js b/packages/service-configuration/package.js index c9e8cc23bf..11310f0201 100644 --- a/packages/service-configuration/package.js +++ b/packages/service-configuration/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Manage the configuration for third-party services", - version: "1.0.1" + version: "1.0.2-pre.0" }); Package.on_use(function(api) { diff --git a/packages/session/package.js b/packages/session/package.js index 73fcd02975..361bf3717b 100644 --- a/packages/session/package.js +++ b/packages/session/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Session variable", - version: '1.0.2' + version: '1.0.3-pre.0' }); Package.on_use(function (api) { diff --git a/packages/sha/package.js b/packages/sha/package.js index 72878cc6b1..dbcd2d62e9 100644 --- a/packages/sha/package.js +++ b/packages/sha/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "SHA256 implementation", - version: "1.0.0" + version: "1.0.1-pre.0" }); Package.on_use(function (api) { diff --git a/packages/showdown/package.js b/packages/showdown/package.js index e89b0e2e80..f18e2ae050 100644 --- a/packages/showdown/package.js +++ b/packages/showdown/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Moved to the 'markdown' package", - version: '1.0.1' + version: '1.0.2-pre.0' }); Package.on_use(function (api) { diff --git a/packages/spacebars-compiler/package.js b/packages/spacebars-compiler/package.js index bc863c5650..0117bc9892 100644 --- a/packages/spacebars-compiler/package.js +++ b/packages/spacebars-compiler/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Compiler for Spacebars template language", - version: '1.0.2' + version: '1.0.3-pre.0' }); Package.on_use(function (api) { diff --git a/packages/spacebars-tests/package.js b/packages/spacebars-tests/package.js index d12ad035aa..7469319aac 100644 --- a/packages/spacebars-tests/package.js +++ b/packages/spacebars-tests/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Additional tests for Spacebars", - version: '1.0.0' + version: '1.0.1-pre.0' }); // These tests are in a separate package to avoid a circular dependency diff --git a/packages/spacebars/package.js b/packages/spacebars/package.js index c0931fc7b1..475982ee9e 100644 --- a/packages/spacebars/package.js +++ b/packages/spacebars/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Handlebars-like template language for Meteor", - version: '1.0.2' + version: '1.0.3-pre.0' }); // For more, see package `spacebars-compiler`, which is used by diff --git a/packages/spiderable/package.js b/packages/spiderable/package.js index d1d8d61736..725342a189 100644 --- a/packages/spiderable/package.js +++ b/packages/spiderable/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Makes the application crawlable to web spiders", - version: "1.0.3" + version: "1.0.4-pre.0" }); Package.on_use(function (api) { diff --git a/packages/srp/package.js b/packages/srp/package.js index e36e6331d4..fb121c3825 100644 --- a/packages/srp/package.js +++ b/packages/srp/package.js @@ -1,4 +1,4 @@ -// XXX COMPAT WITH 0.8.1.3 +// XXX COMPAT WITH 0.8.2-pre.0.3 // This package is replaced by the use of bcrypt in accounts-password, // but we are leaving in some of the code to allow existing user // databases to be upgraded from SRP to bcrypt. diff --git a/packages/standard-app-packages/package.js b/packages/standard-app-packages/package.js index 4b8e923c8f..7c19f71bd2 100644 --- a/packages/standard-app-packages/package.js +++ b/packages/standard-app-packages/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Moved to meteor-platform", - version: '1.0.2' + version: '1.0.3-pre.0' }); Package.on_use(function (api) { diff --git a/packages/star-translate/package.js b/packages/star-translate/package.js index 3860ca42bd..972a4d86a3 100644 --- a/packages/star-translate/package.js +++ b/packages/star-translate/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "A package for translating old bundles into stars", - version: "1.0.3" + version: "1.0.4-pre.0" }); Package.on_use(function (api) { diff --git a/packages/startup/package.js b/packages/startup/package.js index 61304c55e7..6a47f59118 100644 --- a/packages/startup/package.js +++ b/packages/startup/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Deprecated package (now empty)", - version: "1.0.0", + version: "1.0.1-pre.0", }); Package.on_use(function (api) { diff --git a/packages/stylus/package.js b/packages/stylus/package.js index 4c0610b80a..66ee17c7d5 100644 --- a/packages/stylus/package.js +++ b/packages/stylus/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: 'Expressive, dynamic, robust CSS', - version: "1.0.4" + version: "1.0.5-pre.0" }); Package._transitional_registerBuildPlugin({ diff --git a/packages/templating/package.js b/packages/templating/package.js index 0b93ec809d..6f64216b6c 100644 --- a/packages/templating/package.js +++ b/packages/templating/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Allows templates to be defined in .html files", - version: '1.0.7' + version: '1.0.8-pre.0' }); // Today, this package is closely intertwined with Handlebars, meaning diff --git a/packages/test-helpers/package.js b/packages/test-helpers/package.js index e6f60fbb19..a2dd9c6c34 100644 --- a/packages/test-helpers/package.js +++ b/packages/test-helpers/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Utility functions for tests", - version: '1.0.1' + version: '1.0.2-pre.0' }); Package.on_use(function (api) { diff --git a/packages/test-in-browser/package.js b/packages/test-in-browser/package.js index 8853b6c222..0d35be8b41 100644 --- a/packages/test-in-browser/package.js +++ b/packages/test-in-browser/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Run tests interactively in the browser", - version: '1.0.4' + version: '1.0.5-pre.0' }); Package.on_use(function (api) { diff --git a/packages/test-in-console/package.js b/packages/test-in-console/package.js index 547ea624ff..498914d2ab 100644 --- a/packages/test-in-console/package.js +++ b/packages/test-in-console/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Run tests noninteractively, with results going to the console.", - version: '1.0.2' + version: '1.0.3-pre.0' }); Package.on_use(function (api) { diff --git a/packages/test-server-tests-in-console-once/package.js b/packages/test-server-tests-in-console-once/package.js index 3b96f56af5..94acfd85c7 100644 --- a/packages/test-server-tests-in-console-once/package.js +++ b/packages/test-server-tests-in-console-once/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Run server tests noninteractively, with results going to the console.", - version: '1.0.0' + version: '1.0.1-pre.0' }); Package.on_use(function (api) { diff --git a/packages/tinytest/package.js b/packages/tinytest/package.js index 750962da90..c7fcf4af30 100644 --- a/packages/tinytest/package.js +++ b/packages/tinytest/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Tiny testing framework", - version: '1.0.2' + version: '1.0.3-pre.0' }); Package.on_use(function (api) { diff --git a/packages/tracker/package.js b/packages/tracker/package.js index 406d962231..584f892e65 100644 --- a/packages/tracker/package.js +++ b/packages/tracker/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Dependency tracker to allow reactive callbacks", - version: '1.0.2' + version: '1.0.3-pre.0' }); Package.on_use(function (api) { diff --git a/packages/twitter/package.js b/packages/twitter/package.js index acf11decc3..0ea79d46b9 100644 --- a/packages/twitter/package.js +++ b/packages/twitter/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Twitter OAuth flow", - version: '1.1.0' + version: '1.1.1-pre.0' }); Package.on_use(function(api) { diff --git a/packages/ui/package.js b/packages/ui/package.js index 443046e36a..746ab77cd9 100644 --- a/packages/ui/package.js +++ b/packages/ui/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Deprecated: Use the 'blaze' package", - version: '1.0.3' + version: '1.0.4-pre.0' }); Package.on_use(function (api) { diff --git a/packages/underscore-tests/package.js b/packages/underscore-tests/package.js index bb2783936e..a2bfd06a36 100644 --- a/packages/underscore-tests/package.js +++ b/packages/underscore-tests/package.js @@ -2,7 +2,7 @@ Package.describe({ // These tests can't be directly in the underscore packages since // Tinytest depends on underscore summary: "Tests for the underscore package", - version: '1.0.0' + version: '1.0.1-pre.0' }); Package.on_test(function (api) { diff --git a/packages/underscore/package.js b/packages/underscore/package.js index d093e030c0..39f5bd3574 100644 --- a/packages/underscore/package.js +++ b/packages/underscore/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Collection of small helpers: _.map, _.each, ...", - version: '1.0.0' + version: '1.0.1-pre.0' }); Package.on_use(function (api) { diff --git a/packages/url/package.js b/packages/url/package.js index 8f3fda8187..784f909eab 100644 --- a/packages/url/package.js +++ b/packages/url/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Utility code for constructing URLs", - version: "1.0.0" + version: "1.0.1-pre.0" }); Package.onUse(function(api) { diff --git a/packages/webapp-hashing/package.js b/packages/webapp-hashing/package.js index b4e5c469fa..3b473c1c89 100644 --- a/packages/webapp-hashing/package.js +++ b/packages/webapp-hashing/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Used internally by WebApp. Knows how to hash programs from manifests.", - version: "1.0.0" + version: "1.0.1-pre.0" }); Package.onUse(function(api) { diff --git a/packages/webapp/package.js b/packages/webapp/package.js index c78bdfc393..52c4d7eb8f 100644 --- a/packages/webapp/package.js +++ b/packages/webapp/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Serves a Meteor app over HTTP", - version: '1.1.2' + version: '1.1.3-pre.0' }); Npm.depends({connect: "2.9.0", diff --git a/packages/weibo/package.js b/packages/weibo/package.js index d7c14db971..4856c72828 100644 --- a/packages/weibo/package.js +++ b/packages/weibo/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Weibo OAuth flow", - version: '1.1.0' + version: '1.1.1-pre.0' }); Package.on_use(function(api) { From c72dd30b1dc6674adc526cc36acc72e61a74b6e2 Mon Sep 17 00:00:00 2001 From: Avital Oliver Date: Tue, 30 Sep 2014 00:05:49 -0700 Subject: [PATCH 07/18] Don't crash when failing to contact the package server Fixes #2713 --- tools/package-client.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/package-client.js b/tools/package-client.js index d01678dd33..4d3ce70369 100644 --- a/tools/package-client.js +++ b/tools/package-client.js @@ -218,7 +218,7 @@ _updateServerPackageData = function (cachedServerData, options) { try { var conn = openPackageServerConnection(options.packageServerUrl); } catch (err) { - self.handlePackageServerConnectionError(err); + exports.handlePackageServerConnectionError(err); ret.data = null; return ret; } From 2dad47677df66f090b7a77b233f8b06cc07da85c Mon Sep 17 00:00:00 2001 From: Sashko Stubailo Date: Tue, 30 Sep 2014 00:30:42 -0700 Subject: [PATCH 08/18] Update srp version --- packages/srp/package.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/srp/package.js b/packages/srp/package.js index fb121c3825..805e930d75 100644 --- a/packages/srp/package.js +++ b/packages/srp/package.js @@ -5,7 +5,7 @@ Package.describe({ summary: "Library for Secure Remote Password (SRP) exchanges", - version: "1.0.0" + version: "1.0.1-pre.0" }); Package.on_use(function (api) { From ad2dbcfbe0ea199497cd5c8dba284a3d1eba7a3b Mon Sep 17 00:00:00 2001 From: Sashko Stubailo Date: Tue, 30 Sep 2014 01:41:27 -0700 Subject: [PATCH 09/18] Bumped all of the versions again --- packages/meteor-tool/package.js | 2 +- packages/minimongo/package.js | 2 +- scripts/admin/meteor-release-experimental.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js index f657ac42c2..b409829c80 100644 --- a/packages/meteor-tool/package.js +++ b/packages/meteor-tool/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "The Meteor command-line tool", - version: '1.0.33-pre.0' + version: '1.0.33-pre.1' }); Package.includeTool(); diff --git a/packages/minimongo/package.js b/packages/minimongo/package.js index 6a1c958e73..0814c01af7 100644 --- a/packages/minimongo/package.js +++ b/packages/minimongo/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "Meteor's client-side datastore: a port of MongoDB to Javascript", - version: '1.0.4-pre.0' + version: '1.0.4-pre.1' }); Package.on_use(function (api) { diff --git a/scripts/admin/meteor-release-experimental.json b/scripts/admin/meteor-release-experimental.json index c8f6d6d67e..d85362fc76 100644 --- a/scripts/admin/meteor-release-experimental.json +++ b/scripts/admin/meteor-release-experimental.json @@ -1,6 +1,6 @@ { "track": "METEOR", - "version": "0.9.4-pre.0", + "version": "0.9.4-pre.1", "recommended": false, "official": false, "description": "A preview of Meteor 0.9.4." From 1f3538e982af7347598bbd7acacceb726053a82a Mon Sep 17 00:00:00 2001 From: Sashko Stubailo Date: Tue, 30 Sep 2014 01:44:45 -0700 Subject: [PATCH 10/18] Bump version of meteor-tool --- packages/meteor-tool/package.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/meteor-tool/package.js b/packages/meteor-tool/package.js index b409829c80..2a97a8c183 100644 --- a/packages/meteor-tool/package.js +++ b/packages/meteor-tool/package.js @@ -1,6 +1,6 @@ Package.describe({ summary: "The Meteor command-line tool", - version: '1.0.33-pre.1' + version: '1.0.33-pre.2' }); Package.includeTool(); From 44ae2cbea9341d5763adaefd0328f1ae9fd04eac Mon Sep 17 00:00:00 2001 From: David Greenspan Date: Tue, 30 Sep 2014 09:33:13 -0700 Subject: [PATCH 11/18] Clear status message on enableProgressBar(false) Motivated by `meteor shell` in Emacs shell-mode --- tools/console.js | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/tools/console.js b/tools/console.js index f913808cdc..a3060d9bae 100644 --- a/tools/console.js +++ b/tools/console.js @@ -261,13 +261,7 @@ _.extend(Console.prototype, { } } - // For the non-progress-bar status mode, we may need to - // clear some characters that we printed with a trailing `\r`. - if (self._wroteStatusMessage) { - var spaces = new Array(TEMP_STATUS_LENGTH + 1).join(' '); - self._stream.write(spaces + '\r'); - self._wroteStatusMessage = false; - } + self._clearStatusMessage(); if (style) { dest.write(style(message + '\n')); @@ -281,6 +275,17 @@ _.extend(Console.prototype, { } }, + _clearStatusMessage: function () { + var self = this; + // For the non-progress-bar status mode, we may need to + // clear some characters that we printed with a trailing `\r`. + if (self._wroteStatusMessage) { + var spaces = new Array(TEMP_STATUS_LENGTH + 1).join(' '); + self._stream.write(spaces + '\r'); + self._wroteStatusMessage = false; + } + }, + _format: function (logArguments) { var self = this; @@ -318,7 +323,12 @@ _.extend(Console.prototype, { // It's important that we only enter status message mode // if self._pretty, so that we don't start displaying // status messages too soon. - self._inStatusMessageMode = true; + if (enabled) { + self._inStatusMessageMode = true; + } else if (self._inStatusMessageMode) { + self._clearStatusMessage(); + self._inStatusMessageMode = false; + } return; } From 7e6ea64e07ab4e995dd19934ec47730a8e9bcb9e Mon Sep 17 00:00:00 2001 From: Avital Oliver Date: Tue, 30 Sep 2014 01:17:10 -0700 Subject: [PATCH 12/18] Fix `meteor update` from an app created from a checkout --- tools/commands-packages.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/commands-packages.js b/tools/commands-packages.js index b5644528c6..612521dc11 100644 --- a/tools/commands-packages.js +++ b/tools/commands-packages.js @@ -1392,7 +1392,7 @@ var maybeUpdateRelease = function (options) { } // We are running from checkout, so we are not updating the release. - if (release.current.isCheckout()) { + if (release.current && release.current.isCheckout()) { Console.error( "You are running Meteor from a checkout, so we cannot update the Meteor release.\n" + "Checking to see if we can update your packages."); From d794aa6335f4603ad280a76839c39f11455be548 Mon Sep 17 00:00:00 2001 From: Avital Oliver Date: Tue, 30 Sep 2014 11:49:43 -0700 Subject: [PATCH 13/18] Allow more than one dash in package version names This is consistent with the semver spec, and should fix --- .../package-version-parser-tests.js | 12 ++++++++++-- tools/package-version-parser.js | 7 +++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/packages/package-version-parser/package-version-parser-tests.js b/packages/package-version-parser/package-version-parser-tests.js index b934f88b9c..7abf92072c 100644 --- a/packages/package-version-parser/package-version-parser-tests.js +++ b/packages/package-version-parser/package-version-parser-tests.js @@ -156,7 +156,7 @@ Tinytest.add( compare("1.0.0_50", "1.0.1", "<"); compare("1.0.0_50", "1.2.0", "<"); compare("1.0.0_1", "1.0.0_2", "<"); - compare("1.0.0_2", "1.0.0_10", "<"); // verify that we compare ~N as numbers, not strings + compare("1.0.0_2", "1.0.0_10", "<"); // verify that we compare _N "wrap numbers" as numbers, not strings compare("1.0.0", "1.0.0_2", "<"); compare("1.99.0_99", "3.0.0_2", "<"); compare("1.99.0", "2.0.0", "<"); @@ -182,13 +182,21 @@ Tinytest.add( compare("1.0.0-beta.2", "1.0.0-beta.11", "<"); compare("1.0.0-beta.11", "1.0.0-rc.1", "<"); compare("1.0.0-rc.1", "1.0.0", "<"); - compare("1.0.0-r.1", "1.0.0", "<"); // test single character prerelease parts + + // dashes are allowed in prerelease parts + compare("1.0.0--alpha", "1.0.0-alpha", "<"); + compare("1.0.0-a-lpha", "1.0.0-alpha", "<"); + // test single character prerelease parts + compare("1.0.0-r.1", "1.0.0", "<"); + // test the edges of `versionMagnitude` + compare("1.0.0-zzzzzzzzzzzz", "1.0.0", "<"); // Our broken implementation of Rule 11 (see [*] above the // declaration of PackageVersion.versionMagnitude). Maybe one day // we'll fix it, in which case replace "===" with ">" test.isTrue(PackageVersion.versionMagnitude("1.0.0-beta.0") === PackageVersion.versionMagnitude("1.0.0-bear.0")); + }); Tinytest.add("Invalid in 0.9.2", function (test) { diff --git a/tools/package-version-parser.js b/tools/package-version-parser.js index 0374c4d9a8..42fcbc8147 100644 --- a/tools/package-version-parser.js +++ b/tools/package-version-parser.js @@ -94,7 +94,7 @@ var prereleaseIdentifierToFraction = function (prerelease) { if (typeof part === 'number') { digit = part+1; } else if (typeof part === 'string') { - var VALID_CHARACTERS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; + var VALID_CHARACTERS = "-ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; var validCharToNumber = function (ch) { var result = VALID_CHARACTERS.indexOf(ch); @@ -104,13 +104,16 @@ var prereleaseIdentifierToFraction = function (prerelease) { return result; }; - digit = 251 + // Numeric parts always have lower precedence than non-numeric parts. + digit = 101 + // Numeric parts always have lower precedence than non-numeric parts. validCharToNumber(part[0]) * VALID_CHARACTERS.length + (part[1] ? validCharToNumber(part[1]) : 0); } else { throw new Error("Unexpected prerelease identifier part: " + part + " of type " + typeof part); } + // 3000 > 101 + VALID_CHARACTERS.length * + // VALID_CHARACTERS.length. And there's a test to verify this + // ("test the edges of `versionMagnitude`") return memo + digit / Math.pow(3000, index+1); }, -1); }; From 274497d0839f098be4205abb78932883d72d9155 Mon Sep 17 00:00:00 2001 From: ekatek Date: Tue, 30 Sep 2014 12:18:21 -0700 Subject: [PATCH 14/18] mark tests that publish as checkout only When we publish things to the test packaging server, we use the versionsFrom argument that is very difficult to set up right to actually work. Most of the time we don't really set that up and just agree that those tests should fail. As such, I am going to mark most of those tests as checkout-only for now (we still usually check that we can publish manually anyway as part of poking at the release in QA, and there is not a lot of reason that I can think of why publishing from release would be different than pubishing from checkout. So, marking these as checkout-only until we can get a better testing infrastructure for this in place. --- tools/tests/package-tests.js | 9 ++++++--- tools/tests/publish.js | 14 +++++++++----- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/tools/tests/package-tests.js b/tools/tests/package-tests.js index a8fcfabbdf..4bbee0696f 100644 --- a/tools/tests/package-tests.js +++ b/tools/tests/package-tests.js @@ -581,7 +581,8 @@ selftest.define("update server package data unit test", // Add packages to an app. Change the contents of the packages and their // dependencies, make sure that the app still refreshes. -selftest.define("package with --name", ['test-package-server'], function () { +selftest.define("package with --name", + ['test-package-server', "checkout"], function () { var s = new Sandbox(); var run; @@ -626,7 +627,8 @@ selftest.define("package with --name", ['test-package-server'], function () { run.stop(); }); -selftest.define("talk to package server with expired or no accounts token", ['net', 'test-package-server'], function () { +selftest.define("talk to package server with expired or no accounts token", + ['net', 'test-package-server'], function () { var s = new Sandbox(); testUtils.login(s, "test", "testtest"); @@ -698,7 +700,8 @@ var changeVersionAndPublish = function (s, expectAuthorizationFailure) { } }; -selftest.define("packages with organizations", ["net", "test-package-server"], function () { +selftest.define("packages with organizations", + ["net", "test-package-server"], function () { var s = new Sandbox(); testUtils.login(s, "test", "testtest"); diff --git a/tools/tests/publish.js b/tools/tests/publish.js index 9b534dbd74..98b3749f2c 100644 --- a/tools/tests/publish.js +++ b/tools/tests/publish.js @@ -7,7 +7,8 @@ var stats = require('../stats.js'); var Sandbox = selftest.Sandbox; var files = require('../files.js'); -selftest.define("publish-and-search", ["slow", "net", "test-package-server"], function () { +selftest.define("publish-and-search", + ["slow", "net", "test-package-server", "checkout"], function () { var s = new Sandbox; var username = "test"; @@ -101,7 +102,8 @@ selftest.define("publish-and-search", ["slow", "net", "test-package-server"], fu run.match("package: " + packageName); }); -selftest.define("publish-one-arch", ["slow", "net", "test-package-server"], function () { +selftest.define("publish-one-arch", + ["slow", "net", "test-package-server", "checkout"], function () { var s = new Sandbox; var username = "test"; @@ -139,7 +141,8 @@ selftest.define("publish-one-arch", ["slow", "net", "test-package-server"], func }); selftest.define("list-with-a-new-version", - ["slow", "net", "test-package-server"], function () { + ["slow", "net", "test-package-server", "checkout"], + function () { var s = new Sandbox; var username = "test"; @@ -268,7 +271,8 @@ selftest.define("list-with-a-new-version", selftest.define("do-not-update-to-rcs", - ["slow", "net", "test-package-server"], function () { + ["slow", "net", "test-package-server", "checkout"], + function () { var s = new Sandbox; var username = "test"; @@ -389,7 +393,7 @@ selftest.define("do-not-update-to-rcs", selftest.define("package-depends-on-either-version", - ["slow", "net", "test-package-server"], function () { + ["slow", "net", "test-package-server", "checkout"], function () { var s = new Sandbox; var username = "test"; From b4a063c53ca03d63aa21ea53469127ac5c6ef8ab Mon Sep 17 00:00:00 2001 From: Slava Kim Date: Mon, 29 Sep 2014 21:43:40 -0700 Subject: [PATCH 15/18] Don't compile the mobile-config.js control file into an app --- tools/package-source.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/package-source.js b/tools/package-source.js index 5242a0eb2f..cffd2404f8 100644 --- a/tools/package-source.js +++ b/tools/package-source.js @@ -1477,6 +1477,9 @@ _.extend(PackageSource.prototype, { self.sourceRoot = appDir; self.serveRoot = path.sep; + // special files those are excluded from app's top-level sources + var controlFiles = ['mobile-config.js']; + _.each(self.allArchs, function (arch) { // Determine used packages var project = require('./project.js').project; @@ -1531,6 +1534,9 @@ _.extend(PackageSource.prototype, { exclude: sourceExclude }); + // don't include watched but not included control files + sources = _.difference(sources, controlFiles); + var otherUnibuildRegExp = (arch === "os" ? /^client\/$/ : /^server\/$/); From 264b9efb2def12bf974b4ca1263df15a7751b1a9 Mon Sep 17 00:00:00 2001 From: Slava Kim Date: Tue, 30 Sep 2014 12:28:06 -0700 Subject: [PATCH 16/18] Moving things around for categorization Should an no-op --- tools/commands-cordova.js | 245 ++++++++++++++++++++------------------ 1 file changed, 130 insertions(+), 115 deletions(-) diff --git a/tools/commands-cordova.js b/tools/commands-cordova.js index cdb28a7572..fccae29701 100644 --- a/tools/commands-cordova.js +++ b/tools/commands-cordova.js @@ -31,6 +31,8 @@ var cordova = exports; var supportedPlatforms = ['ios', 'android', 'firefoxos']; var webArchName = "web.cordova"; +// --- helpers --- + var localCordova = path.join(files.getCurrentToolsDir(), "tools", "cordova-scripts", "cordova.sh"); @@ -130,6 +132,17 @@ var execFileSyncOrThrow = function (file, args, opts) { return childProcess; }; +var getLoadedPackages = _.once(function () { + var uniload = require('./uniload.js'); + return uniload.load({ + packages: [ 'boilerplate-generator', 'logging', 'webapp-hashing' ] + }); +}); + + + +// --- Cordova routines --- + var ensureAndroidBundleCache = {}; var ensureAndroidBundle = function (command) { @@ -159,13 +172,6 @@ var ensureAndroidBundle = function (command) { } }; -var getLoadedPackages = _.once(function () { - var uniload = require('./uniload.js'); - return uniload.load({ - packages: [ 'boilerplate-generator', 'logging', 'webapp-hashing' ] - }); -}); - var generateCordovaBoilerplate = function (clientDir, options) { var clientJsonPath = path.join(clientDir, 'program.json'); var clientJson = JSON.parse(fs.readFileSync(clientJsonPath, 'utf8')); @@ -212,61 +218,6 @@ var generateCordovaBoilerplate = function (clientDir, options) { return boilerplate.toHTML(); }; -var fetchCordovaPluginFromShaUrl = - function (urlWithSha, localPluginsDir, pluginName) { - verboseLog('Fetching a tarball from url:', urlWithSha); - var pluginPath = path.join(localPluginsDir, pluginName); - var pluginTarballPath = pluginPath + '.tgz'; - - var execFileSync = require('./utils.js').execFileSync; - var whichCurl = execFileSync('which', ['curl']); - - var downloadProcess = null; - - if (whichCurl.success) { - verboseLog('Downloading with curl'); - downloadProcess = - execFileSyncOrThrow('curl', ['-L', urlWithSha, '-o', pluginTarballPath]); - } else { - verboseLog('Downloading with wget'); - downloadProcess = - execFileSyncOrThrow('wget', ['-O', pluginTarballPath, urlWithSha]); - } - - if (! downloadProcess.success) - throw new Error("Failed to fetch the tarball from " + urlWithSha + ": " + - downloadProcess.stderr); - - verboseLog('Create a folder for the plugin', pluginPath); - files.mkdir_p(pluginPath); - - verboseLog('Untarring the tarball with plugin'); - var tarProcess = execFileSyncOrThrow('tar', - ['xf', pluginTarballPath, '-C', pluginPath, '--strip-components=1']); - if (! tarProcess.success) - throw new Error("Failed to untar the tarball from " + urlWithSha + ": " + - tarProcess.stderr); - verboseLog('Untarring succeeded, removing the tarball'); - files.rm_recursive(pluginTarballPath); - return pluginPath; -}; - -cordova.checkIsValidPlatform = function (name) { - if (name.match(/ios/i) && process.platform !== 'darwin') - throw new Error(name + ': not available on your system'); - if (! _.contains(supportedPlatforms, name)) - throw new Error(name + ': no such platform'); -}; - -cordova.checkIsValidPlugin = function (name) { - var pluginHash = {}; - pluginHash[name.split('@')[0]] = name.split('@')[1]; - - // check that every plugin is specifying either an exact constraint or a - // tarball url with sha - utils.ensureOnlyExactVersions(pluginHash); -}; - // options // - debug var getBundle = function (bundlePath, webArchs, options) { @@ -289,14 +240,6 @@ var getBundle = function (bundlePath, webArchs, options) { return bundleResult; }; -var localPluginsPathFromCordovaPath = function (cordovaPath) { - return path.join(cordovaPath, 'local-plugins'); -}; - -//////////////////////////////////////////////////////////////////////////////// -// ensureCordova -//////////////////////////////////////////////////////////////////////////////// - // Creates a Cordova project if necessary. cordova.ensureCordovaProject = function (localPath, appName) { verboseLog('Ensuring the cordova build project'); @@ -322,6 +265,8 @@ cordova.ensureCordovaProject = function (localPath, appName) { } }; +// --- Cordova platforms --- + // Ensures that the Cordova platforms are synchronized with the app-level // platforms. cordova.ensureCordovaPlatforms = function (localPath) { @@ -371,6 +316,60 @@ cordova.ensureCordovaPlatforms = function (localPath) { return true; }; +// checks that every requested platform such as 'android' or 'ios' is already +// added to the project +var checkRequestedPlatforms = function (platforms) { + platforms = _.uniq(platforms); + + var requestedPlatforms = []; + // Find the required platforms. + // ie. ["ios", "android", "ios-device"] will produce ["ios", "android"] + _.each(platforms, function (platformName) { + var platform = platformName.split('-')[0]; + if (! _.contains(requestedPlatforms, platform)) { + requestedPlatforms.push(platform); + } + }); + + var cordovaPlatforms = project.getCordovaPlatforms(); + _.each(requestedPlatforms, function (platform) { + if (! _.contains(cordovaPlatforms, platform)) + throw new Error(platform + +": platform is not added to the project.\n" + +"Try 'meteor add-platform " + platform + "' to add it or\n" + +"'meteor help add-platform' for help."); + }); +}; + +// Builds a Cordova project that targets the list of 'platforms' +// options: +// - appName: the target path of the build +// - host +// - port +cordova.buildPlatforms = function (localPath, platforms, options) { + verboseLog('Running build for platforms:', platforms); + checkRequestedPlatforms(platforms); + buildCordova(localPath, 'build', options); +}; + + +cordova.buildPlatformRunners = function (localPath, platforms, options) { + var runners = []; + _.each(platforms, function (platformName) { + runners.push(new CordovaRunner(localPath, platformName, options)); + }); + return runners; +}; + +cordova.checkIsValidPlatform = function (name) { + if (name.match(/ios/i) && process.platform !== 'darwin') + throw new Error(name + ': not available on your system'); + if (! _.contains(supportedPlatforms, name)) + throw new Error(name + ': no such platform'); +}; + + +// --- Cordova plugins --- var installPlugin = function (cordovaPath, name, version, settings) { verboseLog('Installing a plugin', name, version); @@ -622,6 +621,63 @@ var ensureCordovaPlugins = function (localPath, options) { } }; +var fetchCordovaPluginFromShaUrl = + function (urlWithSha, localPluginsDir, pluginName) { + verboseLog('Fetching a tarball from url:', urlWithSha); + var pluginPath = path.join(localPluginsDir, pluginName); + var pluginTarballPath = pluginPath + '.tgz'; + + var execFileSync = require('./utils.js').execFileSync; + var whichCurl = execFileSync('which', ['curl']); + + var downloadProcess = null; + + if (whichCurl.success) { + verboseLog('Downloading with curl'); + downloadProcess = + execFileSyncOrThrow('curl', ['-L', urlWithSha, '-o', pluginTarballPath]); + } else { + verboseLog('Downloading with wget'); + downloadProcess = + execFileSyncOrThrow('wget', ['-O', pluginTarballPath, urlWithSha]); + } + + if (! downloadProcess.success) + throw new Error("Failed to fetch the tarball from " + urlWithSha + ": " + + downloadProcess.stderr); + + verboseLog('Create a folder for the plugin', pluginPath); + files.mkdir_p(pluginPath); + + verboseLog('Untarring the tarball with plugin'); + var tarProcess = execFileSyncOrThrow('tar', + ['xf', pluginTarballPath, '-C', pluginPath, '--strip-components=1']); + if (! tarProcess.success) + throw new Error("Failed to untar the tarball from " + urlWithSha + ": " + + tarProcess.stderr); + verboseLog('Untarring succeeded, removing the tarball'); + files.rm_recursive(pluginTarballPath); + return pluginPath; +}; + +var localPluginsPathFromCordovaPath = function (cordovaPath) { + return path.join(cordovaPath, 'local-plugins'); +}; + +cordova.checkIsValidPlugin = function (name) { + var pluginHash = {}; + pluginHash[name.split('@')[0]] = name.split('@')[1]; + + // check that every plugin is specifying either an exact constraint or a + // tarball url with sha + utils.ensureOnlyExactVersions(pluginHash); +}; + + + + +// --- Cordova from project --- + // Returns the cordovaDependencies of the Cordova arch from a star json. var getCordovaDependenciesFromStar = function (star) { var cordovaProgram = _.findWhere(star.programs, { arch: webArchName }); @@ -718,51 +774,6 @@ var buildCordova = function (localPath, buildCommand, options) { verboseLog('Done building the cordova build project'); }; -// checks that every requested platform such as 'android' or 'ios' is already -// added to the project -var checkRequestedPlatforms = function (platforms) { - platforms = _.uniq(platforms); - - var requestedPlatforms = []; - // Find the required platforms. - // ie. ["ios", "android", "ios-device"] will produce ["ios", "android"] - _.each(platforms, function (platformName) { - var platform = platformName.split('-')[0]; - if (! _.contains(requestedPlatforms, platform)) { - requestedPlatforms.push(platform); - } - }); - - var cordovaPlatforms = project.getCordovaPlatforms(); - _.each(requestedPlatforms, function (platform) { - if (! _.contains(cordovaPlatforms, platform)) - throw new Error(platform + -": platform is not added to the project.\n" + -"Try 'meteor add-platform " + platform + "' to add it or\n" + -"'meteor help add-platform' for help."); - }); -}; - -// Builds a Cordova project that targets the list of 'platforms' -// options: -// - appName: the target path of the build -// - host -// - port -cordova.buildPlatforms = function (localPath, platforms, options) { - verboseLog('Running build for platforms:', platforms); - checkRequestedPlatforms(platforms); - buildCordova(localPath, 'build', options); -}; - - -cordova.buildPlatformRunners = function (localPath, platforms, options) { - var runners = []; - _.each(platforms, function (platformName) { - runners.push(new CordovaRunner(localPath, platformName, options)); - }); - return runners; -}; - // This is a runner, that we pass to Runner (run-all.js) var CordovaRunner = function (localPath, platformName, options) { @@ -1039,6 +1050,9 @@ var checkAgreePlatformTerms = function (platform) { return agreed; }; + +// --- Cordova commands --- + // add one or more Cordova platforms main.registerCommand({ name: "add-platform", @@ -1152,3 +1166,4 @@ main.registerCommand({ } return 0; }); + From 1337b84466a9933c7e0f1cc6c9b34934ef2d20a6 Mon Sep 17 00:00:00 2001 From: Justin SB Date: Tue, 30 Sep 2014 12:39:25 -0700 Subject: [PATCH 17/18] Properly close the heredoc we pass to phantomjs --- tools/selftest.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/selftest.js b/tools/selftest.js index 2e2276d12f..da88f77800 100644 --- a/tools/selftest.js +++ b/tools/selftest.js @@ -833,7 +833,7 @@ _.extend(PhantomClient.prototype, { '/bin/bash', ['-c', ("exec " + phantomPath + " --load-images=no /dev/stdin <<'END'\n" + - phantomScript + "END\n")]); + phantomScript + "\nEND\n")]); }, stop: function() { var self = this; From a1ab53d2c16ecf59ddf84b1c249a7ca44f8a421a Mon Sep 17 00:00:00 2001 From: Slava Kim Date: Tue, 30 Sep 2014 12:39:38 -0700 Subject: [PATCH 18/18] More moving things around and clean up the external interface of commands-cordova.js --- tools/commands-cordova.js | 119 +++++++++++++++++--------------------- 1 file changed, 54 insertions(+), 65 deletions(-) diff --git a/tools/commands-cordova.js b/tools/commands-cordova.js index fccae29701..ecf1a31c10 100644 --- a/tools/commands-cordova.js +++ b/tools/commands-cordova.js @@ -25,11 +25,52 @@ var Console = require('./console.js').Console; // XXX hard-coded the use of default tropohouse var tropo = tropohouse.default; +var supportedPlatforms = ['ios', 'android', 'firefoxos']; +var webArchName = "web.cordova"; var cordova = exports; -var supportedPlatforms = ['ios', 'android', 'firefoxos']; -var webArchName = "web.cordova"; + +// --- the public interface --- + +// Builds a Cordova project that targets the list of 'platforms' +// options: +// - appName: the target path of the build +// - host +// - port +cordova.buildPlatforms = function (localPath, platforms, options) { + verboseLog('Running build for platforms:', platforms); + checkRequestedPlatforms(platforms); + buildCordova(localPath, 'build', options); +}; + +cordova.buildPlatformRunners = function (localPath, platforms, options) { + var runners = []; + _.each(platforms, function (platformName) { + runners.push(new CordovaRunner(localPath, platformName, options)); + }); + return runners; +}; + +// packages - list of strings +cordova.filterPackages = function (packages) { +// We hard-code the 'cordova' and 'platform' namespaces + var ret = { + rest: [], + plugins: [] + }; + + _.each(packages, function (p) { + var namespace = p.split(':')[0]; + var name = p.split(':').slice(1).join(':'); + if (namespace === 'cordova') { + ret.plugins.push(name); + } else { + ret.rest.push(p); // leave it the same + } + }); + return ret; +}; // --- helpers --- @@ -241,7 +282,7 @@ var getBundle = function (bundlePath, webArchs, options) { }; // Creates a Cordova project if necessary. -cordova.ensureCordovaProject = function (localPath, appName) { +var ensureCordovaProject = function (localPath, appName) { verboseLog('Ensuring the cordova build project'); var cordovaPath = path.join(localPath, 'cordova-build'); var localPluginsPath = localPluginsPathFromCordovaPath(cordovaPath); @@ -269,7 +310,7 @@ cordova.ensureCordovaProject = function (localPath, appName) { // Ensures that the Cordova platforms are synchronized with the app-level // platforms. -cordova.ensureCordovaPlatforms = function (localPath) { +var ensureCordovaPlatforms = function (localPath) { verboseLog('Ensuring that platforms in cordova build project are in sync'); var cordovaPath = path.join(localPath, 'cordova-build'); var platforms = project.getCordovaPlatforms(); @@ -341,27 +382,7 @@ var checkRequestedPlatforms = function (platforms) { }); }; -// Builds a Cordova project that targets the list of 'platforms' -// options: -// - appName: the target path of the build -// - host -// - port -cordova.buildPlatforms = function (localPath, platforms, options) { - verboseLog('Running build for platforms:', platforms); - checkRequestedPlatforms(platforms); - buildCordova(localPath, 'build', options); -}; - - -cordova.buildPlatformRunners = function (localPath, platforms, options) { - var runners = []; - _.each(platforms, function (platformName) { - runners.push(new CordovaRunner(localPath, platformName, options)); - }); - return runners; -}; - -cordova.checkIsValidPlatform = function (name) { +var isValidPlatform = function (name) { if (name.match(/ios/i) && process.platform !== 'darwin') throw new Error(name + ': not available on your system'); if (! _.contains(supportedPlatforms, name)) @@ -598,7 +619,7 @@ var ensureCordovaPlugins = function (localPath, options) { // Cordova to fix the bug in their system, because it doesn't seem // like there's a way around this. files.rm_recursive(path.join(cordovaPath, 'platforms')); - cordova.ensureCordovaPlatforms(localPath); + ensureCordovaPlatforms(localPath); }; Console.stdout.write("Initializing Cordova plugins...\n"); uninstallAllPlugins(); @@ -664,16 +685,6 @@ var localPluginsPathFromCordovaPath = function (cordovaPath) { return path.join(cordovaPath, 'local-plugins'); }; -cordova.checkIsValidPlugin = function (name) { - var pluginHash = {}; - pluginHash[name.split('@')[0]] = name.split('@')[1]; - - // check that every plugin is specifying either an exact constraint or a - // tarball url with sha - utils.ensureOnlyExactVersions(pluginHash); -}; - - // --- Cordova from project --- @@ -700,8 +711,8 @@ var buildCordova = function (localPath, buildCommand, options) { verboseLog('Bundling the web.cordova program of the app'); var bundle = getBundle(bundlePath, [webArchName], options); - cordova.ensureCordovaProject(localPath, options.appName); - cordova.ensureCordovaPlatforms(localPath); + ensureCordovaProject(localPath, options.appName); + ensureCordovaPlatforms(localPath); ensureCordovaPlugins(localPath, _.extend({}, options, { packagePlugins: getCordovaDependenciesFromStar(bundle.starManifest) })); @@ -972,28 +983,6 @@ var execCordovaOnPlatform = function (localPath, platformName, options) { return 0; }; - - -// packages - list of strings -cordova.filterPackages = function (packages) { -// We hard-code the 'cordova' and 'platform' namespaces - var ret = { - rest: [], - plugins: [] - }; - - _.each(packages, function (p) { - var namespace = p.split(':')[0]; - var name = p.split(':').slice(1).join(':'); - if (namespace === 'cordova') { - ret.plugins.push(name); - } else { - ret.rest.push(p); // leave it the same - } - }); - return ret; -}; - var getTermsForPlatform = function (platform) { var url = 'https://warehouse.meteor.com/cordova/license_cordova_' + platform + '.txt'; var result = httpHelpers.request({ @@ -1069,7 +1058,7 @@ main.registerCommand({ try { _.each(platforms, function (platform) { - cordova.checkIsValidPlatform(platform); + isValidPlatform(platform); }); } catch (err) { Console.stderr.write(err.message + "\n"); @@ -1095,8 +1084,8 @@ main.registerCommand({ files.mkdir_p(localPath); var appName = path.basename(options.appDir); - cordova.ensureCordovaProject(localPath, appName); - cordova.ensureCordovaPlatforms(localPath); + ensureCordovaProject(localPath, appName); + ensureCordovaPlatforms(localPath); } _.each(platforms, function (platform) { @@ -1128,8 +1117,8 @@ main.registerCommand({ files.mkdir_p(localPath); var appName = path.basename(options.appDir); - cordova.ensureCordovaProject(localPath, appName); - cordova.ensureCordovaPlatforms(localPath); + ensureCordovaProject(localPath, appName); + ensureCordovaPlatforms(localPath); } });