Address comments

Author: dimitrovmaksim

src/commands/test.js

@@ -2,8 +2,9 @@ const { Binary } = require('binary-install-raw')
 const os = require('os')
 const chalk = require('chalk')
 const fetch = require('node-fetch')
-const { filesystem, print, patching } = require('gluegun')
+const { filesystem, patching, print } = require('gluegun')
 const { fixParameters } = require('../command-helpers/gluegun')
+const path = require('path')
 const semver = require('semver')
 const { spawn, exec } = require('child_process')
 const yaml = require('js-yaml')
@@ -179,10 +180,9 @@ async function runDocker(datasource, opts) {
       let config = await yaml.load(filesystem.read('matchstick.yaml', 'utf8'))
 
       // Check if matchstick.yaml is not empty
-      if(config != undefined) {
+      if(config != null) {
         // If a custom tests folder is declared update dockerfilePath
-        testsFolder = config.testsFolder || './tests'
-        dockerfilePath = testsFolder.endsWith('/') ? testsFolder + '.docker/Dockerfile' : testsFolder + '/.docker/Dockerfile'
+        dockerfilePath = path.join(config.testsFolder || 'tests', '.docker/Dockerfile')
       }
     } catch (error) {
       print.info('A problem occurred while reading matchstick.yaml. Please attend to the errors below:')
@@ -197,8 +197,6 @@ async function runDocker(datasource, opts) {
   // Generate the Dockerfile only if it doesn't exists,
   // version flag and/or force flag is passed.
   if(!dockerfileExists || versionOpt || forceOpt) {
-    print.info("Generating Dockerfile...")
-
     await dockerfile(dockerfilePath, versionOpt, latestVersion)
   }
 
@@ -222,10 +220,10 @@ async function runDocker(datasource, opts) {
 
     // If a matchstick image does not exists, the command returns an empty string,
     // else it'll return the image ID. Skip `docker build` if an image already exists
-    // If `-v/--version` is specified, delete current image(if any) and rebuild.
+    // Delete current image(if any) and rebuild.
     // Use spawn() and {stdio: 'inherit'} so we can see the logs in real time.
     if(!dockerfileExists || stdout === '' || versionOpt || forceOpt) {
-      if ((stdout !== '' && versionOpt) || forceOpt) {
+      if (stdout !== '') {
         exec('docker image rm matchstick', (error, stdout, stderr) => {
           print.info(chalk.bold(`Removing matchstick image\n${stdout}`))
         })
@@ -252,30 +250,29 @@ async function runDocker(datasource, opts) {
 // Downloads Dockerfile template from the demo-subgraph repo
 // Replaces the placeholders with their respective values
 async function dockerfile(dockerfilePath, versionOpt, latestVersion) {
-  let content = await fetch('https://raw.githubusercontent.com/LimeChain/demo-subgraph/main/Dockerfile')
-      .then((response) => {
-        if (response.ok) {
-          return response.text()
-        } else {
-          print.error('A problem occurred while downloading the Dockerfile template:')
-          print.error(`Status Code: ${response.status}, with error: ${response.statusText}`)
-          process.exit(1)
-        }
-      })
+  let spinner = print.spin("Generating Dockerfile...")
 
-
-  // Create the Dockerfile
   try {
+    // Fetch the Dockerfile template content from the demo-subgraph repo
+    let content = await fetch('https://raw.githubusercontent.com/LimeChain/demo-subgraph/main/Dockerfile')
+        .then((response) => {
+          if (response.ok) {
+            return response.text()
+          } else {
+            throw new Error(`Status Code: ${response.status}, with error: ${response.statusText}`);
+          }
+        })
+
+    // Write the Dockerfile
     await filesystem.write(dockerfilePath, content)
-    print.info('Successfully generated Dockerfile.')
+
+    // Replaces the version placeholders
+    await patching.replace(dockerfilePath, '<MATCHSTICK_VERSION>', versionOpt || latestVersion)
+
   } catch (error) {
-    print.error('A problem occurred while generating the Dockerfile. Please attend to the errors below:')
-    print.error(error.message)
+    spinner.fail(`A problem occurred while generating the Dockerfile. Please attend to the errors below:\n ${error.message}`)
     process.exit(1)
   }
 
-  // Replaces the version placeholders
-  await patching.update(dockerfilePath, data => {
-    return data.replace('<MATCHSTICK_VERSION>', versionOpt || latestVersion)
-  })
+  spinner.succeed('Successfully generated Dockerfile.')
 }