From ee008e0aedcad98f7352b93f5ebcfae3e391f612 Mon Sep 17 00:00:00 2001
From: Pablo Alejandro Costesich <rhfixer@gmail.com>
Date: Wed, 2 Mar 2016 14:36:25 -0800
Subject: [PATCH 1/2] Remove extra commands from default generator flow

Rely on subgenerators/commands to get that info. We're keeping the
options in `app.js` so they transfer to subgenerators.

Fixes #10.
---
 generators/app/index.js | 106 ++--------------------------------------
 1 file changed, 4 insertions(+), 102 deletions(-)

diff --git a/generators/app/index.js b/generators/app/index.js
index 072506d8..6d9195b0 100644
--- a/generators/app/index.js
+++ b/generators/app/index.js
@@ -41,13 +41,13 @@ module.exports = generators.Base.extend({
       desc: 'Office client product that can host the add-in',
       required: false
     });
-    
+
     this.option('extensionPoint', {
       type: String,
       desc: 'Supported extension points',
       required: false
     });
-    
+
     this.option('appId', {
       type: String,
       desc: 'Application ID as registered in Azure AD',
@@ -124,27 +124,6 @@ module.exports = generators.Base.extend({
               name: 'Content Add-in',
               value: 'content'
             }]
-        },
-        // technology used to create the addin (html / angular / etc)
-        {
-          name: 'tech',
-          message: 'Technology to use:',
-          type: 'list',
-          when: this.options.tech === undefined,
-          choices: [
-            {
-              name: 'HTML, CSS & JavaScript',
-              value: 'html'
-            }, {
-              name: 'Angular',
-              value: 'ng'
-            }, {
-              name: 'Angular ADAL',
-              value: 'ng-adal'
-            }, {
-              name: 'Manifest.xml only (no application source files)',
-              value: 'manifest-only'
-            }]
         }];
 
       // trigger prompts
@@ -153,84 +132,7 @@ module.exports = generators.Base.extend({
         this.genConfig = extend(this.genConfig, responses);
         done();
       }.bind(this));
-
-    }, // askFor()
-    
-    askForAdalConfig: function(){
-      // if it's not an ADAL app, don't ask the questions
-      if (this.genConfig.tech !== 'ng-adal') {
-        return;
-      }
-
-      var done = this.async();
-
-      // office client application that can host the addin
-      var prompts = [{
-        name: 'appId',
-        message: 'Application ID as registered in Azure AD:',
-        default: '00000000-0000-0000-0000-000000000000',
-        when: this.options.appId === undefined
-      }];
-
-      // trigger prompts
-      this.prompt(prompts, function(responses){
-        this.genConfig = extend(this.genConfig, responses);
-        done();
-      }.bind(this));
-
-    }, // askForAdalConfig()
-
-    askForOfficeClients: function(){
-      // if it's a mail addin, don't ask for Office client
-      if (this.genConfig.type === 'mail') {
-        return;
-      }
-
-      var done = this.async();
-
-      // office client application that can host the addin
-      var prompts = [{
-        name: 'clients',
-        message: 'Supported Office applications:',
-        type: 'checkbox',
-        choices: [
-          {
-            name: 'Word',
-            value: 'Document',
-            checked: true
-          },
-          {
-            name: 'Excel',
-            value: 'Workbook',
-            checked: true
-          },
-          {
-            name: 'PowerPoint',
-            value: 'Presentation',
-            checked: true
-          },
-          {
-            name: 'Project',
-            value: 'Project',
-            checked: true
-          }
-        ],
-        when: this.options.clients === undefined,
-        validate: /* istanbul ignore next */ function(clientsAnswer){
-          if (clientsAnswer.length < 1) {
-            return 'Must select at least one Office application';
-          }
-          return true;
-        }
-      }];
-
-      // trigger prompts
-      this.prompt(prompts, function(responses){
-        this.genConfig = extend(this.genConfig, responses);
-        done();
-      }.bind(this));
-
-    } // askForOfficeClients()
+    }
 
   }, // prompting()
 
@@ -264,7 +166,7 @@ module.exports = generators.Base.extend({
             name: this.genConfig.name,
             'root-path': this.genConfig['root-path'],
             tech: this.genConfig.tech,
-            appId: this.genConfig.appId,            
+            appId: this.genConfig.appId,
             clients: this.genConfig.clients,
             'skip-install': this.options['skip-install']
           }

From 4774019606804df3be7ac900fb67da9318a28d33 Mon Sep 17 00:00:00 2001
From: Pablo Alejandro Costesich <rhfixer@gmail.com>
Date: Wed, 2 Mar 2016 15:36:52 -0800
Subject: [PATCH 2/2] remove yet more options

These options were duplicated, and I forgot to commit them during the
test phase.
---
 generators/app/index.js | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/generators/app/index.js b/generators/app/index.js
index 6d9195b0..49796dfb 100644
--- a/generators/app/index.js
+++ b/generators/app/index.js
@@ -79,32 +79,6 @@ module.exports = generators.Base.extend({
       var done = this.async();
 
       var prompts = [
-        // friendly name of the generator
-        {
-          name: 'name',
-          message: 'Project name (display name):',
-          default: 'My Office Project',
-          when: this.options.name === undefined
-        },
-        // root path where the addin should be created; should go in current folder where
-        //  generator is being executed, or within a subfolder?
-        {
-          name: 'root-path',
-          message: 'Root folder of project?'
-          + ' Default to current directory\n'
-          + ' (' + this.destinationRoot() + '),'
-          + ' or specify relative path\n'
-          + ' from current (src / public): ',
-          default: 'current folder',
-          when: this.options['root-path'] === undefined,
-          filter: /* istanbul ignore next */ function(response){
-            if (response === 'current folder') {
-              return '';
-            } else {
-              return response;
-            }
-          }
-        },
         // type of project - this will dictate which subgenerator to call
         {
           name: 'type',