From c444451279fcd3a98480034265c8106fea4df928 Mon Sep 17 00:00:00 2001 From: Emily Stark Date: Fri, 14 Jun 2013 12:23:50 -0700 Subject: [PATCH 1/2] Galaxy version of meteor mongo --- tools/deploy-galaxy.js | 9 +++++++++ tools/meteor.js | 14 +++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/tools/deploy-galaxy.js b/tools/deploy-galaxy.js index 888352144c..d0d51f0d50 100644 --- a/tools/deploy-galaxy.js +++ b/tools/deploy-galaxy.js @@ -228,3 +228,12 @@ exports.logs = function (options) { logReader.close(); } }; + +// options: +// - context +// - app +exports.mongo = function (options) { + var galaxy = getGalaxy(options.context); + console.log(options.app); + return galaxy.call('getTempMongoUrl', options.app); +}; diff --git a/tools/meteor.js b/tools/meteor.js index d77de9bbbb..45ec6fcd5a 100644 --- a/tools/meteor.js +++ b/tools/meteor.js @@ -790,7 +790,19 @@ Fiber(function () { } else if (new_argv._.length === 2) { // remote mode - deploy.mongo(new_argv._[1], new_argv.url); + if (!!context.galaxyUrl) { + var deployGalaxy = require('./deploy-galaxy.js'); + var url = deployGalaxy.mongo({ + app: new_argv._[1], + context: context + }); + if (new_argv.url) + process.stdout.write(url + "\n"); + else + deploy.run_mongo_shell(url); + } else { + deploy.mongo(new_argv._[1], new_argv.url); + } } else { // usage From 985cea327735a2de42bee46d6da05ad4f5eb97ff Mon Sep 17 00:00:00 2001 From: Emily Stark Date: Fri, 14 Jun 2013 15:30:19 -0700 Subject: [PATCH 2/2] Clean up (Avi's comments) --- tools/deploy-galaxy.js | 3 +-- tools/meteor.js | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/deploy-galaxy.js b/tools/deploy-galaxy.js index d0d51f0d50..42121acb37 100644 --- a/tools/deploy-galaxy.js +++ b/tools/deploy-galaxy.js @@ -232,8 +232,7 @@ exports.logs = function (options) { // options: // - context // - app -exports.mongo = function (options) { +exports.tempMongoUrl = function (options) { var galaxy = getGalaxy(options.context); - console.log(options.app); return galaxy.call('getTempMongoUrl', options.app); }; diff --git a/tools/meteor.js b/tools/meteor.js index 45ec6fcd5a..f72d76fda5 100644 --- a/tools/meteor.js +++ b/tools/meteor.js @@ -792,7 +792,7 @@ Fiber(function () { // remote mode if (!!context.galaxyUrl) { var deployGalaxy = require('./deploy-galaxy.js'); - var url = deployGalaxy.mongo({ + var url = deployGalaxy.tempMongoUrl({ app: new_argv._[1], context: context });