From aff7dfdb50cdf9a9a1772efebf404d590aa8937c Mon Sep 17 00:00:00 2001
From: Avital Oliver <avital@thewe.net>
Date: Wed, 13 Aug 2014 13:55:08 -0700
Subject: [PATCH] Record package usage on `meteor bundle`

Also eliminated arguments that weren't used anywhere,
and removed an XXX comment that was false (recordPackages
doesn't use buildmessage to report connection failures)
---
 tools/commands.js      | 9 +++++++++
 tools/deploy-galaxy.js | 2 +-
 tools/deploy.js        | 4 ++--
 tools/run-app.js       | 5 ++---
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/tools/commands.js b/tools/commands.js
index b000e0d8b2..f61c43ca37 100644
--- a/tools/commands.js
+++ b/tools/commands.js
@@ -493,6 +493,15 @@ main.registerCommand({
     return 1;
   }
 
+  var statsMessages = buildmessage.capture(function () {
+    stats.recordPackages();
+  });
+  if (statsMessages.hasMessages()) {
+    process.stdout.write("Error recording package list:\n" +
+                         statsMessages.formatMessages());
+    // ... but continue;
+  }
+
   var bundler = require(path.join(__dirname, 'bundler.js'));
   var bundleResult = bundler.bundle({
     outputPath: bundlePath,
diff --git a/tools/deploy-galaxy.js b/tools/deploy-galaxy.js
index 0a518715eb..780c1095fd 100644
--- a/tools/deploy-galaxy.js
+++ b/tools/deploy-galaxy.js
@@ -209,7 +209,7 @@ exports.deploy = function (options) {
         stats.recordPackages();
       });
       if (statsMessages.hasMessages()) {
-        process.stdout.write("Error talking to stats server:\n" +
+        process.stdout.write("Error recording package list:\n" +
                              statsMessages.formatMessages());
         // ... but continue;
       }
diff --git a/tools/deploy.js b/tools/deploy.js
index 1b3789fccb..9b1020f052 100644
--- a/tools/deploy.js
+++ b/tools/deploy.js
@@ -398,10 +398,10 @@ var bundleAndDeploy = function (options) {
 
     if (options.recordPackageUsage) {
       var statsMessages = buildmessage.capture(function () {
-        stats.recordPackages(options.appDir);
+        stats.recordPackages();
       });
       if (statsMessages.hasMessages()) {
-        process.stdout.write("Error talking to stats server:\n" +
+        process.stdout.write("Error recording package list:\n" +
                              statsMessages.formatMessages());
         // ... but continue;
       }
diff --git a/tools/run-app.js b/tools/run-app.js
index 003534cfc9..d048f5e92c 100644
--- a/tools/run-app.js
+++ b/tools/run-app.js
@@ -448,11 +448,10 @@ _.extend(AppRunner.prototype, {
     var bundlePath = path.join(self.appDir, '.meteor', 'local', 'build');
     if (self.recordPackageUsage) {
       var statsMessages = buildmessage.capture(function () {
-        stats.recordPackages(self.appDir);
+        stats.recordPackages();
       });
       if (statsMessages.hasMessages()) {
-        // XXX so this happens any time you're offline?
-        process.stdout.write("Error talking to stats server:\n" +
+        process.stdout.write("Error recording package list:\n" +
                              statsMessages.formatMessages());
         // ... but continue;
       }