From fc6488fee1eb7872a7979c9bf729b3c61f3fc4bf Mon Sep 17 00:00:00 2001
From: Sashko Stubailo <sashko@mit.edu>
Date: Mon, 18 Aug 2014 17:56:48 -0700
Subject: [PATCH] Allegedly cleaned up failed refactor, pass all self tests

---
 tools/commands-cordova.js        | 20 +++++++++-----------
 tools/commands-packages.js       |  8 ++++++++
 tools/tests/cordova-platforms.js |  8 ++++----
 tools/tests/cordova-plugins.js   |  6 ++++--
 4 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/tools/commands-cordova.js b/tools/commands-cordova.js
index 29d3beafa8..c5a7239218 100644
--- a/tools/commands-cordova.js
+++ b/tools/commands-cordova.js
@@ -215,11 +215,6 @@ cordova.ensureCordovaProject = function (localPath, appName) {
 // Ensures that the Cordova platforms are synchronized with the app-level
 // platforms.
 cordova.ensureCordovaPlatforms = function (localPath) {
-  files.mkdir_p(localPath);
-
-  var appName = path.basename(options.appDir);
-  cordova.ensureCordovaProject(localPath, appName);
-
   var cordovaPath = path.join(localPath, 'cordova-build');
   var platforms = project.getCordovaPlatforms();
   var platformsList = execFileSyncOrThrow(localCordova, ['platform', 'list'],
@@ -259,11 +254,6 @@ cordova.ensureCordovaPlatforms = function (localPath) {
 //                     we bundle the app to find the required plugins.
 
 cordova.ensureCordovaPlugins = function (localPath, options) {
-  files.mkdir_p(localPath);
-
-  var appName = path.basename(options.appDir);
-  cordova.ensureCordovaProject(localPath, appName);
-  
   options = options || {};
   var plugins = options.packagePlugins;
   if (! plugins) {
@@ -442,7 +432,7 @@ var checkRequestedPlatforms = function (platforms) {
   _.each(requestedPlatforms, function (platform) {
     if (! _.contains(cordovaPlatforms, platform))
       throw new Error(platform +
-        ": platform is not added to the project. Try 'meteor add platform:" +
+        ": platform is not added to the project. Try 'meteor add-platform " +
         platform + "' to add it or 'meteor help add' for help.");
   });
 };
@@ -583,6 +573,10 @@ main.registerCommand({
 
   if (platforms.length) {
     var localPath = path.join(options.appDir, '.meteor', 'local');
+    files.mkdir_p(localPath);
+
+    var appName = path.basename(options.appDir);
+    cordova.ensureCordovaProject(localPath, appName);
     cordova.ensureCordovaPlatforms(localPath);
   }
 
@@ -604,6 +598,10 @@ main.registerCommand({
 
   if (platforms.length) {
     var localPath = path.join(options.appDir, '.meteor', 'local');
+    files.mkdir_p(localPath);
+
+    var appName = path.basename(options.appDir);
+    cordova.ensureCordovaProject(localPath, appName);
     cordova.ensureCordovaPlatforms(localPath);
   }
 
diff --git a/tools/commands-packages.js b/tools/commands-packages.js
index a248f638a6..e9f1f4ebbc 100644
--- a/tools/commands-packages.js
+++ b/tools/commands-packages.js
@@ -1584,6 +1584,10 @@ main.registerCommand({
 
   if (cordovaPlugins.length) {
     var localPath = path.join(options.appDir, '.meteor', 'local');
+    files.mkdir_p(localPath);
+
+    var appName = path.basename(options.appDir);
+    cordova.ensureCordovaProject(localPath, appName);
     
     // The plugins installation still can fail
     try {
@@ -1790,6 +1794,10 @@ main.registerCommand({
 
   if (cordovaPlugins.length) {
     var localPath = path.join(options.appDir, '.meteor', 'local');
+    files.mkdir_p(localPath);
+
+    var appName = path.basename(options.appDir);
+    cordova.ensureCordovaProject(localPath, appName);
     cordova.ensureCordovaPlugins(localPath);
   }
 
diff --git a/tools/tests/cordova-platforms.js b/tools/tests/cordova-platforms.js
index 2993fb7030..aa95cbf125 100644
--- a/tools/tests/cordova-platforms.js
+++ b/tools/tests/cordova-platforms.js
@@ -54,10 +54,10 @@ selftest.define("add cordova platforms", function () {
 
   run = s.run("run", "android");
   run.matchErr("platform is not added");
-  run.matchErr("meteor add platform:android");
+  run.matchErr("meteor add-platform android");
   run.expectExit(1);
 
-  run = s.run("add", "platform:android");
+  run = s.run("add-platform", "android");
   run.match("added");
 
   run = s.run("run", "android");
@@ -71,10 +71,10 @@ selftest.define("add cordova platforms", function () {
   // run.match("running at");
   // run.match("localhost");
 
-  run = s.run("remove", "platform:android");
+  run = s.run("remove-platform", "android");
   run.match("removed");
   run = s.run("run", "android");
   run.matchErr("platform is not added");
-  run.matchErr("meteor add platform:android");
+  run.matchErr("meteor add-platform android");
   run.expectExit(1);
 });
diff --git a/tools/tests/cordova-plugins.js b/tools/tests/cordova-plugins.js
index 61b0f4f888..8b37bf2082 100644
--- a/tools/tests/cordova-plugins.js
+++ b/tools/tests/cordova-plugins.js
@@ -142,9 +142,9 @@ selftest.define("add cordova plugins", function () {
 
   run = s.run("run", "android");
   run.matchErr("not added to the project");
-  run.matchErr("meteor add platform:");
+  run.matchErr("meteor add-platform ");
 
-  run = s.run("add", "platform:android");
+  run = s.run("add-platform", "android");
   run.waitSecs(5);
   run.match("added platform");
 
@@ -171,6 +171,8 @@ selftest.define("add cordova plugins", function () {
 
   run = s.run("list");
   run.match("org.apache.cordova.camera");
+
+  run = s.run("list-platforms");
   run.match("android");
 
   run = s.run("bundle", "../a", "--android-path", "../android",