From 28c41294bba746c75beae0ab26a42c8412cc665a Mon Sep 17 00:00:00 2001
From: Tim Kim <timk@adobe.com>
Date: Fri, 18 Oct 2013 15:56:42 -0700
Subject: [PATCH] CB-4872 - moved version script to promise model

---
 bin/android_sdk_version        |  6 +++++-
 bin/lib/android_sdk_version.js | 30 +++++++++++++++++++++---------
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/bin/android_sdk_version b/bin/android_sdk_version
index e4c8bb5b..547f41bd 100755
--- a/bin/android_sdk_version
+++ b/bin/android_sdk_version
@@ -21,5 +21,9 @@
 
 var android_sdk_version = require('./lib/android_sdk_version');
 
-android_sdk_version.run();
+android_sdk_version.run().done(null, function(err) {
+    console.log(err);
+    process.exit(2);
+});
+
 
diff --git a/bin/lib/android_sdk_version.js b/bin/lib/android_sdk_version.js
index e8a1b1b3..d03e1e7d 100755
--- a/bin/lib/android_sdk_version.js
+++ b/bin/lib/android_sdk_version.js
@@ -19,7 +19,9 @@
        under the License.
 */
 
-var shell = require('shelljs');
+var shell = require('shelljs'),
+    child_process = require('child_process'),
+    Q     = require('q');
 
 get_highest_sdk = function(results){
     var reg = /\d+/;
@@ -32,22 +34,32 @@ get_highest_sdk = function(results){
 }
 
 get_sdks = function() {
-    var targets = shell.exec('android list targets', {silent:true, async:false});
+    var d = Q.defer();
+    child_process.exec('android list targets', function(err, stdout, stderr) {
+        if (err) d.reject(stderr);
+        else d.resolve(stdout);
+    });
 
-    if(targets.code > 0 && targets.output.match(/command\snot\sfound/)) {
-        return new Error('The command \"android\" failed. Make sure you have the latest Android SDK installed, and the \"android\" command (inside the tools/ folder) is added to your path.');
-    } else {
+    return d.promise.then(function(output) {
         var reg = /android-\d+/gi;
-        var results = targets.output.match(reg);
+        var results = output.match(reg);
         if(results.length===0){
-            return new Error('No android sdks installed.');
+            return Q.reject(new Error('No android sdks installed.'));
         }else{
             get_highest_sdk(results);
         }
-    }
+
+        return Q();
+    }, function(stderr) {
+        if (stderr.match(/command\snot\sfound/)) {
+            return Q.reject(new Error('The command \"android\" failed. Make sure you have the latest Android SDK installed, and the \"android\" command (inside the tools/ folder) is added to your path.'));
+        } else {
+            return Q.reject(new Error('An error occurred while listing Android targets'));
+        }
+    });
 }
 
 module.exports.run = function() {
-    get_sdks();
+    return Q.all([get_sdks()]);
 }