Renaming the app task to deploy. Switching up some params

Joel Weirauch · Joel Weirauch · commit 27f31ed3c59b · 2014-10-16T15:56:24.000-05:00
diff --git a/lib/ionic.js b/lib/ionic.js
@@ -225,16 +225,19 @@ var TASKS = [
     module: './ionic/serve'
   },
   {
-    title: 'app',
-    name: 'app',
-    // summary: 'Deploy a new Ionic app version or list versions',
+    title: 'deploy',
+    name: 'deploy',
+    // summary: 'Deploy a new Ionic app version or list uploaded versions',
+    //args: {
+    //  '[options]': '',
+    //  '<uuid>': 'UUID to deploy',
+    //},
     // options: {
-    //   '--versions|-v': 'List recently uploaded versions of this app',
+    //   '--list|-l': 'List recently uploaded versions of this app',
     //   '--deploy|-d': 'Upload the current working copy and mark it as deployed',
     //   '--note|-n': 'Add a note to a deploy',
-    //   '--uuid|-u': 'Mark an already uploaded version as deployed'
     // },
-    module: './ionic/app'
+    module: './ionic/deploy'
    }
 ];
 
diff --git a/lib/ionic/deploy.js b/lib/ionic/deploy.js
@@ -3,6 +3,7 @@ var fs = require('fs'),
     parseUrl = require('url').parse,
     request = require('request'),
     argv = require('optimist').argv,
+    prompt = require('prompt'),
     FormData = require('form-data'),
     IonicProject = require('./project'),
     IonicTask = require('./task').IonicTask,
@@ -30,16 +31,36 @@ IonicTask.prototype.run = function(ionic) {
   login.get(ionic, function(jar) {
     self.jar = jar;
 
-    if (argv['versions'] || argv.v) {
+    if (argv['list'] || argv.l) {
       self.versions(self);
-    } else if (argv['deploy'] || argv.d) {
+    } else {
       if (!self.inputValues['uuid']) {
-        // Deploying a new version
-        var upload = new IonicUploadTask();
 
-        upload.setNote(self.inputValues['note'] || '');
-        upload.run(self.ionic, function() {
-          self.deploy(self);
+        var schema = [{
+          name: 'confirm',
+          description: 'Deploy the current working copy? (yes/no)'.yellow,
+          required: true
+        }];
+
+        prompt.override = argv;
+        prompt.message = '';
+        prompt.delimiter = '';
+        prompt.start();
+
+        prompt.get(schema, function (err, result) {
+          if(err) {
+            return ionic.fail('Error logging in: ' + err);
+          }
+
+          if (result.confirm == 'yes' || result.confirm == 'y') {
+            // Deploying a new version
+            var upload = new IonicUploadTask();
+
+            upload.setNote(self.inputValues['note'] || '');
+            upload.run(self.ionic, function() {
+              self.deploy(self);
+            });
+          }
         });
       } else {
         self.deploy(self);
@@ -163,7 +184,12 @@ IonicTask.prototype.getCmdLineOptions = function() {
   }
 
   getCmdArgValue('note', 'n');
-  getCmdArgValue('uuid', 'u');
+
+  var uuid = argv._[1];
+
+  if (typeof uuid !== 'undefined' && uuid) {
+    self.inputValues['uuid'] = uuid;
+  }
 };
 
 IonicTask.prototype.getCsrfToken = function(jar) {
