Live debug output for the commands executed

Author: kevcodez

buildFiles.js

@@ -38,8 +38,6 @@ function getBuildFiles(externalFiles) {
     return buildFiles
 }
 
-
-
 module.exports = {
     getBuildFiles
 }

gradleCommand.js

@@ -1,8 +1,9 @@
 const {
     spawnSync
 } = require('child_process');
-const path = require('path')
-const {existsSync} = require('fs')
+const {
+    existsSync
+} = require('fs')
 
 function determineGradleCommand(debugLog) {
     let gradleCommand = null

index.js

@@ -27,10 +27,9 @@ const {
   join
 } = require('path');
 const {
-  spawnSync
+  spawn
 } = require('child_process');
 
-
 const ReplaceVersion = require('./ReplaceVersion')
 
 const {
@@ -57,33 +56,53 @@ if (!buildFiles.length) {
   return
 }
 
-console.log('Checking for upgrades...\n')
+exports.debugLog = debugLog;
 
-const gradleDependencyUpdateArgs = ['dependencyUpdates', '-DoutputFormatter=json', '-DoutputDir=build/dependencyUpdates']
-const gradleDependencyUpdateResolution = argv.resolution
-if (gradleDependencyUpdateResolution) {
-  gradleDependencyUpdateArgs.push(`-Drevision=${gradleDependencyUpdateResolution}`)
-}
+async function executeCommandAndWaitForExitCode(command, args) {
+  let commandExitCode
 
-debugLog(`Executing command\n${gradleCommand} ${gradleDependencyUpdateArgs.join(' ')}\n`)
+  const child = spawn(command, args);
+  child.stdout.setEncoding('utf8');
+  child.stdout.on('data', function (data) {
+    debugLog(data);
+  })
 
-const gradleDependencyUpdateProcess = spawnSync(gradleCommand, gradleDependencyUpdateArgs);
+  child.on('close', (code) => {
+    commandExitCode = code
+  })
 
-if (gradleDependencyUpdateProcess.status !== 0) {
-  informUserAboutInstallingUpdatePlugin();
-  return
-}
+  while (commandExitCode === undefined) {
+    debugLog('Waiting for command to finish')
+    await new Promise(resolve => setTimeout(resolve, 500));
+  }
 
-if (!buildFiles.length) {
-  console.log('Unable to find build.gradle, build.gradle.kts or external build file.'.bgRed);
-  return;
+  return commandExitCode
 }
 
-debugLog('Build files ' + buildFiles);
+(async () => {
+  console.log('Checking for upgrades...\n')
 
-exports.debugLog = debugLog;
+  const gradleDependencyUpdateArgs = ['dependencyUpdates', '-DoutputFormatter=json', '-DoutputDir=build/dependencyUpdates']
+  const gradleDependencyUpdateResolution = argv.resolution
+  if (gradleDependencyUpdateResolution) {
+    gradleDependencyUpdateArgs.push(`-Drevision=${gradleDependencyUpdateResolution}`)
+  }
 
-(async () => {
+  debugLog(`Executing command\n${gradleCommand} ${gradleDependencyUpdateArgs.join(' ')}\n`)
+
+  let gradleDependencyUpdateProcessExitCode = await executeCommandAndWaitForExitCode(gradleCommand, gradleDependencyUpdateArgs)
+
+  if (gradleDependencyUpdateProcessExitCode !== 0) {
+    informUserAboutInstallingUpdatePlugin(gradleDependencyUpdateProcessExitCode);
+    return
+  }
+
+  if (!buildFiles.length) {
+    console.log('Unable to find build.gradle, build.gradle.kts or external build file.'.bgRed);
+    return;
+  }
+
+  debugLog('Build files ' + buildFiles);
 
   debugLog(`Reading JSON report file\n`)
 
@@ -117,10 +136,11 @@ exports.debugLog = debugLog;
   if (response.upgrades.some(it => it === 'gradle')) {
     console.log('Upgrading gradle wrapper')
     const upgradeArgs = ['wrapper', '--gradle-version=' + latestGradleRelease]
+
     debugLog(`Executing command\n${gradleCommand}${upgradeArgs.join(' ')}\n`)
-    const upgradeGradleWrapper = spawnSync(gradleCommand, upgradeArgs);
+    let upgradeGradleWrapperExitCode = await executeCommandAndWaitForExitCode(gradleCommand, upgradeArgs)
 
-    if (upgradeGradleWrapper.status !== 0) {
+    if (upgradeGradleWrapperExitCode !== 0) {
       console.log(`Error upgrading gradle wrapper (StatusCode=${upgradeGradleWrapper.status}).`.bgRed)
       console.log(upgradeGradleWrapper.stderr.toString().red)
       return
@@ -250,11 +270,10 @@ function findUpgradeJsonReportFiles() {
   return upgradeReportFiles;
 }
 
-function informUserAboutInstallingUpdatePlugin() {
+function informUserAboutInstallingUpdatePlugin(exitCode) {
   const newestVersion = '0.28.0'
 
-  console.log(`Error executing gradle dependency updates (StatusCode=${gradleDependencyUpdateProcess.status})`.bgRed);
-  console.log(gradleDependencyUpdateProcess.stderr.toString().red);
+  console.log(`Error executing gradle dependency updates (StatusCode=${exitCode})`.bgRed);
   console.log(`\nIn case you haven't installed the gradle-versions-plugin (https://github.com/ben-manes/gradle-versions-plugin), put one of the following in your gradle build file:\n`);
   console.log(`Either Plugins block`);
   console.log(` 
@@ -275,5 +294,4 @@ function informUserAboutInstallingUpdatePlugin() {
   
   apply plugin: "com.github.ben-manes.versions"
   `.green);
-}
-
+}