Added option to overwrite or rename if build directory exists

Author: Nikhil-Vats

__tests__/app.js

@@ -88,14 +88,6 @@ 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);
   });
@@ -105,9 +97,9 @@ 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 user enters an empty string as path of build file to be copied", async () => {
+  it("throws an error if user enters an empty string as the name for directory in which build file will be imported", async () => {
     assert.equal(
-      await validators.copyBuildFileLocally(""),
+      await validators.renameDirectory(""),
       chalk.red("This is a mandatory field, please answer.")
     );
   });

generators/app/index.js

@@ -201,18 +201,73 @@ module.exports = class extends Generator {
         validate: validators.importBuildFileLocally
       },
       {
-        type: "input",
-        name: "copyBuildFileLocally",
-        message:
-          "Please enter the path of the build file, we will paste it into the existing directory.",
+        type: "list",
+        name: "renameOrOverwrite",
+        message: "What do you want to do?",
+        choices: [
+          "Rename the component-dist directory we are making.",
+          "Overwrite the files in the existing component-dist 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
+        }
+      },
+      {
+        type: "input",
+        name: "renameDirectory",
+        message: `Enter the name of the directory in which you want to import the build file, make sure it is not ${chalk.cyan(
+          "dist"
+        )} or ${chalk.cyan("component-dist")}.`,
+        when: function(responses) {
+          if (
+            responses.renameOrOverwrite ===
+            "Rename the component-dist directory we are making."
+          ) {
+            return true;
+          }
+
+          return false;
+        },
+        validate: validators.renameDirectory
+      },
+      {
+        type: "input",
+        name: "importBuildFileInRenamedDirectory",
+        message:
+          "Great! Now enter the path of the build file to import it in the renamed directory.",
+        when: function(responses) {
+          if (
+            responses.renameOrOverwrite ===
+            "Rename the component-dist directory we are making."
+          ) {
+            return true;
+          }
+
+          return false;
+        },
+        validate: validators.importBuildFileInRenamedDirectory
+      },
+      {
+        type: "input",
+        name: "overwriteDirectoryContent",
+        message: `Enter the path of the build file. Please note that this will overwrite all the existing content in ${chalk.cyan(
+          "component-dist"
+        )}.`,
+        when: function(responses) {
+          if (
+            responses.renameOrOverwrite ===
+            "Overwrite the files in the existing component-dist directory."
+          ) {
+            return true;
+          }
+
+          return false;
         },
-        validate: validators.copyBuildFileLocally
+        validate: validators.overwriteDirectoryContent
       }
     ];
 

generators/app/validator.js

@@ -111,7 +111,7 @@ validators.importBuildFileFromNPM = async function(props) {
       .then(() => {
         return true;
       })
-      .catch(async err => {
+      .catch(err => {
         if (err.code === 1) {
           return chalk.red(
             `Sorry, there already seems to be a directory with the same name ${chalk.cyan(
@@ -145,14 +145,14 @@ validators.importBuildFileFromNPM = async function(props) {
 
 validators.copyBuildFileFromNPM = async props => {
   if (props) {
-    var res = executeCommand(
+    var res = await executeCommand(
       "cd component-dist && curl -O " + props,
       "copyBuildFileFromNPM"
     )
       .then(() => {
         return true;
       })
-      .catch(async err => {
+      .catch(err => {
         if (err.code === 3 || err.code === 23) {
           return chalk.red(
             "The URL is malformed. Please ensure the URL is in correct format."
@@ -180,21 +180,21 @@ validators.importBuildFileLocally = async props => {
       return true;
     }
 
-    var res = executeCommand(
+    var res = await executeCommand(
       "mkdir component-dist && cp " + props + " component-dist",
       "importBuildFileLocally"
     )
       .then(() => {
         return true;
       })
-      .catch(async err => {
+      .catch(err => {
         if (err.code === 1) {
           return chalk.red(
             `Oops! We encountered an error. This can happen due to one of the following reasons - \n\n1) The path of build file entered is incorrect. \n2) There's already a directory named ${chalk.cyan(
               "component-dist"
             )}, in this case please input ${chalk.cyan(
               "skip"
-            )} to paste the build file in your existing directory.\n\nPlease see below for the exact error description - \n${chalk.yellow(
+            )} to rename the new directory or overwrite files in the existing one.\n\nPlease see below for the exact error description - \n${chalk.yellow(
               err
             )}`
           );
@@ -215,21 +215,60 @@ validators.importBuildFileLocally = async props => {
   return chalk.red("This is a mandatory field, please answer.");
 };
 
-validators.copyBuildFileLocally = async props => {
+validators.renameDirectory = async props => {
+  if (props) {
+    var res = await executeCommand("mkdir " + props)
+      .then(() => true)
+      .catch(err => {
+        return chalk.red(
+          "Oops! We encountered an error, please see the log below for more details.\n" +
+            err
+        );
+      });
+    return res;
+    /**
+     * Returns true if command execution is successful and proceeds to commonPrompts
+     * returns and logs the error if execution fails
+     */
+  }
+
+  return chalk.red("This is a mandatory field, please answer.");
+};
+
+validators.importBuildFileInRenamedDirectory = async (props, answers) => {
   if (props) {
-    var res = executeCommand(
-      "cp " + props + " component-dist",
-      "copyBuildFileLocally"
+    var res = await executeCommand(
+      "cp " + props + " " + answers.renameDirectory
     )
-      .then(() => {
-        return true;
-      })
-      .catch(async err => {
+      .then(() => true)
+      .catch(err => {
         return chalk.red(
           "Oops! We encountered an error, please see the log below for more details.\n" +
             err
         );
-      }); // Import the build file in component-dist directory locally from computer
+      });
+    return res;
+    /**
+     * Returns true if command execution is successful and proceeds to commonPrompts
+     * returns and logs the error if execution fails
+     */
+  }
+
+  return chalk.red("This is a mandatory field, please answer.");
+};
+
+validators.overwriteDirectoryContent = async props => {
+  if (props) {
+    var res = await executeCommand(
+      "rm -rf component-dist/* && cp " + props + " component-dist"
+    )
+      .then(() => true)
+      .catch(err => {
+        return chalk.red(
+          "Oops! We encountered an error, please see the log below for more details.\n" +
+            err
+        );
+      });
     return res;
     /**
      * Returns true if command execution is successful and proceeds to commonPrompts