Fix hanging when starting daemon / Use __dirname for cwd / Debug logs / Properly exit process

Author: kevcodez

buildFiles.js

@@ -1,15 +1,12 @@
 const {
     existsSync
 } = require('fs');
-const {
-    subDirectories
-} = require('./io')
 const {
     join
 } = require('path')
 const fs = require('fs')
 
-function getBuildFiles(externalFiles) {
+function getBuildFiles(externalFiles, debugLog) {
     let buildFiles = [];
     exports.buildFiles = buildFiles;
     if (externalFiles && externalFiles.length) {
@@ -23,31 +20,36 @@ function getBuildFiles(externalFiles) {
         });
     }
 
-    const allRecursiveFiles = getAllBuildFiles('.')
+    const directoryToSearchIn = __dirname
+
+    debugLog(`Recursively looking for build files in directory ${directoryToSearchIn}`)
 
-    const recursiveBuildFiles = allRecursiveFiles.filter(it => it.endsWith('build.gradle') ||it.endsWith('build.gradle.kts'))
+    const allRecursiveFiles = getAllBuildFiles(directoryToSearchIn)
+
+    const recursiveBuildFiles = allRecursiveFiles.filter(it => it.endsWith('build.gradle') || it.endsWith('build.gradle.kts'))
 
     buildFiles.push(...recursiveBuildFiles)
 
     return buildFiles
 }
 
-const getAllBuildFiles = function(dirPath, arrayOfFiles) {
+const getAllBuildFiles = function (dirPath, arrayOfFiles) {
     const files = fs.readdirSync(dirPath)
-   
+
     arrayOfFiles = arrayOfFiles || []
-   
-    files.forEach(function(file) {
-      if (fs.statSync(dirPath + "/" + file).isDirectory()) {
-        arrayOfFiles = getAllBuildFiles(dirPath + "/" + file, arrayOfFiles)
-      } else {
-        arrayOfFiles.push(join(__dirname, dirPath, "/", file))
-        
-      }
+
+    files.forEach((file) => {
+        const fsStat = fs.statSync(join(dirPath, "/", file))
+
+        if (fsStat.isDirectory()) {
+            arrayOfFiles = getAllBuildFiles(join(dirPath, "/", file), arrayOfFiles)
+        } else {
+            arrayOfFiles.push(join(__dirname, dirPath, "/", file))
+        }
     })
-   
+
     return arrayOfFiles
-  }
+}
 
 module.exports = {
     getBuildFiles

gradleCommand.js

@@ -8,7 +8,9 @@ const {
 function determineGradleCommand(debugLog) {
     let gradleCommand = null
     let gradleWrapper = false
+
     debugLog('Determining gradle command')
+
     try {
         const isWindows = process.platform === 'win32'
         debugLog('isWindows: ' + isWindows)

index.js

@@ -45,15 +45,15 @@ const {
 
 if (!gradleCommand) {
   console.log('Unable to find Gradle Wrapper or Gradle CLI.'.bgRed)
-  return
+  process.exit()
 }
 
 const externalFiles = argv['external-file'];
-const buildFiles = getBuildFiles(externalFiles)
-debugLog('Build Files:\n' + buildFiles.join('\n'))
+const buildFiles = getBuildFiles(externalFiles, debugLog)
+debugLog(`Build Files:\n ${buildFiles.join('\n')}`)
 if (!buildFiles.length) {
   console.log('Unable to find build.gradle, build.gradle.kts or external build file.'.bgRed)
-  return
+  process.exit()
 }
 
 exports.debugLog = debugLog;
@@ -76,6 +76,10 @@ async function executeCommandAndWaitForExitCode(command, args) {
     commandExitCode = code
   })
 
+  child.on('exit', (code) => {
+    commandExitCode = code
+  })
+
   while (commandExitCode === undefined) {
     debugLog('Waiting for command to finish')
     await new Promise(resolve => setTimeout(resolve, 500));
@@ -99,16 +103,14 @@ async function executeCommandAndWaitForExitCode(command, args) {
 
   if (gradleDependencyUpdateProcessExitCode !== 0) {
     informUserAboutInstallingUpdatePlugin(gradleDependencyUpdateProcessExitCode);
-    return
+    process.exit()
   }
 
   if (!buildFiles.length) {
     console.log('Unable to find build.gradle, build.gradle.kts or external build file.'.bgRed);
-    return;
+    process.exit()
   }
 
-  debugLog('Build files ' + buildFiles);
-
   debugLog(`Reading JSON report file\n`)
 
   const dependencyUpdates = findOutdatedDependencies();
@@ -123,7 +125,7 @@ async function executeCommandAndWaitForExitCode(command, args) {
 
   if (!choices.length) {
     console.log('Everything up to date.')
-    return
+    process.exit()
   }
 
   const response = await prompts({
@@ -134,11 +136,11 @@ async function executeCommandAndWaitForExitCode(command, args) {
   });
 
   if (!response.upgrades || !response.upgrades.length) {
-    console.log('No upgrades select')
-    return
+    console.log('No upgrades selected')
+    process.exit()
   }
 
-  if (response.upgrades.some(it => it === 'gradle')) {
+  if (latestGradleRelease && response.upgrades.some(it => it === 'gradle')) {
     console.log('Upgrading gradle wrapper')
     const upgradeArgs = ['wrapper', '--gradle-version=' + latestGradleRelease]
 
@@ -148,7 +150,7 @@ async function executeCommandAndWaitForExitCode(command, args) {
     if (upgradeGradleWrapperExitCode !== 0) {
       console.log(`Error upgrading gradle wrapper (StatusCode=${upgradeGradleWrapper.status}).`.bgRed)
       console.log(upgradeGradleWrapper.stderr.toString().red)
-      return
+      process.exit()
     }
   }
 
@@ -192,7 +194,7 @@ async function executeCommandAndWaitForExitCode(command, args) {
       writeFileSync(buildFile, modifiedContent, 'utf8');
     } catch (err) {
       console.log(`Unable to write gradle build file.\n${err}`.bgRed);
-      return
+      process.exit()
     }
 
   }, buildFileContentMap)
@@ -238,9 +240,10 @@ function buildUpgradeChoicesForUser(outdatedDependencies, dependencyUpdates) {
   choices.sort((a, b) => a.title.localeCompare(b.title));
   debugLog(`Choices\n${JSON.stringify(choices)}\n\n`);
 
+  let latestGradleRelease
   if (dependencyUpdates.gradle) {
     let currentGradleRelease = dependencyUpdates.gradle.running.version;
-    let latestGradleRelease = dependencyUpdates.gradle.current.version;
+    latestGradleRelease = dependencyUpdates.gradle.current.version;
     if (gradleWrapper && currentGradleRelease !== latestGradleRelease) {
       choices.unshift({
         title: `Gradle - ${currentGradleRelease} => ${latestGradleRelease}`,