use security profiles for package

imhoffd · imhoffd · commit 63b2854adb32 · 2015-09-24T15:06:13.000-05:00
diff --git a/lib/ionic/package.js b/lib/ionic/package.js
@@ -1,16 +1,13 @@
 var fs = require('fs'),
     path = require('path'),
-    expandTilde = require('expand-tilde'),
     _ = require('underscore'),
     Q = require('q'),
     moment = require('moment'),
-    ProgressBar = require('progress'),
     IonicAppLib = require('ionic-app-lib'),
     Utils = IonicAppLib.utils,
     Login = IonicAppLib.login,
     Package = IonicAppLib.package,
     LoginTask = require('./login'),
-    Prompt = require('./prompt'),
     Table = require('./table'),
     Task = require('./task').Task;
 
@@ -83,96 +80,24 @@ function packageBuild(ionic, argv, dir, project, appId) {
       return jar;
     })
     .then(function(j) {
-      var q = Q.defer();
-
       jar = j;
 
       if (platform === 'android') {
         if (buildMode === 'debug') {
-          q.resolve({});
+          return Package.buildAndroidDebug(dir, jar, appId);
         } else if (buildMode === 'release') {
-          if (typeof argv.s !== 'undefined') {
-            argv['keystore'] = argv.s;
-          }
-
-          if (typeof argv.p !== 'undefined') {
-            argv['keystore-password'] = argv.p;
-          }
-
-          if (typeof argv.k !== 'undefined') {
-            argv['key-alias'] = argv.k;
+          if (typeof argv.profile === 'undefined') {
+            return Utils.fail("Must specify security profile for android release builds (--profile <tag>).", 'package');
           }
 
-          if (typeof argv.w !== 'undefined') {
-            argv['key-password'] = argv.w;
-          }
-
-          Prompt.prompt([
-              { name: 'keystore', description: 'Keystore File:'.prompt, required: true },
-              { name: 'keystore-password', description: 'Keystore Password:'.prompt, hidden: true, required: true },
-              { name: 'key-alias', description: 'Key Alias:'.prompt, required: true },
-              { name: 'key-password', description: 'Key Password:'.prompt, hidden: true, required: true }
-          ], argv)
-            .then(function(result) {
-              q.resolve(result);
-            })
-            .catch(function(ex) {
-              q.reject(ex);
-            });
-        } else {
-          q.reject('Unrecognized build mode: ' + buildMode);
+          return Package.buildAndroidRelease(dir, jar, appId, argv.profile)
         }
       } else if (platform === 'ios') {
-        if (typeof argv.c !== 'undefined') {
-          argv['cert'] = argv.c;
-        }
-
-        if (typeof argv.p !== 'undefined') {
-          argv['cert-password'] = argv.p;
-        }
-
-        if (typeof argv.r !== 'undefined') {
-          argv['provisioning-profile'] = argv.r;
+        if (typeof argv.profile === 'undefined') {
+          return Utils.fail("Must specify security profile for ios builds (--profile <tag>).", 'package');
         }
 
-        Prompt.prompt([
-            { name: 'cert', description: 'Certificate File:'.prompt, required: true },
-            { name: 'cert-password', description: 'Certificate Password:'.prompt, hidden: true, required: true },
-            { name: 'provisioning-profile', description: 'Provisioning Profile:'.prompt, required: true }
-        ], argv)
-          .then(function(result) {
-            q.resolve(result);
-          })
-          .catch(function(ex) {
-            q.reject(ex);
-          });
-      } else {
-        q.reject('Unrecognized platform: ' + platform);
-      }
-
-      return q.promise;
-    })
-    .then(function(result) {
-      if (platform === 'android') {
-        if (buildMode === 'debug') {
-          return Package.buildAndroidDebug(dir, jar, appId);
-        } else if (buildMode === 'release') {
-          var keystoreFilePath = path.resolve(expandTilde(result['keystore'])),
-              keystorePassword = path.resolve(expandTilde(result['keystore-password'])),
-              keyAlias = result['key-alias'],
-              keyPassword = result['key-password'],
-              keystoreFileStream = fs.createReadStream(keystoreFilePath);
-
-          return Package.buildAndroidRelease(dir, jar, appId, keystoreFileStream, keystorePassword, keyAlias, keyPassword)
-        }
-      } else if (platform === 'ios') {
-        var certificateFilePath = path.resolve(expandTilde(result['cert'])),
-            certificatePassword = result['cert-password'],
-            provisioningProfileFilePath = path.resolve(expandTilde(result['provisioning-profile'])),
-            certificateFileStream = fs.createReadStream(certificateFilePath),
-            provisioningProfileFileStream = fs.createReadStream(provisioningProfileFilePath);
-
-        return Package.buildIOS(dir, jar, appId, buildMode, certificateFileStream, certificatePassword, provisioningProfileFileStream)
+        return Package.buildIOS(dir, jar, appId, argv.profile, buildMode)
       }
 
       return Q.reject('Unrecognized platform/build mode.');
@@ -368,7 +293,7 @@ function packageDownload(ionic, argv, dir, project, appId) {
       }
 
       console.log('Wrote:', filename);
-      console.log('Done!'.green);
+      console.success('Done!'.green);
     }, null, function(state) {
       if (typeof bar === 'undefined') {
         bar = new ProgressBar('Downloading... [:bar]  :percent  :etas', {
diff --git a/lib/tasks/cliTasks.js b/lib/tasks/cliTasks.js
@@ -331,13 +331,7 @@ var TASKS = [
     },
     options: {
       '--release': '(' + 'build <platform>'.yellow + ') Mark this build as a release',
-      '--keystore|-s <path>': '(' + 'build android --release'.yellow + ') Specify the location of your keystore file',
-      '--keystore-password|-p <password>': '(' + 'build android --release'.yellow + ') Specify your keystore password (exclude for prompt)',
-      '--key-alias|-k <alias>': '(' + 'build android --release'.yellow + ') Specify your key alias for this app',
-      '--key-password|-w <password>': '(' + 'build android --release'.yellow + ') Specify your key password for this app (exclude for prompt)',
-      '--cert|-c <path>': '(' + 'build ios [--release]'.yellow + ') Specify the location of your .p12 file',
-      '--cert-password|-p <password>': '(' + 'build ios [--release]'.yellow + ') Specify your certificate password (exclude for prompt)',
-      '--provisioning-profile|-r <path>': '(' + 'build ios [--release]'.yellow + ') Specify the location of your .mobileprovision file',
+      '--profile|-p <tag>': '(' + 'build <platform>'.yellow + ') Specify the Security Profile to use with this build',
       '--destination|-d <path>': '(' + 'download'.yellow + ') Specify the destination directory to download your packaged app.'
     },
     module: './ionic/package'
