Merge pull request #7 from bingnz/update-packages

chore: update packages and fix test coverage.

.gitignore

@@ -2,3 +2,4 @@ node_modules
 release
 *.map
 coverage
+/.nyc_output

.travis.yml

@@ -21,9 +21,13 @@ env:
 before_script:
   - npm prune
 
+script:
+  - npm run build
+  - npm test
+
 after_success:
   - npm install -g codeclimate-test-reporter
-  - codeclimate-test-reporter < coverage/remapped-lcov.info
+  - codeclimate-test-reporter < coverage/lcov.info
   - npm run semantic-release
 
 branches:

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016-2017 David Chandler
+Copyright (c) 2016-2018 David Chandler
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -109,7 +109,7 @@ If no options are specified, looks for a CSS file in the same path as the LESS f
 
 ## License
 
-Copyright (c) 2016-2017 David Chandler
+Copyright (c) 2016-2018 David Chandler
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

generate-coverage-reports.js

@@ -0,0 +1,8 @@
+var remapIstanbul = require('remap-istanbul');
+
+remapIstanbul('./coverage/coverage-final.json', {
+    'json': './coverage/coverage-remapped.json',
+    'html': './coverage/html',
+    'lcovonly': './coverage/lcov.info',
+    'text': null
+});

gulpfile.js

@@ -5,12 +5,20 @@ var plugins = require('gulp-load-plugins')();
 var through2 = require('through2');
 var os = require('os');
 var lazypipe = require('lazypipe');
-var remapIstanbul = require('remap-istanbul/lib/gulpRemapIstanbul');
 
 var tsProject = plugins.typescript.createProject('tsconfig.json', {
     typescript: require('typescript')
 });
 
+function istanbulTypeScriptIgnores() {
+    var ignoreReplacement = '/* istanbul ignore next */\n$1'
+    return lazypipe()
+        .pipe(plugins.replace, /(var __extends =)/, ignoreReplacement)
+        .pipe(plugins.replace, /(var __awaiter =)/, ignoreReplacement)
+        .pipe(plugins.replace, /(var __generator =)/, ignoreReplacement)
+        .pipe(plugins.replace, /(var _this = _super\.call)/, ignoreReplacement)();
+}
+
 gulp.task('compile', function () {
     var tsResult = gulp.src(['src/**/*.ts', 'custom-typings/*.d.ts'])
         .pipe(plugins.sourcemaps.init())
@@ -20,6 +28,7 @@ gulp.task('compile', function () {
         tsResult.dts
             .pipe(gulp.dest('release')),
         tsResult.js
+            .pipe(istanbulTypeScriptIgnores())
             .pipe(plugins.sourcemaps.write('./', {
                 includeContent: false,
                 sourceRoot: function (file) {
@@ -30,46 +39,4 @@ gulp.task('compile', function () {
     ]);
 });
 
-function istanbulTypeScriptIgnores() {
-    var ignoreReplacement = '/* istanbul ignore next */\n$1'
-    return lazypipe()
-        .pipe(plugins.replace, /(var __extends =)/, ignoreReplacement)
-        .pipe(plugins.replace, /(var __awaiter =)/, ignoreReplacement)
-        .pipe(plugins.replace, /(var __generator =)/, ignoreReplacement)
-        .pipe(plugins.replace, /(var _this = _super\.call)/, ignoreReplacement)();
-}
-
-gulp.task('pre-test', ['compile'], function () {
-    return gulp.src(['release/**/*.js'])
-        .pipe(istanbulTypeScriptIgnores())
-        // Covering files
-        .pipe(plugins.istanbul())
-        // Force `require` to return covered files
-        .pipe(plugins.istanbul.hookRequire());
-});
-
-gulp.task('test-and-coverage', ['pre-test'], function () {
-    return gulp.src('test/**/*.js', { read: false })
-        .pipe(plugins.mocha({
-            reporter: 'spec',
-            require: [
-                'babel-polyfill',
-                'babel-core/register'
-            ]
-        }))
-        .pipe(plugins.istanbul.writeReports());
-});
-
-gulp.task('run-tests', ['test-and-coverage'], function () {
-    return gulp.src('coverage/coverage-final.json')
-        .pipe(remapIstanbul({
-            reports: {
-                'json': 'coverage/remapped-coverage.json',
-                'html': 'coverage/remapped-report',
-                'lcovonly': 'coverage/remapped-lcov.info'
-            }
-        }))
-        .pipe(gulp.dest('coverage'));
-});
-
 gulp.task('default', ['compile']);