Merge pull request #116 from willowtreeapps/develop

Merge develop

.gitignore

@@ -75,3 +75,31 @@ typings/
 
 # Web Assembly
 *.bc
+
+### macOS ###
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk

.travis.yml

@@ -5,14 +5,5 @@ language: node_js
 node_js:
   - node
 
-sudo: required
-
-services:
-  - docker
-
-before_install:
-  - docker run -dit --name emscripten -v $(pwd):/src apiaryio/emcc:latest bash
-
 script:
-  - docker exec -it emscripten emmake make
   - npm run test

build.sh

@@ -0,0 +1,2 @@
+em++ --clear-cache
+emmake make

package.json

@@ -22,7 +22,7 @@
     "test": "ava",
     "test:watch": "ava --watch"
   },
-  "main": "./lib/api.js",
+  "main": "./src/js/api.js",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/willowtreeapps/wist.git"

src/js/api.js

@@ -2,7 +2,7 @@
 
 const Linter = require('./linter');
 const CLIEngine = require('./cli-engine');
-const Parser = require('../parser/index');
+const Parser = require('../../dist/libwist');
 
 module.exports = {
     CLIEngine,

test/lib/cli.js

@@ -1,9 +1,9 @@
-const path = require('path'),
-    Rules = require('../../src/js/rules'),
-    test = require('ava');
+const path = require('path');
+const Rules = require('../../src/js/rules');
+const test = require('ava');
 
-const VALID_DIR = path.resolve(`${__dirname}/../fixtures/rules`),
-    INVALID_DIR = path.resolve(`${__dirname}/../fixtures/rules-invaliddir`);
+const VALID_DIR = path.resolve(`${__dirname}/../fixtures/rules`);
+const INVALID_DIR = path.resolve(`${__dirname}/../fixtures/rules-invaliddir`);
 
 let rules;
 
@@ -25,7 +25,7 @@ test('error is not thrown when given a valid rules directory', t => {
 
 test('rules.get for a valid rule returns an object', t => {
     rules.load(VALID_DIR);
-    
+
     const rule = rules.get('fixture-rule');
 
     t.is(typeof rule, 'object');

test/lib/regression.js

@@ -1,7 +1,7 @@
-import test from 'ava';
-import cli from '../../src/js/cli';
-import fs from 'fs';
-import path from 'path';
+const test = require('ava');
+const cli = require('../../src/js/cli');
+const fs = require('fs');
+const path = require('path');
 
 test('Regression tests parse successfully', t => {
     process.chdir('./test/regression');