Move files connecting to Meteor-provided services

to a separate folder

tools/catalog/catalog-remote.js

@@ -5,7 +5,7 @@ var sqlite3 = require('sqlite3');
 var files = require('../fs/files.js');
 var utils = require('../utils/utils.js');
 var buildmessage = require('../buildmessage.js');
-var config = require('../config.js');
+var config = require('../meteor-services/config.js');
 var archinfo = require('../archinfo.js');
 var Console = require('../console.js').Console;
 

tools/cli/commands-packages.js

@@ -2,8 +2,8 @@ var main = require('./main.js');
 var _ = require('underscore');
 var files = require('../fs/files.js');
 var buildmessage = require('../buildmessage.js');
-var auth = require('../auth.js');
-var config = require('../config.js');
+var auth = require('../meteor-services/auth.js');
+var config = require('../meteor-services/config.js');
 var utils = require('../utils/utils.js');
 var httpHelpers = require('../utils/http-helpers.js');
 var compiler = require('../isobuild/compiler.js');

tools/cli/commands.js

@@ -1,18 +1,18 @@
 var main = require('./main.js');
 var _ = require('underscore');
 var files = require('../fs/files.js');
-var deploy = require('../deploy.js');
+var deploy = require('../meteor-services/deploy.js');
 var buildmessage = require('../buildmessage.js');
-var auth = require('../auth.js');
-var authClient = require('../auth-client.js');
-var config = require('../config.js');
+var auth = require('../meteor-services/auth.js');
+var authClient = require('../meteor-services/auth-client.js');
+var config = require('../meteor-services/config.js');
 var Future = require('fibers/future');
 var runLog = require('../run-log.js');
 var utils = require('../utils/utils.js');
 var httpHelpers = require('../utils/http-helpers.js');
 var archinfo = require('../archinfo.js');
 var catalog = require('../catalog/catalog.js');
-var stats = require('../stats.js');
+var stats = require('../meteor-services/stats.js');
 var cordova = require('./commands-cordova.js');
 var Console = require('../console.js').Console;
 var projectContextModule = require('../project-context.js');

tools/isobuild/isopack.js

