@zohodesk/codestandard-validator 0.0.6-exp-2 → 0.0.6-exp-4

package/build/hooks/Precommit/pre-commit.js

@@ -8,19 +8,24 @@ const {
 } = require("../../utils/EslintConfigFileUtils/createEslintConfigFile");
 const {
   getLastCommitHash,
-  getRequiredInfoPath
+  getStoredCommitHash
 } = require("../../utils/General/getGeneralInfo");
+const {
+  executeMethodsThatReturnBooleanValue
+} = require("../../utils/General/wrapperFunctionToExecuteAFunction");
+const {
+  Logger
+} = require("../../utils/Logger/Logger");
 const {
   arePluginsInstalled
 } = require("../../utils/PluginsInstallation/arePluginsInstalled");
 async function validateRemotePackages() {
   try {
-    const {
-      commitHash
-    } = JSON.parse(require(getRequiredInfoPath()));
-    if (!(commitHash == getLastCommitHash())) await executeMethodsThatReturnBooleanValue("Make sure zgit.csez.zohocorpin.com is accessible", cloneViaCdt, null);
-    await executeMethodsThatReturnBooleanValue("Some issue occurred in creating eslint config file.", createEslintConfigFile, null);
-    Logger.log(Logger.SUCCESS_TYPE, "Pre commit setup successfull");
+    if (!(getStoredCommitHash() == getLastCommitHash())) {
+      await executeMethodsThatReturnBooleanValue("Make sure zgit.csez.zohocorpin.com is accessible", cloneViaCdt, null);
+      await executeMethodsThatReturnBooleanValue("Some issue occurred in creating eslint config file.", createEslintConfigFile, null);
+      Logger.log(Logger.SUCCESS_TYPE, "Pre commit setup successfull");
+    }
     arePluginsInstalled();
   } catch (error) {
     Logger.log(Logger.FAILURE_TYPE, `Kindly retry npm install. & ${error.message}`);

package/build/lib/cli.js

@@ -13,11 +13,8 @@ const {
   installEslintExtension
 } = require("../utils/ExtensionInstallation/installEslintExtension");
 const {
-  installPlugins
-} = require("../utils/PluginsInstallation/installPlugins");
-const {
-  checkIfPluginsAreInstalled
-} = require("../utils/PluginsInstallation/checkIfPluginsAreInstalled");
+  arePluginsInstalled
+} = require("../utils/PluginsInstallation/arePluginsInstalled");
 const [,, action, ...options] = process.argv;
 async function run() {
   switch (action) {
@@ -33,10 +30,7 @@ async function run() {
       }
     case "setupPlugins":
       {
-        const {
-          uninstalledPlugins
-        } = checkIfPluginsAreInstalled();
-        await executeMethodsThatReturnBooleanValue("Some issue occurred in installing plugins", installPlugins, uninstalledPlugins);
+        arePluginsInstalled();
         break;
       }
     case "setupExtension":

package/build/utils/General/getGeneralInfo.js

@@ -73,6 +73,9 @@ function getLastCommitHash() {
 function getRequiredInfoPath() {
   return path.join(process.cwd(), 'jsonUtils', 'fsUtils.json');
 }
+function getStoredCommitHash() {
+  return require(path.join(__dirname, '..', '..', '..', 'jsonUtils', 'fsUtils.json')).commitHash;
+}
 module.exports = {
   getSupportedLanguage,
   getTimeStampInfo,
@@ -80,5 +83,6 @@ module.exports = {
   getConfigurationPrecommit,
   getRunningEnv,
   getLastCommitHash,
-  getRequiredInfoPath
+  getRequiredInfoPath,
+  getStoredCommitHash
 };

package/build/utils/HuskySetup/configurePrecommitHook.js

@@ -21,7 +21,7 @@ const {
  */
 function configurePrecommitHook() {
   let rootDirectory = getRootDirectory();
-  let customPrecomitHookPath = path.join(getLibraryInstalledLocation(), "bin", "execute.js");
+  let customPrecomitHookPath = path.join(getLibraryInstalledLocation(), "bin", "precommit.js");
   let customPrePushHookPath = path.join(getLibraryInstalledLocation(), "bin", "push.js");
   let huskyPrecommitPath = path.join(rootDirectory, ".husky", "pre-commit");
   let huskyPrePushPath = path.join(rootDirectory, ".husky", "pre-push");
@@ -36,11 +36,12 @@ function configurePrecommitHook() {
 "${customPrePushHookPath}"
 `;
   let isCustomPrecommitConfigurationSuccessful = executeSynchronizedCommands(writeFileSync, [huskyPrecommitPath, huskyPrecommitHookContent, 'utf-8'], '', 'Could not create and write pre-commit.sh inisde husky directory', false, true);
-  let isCustomPrePushConfigurationSuccessful = executeSynchronizedCommands(writeFileSync, [huskyPrePushPath, huskyPrePushHookContent, 'utf-8'], '', 'Could not create and write pre-commit.sh inisde husky directory', false, true);
+  let isCustomPrePushConfigurationSuccessful = executeSynchronizedCommands(writeFileSync, [huskyPrePushPath, huskyPrePushHookContent, 'utf-8'], '', 'Could not create and write pre-push.sh inisde husky directory', false, true);
   if (isCustomPrecommitConfigurationSuccessful) {
     let isExecutionPermissionGivenSuccessfully = grantExecutionPermission([huskyPrecommitPath, customPrecomitHookPath]);
     return isExecutionPermissionGivenSuccessfully;
-  } else if (isCustomPrePushConfigurationSuccessful) {
+  }
+  if (isCustomPrePushConfigurationSuccessful) {
     let isExecutionPermissionGivenSuccessfully = grantExecutionPermission([huskyPrePushPath, customPrePushHookPath]);
     return isExecutionPermissionGivenSuccessfully;
   } else {

package/build/utils/PluginsInstallation/arePluginsInstalled.js

@@ -1,24 +1,20 @@
 "use strict";
 
+const {
+  executeMethodsThatReturnBooleanValue
+} = require('../General/wrapperFunctionToExecuteAFunction');
 const {
   checkIfPluginsAreInstalled
 } = require('./checkIfPluginsAreInstalled');
-const {
-  printUninstalledPlugins
-} = require('./printUninstalledPlugins');
 const {
   installPlugins
 } = require('./installPlugins');
-function arePluginsInstalled() {
+async function arePluginsInstalled() {
   let {
     uninstalledPlugins,
     noPluginMessage
   } = checkIfPluginsAreInstalled();
-  let areAllPluginsInstalled = uninstalledPlugins.length === 0 ? true : false;
-  if (!areAllPluginsInstalled) {
-    installPlugins(uninstalledPlugins);
-  }
-  // printUninstalledPlugins(uninstalledPlugins,noPluginMessage)
+  await executeMethodsThatReturnBooleanValue("Some issue occurred in installing plugins", installPlugins, uninstalledPlugins);
 }
 module.exports = {
   arePluginsInstalled

package/build/utils/PluginsInstallation/installPlugins.js

@@ -6,9 +6,6 @@ const {
 const {
   writeFileSync
 } = require('fs');
-const {
-  checkIfPluginsAreInstalled
-} = require('./checkIfPluginsAreInstalled');
 const {
   executeSynchronizedCommands
 } = require('../General/executeSyncCommands');
@@ -27,34 +24,30 @@ const {
  * @returns {boolean} - indicating if plugins to be installed are installed successfully or not
  */
 function installPlugins(pluginsToBeInstalled) {
-  // let {uninstalledPlugins : pluginsToBeInstalled} = checkIfPluginsAreInstalled()
-  if (pluginsToBeInstalled.length > 0) {
-    let packageJsonBeforePluginsInstallation = getPackageJsonContentBeforeInstallingPlugins();
-    let installCommand = `npm install --save-dev ${pluginsToBeInstalled.join(' ')}`;
-    Logger.log(Logger.INFO_TYPE, 'Installing plugins ....');
-    Logger.log(Logger.INFO_TYPE, `Install command being executed: ${installCommand}`);
-    let arePluginsInstalledSuccessfully = executeSynchronizedCommands(execSync, [installCommand, {
-      stdio: 'inherit',
-      cwd: getNodeModulesPath()
-    }], '', 'Some issue occured while installing plugins', false, true);
-    if (arePluginsInstalledSuccessfully) {
-      Logger.log(Logger.SUCCESS_TYPE, 'Plugins installation successful');
-      let isPackageJsonRestored = restorePackageJsonContent(packageJsonBeforePluginsInstallation);
-      if (isPackageJsonRestored) {
-        createVersionControlFile(pluginsToBeInstalled);
-        // return true 
-      } else {
-        Logger.log(Logger.FAILURE_TYPE, 'Unable to restore package.json content');
-        // return false
-      }
-    } else {
-      Logger.log(Logger.FAILURE_TYPE, "Unable to install plugins.Kindly retry the command");
-      // return false
-    }
-  } else {
+  if (pluginsToBeInstalled.length === 0) {
     Logger.log(Logger.INFO_TYPE, 'Plugins are already installed');
-    // return true
+    return true;
+  }
+  const packageJsonBackup = getPackageJsonContentBeforeInstallingPlugins();
+  const installCommand = `npm install --save-dev ${pluginsToBeInstalled.join(' ')}`;
+  Logger.log(Logger.INFO_TYPE, 'Installing plugins...');
+  Logger.log(Logger.INFO_TYPE, `Install command being executed: ${installCommand}`);
+  const installed = executeSynchronizedCommands(execSync, [installCommand, {
+    stdio: 'inherit',
+    cwd: getNodeModulesPath()
+  }], '', 'Some issue occurred while installing plugins', false, true);
+  if (!installed) {
+    Logger.log(Logger.FAILURE_TYPE, 'Unable to install plugins. Kindly retry the command');
+    return false;
+  }
+  Logger.log(Logger.SUCCESS_TYPE, 'Plugins installation successful');
+  const restored = restorePackageJsonContent(packageJsonBackup);
+  if (!restored) {
+    Logger.log(Logger.FAILURE_TYPE, 'Unable to restore package.json content');
+    return false;
   }
+  createVersionControlFile(pluginsToBeInstalled);
+  return true;
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zohodesk/codestandard-validator",
-  "version": "0.0.6-exp-2",
+  "version": "0.0.6-exp-4",
   "description": "library to enforce code standard using eslint",
   "main": "index.js",
   "scripts": {