add code coverage

index.d.ts

@@ -5,13 +5,15 @@ declare module NpmtsPlugins {
         fs: any;
         gulp: any;
         g: {
+            coveralls: any;
+            if: any;
             insert: any;
+            istanbul: any;
+            mocha: any;
             sequence: any;
             typescript: any;
         };
-        mathjs: any;
         mergeStream: any;
-        mocha: any;
         path: any;
         q: any;
         smartcli: any;
@@ -22,15 +24,14 @@ declare module NpmtsPlugins {
 declare module NpmtsPaths {
     var init: () => any;
 }
+declare module NpmtsConfigFile {
+    var run: () => any;
+}
 declare module NpmtsOptions {
-    var config: any;
+    var run: (configArg: any) => any;
-    var run: () => any;
 }
-declare module NpmtsCustom {
+declare module NpmtsCompile {
-    var run: () => any;
+    var run: (configArg: any) => any;
-}
-declare module NpmtsDefault {
-    var run: () => any;
 }
 declare module NpmtsTests {
     var run: () => any;
@@ -43,13 +44,15 @@ declare var plugins: {
     fs: any;
     gulp: any;
     g: {
+        coveralls: any;
+        if: any;
         insert: any;
+        istanbul: any;
+        mocha: any;
         sequence: any;
         typescript: any;
     };
-    mathjs: any;
     mergeStream: any;
-    mocha: any;
     path: any;
     q: any;
     smartcli: any;

index.js

@@ -9,13 +9,15 @@ var NpmtsPlugins;
             fs: require("fs-extra"),
             gulp: require("gulp"),
             g: {
+                coveralls: require("gulp-coveralls"),
+                if: require("gulp-if"),
                 insert: require("gulp-insert"),
+                istanbul: require("gulp-istanbul"),
+                mocha: require("gulp-mocha"),
                 sequence: require("gulp-sequence"),
                 typescript: require("gulp-typescript")
             },
-            mathjs: require("mathjs"),
             mergeStream: require("merge2"),
-            mocha: require("mocha"),
             path: require("path"),
             q: require("q"),
             smartcli: require("smartcli"),
@@ -40,199 +42,177 @@ var NpmtsPaths;
     };
 })(NpmtsPaths || (NpmtsPaths = {}));
 /// <reference path="./index.ts" />
-var NpmtsOptions;
+var NpmtsConfigFile;
-(function (NpmtsOptions) {
+(function (NpmtsConfigFile) {
-    NpmtsOptions.config = {};
+    NpmtsConfigFile.run = function () {
-    NpmtsOptions.run = function () {
         var done = plugins.q.defer();
+        var config = {};
         var configPath = plugins.path.join(paths.cwd, "npmts.json");
         if (plugins.smartfile.checks.fileExistsSync(configPath)) {
             plugins.beautylog.info("npmts.json".blue + " config file found!");
-            NpmtsOptions.config = plugins.smartfile.readFileToObject(configPath);
+            config = plugins.smartfile.readFileToObject(configPath);
-            switch (NpmtsOptions.config.mode) {
+            switch (config.mode) {
                 case "default":
-                    plugins.beautylog.log("mode is " + NpmtsOptions.config.mode.yellow);
-                    done.resolve();
-                    break;
                 case "custom":
-                    plugins.beautylog.log("mode is " + NpmtsOptions.config.mode.yellow);
+                    plugins.beautylog.log("mode is " + config.mode.yellow);
-                    done.resolve();
+                    done.resolve(config);
                     break;
                 default:
-                    plugins.beautylog.error("mode " + NpmtsOptions.config.mode.yellow + " not recognised!".red);
+                    plugins.beautylog.error("mode " + config.mode.yellow + " not recognised!".red);
             }
             ;
         }
         else {
             plugins.beautylog.log("no config file found: so mode is " + "default".yellow);
-            NpmtsOptions.config.mode = "default";
+            config.mode = "default";
-            done.resolve();
+            done.resolve(config);
         }
         ;
         return done.promise;
     };
-})(NpmtsOptions || (NpmtsOptions = {}));
+})(NpmtsConfigFile || (NpmtsConfigFile = {}));
 /// <reference path="./index.ts" />
-var NpmtsCustom;
+var NpmtsOptions;
-(function (NpmtsCustom) {
+(function (NpmtsOptions) {
-    NpmtsCustom.run = function () {
+    NpmtsOptions.run = function (configArg) {
         var done = plugins.q.defer();
-        var config = NpmtsOptions.config;
+        var config = configArg;
-        if (config.mode === "custom") {
+        if (config.mode == "default") {
-            plugins.beautylog.log("now running custom tasks");
+            config.typings = [
-            var moduleStream = plugins.mergeStream({ end: false });
+                "./ts/"
-            /* -------------------------------------------------
+            ];
-             * ----------- first install typings ---------------
+            config.ts = (_a = {},
-             * ----------------------------------------------- */
+                _a["./ts/index.ts"] = "./index.js",
-            var typingsDone = plugins.q.defer();
+                _a
-            var typingsCounter = 0;
+            );
-            var typingsCounterAdvance = function () {
+            config.test = ["./index.js"];
-                typingsCounter++;
+            done.resolve(config);
-                if (typeof config.typings[typingsCounter] != "undefined") {
+        }
-                    installTypings();
+        else {
-                }
+            done.resolve(config);
-                else {
-                    plugins.beautylog.success("custom typings installed successfully");
-                    typingsDone.resolve();
-                }
-            };
-            var installTypings = function () {
-                plugins.beautylog.log("now installing " + "typings.json".yellow + " from " + config.typings[typingsCounter].blue);
-                plugins.typings.install({ production: false, cwd: plugins.path.join(paths.cwd, config.typings[typingsCounter]) })
-                    .then(function () {
-                    typingsCounterAdvance();
-                }, function () {
-                    plugins.beautylog.error("something went wrong: Check if path is correct: " + config.typings[typingsCounter].blue);
-                    typingsCounterAdvance();
-                });
-            };
-            installTypings();
-            /* -------------------------------------------------
-             * ----------- second compile TS -------------------
-             * ----------------------------------------------- */
-            typingsDone.promise.then(function () {
-                for (var key in config.ts) {
-                    plugins.beautylog.log("now compiling" + key.blue);
-                    var outputPathIsDir;
-                    try {
-                        if (plugins.fs.statSync(plugins.path.join(paths.cwd, config.ts[key])).isDirectory()) {
-                            outputPathIsDir = true;
-                        }
-                    }
-                    catch (err) {
-                        outputPathIsDir = false;
-                    }
-                    //do some evaluation of the environment
-                    var outputNameSpecified = (!outputPathIsDir
-                        && (plugins.path.extname(config.ts[key]) == ".js"));
-                    var outputName = (function () {
-                        if (outputNameSpecified) {
-                            return plugins.path.basename(config.ts[key]);
-                        }
-                        else {
-                            return undefined;
-                        }
-                    })();
-                    var outputDir = (function () {
-                        if (outputNameSpecified) {
-                            return plugins.path.dirname(plugins.path.join(paths.cwd, config.ts[key]));
-                        }
-                        else {
-                            return plugins.path.join(paths.cwd, config.ts[key]);
-                        }
-                    })();
-                    var tsStream = plugins.gulp.src(plugins.path.join(paths.cwd, key))
-                        .pipe(plugins.g.typescript({
-                        out: outputName,
-                        declaration: true
-                    }));
-                    var stream = plugins.mergeStream([
-                        tsStream.dts.pipe(plugins.gulp.dest(outputDir)),
-                        tsStream.js
-                            .pipe(plugins.g.insert.prepend('#!/usr/bin/env node\n\n'))
-                            .pipe(plugins.gulp.dest(outputDir))
-                    ]);
-                    moduleStream.add(stream);
-                }
-                moduleStream.on("queueDrain", function () {
-                    plugins.beautylog.success("custom TypeScript installed successfully");
-                    moduleStream.on("finish", function () {
-                        done.resolve();
-                    });
-                    moduleStream.end();
-                });
-            });
         }
         return done.promise;
+        var _a;
     };
-})(NpmtsCustom || (NpmtsCustom = {}));
+})(NpmtsOptions || (NpmtsOptions = {}));
 /// <reference path="./index.ts" />
-var NpmtsDefault;
+var NpmtsCompile;
-(function (NpmtsDefault) {
+(function (NpmtsCompile) {
-    NpmtsDefault.run = function () {
+    NpmtsCompile.run = function (configArg) {
         var done = plugins.q.defer();
-        plugins.gulp.task("defaultTypings", function (cb) {
+        var config = configArg;
-            plugins.beautylog.log("now installing default typings");
+        plugins.beautylog.log("now running custom tasks");
-            plugins.typings.install({ production: false, cwd: paths.tsDir })
+        var moduleStream = plugins.mergeStream({ end: false });
-                .then(function () {
+        /* -------------------------------------------------
-                cb();
+         * ----------- first install typings ---------------
-            });
+         * ----------------------------------------------- */
-        });
+        var typingsDone = plugins.q.defer();
-        plugins.gulp.task("defaultIndexTS", function () {
+        var typingsCounter = 0;
-            plugins.beautylog.log("now compiling" + " ts/index.ts".blue);
+        var typingsCounterAdvance = function () {
-            var tsResult = plugins.gulp.src(paths.indexTS)
+            typingsCounter++;
-                .pipe(plugins.g.typescript({
+            if (typeof config.typings[typingsCounter] != "undefined") {
-                out: "./index.js",
+                installTypings();
-                declaration: true
-            }));
-            return plugins.mergeStream([
-                tsResult.dts.pipe(plugins.gulp.dest(paths.cwd)),
-                tsResult.js
-                    .pipe(plugins.g.insert.prepend('#!/usr/bin/env node\n\n'))
-                    .pipe(plugins.gulp.dest(paths.cwd))
-            ]);
-        });
-        plugins.gulp.task("defaultTestTS", function () {
-            plugins.beautylog.log("now compiling" + " ts/test.ts".blue);
-            var stream = plugins.gulp.src(paths.testTS)
-                .pipe(plugins.g.typescript({
-                out: "test.js"
-            }))
-                .pipe(plugins.gulp.dest(paths.testDir));
-            return stream;
-        });
-        plugins.gulp.task("defaultCleanup", function (cb) {
-            plugins.beautylog.success("default TypeScript for this module compiled successfully.");
-            done.resolve();
-            cb();
-        });
-        plugins.gulp.task("default", function (cb) {
-            if (NpmtsOptions.config.mode == "default") {
-                plugins.g.sequence("defaultTypings", "defaultIndexTS", "defaultTestTS", "defaultCleanup", cb);
             }
             else {
-                cb();
+                plugins.beautylog.success("custom typings installed successfully");
-                done.resolve();
+                typingsDone.resolve();
             }
+        };
+        var installTypings = function () {
+            plugins.beautylog.log("now installing " + "typings.json".yellow + " from " + config.typings[typingsCounter].blue);
+            plugins.typings.install({ production: false, cwd: plugins.path.join(paths.cwd, config.typings[typingsCounter]) })
+                .then(function () {
+                typingsCounterAdvance();
+            }, function () {
+                plugins.beautylog.error("something went wrong: Check if path is correct: " + config.typings[typingsCounter].blue);
+                typingsCounterAdvance();
+            });
+        };
+        installTypings();
+        /* -------------------------------------------------
+         * ----------- second compile TS -------------------
+         * ----------------------------------------------- */
+        typingsDone.promise.then(function () {
+            for (var key in config.ts) {
+                plugins.beautylog.log("now compiling" + key.blue);
+                var outputPathIsDir;
+                try {
+                    if (plugins.fs.statSync(plugins.path.join(paths.cwd, config.ts[key])).isDirectory()) {
+                        outputPathIsDir = true;
+                    }
+                }
+                catch (err) {
+                    outputPathIsDir = false;
+                }
+                //do some evaluation of the environment
+                var outputNameSpecified = (!outputPathIsDir
+                    && (plugins.path.extname(config.ts[key]) == ".js"));
+                var outputName = (function () {
+                    if (outputNameSpecified) {
+                        return plugins.path.basename(config.ts[key]);
+                    }
+                    else {
+                        return undefined;
+                    }
+                })();
+                var outputDir = (function () {
+                    if (outputNameSpecified) {
+                        return plugins.path.dirname(plugins.path.join(paths.cwd, config.ts[key]));
+                    }
+                    else {
+                        return plugins.path.join(paths.cwd, config.ts[key]);
+                    }
+                })();
+                var tsStream = plugins.gulp.src(plugins.path.join(paths.cwd, key))
+                    .pipe(plugins.g.typescript({
+                    out: outputName,
+                    declaration: true
+                }));
+                var stream = plugins.mergeStream([
+                    tsStream.dts.pipe(plugins.gulp.dest(outputDir)),
+                    tsStream.js
+                        .pipe(plugins.g.insert.prepend('#!/usr/bin/env node\n\n'))
+                        .pipe(plugins.gulp.dest(outputDir))
+                ]);
+                moduleStream.add(stream);
+            }
+            moduleStream.on("queueDrain", function () {
+                plugins.beautylog.success("custom TypeScript installed successfully");
+                moduleStream.on("finish", function () {
+                    done.resolve();
+                });
+                moduleStream.end();
+            });
         });
-        plugins.gulp.start.apply(plugins.gulp, ['default']);
         return done.promise;
     };
-})(NpmtsDefault || (NpmtsDefault = {}));
+})(NpmtsCompile || (NpmtsCompile = {}));
 /// <reference path="./index.ts" />
 var NpmtsTests;
 (function (NpmtsTests) {
     NpmtsTests.run = function () {
         var done = plugins.q.defer();
-        plugins.fs.ensureDirSync(paths.testDir); //make sure that mocha has a directory to look for tests
+        plugins.gulp.task('istanbul', function () {
-        plugins.beautylog.info("Now running mocha tests");
+            return plugins.gulp.src([plugins.path.join(paths.cwd, "index.js")])
-        var mocha = new plugins.mocha(); // Instantiate a Mocha instance.
+                .pipe(plugins.g.istanbul())
-        mocha.addFile(plugins.path.join(paths.testDir, "test.js"));
+                .pipe(plugins.g.istanbul.hookRequire());
-        mocha.run(function (failures) {
+        });
-            process.on('exit', function () {
+        plugins.gulp.task('mocha', function () {
-                process.exit(failures);
+            return plugins.gulp.src(['test/test.js'])
+                .pipe(plugins.g.mocha())
+                .pipe(plugins.g.istanbul.writeReports())
+                .pipe(plugins.g.istanbul.enforceThresholds({ thresholds: { global: 90 } }));
+        });
+        plugins.gulp.task("coveralls", function () {
+            return plugins.gulp.src('coverage/**/lcov.info')
+                .pipe(plugins.g.if(process.env.TRAVIS, plugins.g.coveralls()));
+        });
+        plugins.gulp.task("test", function () {
+            plugins.g.sequence("istanbul", "mocha", "coveralls", function () {
+                done.resolve();
             });
         });
+        plugins.gulp.start.apply(plugins.gulp, ['test']);
         return done.promise;
     };
 })(NpmtsTests || (NpmtsTests = {}));
@@ -241,9 +221,9 @@ var NpmtsPromisechain;
 (function (NpmtsPromisechain) {
     NpmtsPromisechain.init = function () {
         var promisechain;
-        NpmtsOptions.run()
+        NpmtsConfigFile.run()
-            .then(NpmtsDefault.run)
+            .then(NpmtsOptions.run)
-            .then(NpmtsCustom.run)
+            .then(NpmtsCompile.run)
             .then(NpmtsTests.run);
         return promisechain;
     };
@@ -252,9 +232,9 @@ var NpmtsPromisechain;
 /// <reference path="./npmts.plugins.ts" />
 /// <reference path="./npmts.cli.ts" />
 /// <reference path="./npmts.paths.ts" />
+/// <reference path="./npmts.configfile.ts" />
 /// <reference path="./npmts.options.ts" />
-/// <reference path="./npmts.custom.ts" />
+/// <reference path="./npmts.compile.ts" />
-/// <reference path="./npmts.default.ts" />
 /// <reference path="./npmts.tests.ts" />
 /// <reference path="./npmts.promisechain.ts" />
 console.log("**** starting NPMTS ****");

package.json

@@ -29,13 +29,15 @@
     "beautylog": "2.0.7",
     "fs-extra": "^0.26.5",
     "gulp": "3.9.0",
+    "gulp-coveralls": "^0.1.4",
+    "gulp-if": "^2.0.0",
     "gulp-insert": "0.5.0",
+    "gulp-istanbul": "^0.10.3",
+    "gulp-mocha": "^2.2.0",
     "gulp-sequence": "^0.4.4",
     "gulp-typescript": "2.10.0",
     "gulp-typings": "0.0.0",
-    "mathjs": "^2.7.0",
     "merge2": "1.0.1",
-    "mocha": "^2.4.5",
     "q": "^1.4.1",
     "smartcli": "0.0.11",
     "smartfile": "0.0.11",

test/assets/coverage/coverage-final.json

@@ -0,0 +1,2 @@
+{
+"/Users/philkunz/github/pushrocks/npmts/test/assets/index.js":{"path":"/Users/philkunz/github/pushrocks/npmts/test/assets/index.js","s":{"1":1,"2":1,"3":1},"b":{},"f":{"1":1},"fnMap":{"1":{"name":"(anonymous_1)","line":5,"loc":{"start":{"line":5,"column":18},"end":{"line":5,"column":30}}}},"statementMap":{"1":{"start":{"line":4,"column":0},"end":{"line":8,"column":2}},"2":{"start":{"line":6,"column":8},"end":{"line":6,"column":46}},"3":{"start":{"line":9,"column":0},"end":{"line":9,"column":28}}},"branchMap":{},"l":{"4":1,"6":1,"9":1}}}

test/assets/coverage/lcov-report/assets/index.html

@@ -0,0 +1,93 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <title>Code coverage report for assets/</title>
+    <meta charset="utf-8" />
+    <link rel="stylesheet" href="../prettify.css" />
+    <link rel="stylesheet" href="../base.css" />
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <style type='text/css'>
+        .coverage-summary .sorter {
+            background-image: url(../sort-arrow-sprite.png);
+        }
+    </style>
+</head>
+<body>
+<div class='wrapper'>
+  <div class='pad1'>
+    <h1>
+      <a href="../index.html">all files</a> assets/
+    </h1>
+    <div class='clearfix'>
+      <div class='fl pad1y space-right2'>
+        <span class="strong">100% </span>
+        <span class="quiet">Statements</span>
+        <span class='fraction'>3/3</span>
+      </div>
+      <div class='fl pad1y space-right2'>
+        <span class="strong">100% </span>
+        <span class="quiet">Branches</span>
+        <span class='fraction'>0/0</span>
+      </div>
+      <div class='fl pad1y space-right2'>
+        <span class="strong">100% </span>
+        <span class="quiet">Functions</span>
+        <span class='fraction'>1/1</span>
+      </div>
+      <div class='fl pad1y space-right2'>
+        <span class="strong">100% </span>
+        <span class="quiet">Lines</span>
+        <span class='fraction'>3/3</span>
+      </div>
+    </div>
+  </div>
+  <div class='status-line high'></div>
+<div class="pad1">
+<table class="coverage-summary">
+<thead>
+<tr>
+   <th data-col="file" data-fmt="html" data-html="true" class="file">File</th>
+   <th data-col="pic" data-type="number" data-fmt="html" data-html="true" class="pic"></th>
+   <th data-col="statements" data-type="number" data-fmt="pct" class="pct">Statements</th>
+   <th data-col="statements_raw" data-type="number" data-fmt="html" class="abs"></th>
+   <th data-col="branches" data-type="number" data-fmt="pct" class="pct">Branches</th>
+   <th data-col="branches_raw" data-type="number" data-fmt="html" class="abs"></th>
+   <th data-col="functions" data-type="number" data-fmt="pct" class="pct">Functions</th>
+   <th data-col="functions_raw" data-type="number" data-fmt="html" class="abs"></th>
+   <th data-col="lines" data-type="number" data-fmt="pct" class="pct">Lines</th>
+   <th data-col="lines_raw" data-type="number" data-fmt="html" class="abs"></th>
+</tr>
+</thead>
+<tbody><tr>
+	<td class="file high" data-value="index.js"><a href="index.js.html">index.js</a></td>
+	<td data-value="100" class="pic high"><div class="chart"><div class="cover-fill cover-full" style="width: 100%;"></div><div class="cover-empty" style="width:0%;"></div></div></td>
+	<td data-value="100" class="pct high">100%</td>
+	<td data-value="3" class="abs high">3/3</td>
+	<td data-value="100" class="pct high">100%</td>
+	<td data-value="0" class="abs high">0/0</td>
+	<td data-value="100" class="pct high">100%</td>
+	<td data-value="1" class="abs high">1/1</td>
+	<td data-value="100" class="pct high">100%</td>
+	<td data-value="3" class="abs high">3/3</td>
+	</tr>
+
+</tbody>
+</table>
+</div><div class='push'></div><!-- for sticky footer -->
+</div><!-- /wrapper -->
+<div class='footer quiet pad2 space-top1 center small'>
+  Code coverage
+  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Feb 09 2016 05:39:17 GMT+0100 (CET)
+</div>
+</div>
+<script src="../prettify.js"></script>
+<script>
+window.onload = function () {
+        if (typeof prettyPrint === 'function') {
+            prettyPrint();
+        }
+};
+</script>
+<script src="../sorter.js"></script>
+</body>
+</html>

test/assets/coverage/lcov-report/assets/index.js.html

@@ -0,0 +1,92 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <title>Code coverage report for assets/index.js</title>
+    <meta charset="utf-8" />
+    <link rel="stylesheet" href="../prettify.css" />
+    <link rel="stylesheet" href="../base.css" />
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <style type='text/css'>
+        .coverage-summary .sorter {
+            background-image: url(../sort-arrow-sprite.png);
+        }
+    </style>
+</head>
+<body>
+<div class='wrapper'>
+  <div class='pad1'>
+    <h1>
+      <a href="../index.html">all files</a> / <a href="index.html">assets/</a> index.js
+    </h1>
+    <div class='clearfix'>
+      <div class='fl pad1y space-right2'>
+        <span class="strong">100% </span>
+        <span class="quiet">Statements</span>
+        <span class='fraction'>3/3</span>
+      </div>
+      <div class='fl pad1y space-right2'>
+        <span class="strong">100% </span>
+        <span class="quiet">Branches</span>
+        <span class='fraction'>0/0</span>
+      </div>
+      <div class='fl pad1y space-right2'>
+        <span class="strong">100% </span>
+        <span class="quiet">Functions</span>
+        <span class='fraction'>1/1</span>
+      </div>
+      <div class='fl pad1y space-right2'>
+        <span class="strong">100% </span>
+        <span class="quiet">Lines</span>
+        <span class='fraction'>3/3</span>
+      </div>
+    </div>
+  </div>
+  <div class='status-line high'></div>
+<pre><table class="coverage">
+<tr><td class="line-count quiet">1
+2
+3
+4
+5
+6
+7
+8
+9
+10</td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">1×</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">1×</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">1×</span>
+<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">#!/usr/bin/env node
+&nbsp;
+/// &lt;reference path="./typings/main.d.ts" /&gt;
+var testplugin = {
+    logSomething: function () {
+        console.log("only function executed");
+    }
+};
+module.exports = testplugin;
+&nbsp;</pre></td></tr>
+</table></pre>
+<div class='push'></div><!-- for sticky footer -->
+</div><!-- /wrapper -->
+<div class='footer quiet pad2 space-top1 center small'>
+  Code coverage
+  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Feb 09 2016 05:39:17 GMT+0100 (CET)
+</div>
+</div>
+<script src="../prettify.js"></script>
+<script>
+window.onload = function () {
+        if (typeof prettyPrint === 'function') {
+            prettyPrint();
+        }
+};
+</script>
+<script src="../sorter.js"></script>
+</body>
+</html>

test/assets/coverage/lcov-report/base.css

@@ -0,0 +1,212 @@
+body, html {
+  margin:0; padding: 0;
+  height: 100%;
+}
+body {
+    font-family: Helvetica Neue, Helvetica, Arial;
+    font-size: 14px;
+    color:#333;
+}
+.small { font-size: 12px;; }
+*, *:after, *:before {
+  -webkit-box-sizing:border-box;
+     -moz-box-sizing:border-box;
+          box-sizing:border-box;
+  }
+h1 { font-size: 20px; margin: 0;}
+h2 { font-size: 14px; }
+pre {
+    font: 12px/1.4 Consolas, "Liberation Mono", Menlo, Courier, monospace;
+    margin: 0;
+    padding: 0;
+    -moz-tab-size: 2;
+    -o-tab-size:  2;
+    tab-size: 2;
+}
+a { color:#0074D9; text-decoration:none; }
+a:hover { text-decoration:underline; }
+.strong { font-weight: bold; }
+.space-top1 { padding: 10px 0 0 0; }
+.pad2y { padding: 20px 0; }
+.pad1y { padding: 10px 0; }
+.pad2x { padding: 0 20px; }
+.pad2 { padding: 20px; }
+.pad1 { padding: 10px; }
+.space-left2 { padding-left:55px; }
+.space-right2 { padding-right:20px; }
+.center { text-align:center; }
+.clearfix { display:block; }
+.clearfix:after {
+  content:'';
+  display:block;
+  height:0;
+  clear:both;
+  visibility:hidden;
+  }
+.fl { float: left; }
+@media only screen and (max-width:640px) {
+  .col3 { width:100%; max-width:100%; }
+  .hide-mobile { display:none!important; }
+}
+
+.quiet {
+  color: #7f7f7f;
+  color: rgba(0,0,0,0.5);
+}
+.quiet a { opacity: 0.7; }
+
+.fraction {
+  font-family: Consolas, 'Liberation Mono', Menlo, Courier, monospace;
+  font-size: 10px;
+  color: #555;
+  background: #E8E8E8;
+  padding: 4px 5px;
+  border-radius: 3px;
+  vertical-align: middle;
+}
+
+div.path a:link, div.path a:visited { color: #333; }
+table.coverage {
+  border-collapse: collapse;
+  margin: 10px 0 0 0;
+  padding: 0;
+}
+
+table.coverage td {
+  margin: 0;
+  padding: 0;
+  vertical-align: top;
+}
+table.coverage td.line-count {
+    text-align: right;
+    padding: 0 5px 0 20px;
+}
+table.coverage td.line-coverage {
+    text-align: right;
+    padding-right: 10px;
+    min-width:20px;
+}
+
+table.coverage td span.cline-any {
+    display: inline-block;
+    padding: 0 5px;
+    width: 100%;
+}
+.missing-if-branch {
+    display: inline-block;
+    margin-right: 5px;
+    border-radius: 3px;
+    position: relative;
+    padding: 0 4px;
+    background: #333;
+    color: yellow;
+}
+
+.skip-if-branch {
+    display: none;
+    margin-right: 10px;
+    position: relative;
+    padding: 0 4px;
+    background: #ccc;
+    color: white;
+}
+.missing-if-branch .typ, .skip-if-branch .typ {
+    color: inherit !important;
+}
+.coverage-summary {
+  border-collapse: collapse;
+  width: 100%;
+}
+.coverage-summary tr { border-bottom: 1px solid #bbb; }
+.keyline-all { border: 1px solid #ddd; }
+.coverage-summary td, .coverage-summary th { padding: 10px; }
+.coverage-summary tbody { border: 1px solid #bbb; }
+.coverage-summary td { border-right: 1px solid #bbb; }
+.coverage-summary td:last-child { border-right: none; }
+.coverage-summary th {
+  text-align: left;
+  font-weight: normal;
+  white-space: nowrap;
+}
+.coverage-summary th.file { border-right: none !important; }
+.coverage-summary th.pct { }
+.coverage-summary th.pic,
+.coverage-summary th.abs,
+.coverage-summary td.pct,
+.coverage-summary td.abs { text-align: right; }
+.coverage-summary td.file { white-space: nowrap;  }
+.coverage-summary td.pic { min-width: 120px !important;  }
+.coverage-summary tfoot td { }
+
+.coverage-summary .sorter {
+    height: 10px;
+    width: 7px;
+    display: inline-block;
+    margin-left: 0.5em;
+    background: url(sort-arrow-sprite.png) no-repeat scroll 0 0 transparent;
+}
+.coverage-summary .sorted .sorter {
+    background-position: 0 -20px;
+}
+.coverage-summary .sorted-desc .sorter {
+    background-position: 0 -10px;
+}
+.status-line {  height: 10px; }
+/* dark red */
+.red.solid, .status-line.low, .low .cover-fill { background:#C21F39 }
+.low .chart { border:1px solid #C21F39 }
+/* medium red */
+.cstat-no, .fstat-no, .cbranch-no, .cbranch-no { background:#F6C6CE }
+/* light red */
+.low, .cline-no { background:#FCE1E5 }
+/* light green */
+.high, .cline-yes { background:rgb(230,245,208) }
+/* medium green */
+.cstat-yes { background:rgb(161,215,106) }
+/* dark green */
+.status-line.high, .high .cover-fill { background:rgb(77,146,33) }
+.high .chart { border:1px solid rgb(77,146,33) }
+
+
+.medium .chart { border:1px solid #666; }
+.medium .cover-fill { background: #666; }
+
+.cbranch-no { background:  yellow !important; color: #111; }
+
+.cstat-skip { background: #ddd; color: #111; }
+.fstat-skip { background: #ddd; color: #111 !important; }
+.cbranch-skip { background: #ddd !important; color: #111; }
+
+span.cline-neutral { background: #eaeaea; }
+.medium { background: #eaeaea; }
+
+.cover-fill, .cover-empty {
+  display:inline-block;
+  height: 12px;
+}
+.chart {
+  line-height: 0;
+}
+.cover-empty {
+    background: white;
+}
+.cover-full {
+    border-right: none !important;
+}
+pre.prettyprint {
+    border: none !important;
+    padding: 0 !important;
+    margin: 0 !important;
+}
+.com { color: #999 !important; }
+.ignore-none { color: #999; font-weight: normal; }
+
+.wrapper {
+  min-height: 100%;
+  height: auto !important;
+  height: 100%;
+  margin: 0 auto -48px;
+}
+.footer, .push {
+  height: 48px;
+}

test/assets/coverage/lcov-report/index.html

@@ -0,0 +1,93 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <title>Code coverage report for All files</title>
+    <meta charset="utf-8" />
+    <link rel="stylesheet" href="prettify.css" />
+    <link rel="stylesheet" href="base.css" />
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <style type='text/css'>
+        .coverage-summary .sorter {
+            background-image: url(sort-arrow-sprite.png);
+        }
+    </style>
+</head>
+<body>
+<div class='wrapper'>
+  <div class='pad1'>
+    <h1>
+      /
+    </h1>
+    <div class='clearfix'>
+      <div class='fl pad1y space-right2'>
+        <span class="strong">100% </span>
+        <span class="quiet">Statements</span>
+        <span class='fraction'>3/3</span>
+      </div>
+      <div class='fl pad1y space-right2'>
+        <span class="strong">100% </span>
+        <span class="quiet">Branches</span>
+        <span class='fraction'>0/0</span>
+      </div>
+      <div class='fl pad1y space-right2'>
+        <span class="strong">100% </span>
+        <span class="quiet">Functions</span>
+        <span class='fraction'>1/1</span>
+      </div>
+      <div class='fl pad1y space-right2'>
+        <span class="strong">100% </span>
+        <span class="quiet">Lines</span>
+        <span class='fraction'>3/3</span>
+      </div>
+    </div>
+  </div>
+  <div class='status-line high'></div>
+<div class="pad1">
+<table class="coverage-summary">
+<thead>
+<tr>
+   <th data-col="file" data-fmt="html" data-html="true" class="file">File</th>
+   <th data-col="pic" data-type="number" data-fmt="html" data-html="true" class="pic"></th>
+   <th data-col="statements" data-type="number" data-fmt="pct" class="pct">Statements</th>
+   <th data-col="statements_raw" data-type="number" data-fmt="html" class="abs"></th>
+   <th data-col="branches" data-type="number" data-fmt="pct" class="pct">Branches</th>
+   <th data-col="branches_raw" data-type="number" data-fmt="html" class="abs"></th>
+   <th data-col="functions" data-type="number" data-fmt="pct" class="pct">Functions</th>
+   <th data-col="functions_raw" data-type="number" data-fmt="html" class="abs"></th>
+   <th data-col="lines" data-type="number" data-fmt="pct" class="pct">Lines</th>
+   <th data-col="lines_raw" data-type="number" data-fmt="html" class="abs"></th>
+</tr>
+</thead>
+<tbody><tr>
+	<td class="file high" data-value="assets/"><a href="assets/index.html">assets/</a></td>
+	<td data-value="100" class="pic high"><div class="chart"><div class="cover-fill cover-full" style="width: 100%;"></div><div class="cover-empty" style="width:0%;"></div></div></td>
+	<td data-value="100" class="pct high">100%</td>
+	<td data-value="3" class="abs high">3/3</td>
+	<td data-value="100" class="pct high">100%</td>
+	<td data-value="0" class="abs high">0/0</td>
+	<td data-value="100" class="pct high">100%</td>
+	<td data-value="1" class="abs high">1/1</td>
+	<td data-value="100" class="pct high">100%</td>
+	<td data-value="3" class="abs high">3/3</td>
+	</tr>
+
+</tbody>
+</table>
+</div><div class='push'></div><!-- for sticky footer -->
+</div><!-- /wrapper -->
+<div class='footer quiet pad2 space-top1 center small'>
+  Code coverage
+  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Feb 09 2016 05:39:17 GMT+0100 (CET)
+</div>
+</div>
+<script src="prettify.js"></script>
+<script>
+window.onload = function () {
+        if (typeof prettyPrint === 'function') {
+            prettyPrint();
+        }
+};
+</script>
+<script src="sorter.js"></script>
+</body>
+</html>

test/assets/coverage/lcov-report/prettify.css

@@ -0,0 +1 @@
+.pln{color:#000}@media screen{.str{color:#080}.kwd{color:#008}.com{color:#800}.typ{color:#606}.lit{color:#066}.pun,.opn,.clo{color:#660}.tag{color:#008}.atn{color:#606}.atv{color:#080}.dec,.var{color:#606}.fun{color:red}}@media print,projection{.str{color:#060}.kwd{color:#006;font-weight:bold}.com{color:#600;font-style:italic}.typ{color:#404;font-weight:bold}.lit{color:#044}.pun,.opn,.clo{color:#440}.tag{color:#006;font-weight:bold}.atn{color:#404}.atv{color:#060}}pre.prettyprint{padding:2px;border:1px solid #888}ol.linenums{margin-top:0;margin-bottom:0}li.L0,li.L1,li.L2,li.L3,li.L5,li.L6,li.L7,li.L8{list-style-type:none}li.L1,li.L3,li.L5,li.L7,li.L9{background:#eee}

test/assets/coverage/lcov-report/sorter.js

@@ -0,0 +1,158 @@
+var addSorting = (function () {
+    "use strict";
+    var cols,
+        currentSort = {
+            index: 0,
+            desc: false
+        };
+
+    // returns the summary table element
+    function getTable() { return document.querySelector('.coverage-summary'); }
+    // returns the thead element of the summary table
+    function getTableHeader() { return getTable().querySelector('thead tr'); }
+    // returns the tbody element of the summary table
+    function getTableBody() { return getTable().querySelector('tbody'); }
+    // returns the th element for nth column
+    function getNthColumn(n) { return getTableHeader().querySelectorAll('th')[n]; }
+
+    // loads all columns
+    function loadColumns() {
+        var colNodes = getTableHeader().querySelectorAll('th'),
+            colNode,
+            cols = [],
+            col,
+            i;
+
+        for (i = 0; i < colNodes.length; i += 1) {
+            colNode = colNodes[i];
+            col = {
+                key: colNode.getAttribute('data-col'),
+                sortable: !colNode.getAttribute('data-nosort'),
+                type: colNode.getAttribute('data-type') || 'string'
+            };
+            cols.push(col);
+            if (col.sortable) {
+                col.defaultDescSort = col.type === 'number';
+                colNode.innerHTML = colNode.innerHTML + '<span class="sorter"></span>';
+            }
+        }
+        return cols;
+    }
+    // attaches a data attribute to every tr element with an object
+    // of data values keyed by column name
+    function loadRowData(tableRow) {
+        var tableCols = tableRow.querySelectorAll('td'),
+            colNode,
+            col,
+            data = {},
+            i,
+            val;
+        for (i = 0; i < tableCols.length; i += 1) {
+            colNode = tableCols[i];
+            col = cols[i];
+            val = colNode.getAttribute('data-value');
+            if (col.type === 'number') {
+                val = Number(val);
+            }
+            data[col.key] = val;
+        }
+        return data;
+    }
+    // loads all row data
+    function loadData() {
+        var rows = getTableBody().querySelectorAll('tr'),
+            i;
+
+        for (i = 0; i < rows.length; i += 1) {
+            rows[i].data = loadRowData(rows[i]);
+        }
+    }
+    // sorts the table using the data for the ith column
+    function sortByIndex(index, desc) {
+        var key = cols[index].key,
+            sorter = function (a, b) {
+                a = a.data[key];
+                b = b.data[key];
+                return a < b ? -1 : a > b ? 1 : 0;
+            },
+            finalSorter = sorter,
+            tableBody = document.querySelector('.coverage-summary tbody'),
+            rowNodes = tableBody.querySelectorAll('tr'),
+            rows = [],
+            i;
+
+        if (desc) {
+            finalSorter = function (a, b) {
+                return -1 * sorter(a, b);
+            };
+        }
+
+        for (i = 0; i < rowNodes.length; i += 1) {
+            rows.push(rowNodes[i]);
+            tableBody.removeChild(rowNodes[i]);
+        }
+
+        rows.sort(finalSorter);
+
+        for (i = 0; i < rows.length; i += 1) {
+            tableBody.appendChild(rows[i]);
+        }
+    }
+    // removes sort indicators for current column being sorted
+    function removeSortIndicators() {
+        var col = getNthColumn(currentSort.index),
+            cls = col.className;
+
+        cls = cls.replace(/ sorted$/, '').replace(/ sorted-desc$/, '');
+        col.className = cls;
+    }
+    // adds sort indicators for current column being sorted
+    function addSortIndicators() {
+        getNthColumn(currentSort.index).className += currentSort.desc ? ' sorted-desc' : ' sorted';
+    }
+    // adds event listeners for all sorter widgets
+    function enableUI() {
+        var i,
+            el,
+            ithSorter = function ithSorter(i) {
+                var col = cols[i];
+
+                return function () {
+                    var desc = col.defaultDescSort;
+
+                    if (currentSort.index === i) {
+                        desc = !currentSort.desc;
+                    }
+                    sortByIndex(i, desc);
+                    removeSortIndicators();
+                    currentSort.index = i;
+                    currentSort.desc = desc;
+                    addSortIndicators();
+                };
+            };
+        for (i =0 ; i < cols.length; i += 1) {
+            if (cols[i].sortable) {
+                // add the click event handler on the th so users
+                // dont have to click on those tiny arrows
+                el = getNthColumn(i).querySelector('.sorter').parentElement;
+                if (el.addEventListener) {
+                    el.addEventListener('click', ithSorter(i));
+                } else {
+                    el.attachEvent('onclick', ithSorter(i));
+                }
+            }
+        }
+    }
+    // adds sorting functionality to the UI
+    return function () {
+        if (!getTable()) {
+            return;
+        }
+        cols = loadColumns();
+        loadData(cols);
+        addSortIndicators();
+        enableUI();
+    };
+})();
+
+window.addEventListener('load', addSorting);

test/assets/coverage/lcov.info

@@ -0,0 +1,14 @@
+TN:
+SF:/Users/philkunz/github/pushrocks/npmts/test/assets/index.js
+FN:5,(anonymous_1)
+FNF:1
+FNH:1
+FNDA:1,(anonymous_1)
+DA:4,1
+DA:6,1
+DA:9,1
+LF:3
+LH:3
+BRF:0
+BRH:0
+end_of_record

test/assets/custom.d.ts

@@ -1 +0,0 @@
-declare var hello: string;

test/assets/custom.js

@@ -1,3 +0,0 @@
-#!/usr/bin/env node
-
-var hello = "hello";

test/assets/index.d.ts

@@ -0,0 +1,4 @@
+/// <reference path="ts/typings/main.d.ts" />
+declare var testplugin: {
+    logSomething: () => void;
+};

test/assets/index.js

@@ -1,5 +1,9 @@
 #!/usr/bin/env node
 
-(function () {
+/// <reference path="./typings/main.d.ts" />
-    console.log("test");
+var testplugin = {
-}());
+    logSomething: function () {
+        console.log("only function executed");
+    }
+};
+module.exports = testplugin;

test/assets/npmts.json

@@ -1,5 +1,5 @@
 {
-  "mode":"custom",
+  "mode":"default",
   "ts":{
     "./customdir/*.ts":"./"
   },

test/assets/test/test.js

@@ -1 +1,10 @@
+/// <reference path="./typings/main.d.ts" />
 console.log("**** starting test ****");
+var testplugin = require("../index.js");
+describe("testplugins", function () {
+    describe(".logSomething", function () {
+        it("should log something", function () {
+            testplugin.logSomething();
+        });
+    });
+});

test/assets/ts/index.js

@@ -1,4 +1,8 @@
-(function () {
+/// <reference path="./typings/main.d.ts" />
-    console.log("test");
+var testplugin = {
-}());
+    logSomething: function () {
+        console.log("only function executed");
+    }
+};
+module.exports = testplugin;
 //# sourceMappingURL=index.js.map

test/assets/ts/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA,CAAC;IACG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;AACvB,CAAC,EAAE,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA,4CAA4C;AAC5C,IAAI,UAAU,GAAG;IACb,YAAY,EAAE;QACV,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;IAC1C,CAAC;CACJ,CAAC;AACF,MAAM,CAAC,OAAO,GAAG,UAAU,CAAC"}

test/assets/ts/index.ts

@@ -1,3 +1,7 @@
-(function(){
+/// <reference path="./typings/main.d.ts" />
-    console.log("test")
+var testplugin = {
-}());
+    logSomething: function(){
+        console.log("only function executed");
+    }
+};
+module.exports = testplugin;

test/assets/ts/test.js

@@ -1,2 +1,11 @@
+/// <reference path="./typings/main.d.ts" />
 console.log("**** starting test ****");
+var testplugin = require("../index.js");
+describe("testplugins", function () {
+    describe(".logSomething", function () {
+        it("should log something", function () {
+            testplugin.logSomething();
+        });
+    });
+});
 //# sourceMappingURL=test.js.map

test/assets/ts/test.js.map

@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC"}
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":"AAAA,4CAA4C;AAC5C,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;AACvC,IAAI,UAAU,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;AACxC,QAAQ,CAAC,aAAa,EAAC;IACnB,QAAQ,CAAC,eAAe,EAAC;QACrB,EAAE,CAAC,sBAAsB,EAAC;YACtB,UAAU,CAAC,YAAY,EAAE,CAAA;QAC7B,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}

test/assets/ts/test.ts

@@ -1 +1,10 @@
+/// <reference path="./typings/main.d.ts" />
 console.log("**** starting test ****");
+var testplugin = require("../index.js");
+describe("testplugins",function(){
+    describe(".logSomething",function(){
+        it("should log something",function(){
+            testplugin.logSomething()
+        });
+    });
+});

ts/index.ts

@@ -2,9 +2,9 @@
 /// <reference path="./npmts.plugins.ts" />
 /// <reference path="./npmts.cli.ts" />
 /// <reference path="./npmts.paths.ts" />
+/// <reference path="./npmts.configfile.ts" />
 /// <reference path="./npmts.options.ts" />
-/// <reference path="./npmts.custom.ts" />
+/// <reference path="./npmts.compile.ts" />
-/// <reference path="./npmts.default.ts" />
 /// <reference path="./npmts.tests.ts" />
 /// <reference path="./npmts.promisechain.ts" />
 console.log("**** starting NPMTS ****")

ts/npmts.compile.ts

@@ -0,0 +1,93 @@
+/// <reference path="./index.ts" />
+module NpmtsCompile {
+    export var run = function(configArg){
+        var done = plugins.q.defer();
+        var config = configArg;
+        plugins.beautylog.log("now running custom tasks");
+        var moduleStream = plugins.mergeStream({end: false});
+        /* -------------------------------------------------
+         * ----------- first install typings ---------------
+         * ----------------------------------------------- */
+        var typingsDone = plugins.q.defer();
+        var typingsCounter:number = 0;
+        var typingsCounterAdvance = function(){
+            typingsCounter++;
+            if(typeof config.typings[typingsCounter] != "undefined"){
+                installTypings();
+            } else {
+                plugins.beautylog.success("custom typings installed successfully");
+                typingsDone.resolve();
+            }
+        };
+        var installTypings = function() {
+            plugins.beautylog.log("now installing " + "typings.json".yellow + " from " + config.typings[typingsCounter].blue);
+            plugins.typings.install({production: false, cwd: plugins.path.join(paths.cwd,config.typings[typingsCounter])})
+                .then(function(){
+                    typingsCounterAdvance();
+                },function(){
+                    plugins.beautylog.error("something went wrong: Check if path is correct: " + config.typings[typingsCounter].blue);
+                    typingsCounterAdvance();
+                });
+        };
+        installTypings();
+        /* -------------------------------------------------
+         * ----------- second compile TS -------------------
+         * ----------------------------------------------- */
+        typingsDone.promise.then(function(){
+            for (var key in config.ts) {
+                plugins.beautylog.log("now compiling" + key.blue);
+                var outputPathIsDir:boolean;
+                try {
+                    if(plugins.fs.statSync(plugins.path.join(paths.cwd,config.ts[key])).isDirectory()){
+                        outputPathIsDir = true;
+                    }
+                }
+                catch(err) {
+                    outputPathIsDir = false;
+                }
+                //do some evaluation of the environment
+                var outputNameSpecified:boolean = (
+                    !outputPathIsDir
+                    && (plugins.path.extname(config.ts[key]) == ".js")
+                );
+                var outputName = (function(){
+                    if(outputNameSpecified){
+                        return plugins.path.basename(config.ts[key])
+                    } else {
+                        return undefined
+                    }
+                })();
+                var outputDir = (function(){
+                    if(outputNameSpecified){
+                        return plugins.path.dirname(
+                            plugins.path.join(paths.cwd,config.ts[key])
+                        )
+                    } else {
+                        return plugins.path.join(paths.cwd,config.ts[key])
+                    }
+                })();
+
+                var tsStream = plugins.gulp.src(plugins.path.join(paths.cwd,key))
+                    .pipe(plugins.g.typescript({
+                        out: outputName,
+                        declaration: true
+                    }));
+                var stream = plugins.mergeStream([
+                    tsStream.dts.pipe(plugins.gulp.dest(outputDir)),
+                    tsStream.js
+                        .pipe(plugins.g.insert.prepend('#!/usr/bin/env node\n\n'))
+                        .pipe(plugins.gulp.dest(outputDir))
+                ]);
+                moduleStream.add(stream);
+            }
+            moduleStream.on("queueDrain",function(){
+                plugins.beautylog.success("custom TypeScript installed successfully");
+                moduleStream.on("finish",function(){
+                    done.resolve();
+                });
+                moduleStream.end();
+            });
+        });
+        return done.promise;
+    }
+}

ts/npmts.configfile.ts

@@ -0,0 +1,26 @@
+/// <reference path="./index.ts" />
+module NpmtsConfigFile {
+    export var run = function(){
+        var done = plugins.q.defer();
+        var config:any = {};
+        var configPath = plugins.path.join(paths.cwd,"npmts.json");
+        if(plugins.smartfile.checks.fileExistsSync(configPath)){
+            plugins.beautylog.info("npmts.json".blue + " config file found!");
+            config = plugins.smartfile.readFileToObject(configPath);
+            switch (config.mode){
+                case "default":
+                case "custom":
+                    plugins.beautylog.log("mode is " + config.mode.yellow);
+                    done.resolve(config);
+                    break;
+                default:
+                    plugins.beautylog.error("mode " + config.mode.yellow + " not recognised!".red);
+            };
+        } else {
+            plugins.beautylog.log("no config file found: so mode is " + "default".yellow);
+            config.mode = "default";
+            done.resolve(config);
+        };
+        return done.promise;
+    }
+}

ts/npmts.custom.ts

@@ -1,95 +0,0 @@
-/// <reference path="./index.ts" />
-module NpmtsCustom {
-    export var run = function(){
-        var done = plugins.q.defer();
-        var config = NpmtsOptions.config;
-        if(config.mode === "custom"){
-            plugins.beautylog.log("now running custom tasks");
-            var moduleStream = plugins.mergeStream({end: false});
-            /* -------------------------------------------------
-             * ----------- first install typings ---------------
-             * ----------------------------------------------- */
-            var typingsDone = plugins.q.defer();
-            var typingsCounter:number = 0;
-            var typingsCounterAdvance = function(){
-                typingsCounter++;
-                if(typeof config.typings[typingsCounter] != "undefined"){
-                    installTypings();
-                } else {
-                    plugins.beautylog.success("custom typings installed successfully");
-                    typingsDone.resolve();
-                }
-            };
-            var installTypings = function() {
-                plugins.beautylog.log("now installing " + "typings.json".yellow + " from " + config.typings[typingsCounter].blue);
-                plugins.typings.install({production: false, cwd: plugins.path.join(paths.cwd,config.typings[typingsCounter])})
-                    .then(function(){
-                        typingsCounterAdvance();
-                    },function(){
-                        plugins.beautylog.error("something went wrong: Check if path is correct: " + config.typings[typingsCounter].blue);
-                        typingsCounterAdvance();
-                    });
-            };
-            installTypings();
-            /* -------------------------------------------------
-             * ----------- second compile TS -------------------
-             * ----------------------------------------------- */
-            typingsDone.promise.then(function(){
-                for (var key in config.ts) {
-                    plugins.beautylog.log("now compiling" + key.blue);
-                    var outputPathIsDir:boolean;
-                    try {
-                        if(plugins.fs.statSync(plugins.path.join(paths.cwd,config.ts[key])).isDirectory()){
-                            outputPathIsDir = true;
-                        }
-                    }
-                    catch(err) {
-                        outputPathIsDir = false;
-                    }
-                    //do some evaluation of the environment
-                    var outputNameSpecified:boolean = (
-                        !outputPathIsDir
-                        && (plugins.path.extname(config.ts[key]) == ".js")
-                    );
-                    var outputName = (function(){
-                        if(outputNameSpecified){
-                            return plugins.path.basename(config.ts[key])
-                        } else {
-                            return undefined
-                        }
-                    })();
-                    var outputDir = (function(){
-                        if(outputNameSpecified){
-                            return plugins.path.dirname(
-                                plugins.path.join(paths.cwd,config.ts[key])
-                            )
-                        } else {
-                            return plugins.path.join(paths.cwd,config.ts[key])
-                        }
-                    })();
-
-                    var tsStream = plugins.gulp.src(plugins.path.join(paths.cwd,key))
-                        .pipe(plugins.g.typescript({
-                            out: outputName,
-                            declaration: true
-                        }));
-                    var stream = plugins.mergeStream([
-                        tsStream.dts.pipe(plugins.gulp.dest(outputDir)),
-                        tsStream.js
-                            .pipe(plugins.g.insert.prepend('#!/usr/bin/env node\n\n'))
-                            .pipe(plugins.gulp.dest(outputDir))
-                    ]);
-                    moduleStream.add(stream);
-                }
-                moduleStream.on("queueDrain",function(){
-                    plugins.beautylog.success("custom TypeScript installed successfully");
-                    moduleStream.on("finish",function(){
-                        done.resolve();
-                    });
-                    moduleStream.end();
-                });
-            });
-        }
-        return done.promise;
-    }
-}

ts/npmts.default.ts

@@ -1,58 +0,0 @@
-/// <reference path="./index.ts" />
-
-module NpmtsDefault {
-    export var run = function() {
-        var done = plugins.q.defer();
-        plugins.gulp.task("defaultTypings",function(cb){
-            plugins.beautylog.log("now installing default typings");
-            plugins.typings.install({production: false, cwd: paths.tsDir})
-                .then(function(){
-                    cb();
-                });
-        });
-        plugins.gulp.task("defaultIndexTS", function(){
-            plugins.beautylog.log("now compiling" + " ts/index.ts".blue);
-            var tsResult = plugins.gulp.src(paths.indexTS)
-                .pipe(plugins.g.typescript({
-                    out:"./index.js",
-                    declaration:true
-                }));
-
-            return plugins.mergeStream([
-                tsResult.dts.pipe(plugins.gulp.dest(paths.cwd)),
-                tsResult.js
-                    .pipe(plugins.g.insert.prepend('#!/usr/bin/env node\n\n'))
-                    .pipe(plugins.gulp.dest(paths.cwd))
-            ]);
-        });
-
-        plugins.gulp.task("defaultTestTS", function(){
-            plugins.beautylog.log("now compiling" + " ts/test.ts".blue);
-            var stream = plugins.gulp.src(paths.testTS)
-                .pipe(plugins.g.typescript({
-                    out: "test.js"
-                }))
-                .pipe(plugins.gulp.dest(paths.testDir));
-            return stream;
-        });
-
-        plugins.gulp.task("defaultCleanup",function(cb){
-            plugins.beautylog.success("default TypeScript for this module compiled successfully.");
-            done.resolve();
-            cb();
-        });
-
-        plugins.gulp.task("default",function(cb){
-            if(NpmtsOptions.config.mode == "default"){
-                plugins.g.sequence("defaultTypings","defaultIndexTS","defaultTestTS","defaultCleanup",cb);
-            } else {
-                cb();
-                done.resolve();
-            }
-
-        });
-
-        plugins.gulp.start.apply(plugins.gulp, ['default']);
-        return done.promise;
-    }
-}

ts/npmts.options.ts

@@ -1,29 +1,20 @@
 /// <reference path="./index.ts" />
 module NpmtsOptions {
-    export var config:any = {};
+    export var run = function(configArg){
-    export var run = function(){
         var done = plugins.q.defer();
-        var configPath = plugins.path.join(paths.cwd,"npmts.json");
+        var config = configArg;
-        if(plugins.smartfile.checks.fileExistsSync(configPath)){
+        if (config.mode == "default"){
-            plugins.beautylog.info("npmts.json".blue + " config file found!");
+            config.typings = [
-            config = plugins.smartfile.readFileToObject(configPath);
+                "./ts/"
-            switch (config.mode){
+            ];
-                case "default":
+            config.ts = {
-                    plugins.beautylog.log("mode is " + config.mode.yellow);
+                ["./ts/index.ts"]: "./index.js"
-                    done.resolve();
-                    break;
-                case "custom":
-                    plugins.beautylog.log("mode is " + config.mode.yellow);
-                    done.resolve();
-                    break;
-                default:
-                    plugins.beautylog.error("mode " + config.mode.yellow + " not recognised!".red);
             };
+            config.test = ["./index.js"];
+            done.resolve(config);
         } else {
-            plugins.beautylog.log("no config file found: so mode is " + "default".yellow);
+            done.resolve(config);
-            config.mode = "default";
+        }
-            done.resolve();
-        };
         return done.promise;
     }
 }

ts/npmts.plugins.ts

@@ -6,14 +6,16 @@ module NpmtsPlugins {
             fs: require("fs-extra"),
             gulp: require("gulp"),
             g: {
+                coveralls: require("gulp-coveralls"),
+                if: require("gulp-if"),
                 insert: require("gulp-insert"),
+                istanbul: require("gulp-istanbul"),
+                mocha: require("gulp-mocha"),
                 sequence: require("gulp-sequence"),
                 typescript: require("gulp-typescript")
 
             },
-            mathjs: require("mathjs"),
             mergeStream: require("merge2"),
-            mocha: require("mocha"),
             path: require("path"),
             q:require("q"),
             smartcli: require("smartcli"),

ts/npmts.promisechain.ts

@@ -2,9 +2,9 @@
 module NpmtsPromisechain {
     export var init = function(){
         var promisechain;
-        NpmtsOptions.run()
+        NpmtsConfigFile.run()
-            .then(NpmtsDefault.run)
+            .then(NpmtsOptions.run)
-            .then(NpmtsCustom.run)
+            .then(NpmtsCompile.run)
             .then(NpmtsTests.run);
         return promisechain;
     }

ts/npmts.tests.ts

@@ -2,18 +2,38 @@
 module NpmtsTests {
     export var run = function() {
         var done = plugins.q.defer();
-        plugins.fs.ensureDirSync(paths.testDir); //make sure that mocha has a directory to look for tests
-        plugins.beautylog.info("Now running mocha tests");
 
-        var mocha = new plugins.mocha(); // Instantiate a Mocha instance.
+        plugins.gulp.task('istanbul', function () {
-        mocha.addFile(
+            return plugins.gulp.src([plugins.path.join(paths.cwd,"index.js")])
-            plugins.path.join(paths.testDir, "test.js")
+                // Covering files
-        );
+                .pipe(plugins.g.istanbul())
-        mocha.run(function(failures){
+                // Force `require` to return covered files
-            process.on('exit', function () {
+                .pipe(plugins.g.istanbul.hookRequire());
-                process.exit(failures);
-            });
         });
+
+        plugins.gulp.task('mocha', function () {
+            return plugins.gulp.src(['test/test.js'])
+                .pipe(plugins.g.mocha())
+                // Creating the reports after tests ran
+                .pipe(plugins.g.istanbul.writeReports())
+                // Enforce a coverage of at least 90%
+                .pipe(plugins.g.istanbul.enforceThresholds({ thresholds: { global: 90 } }));
+        });
+
+        plugins.gulp.task("coveralls",function(){
+            return plugins.gulp.src('coverage/**/lcov.info')
+                .pipe(plugins.g.if(
+                    process.env.TRAVIS,
+                    plugins.g.coveralls()
+                ));
+        });
+
+        plugins.gulp.task("test",function(){
+            plugins.g.sequence("istanbul","mocha","coveralls",function(){
+                done.resolve();
+            })
+        });
+        plugins.gulp.start.apply(plugins.gulp, ['test']);
         return done.promise;
     }
 }