Merge pull request #332 from sc-forks/maint/yarn

Use yarn

Author: cgewecke

.circleci/config.yml

@@ -12,9 +12,9 @@ jobs:
      - run:
          name: Install dependencies
          command: |
-           npm install
+           yarn
      - run:
-         name: Get submodules 
+         name: Get submodules
          command: |
            git submodule update --init
      - run:

README.md

@@ -140,6 +140,12 @@ Contributions are welcome! If you're opening a PR that adds features please cons
 also lint your submission with `npm run lint`. Bugs can be reported in the
 [issues](https://github.com/sc-forks/solidity-coverage/issues).
 
+Set up the development environment with:
+```
+$ git clone https://github.com/sc-forks/solidity-coverage.git
+$ yarn
+```
+
 ### Contributors
 + [@area](https://github.com/area)
 + [@cgewecke](https://github.com/cgewecke)

lib/app.js

@@ -94,12 +94,13 @@ class App {
         });
       }
 
-      // Load config if present, accomodate common windows naming.
+      // Load config
       let truffleConfig;
+      let oldTrufflePath = `${this.workingDir}/truffle.js`;
+      let newTrufflePath = `${this.workingDir}/truffle-config.js`;
 
-      shell.test('-e', `${this.workingDir}/truffle.js`)
-          ? truffleConfig = reqCwd.silent(`${this.workingDir}/truffle.js`)
-          : truffleConfig = reqCwd.silent(`${this.workingDir}/truffle-config.js`);
+      if      (shell.test('-e', oldTrufflePath)) truffleConfig = reqCwd.silent(oldTrufflePath);
+      else if (shell.test('-e', newTrufflePath)) truffleConfig = reqCwd.silent(newTrufflePath);
 
       // Coverage network opts specified: use port if declared
       if (truffleConfig && truffleConfig.networks && truffleConfig.networks.coverage) {
@@ -109,10 +110,7 @@ class App {
       // No coverage network defaults to the dev network on port 8555, high gas / low price.
       } else {
         const trufflejs = defaultTruffleConfig(this.port, gasLimitHex, gasPriceHex);
-
-        (process.platform === 'win32')
-          ? fs.writeFileSync(`${this.coverageDir}/truffle-config.js`, trufflejs)
-          : fs.writeFileSync(`${this.coverageDir}/truffle.js`, trufflejs);
+        fs.writeFileSync(`${this.coverageDir}/truffle-config.js`, trufflejs);
       }
 
       // Compile the contracts before instrumentation and preserve their ABI's.
@@ -272,7 +270,7 @@ class App {
       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();