Windows compatibility enhancement fix for module

neel1996 · neel1996 · commit 416c2248a064 · 2020-07-02T12:30:00.000Z
diff --git a/API/addRepoApi.js b/API/addRepoApi.js
@@ -43,7 +43,7 @@ async function addRepoHandler(repoName, repoPath, initCheck) {
     .access(repoPath)
     .then(async () => {
       if (initCheck) {
-        await execPromisified(`cd ${repoPath}; git init`);
+        await execPromisified(`git init`, { cwd: repoPath });
       }
 
       if (repoData) {
diff --git a/API/healthcheckApi.js b/API/healthcheckApi.js
@@ -27,9 +27,6 @@ async function checkStatus(param) {
   var commandString = "";
 
   switch (param) {
-    case "OS":
-      commandString = `uname`;
-      break;
     case "GIT":
       commandString = `git --version`;
       break;
diff --git a/API/settingsApi.js b/API/settingsApi.js
@@ -2,9 +2,6 @@ const { exec } = require("child_process");
 const dotenv = require("dotenv").config();
 const fs = require("fs");
 
-const util = require("util");
-const execPromised = util.promisify(exec);
-
 const fetchDatabaseFile = async () => {
   const dbPath = process.env.DATABASE_FILE || "NO_DATABASE_FILE";
   console.log(dbPath);
diff --git a/git/gitAddBranchApi.js b/git/gitAddBranchApi.js
@@ -5,9 +5,9 @@ const execPromisified = util.promisify(exec);
 const fetchRepopath = require("../global/fetchGitRepoPath");
 
 const gitAddBranchApi = async (repoId, branchName) => {
-  return await execPromisified(
-    `cd ${fetchRepopath.getRepoPath(repoId)}; git checkout -b ${branchName}`
-  )
+  return await execPromisified(`git checkout -b ${branchName}`, {
+    cwd: fetchRepopath.getRepoPath(repoId),
+  })
     .then((res) => {
       console.log(res);
       return "BRANCH_CREATION_SUCCESS";
diff --git a/git/gitCommitChangesAPI.js b/git/gitCommitChangesAPI.js
@@ -7,9 +7,9 @@ const fetchRepopath = require("../global/fetchGitRepoPath");
 const gitCommitChangesApi = async (repoId, commitMessage) => {
   commitMessage = commitMessage.split("||").join("\n");
 
-  return await execPromisified(
-    `cd ${fetchRepopath.getRepoPath(repoId)}; git commit -m "${commitMessage}"`
-  )
+  return await execPromisified(`git commit -m "${commitMessage}"`, {
+    cwd: fetchRepopath.getRepoPath(repoId),
+  })
     .then(({ stdout, stderr }) => {
       if (!stderr) {
         return "COMMIT_DONE";
diff --git a/git/gitCommitLogsAPI.js b/git/gitCommitLogsAPI.js
@@ -5,9 +5,9 @@ const execPromisified = util.promisify(exec);
 
 async function gitCommitLogHandler(repoId) {
   const repoPath = fetchRepopath.getRepoPath(repoId);
-  return await execPromisified(
-    `cd ${repoPath}; git log --pretty=format:"%h||%an||%ad||%s"`
-  ).then((res) => {
+  return await execPromisified(`git log --pretty=format:"%h||%an||%ad||%s"`, {
+    cwd: repoPath,
+  }).then((res) => {
     const { stdout, stderr } = res;
 
     if (stdout && !stderr) {
diff --git a/git/gitFetchPullApi.js b/git/gitFetchPullApi.js
@@ -5,9 +5,9 @@ const execPromisified = util.promisify(exec);
 const fetchRepopath = require("../global/fetchGitRepoPath");
 
 const gitFetchApi = async (repoId) => {
-  return await execPromisified(
-    `cd ${fetchRepopath.getRepoPath(repoId)}; git fetch`
-  )
+  return await execPromisified(`git fetch`, {
+    cwd: fetchRepopath.getRepoPath(repoId),
+  })
     .then(({ stdout, stderr }) => {
       if (stdout && !stderr) {
         const fetchResponse = stdout.trim().split("\n");
@@ -38,9 +38,9 @@ const gitFetchApi = async (repoId) => {
 };
 
 const gitPullApi = async (repoId) => {
-  return await execPromisified(
-    `cd ${fetchRepopath.getRepoPath(repoId)}; git pull`
-  )
+  return await execPromisified(`git pull`, {
+    cwd: fetchRepopath.getRepoPath(repoId),
+  })
     .then(async ({ stdout, stderr }) => {
       if (stdout && !stderr) {
         const pullResponse = stdout.trim().split("\n");
diff --git a/git/gitFileDifferenceAPI.js b/git/gitFileDifferenceAPI.js
@@ -14,7 +14,8 @@ async function gitFileDifferenceHandler(repoId, fileName) {
 async function getGitFileDifference(repoId, fileName) {
   const repoPath = fetchRepopath.getRepoPath(repoId);
   return await execPromisified(
-    `cd ${repoPath}; git diff --stat ${fileName} && echo "SPLIT___LINE" && git diff -U$(wc -l ${fileName} | xargs)`
+    `git diff --stat ${fileName} && echo "SPLIT___LINE" && git diff -U$(wc -l ${fileName} | xargs)`,
+    { cwd: repoPath }
   ).then((res) => {
     const { stdout, stderr } = res;
 
diff --git a/git/gitGetStagedFilesAPI.js b/git/gitGetStagedFilesAPI.js
@@ -6,9 +6,9 @@ const execPromisified = util.promisify(exec);
 const fetchRepopath = require("../global/fetchGitRepoPath");
 
 const getStagedFiles = async (repoId) => {
-  return await execPromisified(
-    `cd ${fetchRepopath.getRepoPath(repoId)}; git diff --name-only --cached`
-  )
+  return await execPromisified(`git diff --name-only --cached`, {
+    cwd: fetchRepopath.getRepoPath(repoId),
+  })
     .then((res) => {
       const { stdout, stderr } = res;
 
diff --git a/git/gitGetUnpushedCommits.js b/git/gitGetUnpushedCommits.js
@@ -6,9 +6,8 @@ const fetchRepopath = require("../global/fetchGitRepoPath");
 
 const gitGetUnpushedCommits = async (repoId, remoteURL) => {
   return await execPromisified(
-    `cd ${fetchRepopath.getRepoPath(
-      repoId
-    )}; git log --branches --not --remotes --pretty=format:"%h||%an||%ad||%s"`
+    `git log --branches --not --remotes --pretty=format:"%h||%an||%ad||%s"`,
+    { cwd: fetchRepopath.getRepoPath(repoId) }
   ).then((res) => {
     const { stdout, stderr } = res;
 
diff --git a/git/gitPushToRemoteAPI.js b/git/gitPushToRemoteAPI.js
@@ -6,18 +6,17 @@ const fetchRepopath = require("../global/fetchGitRepoPath");
 
 const gitPushToRemoteApi = async (repoId, remoteHost, branch) => {
   return await execPromisified(
-    `cd ${fetchRepopath.getRepoPath(
-      repoId
-    )}; git remote -v | grep '${remoteHost}' | grep 'push'`
+    `git remote -v | grep '${remoteHost}' | grep 'push'`,
+    { cwd: fetchRepopath.getRepoPath(repoId) }
   )
     .then(async ({ stdout, stderr }) => {
       if (!stderr) {
         const remoteName = stdout.trim().split(/\s/gi)[0];
         const pushCommand = `git push -u ${remoteName} ${branch}`;
 
-        return await execPromisified(
-          `cd ${fetchRepopath.getRepoPath(repoId)}; ${pushCommand}`
-        )
+        return await execPromisified(`${pushCommand}`, {
+          cwd: fetchRepopath.getRepoPath(repoId),
+        })
           .then((stdout, stderr) => {
             if (!stderr && stdout) {
               return "PUSH_DONE";
diff --git a/git/gitRemoveStagedItems.js b/git/gitRemoveStagedItems.js
@@ -6,9 +6,9 @@ const execPromisified = util.promisify(exec);
 const fetchRepopath = require("../global/fetchGitRepoPath");
 
 const gitRemoveStagedItemApi = async (repoId, item) => {
-  return await execPromisified(
-    `cd ${fetchRepopath.getRepoPath(repoId)}; git reset ${item}`
-  ).then(({ stdout, stderr }) => {
+  return await execPromisified(`git reset ${item}`, {
+    cwd: fetchRepopath.getRepoPath(repoId),
+  }).then(({ stdout, stderr }) => {
     if (stderr) {
       console.log(stderr);
       return "STAGE_REMOVE_FAILED";
@@ -20,9 +20,9 @@ const gitRemoveStagedItemApi = async (repoId, item) => {
 };
 
 const gitRemoveAllStagedItemApi = async (repoId) => {
-  return await execPromisified(
-    `cd ${fetchRepopath.getRepoPath(repoId)}; git reset`
-  ).then(({ stdout, stderr }) => {
+  return await execPromisified(`git reset`, {
+    cwd: fetchRepopath.getRepoPath(repoId),
+  }).then(({ stdout, stderr }) => {
     if (stderr) {
       console.log(stderr);
       return "STAGE_ALL_REMOVE_FAILED";
diff --git a/git/gitRepoStatus.js b/git/gitRepoStatus.js
@@ -35,7 +35,6 @@ const getGitStatus = async (repoPath) => {
       return isGitLogAvailable;
     })
     .catch((err) => {
-      // console.log(err);
       isGitLogAvailable = false;
       return isGitLogAvailable;
     });
@@ -44,7 +43,7 @@ const getGitStatus = async (repoPath) => {
 
   let gitRemotePromise =
     isGitLogAvailable &&
-    (await execPromised(`${currentDir} git remote`).then(
+    (await execPromised(`git remote`, { cwd: repoPath }).then(
       ({ stdout, stderr }) => {
         if (stdout && !stderr) {
           const localRemote = stdout.trim().split("\n");
@@ -53,9 +52,9 @@ const getGitStatus = async (repoPath) => {
             localRemote &&
               localRemote.map(async (remote) => {
                 console.log("LOOP ::", remote);
-                return await execPromised(
-                  `${currentDir} git remote get-url ${remote}`
-                ).then(({ stdout, stderr }) => {
+                return await execPromised(`git remote get-url ${remote}`, {
+                  cwd: repoPath,
+                }).then(({ stdout, stderr }) => {
                   if (stdout && !stderr) {
                     console.log("REMOTE :: ", stdout);
                     return stdout.trim();
@@ -99,7 +98,7 @@ const getGitStatus = async (repoPath) => {
   // Module to get all available branches
   gitBranchList =
     isGitLogAvailable &&
-    (await execPromised(`${currentDir} git branch`)
+    (await execPromised(`git branch`, { cwd: repoPath })
       .then((res) => {
         if (!res.stderr) {
           return res.stdout;
@@ -132,7 +131,7 @@ const getGitStatus = async (repoPath) => {
 
   // Module to get total number of commits to current branch
   isGitLogAvailable &&
-    (await execPromised(`${currentDir} git log --oneline`)
+    (await execPromised(`git log --oneline`, { cwd: repoPath })
       .then((res) => {
         const { stdout, stderr } = res;
         if (stderr) {
@@ -159,50 +158,52 @@ const getGitStatus = async (repoPath) => {
   //Module to get latest git commit
 
   isGitLogAvailable &&
-    (await execPromised(`${currentDir} git log -1 --oneline`).then((res) => {
-      if (res && !res.stderr) {
-        gitLatestCommit = res.stdout.trim();
+    (await execPromised(`git log -1 --oneline`, { cwd: repoPath }).then(
+      (res) => {
+        if (res && !res.stderr) {
+          gitLatestCommit = res.stdout.trim();
+        }
       }
-    }));
+    ));
 
   //Module to get all git tracked files
   var gitTrackedFileDetails = [];
 
   gitTrackedFiles =
     isGitLogAvailable &&
-    (await execPromised(`${currentDir} git ls-tree --name-status HEAD`).then(
-      ({ stdout, stderr }) => {
-        if (stdout && !stderr) {
-          const fileList = stdout.trim().split("\n");
-
-          const localFiles = Promise.all(
-            fileList.map(async (item) => {
-              gitTrackedFileDetails.push(item);
-
-              return await fs.promises
-                .stat(`${item}`)
-                .then((fileType) => {
-                  if (fileType.isFile()) {
-                    return `${item}: File`;
-                  } else if (fileType.isDirectory()) {
-                    return `${item}: directory`;
-                  } else {
-                    return `${item}: File`;
-                  }
-                })
-                .catch((err) => {
-                  console.log(err);
+    (await execPromised(`git ls-tree --name-status HEAD`, {
+      cwd: repoPath,
+    }).then(({ stdout, stderr }) => {
+      if (stdout && !stderr) {
+        const fileList = stdout.trim().split("\n");
+
+        const localFiles = Promise.all(
+          fileList.map(async (item) => {
+            gitTrackedFileDetails.push(item);
+
+            return await fs.promises
+              .stat(`${item}`)
+              .then((fileType) => {
+                if (fileType.isFile()) {
                   return `${item}: File`;
-                });
-            })
-          );
-          return localFiles;
-        } else {
-          console.log(stderr);
-          return [];
-        }
+                } else if (fileType.isDirectory()) {
+                  return `${item}: directory`;
+                } else {
+                  return `${item}: File`;
+                }
+              })
+              .catch((err) => {
+                console.log(err);
+                return `${item}: File`;
+              });
+          })
+        );
+        return localFiles;
+      } else {
+        console.log(stderr);
+        return [];
       }
-    ));
+    }));
 
   //Module to fetch commit for each file and folder
 
@@ -212,9 +213,9 @@ const getGitStatus = async (repoPath) => {
     isGitLogAvailable &&
     (await Promise.all(
       gitTrackedFileDetails.map(async (gitFile) => {
-        return await execPromised(
-          `${currentDir} git log -1 --oneline ${gitFile}`
-        ).then(({ stdout, stderr }) => {
+        return await execPromised(`git log -1 --oneline ${gitFile}`, {
+          cwd: repoPath,
+        }).then(({ stdout, stderr }) => {
           if (stdout && !stderr) {
             return stdout.trim();
           } else {
@@ -228,7 +229,7 @@ const getGitStatus = async (repoPath) => {
   //Module to get totally tracked git artifacts
 
   isGitLogAvailable &&
-    (await execPromised(`${currentDir} git ls-files`).then((res) => {
+    (await execPromised(`git ls-files`, { cwd: repoPath }).then((res) => {
       const { stdout, stderr } = res;
       if (stdout && !stderr) {
         if (stdout.split("\n")) {
diff --git a/git/gitSetBranch.js b/git/gitSetBranch.js
@@ -6,9 +6,9 @@ const execPromisified = util.promisify(exec);
 const fetchRepopath = require("../global/fetchGitRepoPath");
 
 const gitSetBranchApi = async (repoId, branch) => {
-  return await execPromisified(
-    `cd ${fetchRepopath.getRepoPath(repoId)}; git checkout ${branch}`
-  ).then(({ stdout, stderr }) => {
+  return await execPromisified(`git checkout ${branch}`, {
+    cwd: fetchRepopath.getRepoPath(repoId),
+  }).then(({ stdout, stderr }) => {
     if (stderr) {
       return "BRANCH_SET_FAILED";
     } else {
diff --git a/git/gitStageAllItemsAPI.js b/git/gitStageAllItemsAPI.js
@@ -5,12 +5,15 @@ const execPromisified = util.promisify(exec);
 const fetchRepopath = require("../global/fetchGitRepoPath");
 
 const gitStageAllItemsApi = async (repoId) => {
-  return await execPromisified(
-    `cd ${fetchRepopath.getRepoPath(repoId)}; git add --all`
-  )
+  return await execPromisified(`git add --all`, {
+    cwd: fetchRepopath.getRepoPath(repoId),
+  })
     .then(({ stdout, stderr }) => {
       if (!stderr) {
         return "ALL_STAGED";
+      } else {
+        console.log(stderr);
+        return "ERR_STAGE_ALL";
       }
     })
     .catch((err) => {
diff --git a/git/gitStageItem.js b/git/gitStageItem.js
@@ -5,9 +5,9 @@ const execPromisified = util.promisify(exec);
 const fetchRepopath = require("../global/fetchGitRepoPath");
 
 const gitStageItem = async (repoId, item) => {
-  return await execPromisified(
-    `cd ${fetchRepopath.getRepoPath(repoId)}; git add ${item}`
-  ).then(({ stdout, stderr }) => {
+  return await execPromisified(`git add ${item}`, {
+    cwd: fetchRepopath.getRepoPath(repoId),
+  }).then(({ stdout, stderr }) => {
     if (stderr) {
       console.log(stderr);
       return "ADD_ITEM_FAILED";
diff --git a/git/gitTrackedDiff.js b/git/gitTrackedDiff.js

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ async function addRepoHandler(repoName, repoPath, initCheck) {`
`43`	`43`	`.access(repoPath)`
`44`	`44`	`.then(async () => {`
`45`	`45`	`if (initCheck) {`
`46`		- await execPromisified(`cd ${repoPath}; git init`);
	`46`	+ await execPromisified(`git init`, { cwd: repoPath });
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`if (repoData) {`