Merge branch 'meteor-mongo' into linker

hy · Jun 14, 2013 · ea48bf8 · ea48bf8
2 parents 9bafe2f + 985cea3
commit ea48bf8
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/tools/deploy-galaxy.js b/tools/deploy-galaxy.js
@@ -228,3 +228,11 @@ exports.logs = function (options) {
     logReader.close();
   }
 };
+
+// options:
+// - context
+// - app
+exports.tempMongoUrl = function (options) {
+  var galaxy = getGalaxy(options.context);
+  return galaxy.call('getTempMongoUrl', options.app);
+};
diff --git 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.tempMongoUrl({
+            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