revert: "feat(project): add ability to specifically decide whether to…

… use license headers or not"

This reverts commit 7b0e80f.

__tests__/project/indexTests.ts

@@ -823,42 +823,6 @@ describe("generator:project", () => {
     {
     }
 }
-`
-        );
-      });
-    });
-
-    describe("License Disabled", () => {
-      let workDir = "";
-      beforeAll(() => {
-        return helpers
-          .run(generatorDir)
-          .withPrompts(
-            getPromptConfig({
-              description: "Cake addin generation test",
-              enableWyam: false,
-              useLicenseHeaders: false,
-            })
-          )
-          .withOptions({
-            "skip-dotnet": true,
-            "start-year": 2018,
-          })
-          .inTmpDir((dir) => (workDir = dir));
-      });
-
-      it("should not generate license headers when disabled", () => {
-        assert.equalsFileContent(
-          path.join(workDir, "src", "Cake.TestApp", "TestAppSettings.cs"),
-          `namespace Cake.TestApp
-{
-    using System;
-    using Cake.Core.Tooling;
-
-    public sealed class TestAppSettings : ToolSettings
-    {
-    }
-}
 `
         );
       });

defaultConfigs.ts

@@ -11,7 +11,6 @@ defaultConfig[PromptNames.Description] = "My Awesome Test Description";
 defaultConfig[PromptNames.ShortDescription] =
   defaultConfig[PromptNames.Description];
 defaultConfig[PromptNames.LicenseType] = "MIT";
-defaultConfig[PromptNames.UseLicenseHeaders] = true;
 defaultConfig[PromptNames.EmailAddress] = "test@app.com";
 defaultConfig[PromptNames.SourceDir] = "./src";
 defaultConfig[PromptNames.ScriptName] = "recipe.cake";

src/project/index.ts

@@ -39,7 +39,6 @@ export default class ProjectGenerator extends BaseGenerator {
       PromptNames.RepositoryOwner,
       PromptNames.Description,
       PromptNames.LicenseType,
-      PromptNames.UseLicenseHeaders,
       PromptNames.EnableWyam,
       PromptNames.UnitTestLibrary,
       PromptNames.UseTabs,
@@ -63,11 +62,6 @@ export default class ProjectGenerator extends BaseGenerator {
    * the user specified directory.
    */
   public writing() {
-    const licenseType = this.getValue<string>(PromptNames.LicenseType);
-    if (licenseType === "Unlicense" || licenseType === "WTFPL") {
-      this.setValue(PromptNames.UseLicenseHeaders, false);
-    }
-
     const sourceDir = this.getValue<string>(PromptNames.SourceDir, "./src");
     if (!sourceDir) {
       throw Error("Unable to get the current source directory to use");

src/project/templates/headers/csheader.tmpl

@@ -1,18 +1,15 @@
 <%
-	let text = "";
-	if (useLicenseHeaders) {
-		text = include(licenseType + ".tmpl").split('\n').map(s => {
-			if (!s || s.trim() == "") {
-				return " *";
-			}
-			else {
-				return " * " + s;
-			}
-		}).join('\n').replace(/[\* \n\r]*$/, '');
-
-		if (text && text !== " *") {
-			text = "/*\n" + text + "\n */\n\n";
+	var text = include(licenseType + ".tmpl").split('\n').map(s => {
+		if (!s || s.trim() == "") {
+			return " *";
+		}
+		else {
+			return " * " + s;
 		}
+	}).join('\n').replace(/[\* \n\r]*$/, '');
+
+	if (text && text !== " *") {
+		text = "/*\n" + text + "\n */\n\n";
 	}
 -%>
 <%- text -%>

src/project/templates/headers/stylecopheader.tmpl

@@ -1,14 +1,11 @@
 <%
-	let text = "";
-	if (useLicenseHeaders) {
-		text = include(licenseType + ".tmpl", { startYear: "{year}", author: "{companyName}" }).trimEnd();
-		var replacements = '\t';
+	var text = include(licenseType + ".tmpl", { startYear: "{year}", author: "{companyName}" }).trimEnd();
+	var replacements = '\t';
 
-		if (!useTabs) {
-			replacements = '';
-			for (let i = 0; i < indentSize; i++) {
-				replacements = replacements + ' ';
-			}
+	if (!useTabs) {
+		replacements = '';
+		for (let i = 0; i < indentSize; i++) {
+			replacements = replacements + ' ';
 		}
 	}
 %>

src/utils/constants/prompt-names.d.ts

@@ -36,6 +36,5 @@ export const enum PromptNames {
   ShortDescription = "shortDescription",
   SourceDir = "sourceDir",
   UnitTestLibrary = "unitTestLibrary",
-  UseLicenseHeaders = "useLicenseHeaders",
   UseTabs = "useTabs",
 }

src/utils/generator-prompts.ts

@@ -161,17 +161,6 @@ export abstract class GeneratorPrompts {
       name: PromptNames.LicenseType,
       validate: new NotEmptyValidator("license").validate,
     },
-    {
-      default: true,
-      description:
-        "Wether to generate source files with a license header or not.",
-      inputType: InputType.Confirm,
-      isCommon: false,
-      message: "Do you want to use license header for source files? ",
-      name: PromptNames.UseLicenseHeaders,
-      when: (answers) =>
-        answers.licenseType !== "Unlicense" && answers.licenseType !== "WTFPL",
-    },
     {
       inputType: InputType.Text,
       isCommon: false,