Merge pull request #29 from Nikhil-Vats/overwrite_rename

Added option to overwrite or rename if build directory exists

Author: sarthak-sehgal

__tests__/app.js

@@ -79,6 +79,11 @@ describe("generator-biojs-webcomponents:app - Make a new Web Component", () => {
 });
 
 describe("generator-biojs-webcomponents:app - Upgrade an existing component by importing build file locally", () => {
+  it("makes a new directory named - component-dist", async () => {
+    await validators
+      .directoryName("component-dist")
+      .then(() => assert.file(["component-dist"]));
+  });
   it("imports the build file", async () => {
     await validators
       .importBuildFileLocally(
@@ -88,57 +93,27 @@ describe("generator-biojs-webcomponents:app - Upgrade an existing component by i
         assert.file(["component-dist/validator.js"]);
       });
   });
-  it("only pastes the build file", async () => {
-    // This will work as the directory component-dist already exists because of the above test
-    await validators
-      .copyBuildFileLocally(path.join(__dirname, "../LICENSE"))
-      .then(() => {
-        assert.file(["component-dist/LICENSE"]);
-      });
-  });
-  it("skips the current question if user enters skip", async () => {
-    assert.equal(await validators.importBuildFileLocally("skip"), true);
-  });
   it("throws an error if user enters an empty string as path of build file", async () => {
     assert.equal(
       await validators.importBuildFileFromNPM(""),
       chalk.red("This is a mandatory field, please answer.")
     );
   });
-  it("throws an error if user enters an empty string as path of build file to be copied", async () => {
-    assert.equal(
-      await validators.copyBuildFileLocally(""),
-      chalk.red("This is a mandatory field, please answer.")
-    );
-  });
 });
 
 describe("generator-biojs-webcomponents:app - Upgrade an existing component by importing build file using npm", () => {
-  it("works successfully if the package name and version entered is correct", async () => {
+  it("throws an error if version entered does not exist", async () => {
     assert.equal(
       await validators.version("fkdk", { packageName: "node" }),
       chalk.red(
         "Sorry, the version - " +
-          chalk.red.bold("fkdk") +
+          chalk.yellow("fkdk") +
           " doesn't exist. Please enter again. Enter " +
           chalk.cyan("latest") +
           " if you want to import the latest version."
       )
     );
   });
-  it("skips the current question if user enters skip", async () => {
-    assert.equal(await validators.importBuildFileFromNPM("skip"), true);
-  });
-  it("downloads the file if URL entered is correct", async () => {
-    // This will work as the directory component-dist is already created above
-    await validators
-      .copyBuildFileFromNPM(
-        "https://cdn.jsdelivr.net/npm/[email protected]/build/protvista.min.gz.js"
-      )
-      .then(() => {
-        assert.file(["component-dist/protvista.min.gz.js"]);
-      });
-  });
   it("throws an error if an npm package doesn't exist", async () => {
     assert.equal(
       await validators.packageName("cbaxyz"),
@@ -171,10 +146,4 @@ describe("generator-biojs-webcomponents:app - Upgrade an existing component by i
       chalk.red("This is a mandatory field, please answer.")
     );
   });
-  it("throws an error if downloadURL for build file to copied entered is empty", async () => {
-    assert.equal(
-      await validators.copyBuildFileFromNPM(""),
-      chalk.red("This is a mandatory field, please answer.")
-    );
-  });
 });

generators/app/index.js

@@ -41,11 +41,11 @@ module.exports = class extends Generator {
         type: "rawlist",
         name: "importFrom",
         message:
-          "We need the build file (generally index.js, main.js or componentName.js) for this, import it using one of the options -",
+          "I need the build file (generally index.js, main.js or componentName.js) for this, import it using one of the options -",
         choices: [
           "Install component from npm package (Recommended - fastest way)",
-          "Tell us the path of the build file on your local machine and we will import it in the project.",
-          "Tell us the npm package name, version, build file URL and we will download the build file."
+          "Tell us the path of the build file on your local machine and I will import it in the project.",
+          "Tell us the npm package name, version, build file URL and I will download the build file."
         ],
         default: 0
       }
@@ -84,7 +84,7 @@ module.exports = class extends Generator {
         type: "input",
         name: "checkVersionAndInstallComponent",
         message:
-          "Great! We will import the latest version of the npm package, if you don't want this, enter the version.",
+          "Great! I will import the latest version of the npm package, if you don't want this, enter the version.",
         default: "latest",
         when: function(responses) {
           if (responses.confirmPackageNameToInstallComponent) {
@@ -131,7 +131,7 @@ module.exports = class extends Generator {
         type: "input",
         name: "version",
         message:
-          "Great! We will import the latest version of your file from the npm package, if you don't want this, enter the version.",
+          "Great! I will import the latest version of your file from the npm package, if you don't want this, enter the version.",
         default: "latest",
         when: function(responses) {
           if (responses.confirmPackageName) {
@@ -144,31 +144,15 @@ module.exports = class extends Generator {
       },
       {
         type: "input",
-        name: "importBuildFileFromNPM",
-        message: function(answers) {
-          return (
-            "This URL - " +
-            chalk.bold.yellow(
-              "https://www.jsdelivr.com/package/npm/" +
-                answers.packageName +
-                "?version=" +
-                answers.version
-            ) +
-            " contains the directory of the package, please find the build file (generally in the dist or build folder) and paste the link here, we will download it for you."
-          );
-        },
-        when: function(responses) {
-          if (responses.confirmPackageName) {
-            return true; // Show this prompt if user says that package description is correct
-          }
-
-          return false; // Don't show this prompt if user says that package description is incorrect
-        },
-        validate: validators.importBuildFileFromNPM
+        name: "directoryName",
+        message:
+          "The build file will be imported in a separate directory in the project's root. Enter the name of this directory or press Enter if you like to go with default.",
+        validate: validators.directoryName,
+        default: "component-dist"
       },
       {
         type: "input",
-        name: "copyBuildFileFromNPM",
+        name: "importBuildFileFromNPM",
         message: function(answers) {
           return (
             "This URL - " +
@@ -178,41 +162,36 @@ module.exports = class extends Generator {
                 "?version=" +
                 answers.version
             ) +
-            " contains the directory of the package, please find the build file (generally in the dist or build folder) and paste the link here, we will download it for you in the existing folder."
+            " contains the directory of the package, please find the build file (generally in the dist or build folder) and paste the link here, I will download it for you."
           );
         },
         when: function(responses) {
-          if (responses.importBuildFileFromNPM === "skip") {
+          if (responses.confirmPackageName) {
             return true; // Show this prompt if user says that package description is correct
           }
 
           return false; // Don't show this prompt if user says that package description is incorrect
         },
-        validate: validators.copyBuildFileFromNPM
+        validate: validators.importBuildFileFromNPM
       }
     ];
 
     // Prompt(s) if user chooses to import files locally from computer
     const localPrompts = [
       {
         type: "input",
-        name: "importBuildFileLocally",
-        message: "Please enter the path of the build file.",
-        validate: validators.importBuildFileLocally
+        name: "directoryName",
+        message: `The build file will be imported in a separate directory in the project's root. Enter the name of this directory or press Enter if you like to go with default ${chalk.cyan(
+          "component-dist"
+        )}.`,
+        validate: validators.directoryName,
+        default: "component-dist"
       },
       {
         type: "input",
-        name: "copyBuildFileLocally",
-        message:
-          "Please enter the path of the build file, we will paste it into the existing directory.",
-        when: function(responses) {
-          if (responses.importBuildFileLocally === "skip") {
-            return true; // Show this prompt if user says that package description is correct
-          }
-
-          return false; // Don't show this prompt if user says that package description is incorrect
-        },
-        validate: validators.copyBuildFileLocally
+        name: "importBuildFileLocally",
+        message: "Please enter the path of the build file.",
+        validate: validators.importBuildFileLocally
       }
     ];
 
@@ -466,7 +445,7 @@ module.exports = class extends Generator {
       yarn: false
     });
     this.log(
-      `While we install the dependencies, you can read the next steps - \n1. Write the code for your component, instructions are in ${chalk.yellow(
+      `While I install the dependencies, you can read the next steps - \n1. Write the code for your component, instructions are in ${chalk.yellow(
         "src/index.js"
       )}.\n2. Add css styles to your component in ${chalk.yellow(
         "src/style"