From e6d03212c1085f5163018bf5fdecc9c2e941c80b Mon Sep 17 00:00:00 2001
From: Felipe Rabelo <felipejrabelo@gmail.com>
Date: Thu, 24 Sep 2020 01:15:45 -0300
Subject: [PATCH] some changes in cli.js ncq-cmd.js ncq-cmd-tests.js

---
 ncq/cli/cli.js         | 11 +++++-----
 ncq/cli/ncq-cmd.js     | 46 ++++++++++++++++++++++--------------------
 tests/ncq-cmd-tests.js |  2 +-
 3 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/ncq/cli/cli.js b/ncq/cli/cli.js
index 7e1b739..70bcf48 100644
--- a/ncq/cli/cli.js
+++ b/ncq/cli/cli.js
@@ -22,18 +22,19 @@ class CLI {
     var commands = Array.from(this.cmd.getnames());
 
     //functions starting with do only
+    
+    const doPrefix = "do_";
+    const emptyStr = "";
+
     commands = commands.filter(function (value) {
-      if (value.startsWith("do_")) {
+      if (value.startsWith(doPrefix)) {
         return true;
       }
     });
 
     //get actual commands from function names
     commands.forEach((element, index) => {
-      if (element.startsWith("do_")) {
-        element = element.replace("do_", "");
-      }
-
+      element = element.replace(doPrefix, emptyStr);
       commands[index] = element;
     });
 
diff --git a/ncq/cli/ncq-cmd.js b/ncq/cli/ncq-cmd.js
index 3ab66a1..8899281 100644
--- a/ncq/cli/ncq-cmd.js
+++ b/ncq/cli/ncq-cmd.js
@@ -24,8 +24,8 @@ class NcqCmd extends Cmd {
     this.opening =
       "Welcome to NCQ Command Line Interface. Type help for more information.";
     this.replWarning =
-      "No REPL. Create a node.js REPL with the repl command to use this command: ";
-    this.unknown = "Did not understand command: ";
+      "No REPL. Create a node.js REPL with the repl command to use this command:";
+    this.unknown = "Did not understand command:";
     this.helpPrompt = "Write help to show the list of commands.";
     this.replCmds = [];
     this.counter = 0;
@@ -44,15 +44,18 @@ class NcqCmd extends Cmd {
    */
   default(inp) {
     //if command is a repl command, give user help for how to start repl
+    // Cant understand what this peace of code is doing in here
+    // replCmds array seems to be always empty, so IF statment neve evaluates TRUE
     var cmd = inp.substring(0, inp.indexOf("("));
     if (this.replCmds.includes(cmd)) {
-      console.log(this.replWarning + inp);
+      console.log(`${this.replWarning} ${inp}`);
       console.log(this.helpPrompt);
       return;
     }
+    
 
     //otherwise, don't understand command
-    console.log(this.unknown + inp);
+    console.log(`${this.unknown} ${inp}`);
     console.log(this.helpPrompt);
   }
 
@@ -81,18 +84,23 @@ class NcqCmd extends Cmd {
   }
 
   do_repl(inp) {
+
+    const emptyStr = "";
+    const singleSpaceStr = " ";
+    const dirPrefix = "tmp";
+
     //if packages
     var required = [];
-    if (inp.trim() != "") {
+    if (inp.trim() != emptyStr) {
       //print packages
       console.log(inp);
       //get list of packages
-      required = inp.split(" ");
+      required = inp.split(singleSpaceStr);
     }
 
     //make temporary folder
     this.counter++;
-    var tmpDir = path.join(BASE, "tmp" + this.counter);
+    var tmpDir = path.join(BASE, dirPrefix + this.counter);
     //if not logging usage temporary folder works as expected, can be overwrtten
     if(!OPTIONS.usage){
       if (fs.existsSync(tmpDir)) {
@@ -103,7 +111,7 @@ class NcqCmd extends Cmd {
       //otherwise, find a nonexistant tmpN
       while(fs.existsSync(tmpDir)){
         this.counter++;
-        var tmpDir = path.join(BASE, "tmp" + this.counter);
+        var tmpDir = path.join(BASE, dirPrefix + this.counter);
       }
     }
 
@@ -120,9 +128,7 @@ class NcqCmd extends Cmd {
 
     // install packages within that directory
     cprocess.execSync(
-      "npm install " +
-        required.join(" ") +
-        " --save --production --no-optional",
+      `npm install ${required.join(singleSpaceStr)} --save --production --no-optional`,
       {
         stdio: [process.stdin, process.stdout, process.stdout],
       }
@@ -144,26 +150,22 @@ class NcqCmd extends Cmd {
     }
 
     //pass current process arguments
-    var nodeOptions = "";
+    
+    var nodeOptions = emptyStr;
+
     if (process.execArgv) {
-      nodeOptions = process.execArgv.join(" ") + " ";
+      nodeOptions = process.execArgv.join(singleSpaceStr);
     }
 
     try {
       cprocess.execSync(
-        "node " +
-          nodeOptions +
-          "../ncq/repl.js " +
-          required.join(" ") +
-          " " +
-          args.join(" "),
-        {
+        `node ${nodeOptions} ../ncq/repl.js ${required.join(singleSpaceStr)} ${args.join(singleSpaceStr)}`,
+        { 
           stdio: "inherit",
         }
       );
     } catch (err) {
-      //catch error
-      console.log("\nREPL failed with code " + err.status);
+      console.log(`\nREPL failed with code ${err.status}`);
       return;
     }
 
diff --git a/tests/ncq-cmd-tests.js b/tests/ncq-cmd-tests.js
index 7698a47..c14717d 100644
--- a/tests/ncq-cmd-tests.js
+++ b/tests/ncq-cmd-tests.js
@@ -97,7 +97,7 @@ describe("NcqCmd", function () {
 
       await ncqCmd.run();
 
-      assert.strictEqual(output[1], ncqCmd.unknown + "unknown");
+      assert.strictEqual(output[1], `${ncqCmd.unknown} unknown`);
     });
     it("should print help for repl", async function () {
       var ncqCmd = new NcqCmd(new PromptHandler(Input, { show: false }), packages);