Making more progress but this commit doesn't fully work

Error with the language download

Author: hhawkins

generators/app/eventTypes.json

@@ -0,0 +1,21 @@
+{
+    "http" : {
+        "Languages" : ["JavaScript", "C#", "Batch", "Powershell"]
+    },
+
+    "blob" : {
+        "Languages" : ["JavaScript", "C#", "Batch"]
+    },
+
+    "eventhub" : {
+        "Languages" : ["JavaScript", "C#", "Python"]
+    },
+
+    "timer" : {
+        "Languages" : ["JavaScript", "C#", "Powershell"]
+    },
+
+    "queue" : {
+        "Languages" : ["JavaScript", "C#", "Batch", "Bash", "Python", "Powershell"]
+    }
+}

generators/app/index.js

@@ -8,7 +8,7 @@ var fs = require('fs');
 var path = require('path');
 var languages = require ('./languages.js');
 var languagesJSON = require('./languages.json');
-// var Regex = require("regex");
+var eventTypesJson = require('./eventTypes.json');
 
 // Setting up constants for the menu items
 const ALL_TEMPLATES = 'List all templates',
@@ -117,15 +117,15 @@ module.exports = yeoman.Base.extend({
 
       var prompts = [{
         type: 'rawlist',
-        name: 'languageChoose',
+        name: 'languageChose',
         message: 'Select an option...',
         choices: listOfLanguages,
         default: listOfLanguages[0]
       }];
 
       return this.prompt(prompts).then(answer => {
         this.answer = answer;
-        this._showRelevantTemplates(this.answer.languageChoose)
+        this._showLanguageRelevantTemplates(this.answer.languageChose)
       });
     }
 
@@ -136,26 +136,30 @@ module.exports = yeoman.Base.extend({
     //------------------------------
     if (this.answer.requestFunctionTemplates == TEMPLATES_BY_EVENT_TYPE) {
       this.log('Feature coming soon, just wait on it!');
-    }
-  },
-
-  _showRelevantTemplates: function(languageName) {
-    // Setup the correlation with the language chosen to the template name
-    var languageTemplateIdentifier = "";
-    if (languageName === "JavaScript")
-      languageTemplateIdentifier = "NodeJS";
 
-    if (languageName === "C#")
-      languageTemplateIdentifier = "CSharp";
+      let listOfEventTypes = [];
+      for (let key in eventTypesJson) {
+        listOfEventTypes.push(key);
+      }
 
-    if (languageName === "Python")
-      languageTemplateIdentifier = "Python";
+      var prompts = [{
+        type: 'rawlist',
+        name: 'eventChoose',
+        message: 'Select an option...',
+        choices: listOfEventTypes,
+        default: listOfEventTypes[0]
+      }];
 
-    if (languageName === "PowerShell")
-      languageTemplateIdentifier = "Powershell";
+      return this.prompt(prompts).then(answer => {
+        this.answer = answer;
+        this._showEventRelevantTemplates(this.answer.eventChoose)
+      });
+    }
+  },
 
-    if (languageName === "Batch")
-      languageTemplateIdentifier = "Batch";
+  _showLanguageRelevantTemplates: function(languageName) {
+    // Setup the correlation with the language chosen to the template name
+    var languageTemplateIdentifier = languages.resolveLanguageIdentifier(languageName);
 
     var options = {
       uri: 'https://api.github.com/repos/Azure/azure-webjobs-sdk-templates/contents/Templates',
@@ -165,11 +169,11 @@ module.exports = yeoman.Base.extend({
       json: true
     };
 
+    var listOfTemplates = [];
+    var listOfUrls = {};
+
     requestPromise(options)
       .then(templates => {
-        var listOfTemplates = [];
-        var listOfUrls = {};
-
         for (let i = 0; i < templates.length; i++) {
           let templateName = templates[i]['name'];
           if (templateName.indexOf(languageTemplateIdentifier) >= 0) {
@@ -184,12 +188,30 @@ module.exports = yeoman.Base.extend({
             message: 'Select from one of the available templates...',
             choices: listOfTemplates,
             default: 0
+          }, {
+            type: 'input',
+            name: 'functionName',
+            message: 'Enter a name for your function...',
+            default: 'MyAzureFunction'
           }];
 
         return this.prompt(prompts).then(answer => {
           this.answer = answer;
         });
-      });
+      })
+      .then(() => {
+        this.log("downloadTemplate options:");
+        this.log(this.answer.templateToUse, listOfUrls, this.answer.functionName, languageName);
+        this._downloadTemplate(this.answer.templateToUse, listOfUrls, this.answer.functionName, languageName);
+      })
+      .catch(err => {
+        this.log('There was an error in searching for available templates...');
+        this.log(err);
+      });;
+  },
+
+  _showEventRelevantTemplates: function(eventName) {
+
   },
 
   _downloadTemplate: function (templateToUse, listOfUrls, functionName, language = "") {
@@ -233,7 +255,6 @@ module.exports = yeoman.Base.extend({
                   languageOfTemplate = languages.resolveLanguage(path.resolve(pathToSaveFunction, "metadata.json"));
                   if (languageToUse === "") {
                     languageToUse = languageOfTemplate;
-                    this.log('languageToUse: ' + languageToUse);
 
                     for (let j = 0; j < files.length; j++) {
                       var fileName = files[j]['name'];
@@ -272,9 +293,6 @@ module.exports = yeoman.Base.extend({
                   this.log(err);
                 })
                 .pipe(fs.createWriteStream(path.resolve(pathToSaveFunction, fileName)));
-
-              this.log('Downloading file ' + fileName + ' to:');
-              this.log(path.resolve(pathToSaveFunction, fileName));
             }         
           }
 

generators/app/languages.js

@@ -7,4 +7,32 @@ this.resolveLanguage = function (jsonFilePath){
 
     // Return the language
     return metadataJson['language'];
+}
+
+this.resolveLanguageIdentifier = function (language){
+    let tempIdentifier = "";
+
+    // Return the determined Identifier
+    switch(language) {
+        case "Javascript":
+            tempIdentifier = "NodeJS";
+            break;
+        case "C#":
+            tempIdentifier = "CSharp";
+            break;
+        case "Python":
+            tempIdentifier = "Python";
+            break;
+        case "PowerShell":
+            tempIdentifier = "Powershell";
+            break;
+        case "Batch":
+            tempIdentifier = "Batch";
+            break;
+        case "Bash":
+            tempIdentifier = "Bash";
+            break;
+    }
+
+    return tempIdentifier;
 }

generators/app/languages.json

@@ -22,5 +22,10 @@
     "Batch" : {
         "fileExtension" : ".bat",
         "additionalFiles" : "package.json"
+    },
+
+     "Bash" : {
+        "fileExtension" : ".sh",
+        "additionalFiles" : "package.json"
     }
 }