Fix running on Windows

Author: zone117x

bin/exec.js

@@ -13,8 +13,8 @@ death((signal, err) => app.cleanUp(err));
 (async () => {
 
   try {
-    app.generateCoverageEnvironment();
-    app.instrumentTarget();
+    await app.generateCoverageEnvironment();
+    await app.instrumentTarget();
     await app.launchTestrpc();
     await app.runTestCommand();
     await app.generateReport();

lib/app.js

@@ -58,7 +58,7 @@ class App {
    * Generates a copy of the target project configured for solidity-coverage and saves to
    * the coverage environment folder. Process exits(1) if try fails
   */
-  generateCoverageEnvironment() {
+  async generateCoverageEnvironment() {
     this.log('Generating coverage environment');
 
     try {
@@ -118,7 +118,7 @@ class App {
         shell.rm('-Rf', `${this.coverageDir}/build/contracts`)
       }
 
-      this.runCompileCommand();
+      await this.runCompileCommand();
       this.originalArtifacts = this.loadArtifacts();
       shell.rm('-Rf', `${this.coverageDir}/build/contracts`);
 
@@ -136,7 +136,7 @@ class App {
    * + Save instrumented contract in the coverage environment folder where covered tests will run
    * + Add instrumentation info to the coverage map
    */
-  instrumentTarget() {
+  async instrumentTarget() {
     this.skipFiles = this.skipFiles.map(contract => `${this.coverageDir}/contracts/${contract}`);
     this.skipFiles.push(`${this.coverageDir}/contracts/Migrations.sol`);
 
@@ -162,7 +162,7 @@ class App {
       const msg = `There was a problem instrumenting ${currentFile}: `;
       this.cleanUp(msg + err);
     }
-    this.postProcessPure(this.coverageDir);
+    await this.postProcessPure(this.coverageDir);
   }
 
   /**
@@ -191,32 +191,24 @@ class App {
    *  Also reads the 'allFiredEvents' log.
    */
   async runTestCommand() {
-    
-    let testCommand = require("truffle-core/lib/commands/test");
-    let options = { logger: console, network: 'coverage', _: [] };
 
-    shell.cd(this.coverageDir);
+    try {
+      this.log(`Running: truffle compile\n(this can take a few seconds)...`);
 
-    await new Promise((resolve, reject) => {
-      testCommand.run(options, (err, res) => {
-        if (err) {
-          reject(err);
-        }
-        resolve(res);
-      });
-    });
+      shell.cd(this.coverageDir);
 
-    shell.cd('./..');
+      let testCommand = require("truffle-core/lib/commands/test");
+      let options = { logger: console, network: 'coverage', _: [] };
 
-    return;
+      await new Promise((resolve, reject) => {
+        testCommand.run(options, (err, res) => {
+          if (err) {
+            reject(err);
+          }
+          resolve(res);
+        });
+      });
 
-    try {
-      const defaultCommand = `truffle test ${this.network} ${this.silence}`;
-      const command = this.testCommand || defaultCommand;
-      this.log(`Running: ${command}\n(this can take a few seconds)...`);
-      shell.cd(this.coverageDir);
-      shell.exec(command);
-      this.testsErrored = shell.error();
       shell.cd('./..');
     } catch (err) {
       const msg =
@@ -235,14 +227,25 @@ class App {
    *  coverage environment folder. Shell cd command needs to be invoked
    *  as its own statement for command line options to work, apparently.
    */
-  runCompileCommand() {
+  async runCompileCommand() {
+
     try {
-      const defaultCommand = `truffle compile ${this.network} ${this.silence}`;
-      const command = this.compileCommand || defaultCommand;
-      this.log(`Running: ${command}\n(this can take a few seconds)...`);
+      //const defaultCommand = `truffle compile ${this.network} ${this.silence}`;
+      //const command = this.compileCommand || defaultCommand;
+      //this.log(`Running: ${command}\n(this can take a few seconds)...`);
       shell.cd(this.coverageDir);
-      shell.exec(command);
-      this.testsErrored = shell.error();
+
+      let Config = require("truffle-config");
+      let Contracts = require("truffle-workflow-compile");
+      let config = Config.detect({ 
+          logger: console, 
+          network: 'coverage'
+      });
+      await new Promise(resolve => Contracts.compile(config, resolve));
+
+      //shell.exec(command);
+      //this.testsErrored = shell.error();
+
       shell.cd('./..');
     } catch (err) {
       const msg =
@@ -388,7 +391,7 @@ class App {
    * in the coverageEnv before the `contracts` folder is instrumented.
    * @param  {String} env 'coverageEnv' presumably
    */
-  postProcessPure(env) {
+  async postProcessPure(env) {
     shell.ls(`${env}/**/*.sol`).forEach(file => {
       const contractPath = this.platformNeutralPath(file);
       const contract = fs.readFileSync(contractPath).toString();
@@ -403,7 +406,7 @@ class App {
     });
 
     // First, compile the instrumented contracts
-    this.runCompileCommand();
+    await this.runCompileCommand();
 
     // Now swap the original abis into the instrumented artifacts so that truffle etc uses 'call'
     // on them.