@@ -1591,6 +1591,7 @@ _.extend(Isopack.prototype, {
       /^tools\/packaging\/[^\/]+\.js$/,
       /^tools\/utils\/[^\/]+\.js$/,
       /^tools\/fs\/[^\/]+\.js$/,
+      /^tools\/meteor-services\/[^\/]+\.js$/,
       // We don't support running self-test from an install anymore
     ];
 

tools/meteor-services/auth-client.js

@@ -1,7 +1,7 @@
 var auth = require('./auth.js');
-var Console = require('./console.js').Console;
+var Console = require('../console.js').Console;
 var ServiceConnection = require('./service-connection.js');
-var httpHelpers = require('./utils/http-helpers.js');
+var httpHelpers = require('../utils/http-helpers.js');
 
 exports.AlreadyPrintedMessageError = function () {};
 

tools/meteor-services/auth.js

@@ -1,14 +1,14 @@
 var _ = require('underscore');
-var utils = require('./utils/utils.js');
-var files = require('./fs/files.js');
+var utils = require('../utils/utils.js');
+var files = require('../fs/files.js');
 var config = require('./config.js');
-var httpHelpers = require('./utils/http-helpers.js');
-var fiberHelpers = require('./utils/fiber-helpers.js');
+var httpHelpers = require('../utils/http-helpers.js');
+var fiberHelpers = require('../utils/fiber-helpers.js');
 var querystring = require('querystring');
 var url = require('url');
 var Future = require('fibers/future');
-var isopackets = require('./tool-env/isopackets.js');
-var Console = require('./console.js').Console;
+var isopackets = require('../tool-env/isopackets.js');
+var Console = require('../console.js').Console;
 
 var auth = exports;
 

tools/meteor-services/config.js

@@ -1,7 +1,7 @@
 var url = require('url');
-var files = require('./fs/files.js');
+var files = require('../fs/files.js');
 var _ = require('underscore');
-var tropohouse = require('./packaging/tropohouse.js');
+var tropohouse = require('../packaging/tropohouse.js');
 
 // A few functions in the `meteor` tool talk to MDG servers: primarily
 // checking for updates, logging into your Meteor account, and

tools/meteor-services/deploy.js

@@ -4,14 +4,14 @@
 // prompt for password
 // send RPC with or without password as required
 
-var files = require('./fs/files.js');
-var httpHelpers = require('./utils/http-helpers.js');
-var buildmessage = require('./buildmessage.js');
+var files = require('../fs/files.js');
+var httpHelpers = require('../utils/http-helpers.js');
+var buildmessage = require('../buildmessage.js');
 var config = require('./config.js');
 var auth = require('./auth.js');
 var _ = require('underscore');
 var stats = require('./stats.js');
-var Console = require('./console.js').Console;
+var Console = require('../console.js').Console;
 
 // Make a synchronous RPC to the "classic" MDG deploy API. The deploy
 // API has the following contract:
@@ -397,7 +397,7 @@ var bundleAndDeploy = function (options) {
   });
 
   if (! messages.hasMessages()) {
-    var bundler = require('./isobuild/bundler.js');
+    var bundler = require('../isobuild/bundler.js');
 
     var bundleResult = bundler.bundle({
       projectContext: options.projectContext,

tools/meteor-services/service-connection.js

@@ -1,6 +1,6 @@
 var Future = require("fibers/future");
 var _ = require("underscore");
-var isopackets = require('./tool-env/isopackets.js');
+var isopackets = require('../tool-env/isopackets.js');
 
 // Wrapper to manage a connection to a DDP service. The main difference between
 // it and a raw DDP connection is that the constructor blocks until a successful

tools/meteor-services/stats.js

@@ -2,11 +2,11 @@ var Fiber = require("fibers");
 var _ = require("underscore");
 
 var config = require('./config.js');
-var files = require('./fs/files.js');
+var files = require('../fs/files.js');
 var auth = require('./auth.js');
 var ServiceConnection = require('./service-connection.js');
-var httpHelpers = require('./utils/http-helpers.js');
-var Console = require('./console.js').Console;
+var httpHelpers = require('../utils/http-helpers.js');
+var Console = require('../console.js').Console;
 
 // The name of the package that you add to your app to opt out of
 // sending stats.

tools/packaging/package-client.js

@@ -1,14 +1,14 @@
 var Future = require('fibers/future');
 var _ = require('underscore');
 
-var config = require('../config.js');
+var config = require('../meteor-services/config.js');
 var httpHelpers = require('../utils/http-helpers.js');
 var release = require('./release.js');
 var files = require('../fs/files.js');
 var utils = require('../utils/utils.js');
 var buildmessage = require('../buildmessage.js');
 var compiler = require('../isobuild/compiler.js');
-var authClient = require('../auth-client.js');
+var authClient = require('../meteor-services/auth-client.js');
 var catalog = require('../catalog/catalog.js');
 var projectContextModule = require('../project-context.js');
 var colonConverter = require('../utils/colon-converter.js');

tools/packaging/tropohouse.js

@@ -5,7 +5,7 @@ var httpHelpers = require('../utils/http-helpers.js');
 var archinfo = require('../archinfo.js');
 var catalog = require('../catalog/catalog.js');
 var Isopack = require('../isobuild/isopack.js').Isopack;
-var config = require('../config.js');
+var config = require('../meteor-services/config.js');
 var buildmessage = require('../buildmessage.js');
 var Console = require('../console.js').Console;
 var colonConverter = require('../utils/colon-converter.js');

tools/packaging/updater.js

@@ -6,7 +6,7 @@ var archinfo = require('../archinfo.js');
 var isopack = require('../isobuild/isopack.js');
 var buildmessage = require('../buildmessage.js');
 var Console = require('../console.js').Console;
-var auth = require('../auth.js');
+var auth = require('../meteor-services/auth.js');
 var files = require('../fs/files.js');
 
 var tropohouse = require('./tropohouse.js');

tools/runners/run-app.js

@@ -7,7 +7,7 @@ var watch = require('../fs/watch.js');
 var bundler = require('../isobuild/bundler.js');
 var buildmessage = require('../buildmessage.js');
 var runLog = require('../run-log.js');
-var stats = require('../stats.js');
+var stats = require('../meteor-services/stats.js');
 var cordova = require('../cli/commands-cordova.js');
 var Console = require('../console.js').Console;
 var catalog = require('../catalog/catalog.js');

tools/selftest.js

@@ -10,7 +10,7 @@ var utils = require('./utils/utils.js');
 var parseStack = require('./utils/parse-stack.js');
 var Console = require('./console.js').Console;
 var archinfo = require('./archinfo.js');
-var config = require('./config.js');
+var config = require('./meteor-services/config.js');
 var buildmessage = require('./buildmessage.js');
 
 var catalog = require('./catalog/catalog.js');

tools/test-utils.js

@@ -1,7 +1,7 @@
 var isopackets = require('./tool-env/isopackets.js');
-var config = require('./config.js');
+var config = require('./meteor-services/config.js');
 var utils = require('./utils/utils.js');
-var auth = require('./auth.js');
+var auth = require('./meteor-services/auth.js');
 var selftest = require('./selftest.js');
 
 var randomString = function (charsCount) {

tools/tests/authorized.js

@@ -1,7 +1,7 @@
 var selftest = require('../selftest.js');
 var testUtils = require('../test-utils.js');
 var Sandbox = selftest.Sandbox;
-var config = require('../config.js');
+var config = require('../meteor-services/config.js');
 
 var commandTimeoutSecs = testUtils.accountsCommandTimeoutSecs;
 

tools/tests/autoupdate.js

@@ -1,5 +1,5 @@
 var selftest = require('../selftest.js');
-var config = require('../config.js');
+var config = require('../meteor-services/config.js');
 var catalogRemote = require('../catalog/catalog-remote.js');
 var buildmessage = require('../buildmessage.js');
 var Sandbox = selftest.Sandbox;

tools/tests/cordova-hcp.js

@@ -3,7 +3,7 @@ var selftest = require('../selftest.js');
 var httpHelpers = require('../utils/http-helpers.js');
 var Sandbox = selftest.Sandbox;
 var testUtils = require('../test-utils.js');
-var config = require('../config.js');
+var config = require('../meteor-services/config.js');
 
 // This is not an end-to-end test for Cordova hot code push, but this test
 // is for the issue that we observed where the value of the

tools/tests/deploy-auth.js

@@ -4,7 +4,7 @@ var testUtils = require('../test-utils.js');
 var files = require('../fs/files.js');
 var Sandbox = selftest.Sandbox;
 var httpHelpers = require('../utils/http-helpers.js');
-var config = require('../config.js');
+var config = require('../meteor-services/config.js');
 
 var commandTimeoutSecs = testUtils.accountsCommandTimeoutSecs;
 

tools/tests/list-sites.js

@@ -2,7 +2,7 @@ var _ = require('underscore');
 var selftest = require('../selftest.js');
 var testUtils = require('../test-utils.js');
 var files = require('../fs/files.js');
-var config = require('../config.js');
+var config = require('../meteor-services/config.js');
 var Sandbox = selftest.Sandbox;
 
 var commandTimeoutSecs = testUtils.accountsCommandTimeoutSecs;

tools/tests/logs-mongo-auth.js

@@ -2,7 +2,7 @@ var _ = require('underscore');
 var selftest = require('../selftest.js');
 var Sandbox = selftest.Sandbox;
 var testUtils = require('../test-utils.js');
-var config = require('../config.js');
+var config = require('../meteor-services/config.js');
 
 // XXX need to make sure that mother doesn't clean up:
 // 'legacy-password-app-for-selftest'

tools/tests/package-tests.js

@@ -475,7 +475,7 @@ selftest.define("update server package data unit test",
   var packageStorageFileDir = files.mkdtemp("update-server-package-data");
 
   var rC = require('../catalog/catalog-remote.js');
-  var config = require('../config.js');
+  var config = require('../meteor-services/config.js');
   var packageStorage = new rC.RemoteCatalog();
   var packageStorageFile = config.getPackageStorage({
     root: packageStorageFileDir,

tools/tests/publish.js

@@ -2,7 +2,7 @@ var _ = require('underscore');
 var utils = require('../utils/utils.js');
 var testUtils = require('../test-utils.js');
 var selftest = require('../selftest.js');
-var stats = require('../stats.js');
+var stats = require('../meteor-services/stats.js');
 var Sandbox = selftest.Sandbox;
 var files = require('../fs/files.js');
 

tools/tests/registration.js

@@ -4,7 +4,7 @@ var testUtils = require('../test-utils.js');
 var utils = require('../utils/utils.js');
 var Sandbox = selftest.Sandbox;
 var httpHelpers = require('../utils/http-helpers.js');
-var config = require('../config.js');
+var config = require('../meteor-services/config.js');
 
 var expectInvalidToken = selftest.markStack(function (token) {
   // Same XXX as testUtils.registerWithToken: should be hardcoded to

tools/tests/report-stats.js

@@ -2,12 +2,12 @@ var _ = require('underscore');
 var os = require('os');
 var util = require('util');
 
-var auth = require('../auth.js');
+var auth = require('../meteor-services/auth.js');
 var files = require('../fs/files.js');
-var config = require('../config.js');
+var config = require('../meteor-services/config.js');
 var selftest = require('../selftest.js');
 var testUtils = require('../test-utils.js');
-var stats = require('../stats.js');
+var stats = require('../meteor-services/stats.js');
 var tropohouseModule = require('../packaging/tropohouse.js');
 var release = require('../packaging/release.js');
 var Sandbox = selftest.Sandbox;

tools/tool-env/isopackets.js

@@ -7,7 +7,7 @@ var isopackCacheModule = require('../isobuild/isopack-cache.js');
 
 var buildmessage = require('../buildmessage.js');
 var files = require('../fs/files.js');
-var config = require('../config.js');
+var config = require('../meteor-services/config.js');
 var watch = require('../fs/watch.js');
 var Console = require('../console.js').Console;
 var fiberHelpers = require('../utils/fiber-helpers.js');

tools/utils/http-helpers.js

@@ -9,8 +9,8 @@ var _ = require('underscore');
 var Future = require('fibers/future');
 
 var files = require('../fs/files.js');
-var auth = require('../auth.js');
-var config = require('../config.js');
+var auth = require('../meteor-services/auth.js');
+var config = require('../meteor-services/config.js');
 var release = require('../packaging/release.js');
 var Console = require('../console.js').Console;