kuduscript - npm Package Compare versions

Comparing version 0.1.11 to 0.1.14

bin/kuduscript.js

@@ -12,2 +12,3 @@ var commander = require('commander');
        .option('--aspWAP <projectFilePath>', 'Create a deployment script for .NET web application, specify the project file path')
+       .option('--aspProjectK <projectFilePath>', 'Create a deployment script for ProjectK web application, specify the project.json file path')
        .option('--aspWebSite', 'Create a deployment script for basic website')
@@ -32,3 +33,3 @@ .option('--node', 'Create a deployment script for node.js website')
   var scriptType = options.scriptType;
-  var projectFile = options.aspWAP || options.dotNetConsole;
+  var projectFile = options.aspWAP || options.dotNetConsole || options.aspProjectK;
   var solutionFile = options.solutionFile;
@@ -39,3 +40,3 @@ var sitePath = options.sitePath || repositoryRoot;
 
-  var exclusionFlags = [options.aspWAP, options.php, options.python, options.aspWebSite, options.node, options.basic, options.dotNetConsole];
+  var exclusionFlags = [options.aspWAP, options.php, options.python, options.aspWebSite, options.node, options.basic, options.dotNetConsole, options.aspProjectK];
   var flagCount = 0;
@@ -60,2 +61,4 @@ for (var i in exclusionFlags) {
     projectType = generator.ProjectType.wap;
+  } else if (options.aspProjectK) {
+    projectType = generator.ProjectType.projectK
   } else if (options.aspWebSite) {
@@ -65,2 +68,4 @@ projectType = generator.ProjectType.website;
     projectType = generator.ProjectType.node;
+  } else if (options.python) {
+      projectType = generator.ProjectType.python;
   } else if (options.dotNetConsole) {
@@ -67,0 +72,0 @@ projectType = generator.ProjectType.dotNetConsole;

lib/generator.js

@@ -1,2 +0,2 @@
-/*** Generated by streamline 0.4.10 (callbacks) - DO NOT EDIT ***/ var __rt=require('streamline/lib/callbacks/runtime').runtime(__filename),__func=__rt.__func,__cb=__rt.__cb; var package = require("../package.json");
+/*** Generated by streamline 0.4.11 (callbacks) - DO NOT EDIT ***/ var __rt=require('streamline/lib/callbacks/runtime').runtime(__filename),__func=__rt.__func,__cb=__rt.__cb; var package = require("../package.json");
 
@@ -40,4 +40,6 @@
   node: "NODE",
+  python: "PYTHON",
   basic: "BASIC",
-  dotNetConsole: "DOT_NET_CONSOLE"};
+  dotNetConsole: "DOT_NET_CONSOLE",
+  projectK: "PROJECTK"};
 
@@ -58,3 +60,3 @@
 
-    if (((projectType === ProjectType.wap) || (projectType === ProjectType.website))) {
+    if (((((projectType === ProjectType.wap) || (projectType === ProjectType.website)) || (projectType === ProjectType.projectK)) || (projectType === ProjectType.python))) {
 
@@ -119,23 +121,33 @@ scriptType = ScriptType.batch; }
   this.generators[ProjectType.node] = generateNodeDeploymentScript;
+  this.generators[ProjectType.python] = generatePythonDeploymentScript;
   this.generators[ProjectType.basic] = generateBasicWebSiteDeploymentScript;
-  this.generators[ProjectType.dotNetConsole] = generateDotNetConsoleDeploymentScript;};
+  this.generators[ProjectType.dotNetConsole] = generateDotNetConsoleDeploymentScript;
+  this.generators[ProjectType.projectK] = generateProjectKDeploymentScript;};
 
 
-function generateDotNetConsoleDeploymentScript(scriptGenerator, _) { var __frame = { name: "generateDotNetConsoleDeploymentScript", line: 121 }; return __func(_, this, arguments, generateDotNetConsoleDeploymentScript, 1, __frame, function __$generateDotNetConsoleDeploymentScript() {
+function generateProjectKDeploymentScript(scriptGenerator, _) { var __frame = { name: "generateProjectKDeploymentScript", line: 125 }; return __func(_, this, arguments, generateProjectKDeploymentScript, 1, __frame, function __$generateProjectKDeploymentScript() {
+    return scriptGenerator.generateProjectKDeploymentScript(__cb(_, __frame, 1, 2, _, true)); });};
+
+
+function generateDotNetConsoleDeploymentScript(scriptGenerator, _) { var __frame = { name: "generateDotNetConsoleDeploymentScript", line: 129 }; return __func(_, this, arguments, generateDotNetConsoleDeploymentScript, 1, __frame, function __$generateDotNetConsoleDeploymentScript() {
     return scriptGenerator.generateDotNetConsoleDeploymentScript(__cb(_, __frame, 1, 2, _, true)); });};
 
 
-function generateWapDeploymentScript(scriptGenerator, _) { var __frame = { name: "generateWapDeploymentScript", line: 125 }; return __func(_, this, arguments, generateWapDeploymentScript, 1, __frame, function __$generateWapDeploymentScript() {
+function generateWapDeploymentScript(scriptGenerator, _) { var __frame = { name: "generateWapDeploymentScript", line: 133 }; return __func(_, this, arguments, generateWapDeploymentScript, 1, __frame, function __$generateWapDeploymentScript() {
     return scriptGenerator.generateWapDeploymentScript(__cb(_, __frame, 1, 2, _, true)); });};
 
 
-function generateWebSiteDeploymentScript(scriptGenerator, _) { var __frame = { name: "generateWebSiteDeploymentScript", line: 129 }; return __func(_, this, arguments, generateWebSiteDeploymentScript, 1, __frame, function __$generateWebSiteDeploymentScript() {
+function generateWebSiteDeploymentScript(scriptGenerator, _) { var __frame = { name: "generateWebSiteDeploymentScript", line: 137 }; return __func(_, this, arguments, generateWebSiteDeploymentScript, 1, __frame, function __$generateWebSiteDeploymentScript() {
     return scriptGenerator.generateWebSiteDeploymentScript(__cb(_, __frame, 1, 2, _, true)); });};
 
 
-function generateNodeDeploymentScript(scriptGenerator, _) { var __frame = { name: "generateNodeDeploymentScript", line: 133 }; return __func(_, this, arguments, generateNodeDeploymentScript, 1, __frame, function __$generateNodeDeploymentScript() {
+function generateNodeDeploymentScript(scriptGenerator, _) { var __frame = { name: "generateNodeDeploymentScript", line: 141 }; return __func(_, this, arguments, generateNodeDeploymentScript, 1, __frame, function __$generateNodeDeploymentScript() {
     return scriptGenerator.generateNodeDeploymentScript(__cb(_, __frame, 1, 2, _, true)); });};
 
 
-function generateBasicWebSiteDeploymentScript(scriptGenerator, _) { var __frame = { name: "generateBasicWebSiteDeploymentScript", line: 137 }; return __func(_, this, arguments, generateBasicWebSiteDeploymentScript, 1, __frame, function __$generateBasicWebSiteDeploymentScript() {
+function generatePythonDeploymentScript(scriptGenerator, _) { var __frame = { name: "generatePythonDeploymentScript", line: 145 }; return __func(_, this, arguments, generatePythonDeploymentScript, 1, __frame, function __$generatePythonDeploymentScript() {
+    return scriptGenerator.generatePythonDeploymentScript(__cb(_, __frame, 1, 2, _, true)); });};
+
+
+function generateBasicWebSiteDeploymentScript(scriptGenerator, _) { var __frame = { name: "generateBasicWebSiteDeploymentScript", line: 149 }; return __func(_, this, arguments, generateBasicWebSiteDeploymentScript, 1, __frame, function __$generateBasicWebSiteDeploymentScript() {
     if (scriptGenerator.solutionPath) {
@@ -147,3 +159,3 @@ return _(new Error("Solution path is not supported with this website type")); } ;
 
-ScriptGenerator.prototype.generateDeploymentScript = function ScriptGenerator_prototype_generateDeploymentScript__1(_) { var generator, __this = this; var __frame = { name: "ScriptGenerator_prototype_generateDeploymentScript__1", line: 144 }; return __func(_, this, arguments, ScriptGenerator_prototype_generateDeploymentScript__1, 0, __frame, function __$ScriptGenerator_prototype_generateDeploymentScript__1() {
+ScriptGenerator.prototype.generateDeploymentScript = function ScriptGenerator_prototype_generateDeploymentScript__1(_) { var generator, __this = this; var __frame = { name: "ScriptGenerator_prototype_generateDeploymentScript__1", line: 156 }; return __func(_, this, arguments, ScriptGenerator_prototype_generateDeploymentScript__1, 0, __frame, function __$ScriptGenerator_prototype_generateDeploymentScript__1() {
     generator = __this.generators[__this.projectType];
@@ -167,3 +179,3 @@ if (!generator) {
 
-ScriptGenerator.prototype.generateNodeDeploymentScript = function ScriptGenerator_prototype_generateNodeDeploymentScript__2(_) { var __this = this; var __frame = { name: "ScriptGenerator_prototype_generateNodeDeploymentScript__2", line: 163 }; return __func(_, this, arguments, ScriptGenerator_prototype_generateNodeDeploymentScript__2, 0, __frame, function __$ScriptGenerator_prototype_generateNodeDeploymentScript__2() {
+ScriptGenerator.prototype.generateNodeDeploymentScript = function ScriptGenerator_prototype_generateNodeDeploymentScript__2(_) { var __this = this; var __frame = { name: "ScriptGenerator_prototype_generateNodeDeploymentScript__2", line: 175 }; return __func(_, this, arguments, ScriptGenerator_prototype_generateNodeDeploymentScript__2, 0, __frame, function __$ScriptGenerator_prototype_generateNodeDeploymentScript__2() {
     log.info("Generating deployment script for node.js Web Site");
@@ -174,3 +186,13 @@
 
-ScriptGenerator.prototype.generateWapDeploymentScript = function ScriptGenerator_prototype_generateWapDeploymentScript__3(_) { var msbuildArguments, msbuildArgumentsForInPlace, solutionDir, solutionArgs, options, __this = this; var __frame = { name: "ScriptGenerator_prototype_generateWapDeploymentScript__3", line: 169 }; return __func(_, this, arguments, ScriptGenerator_prototype_generateWapDeploymentScript__3, 0, __frame, function __$ScriptGenerator_prototype_generateWapDeploymentScript__3() {
+ScriptGenerator.prototype.generatePythonDeploymentScript = function ScriptGenerator_prototype_generatePythonDeploymentScript__3(_) { var __this = this; var __frame = { name: "ScriptGenerator_prototype_generatePythonDeploymentScript__3", line: 181 }; return __func(_, this, arguments, ScriptGenerator_prototype_generatePythonDeploymentScript__3, 0, __frame, function __$ScriptGenerator_prototype_generatePythonDeploymentScript__3() {
+    log.info("Generating deployment script for python Web Site");
+
+    if ((__this.scriptType != ScriptType.batch)) {
+      return _(new Error("Only batch script files are supported for python Web Site")); } ;
+
+
+    return __this.generateBasicDeploymentScript("python.template", __cb(_, __frame, 7, 2, _, true)); });};
+
+
+ScriptGenerator.prototype.generateWapDeploymentScript = function ScriptGenerator_prototype_generateWapDeploymentScript__4(_) { var msbuildArguments, msbuildArgumentsForInPlace, solutionDir, solutionArgs, options, __this = this; var __frame = { name: "ScriptGenerator_prototype_generateWapDeploymentScript__4", line: 191 }; return __func(_, this, arguments, ScriptGenerator_prototype_generateWapDeploymentScript__4, 0, __frame, function __$ScriptGenerator_prototype_generateWapDeploymentScript__4() {
     argNotNull(__this.projectPath, "projectPath");
@@ -209,6 +231,22 @@
 
-ScriptGenerator.prototype.generateDotNetConsoleDeploymentScript = function ScriptGenerator_prototype_generateDotNetConsoleDeploymentScript__4(_) { var msbuildArguments, solutionDir, solutionArgs, options, __this = this; var __frame = { name: "ScriptGenerator_prototype_generateDotNetConsoleDeploymentScript__4", line: 203 }; return __func(_, this, arguments, ScriptGenerator_prototype_generateDotNetConsoleDeploymentScript__4, 0, __frame, function __$ScriptGenerator_prototype_generateDotNetConsoleDeploymentScript__4() {
+ScriptGenerator.prototype.generateProjectKDeploymentScript = function ScriptGenerator_prototype_generateProjectKDeploymentScript__5(_) { var options, __this = this; var __frame = { name: "ScriptGenerator_prototype_generateProjectKDeploymentScript__5", line: 225 }; return __func(_, this, arguments, ScriptGenerator_prototype_generateProjectKDeploymentScript__5, 0, __frame, function __$ScriptGenerator_prototype_generateProjectKDeploymentScript__5() {
     argNotNull(__this.projectPath, "projectPath");
 
     if ((__this.scriptType != ScriptType.batch)) {
+      return _(new Error("Only batch script files are supported for Project K Application")); } ;
+
+
+    log.info("Generating deployment script for ProjectK Application");
+
+    options = {
+      kreProject: __this.projectPath };
+
+
+    return __this.generateKDeploymentScript("deploy.batch.aspnet.k.template", options, __cb(_, __frame, 13, 2, _, true)); });};
+
+
+ScriptGenerator.prototype.generateDotNetConsoleDeploymentScript = function ScriptGenerator_prototype_generateDotNetConsoleDeploymentScript__6(_) { var msbuildArguments, solutionDir, solutionArgs, options, __this = this; var __frame = { name: "ScriptGenerator_prototype_generateDotNetConsoleDeploymentScript__6", line: 241 }; return __func(_, this, arguments, ScriptGenerator_prototype_generateDotNetConsoleDeploymentScript__6, 0, __frame, function __$ScriptGenerator_prototype_generateDotNetConsoleDeploymentScript__6() {
+    argNotNull(__this.projectPath, "projectPath");
+
+    if ((__this.scriptType != ScriptType.batch)) {
       return _(new Error("Only batch script files are supported for .NET Web Application")); } ;
@@ -241,3 +279,3 @@
 
-ScriptGenerator.prototype.generateWebSiteDeploymentScript = function ScriptGenerator_prototype_generateWebSiteDeploymentScript__5(_) { var msbuildArguments, __this = this; var __frame = { name: "ScriptGenerator_prototype_generateWebSiteDeploymentScript__5", line: 234 }; return __func(_, this, arguments, ScriptGenerator_prototype_generateWebSiteDeploymentScript__5, 0, __frame, function __$ScriptGenerator_prototype_generateWebSiteDeploymentScript__5() { return (function __$ScriptGenerator_prototype_generateWebSiteDeploymentScript__5(__then) {
+ScriptGenerator.prototype.generateWebSiteDeploymentScript = function ScriptGenerator_prototype_generateWebSiteDeploymentScript__7(_) { var msbuildArguments, __this = this; var __frame = { name: "ScriptGenerator_prototype_generateWebSiteDeploymentScript__7", line: 272 }; return __func(_, this, arguments, ScriptGenerator_prototype_generateWebSiteDeploymentScript__7, 0, __frame, function __$ScriptGenerator_prototype_generateWebSiteDeploymentScript__7() { return (function __$ScriptGenerator_prototype_generateWebSiteDeploymentScript__7(__then) {
       if (__this.solutionPath) {
@@ -260,3 +298,3 @@
 
-ScriptGenerator.prototype.generateBasicDeploymentScript = function ScriptGenerator_prototype_generateBasicDeploymentScript__6(templateFileName, _) { var lowerCaseScriptType, fixedSitePath, templateContent, __this = this; var __frame = { name: "ScriptGenerator_prototype_generateBasicDeploymentScript__6", line: 252 }; return __func(_, this, arguments, ScriptGenerator_prototype_generateBasicDeploymentScript__6, 1, __frame, function __$ScriptGenerator_prototype_generateBasicDeploymentScript__6() {
+ScriptGenerator.prototype.generateBasicDeploymentScript = function ScriptGenerator_prototype_generateBasicDeploymentScript__8(templateFileName, _) { var lowerCaseScriptType, fixedSitePath, templateContent, __this = this; var __frame = { name: "ScriptGenerator_prototype_generateBasicDeploymentScript__8", line: 290 }; return __func(_, this, arguments, ScriptGenerator_prototype_generateBasicDeploymentScript__8, 1, __frame, function __$ScriptGenerator_prototype_generateBasicDeploymentScript__8() {
     argNotNull(templateFileName, "templateFileName");
@@ -275,3 +313,3 @@
 
-ScriptGenerator.prototype.generateDotNetDeploymentScript = function ScriptGenerator_prototype_generateDotNetDeploymentScript__7(templateFileName, options, _) { var solutionDir, templateContent, __this = this; var __frame = { name: "ScriptGenerator_prototype_generateDotNetDeploymentScript__7", line: 266 }; return __func(_, this, arguments, ScriptGenerator_prototype_generateDotNetDeploymentScript__7, 2, __frame, function __$ScriptGenerator_prototype_generateDotNetDeploymentScript__7() {
+ScriptGenerator.prototype.generateDotNetDeploymentScript = function ScriptGenerator_prototype_generateDotNetDeploymentScript__9(templateFileName, options, _) { var solutionDir, templateContent, __this = this; var __frame = { name: "ScriptGenerator_prototype_generateDotNetDeploymentScript__9", line: 304 }; return __func(_, this, arguments, ScriptGenerator_prototype_generateDotNetDeploymentScript__9, 2, __frame, function __$ScriptGenerator_prototype_generateDotNetDeploymentScript__9() {
     argNotNull(templateFileName, "templateFileName");
@@ -295,2 +333,15 @@
 
+ScriptGenerator.prototype.generateKDeploymentScript = function ScriptGenerator_prototype_generateKDeploymentScript__10(templateFileName, options, _) { var templateContent, __this = this; var __frame = { name: "ScriptGenerator_prototype_generateKDeploymentScript__10", line: 323 }; return __func(_, this, arguments, ScriptGenerator_prototype_generateKDeploymentScript__10, 2, __frame, function __$ScriptGenerator_prototype_generateKDeploymentScript__10() {
+    argNotNull(templateFileName, "templateFileName");
+
+
+
+
+
+
+    templateContent = getTemplatesContent(["deploy.batch.prefix.template","deploy.batch.aspnet.template",templateFileName,"deploy.batch.postfix.template",]).replace(/{PROJECT_JSON}/g, fixPathSeperatorToWindows(options.kreProject));
+
+    return __this.writeDeploymentFiles(templateContent, __cb(_, __frame, 10, 2, _, true)); });};
+
+
 function getTemplatesContent(fileNames) {
@@ -324,3 +375,3 @@ var content = "";
 
-ScriptGenerator.prototype.writeDeploymentFiles = function ScriptGenerator_prototype_writeDeploymentFiles__8(templateContent, _) { var deployScriptFileName, deploymentCommand, deployScriptPath, deploymentFilePath, __this = this; var __frame = { name: "ScriptGenerator_prototype_writeDeploymentFiles__8", line: 313 }; return __func(_, this, arguments, ScriptGenerator_prototype_writeDeploymentFiles__8, 1, __frame, function __$ScriptGenerator_prototype_writeDeploymentFiles__8() {
+ScriptGenerator.prototype.writeDeploymentFiles = function ScriptGenerator_prototype_writeDeploymentFiles__11(templateContent, _) { var deployScriptFileName, deploymentCommand, deployScriptPath, deploymentFilePath, __this = this; var __frame = { name: "ScriptGenerator_prototype_writeDeploymentFiles__11", line: 364 }; return __func(_, this, arguments, ScriptGenerator_prototype_writeDeploymentFiles__11, 1, __frame, function __$ScriptGenerator_prototype_writeDeploymentFiles__11() {
     argNotNull(templateContent, "templateContent");
@@ -344,7 +395,7 @@
 
-    return writeContentToFile(deployScriptPath, templateContent, __cb(_, __frame, 19, 2, function __$ScriptGenerator_prototype_writeDeploymentFiles__8() { return (function __$ScriptGenerator_prototype_writeDeploymentFiles__8(__then) {
+    return writeContentToFile(deployScriptPath, templateContent, __cb(_, __frame, 19, 2, function __$ScriptGenerator_prototype_writeDeploymentFiles__11() { return (function __$ScriptGenerator_prototype_writeDeploymentFiles__11(__then) {
 
         if (!__this.noDotDeployment) {
 
-          return writeContentToFile(deploymentFilePath, ("[config]\ncommand = " + deploymentCommand), __cb(_, __frame, 23, 4, __then, true)); } else { __then(); } ; })(function __$ScriptGenerator_prototype_writeDeploymentFiles__8() {
+          return writeContentToFile(deploymentFilePath, ("[config]\ncommand = " + deploymentCommand), __cb(_, __frame, 23, 4, __then, true)); } else { __then(); } ; })(function __$ScriptGenerator_prototype_writeDeploymentFiles__11() {
 
@@ -363,3 +414,3 @@
 
-function writeContentToFile(path, content, _) { var __frame = { name: "writeContentToFile", line: 350 }; return __func(_, this, arguments, writeContentToFile, 2, __frame, function __$writeContentToFile() { return (function __$writeContentToFile(__then) {
+function writeContentToFile(path, content, _) { var __frame = { name: "writeContentToFile", line: 401 }; return __func(_, this, arguments, writeContentToFile, 2, __frame, function __$writeContentToFile() { return (function __$writeContentToFile(__then) {
 
@@ -366,0 +417,0 @@ if (fs.existsSync(path)) {

package.json

 {
   "name": "kuduscript",
   "author": "Outercurve Foundation",
-  "version": "0.1.11",
+  "version": "0.1.14",
   "description": "Tool for generating deployment scripts for Azure Websites",
@@ -6,0 +6,0 @@ "tags": [

test/smokeTest.js

@@ -29,2 +29,8 @@ // Functional tests using mocha and should.
 
+    test('Python generated batch script runs without a failure', function (done) {
+        generateFile(pathUtil.join(testDir, "app.py"), "content");
+        var isBash = false;
+        runScenario("--python", isBash, done);
+    });
+
     test('Basic generated bash script runs without a failure', function (done) {
@@ -31,0 +37,0 @@ generateFile(pathUtil.join(testDir, "server.js"), "content");

No alert changes

Improved metrics

Total package byte prevSize

52569

increased by23.7%

Number of package files

23

increased by9.52%

Lines of code

504

increased by8.15%

No dependency changes