diff --git a/index.d.ts b/index.d.ts index 1fc7df5..1dde104 100644 --- a/index.d.ts +++ b/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: () => any; + var run: (configArg: any) => any; } -declare module NpmtsCustom { - var run: () => any; -} -declare module NpmtsDefault { - var run: () => any; +declare module NpmtsCompile { + var run: (configArg: any) => 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; diff --git a/index.js b/index.js index 98449f8..9463da9 100644 --- a/index.js +++ b/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 = {})); /// -var NpmtsOptions; -(function (NpmtsOptions) { - NpmtsOptions.config = {}; - NpmtsOptions.run = function () { +var NpmtsConfigFile; +(function (NpmtsConfigFile) { + NpmtsConfigFile.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); - switch (NpmtsOptions.config.mode) { + config = plugins.smartfile.readFileToObject(configPath); + 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); - done.resolve(); + plugins.beautylog.log("mode is " + config.mode.yellow); + 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"; - done.resolve(); + config.mode = "default"; + done.resolve(config); } ; return done.promise; }; -})(NpmtsOptions || (NpmtsOptions = {})); +})(NpmtsConfigFile || (NpmtsConfigFile = {})); /// -var NpmtsCustom; -(function (NpmtsCustom) { - NpmtsCustom.run = function () { +var NpmtsOptions; +(function (NpmtsOptions) { + NpmtsOptions.run = function (configArg) { 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 = 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; - 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(); - }); - }); + var config = configArg; + if (config.mode == "default") { + config.typings = [ + "./ts/" + ]; + config.ts = (_a = {}, + _a["./ts/index.ts"] = "./index.js", + _a + ); + config.test = ["./index.js"]; + done.resolve(config); + } + else { + done.resolve(config); } return done.promise; + var _a; }; -})(NpmtsCustom || (NpmtsCustom = {})); +})(NpmtsOptions || (NpmtsOptions = {})); /// -var NpmtsDefault; -(function (NpmtsDefault) { - NpmtsDefault.run = function () { +var NpmtsCompile; +(function (NpmtsCompile) { + NpmtsCompile.run = function (configArg) { 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); + 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 = 0; + var typingsCounterAdvance = function () { + typingsCounter++; + if (typeof config.typings[typingsCounter] != "undefined") { + installTypings(); } else { - cb(); - done.resolve(); + 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(); + }); }); - plugins.gulp.start.apply(plugins.gulp, ['default']); return done.promise; }; -})(NpmtsDefault || (NpmtsDefault = {})); +})(NpmtsCompile || (NpmtsCompile = {})); /// 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.beautylog.info("Now running mocha tests"); - var mocha = new plugins.mocha(); // Instantiate a Mocha instance. - mocha.addFile(plugins.path.join(paths.testDir, "test.js")); - mocha.run(function (failures) { - process.on('exit', function () { - process.exit(failures); + plugins.gulp.task('istanbul', function () { + return plugins.gulp.src([plugins.path.join(paths.cwd, "index.js")]) + .pipe(plugins.g.istanbul()) + .pipe(plugins.g.istanbul.hookRequire()); + }); + plugins.gulp.task('mocha', function () { + 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() - .then(NpmtsDefault.run) - .then(NpmtsCustom.run) + NpmtsConfigFile.run() + .then(NpmtsOptions.run) + .then(NpmtsCompile.run) .then(NpmtsTests.run); return promisechain; }; @@ -252,9 +232,9 @@ var NpmtsPromisechain; /// /// /// +/// /// -/// -/// +/// /// /// console.log("**** starting NPMTS ****"); diff --git a/package.json b/package.json index 15d1d70..c1d98f4 100644 --- a/package.json +++ b/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", diff --git a/test/assets/coverage/coverage-final.json b/test/assets/coverage/coverage-final.json new file mode 100644 index 0000000..cbb0d9c --- /dev/null +++ b/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}}} diff --git a/test/assets/coverage/lcov-report/assets/index.html b/test/assets/coverage/lcov-report/assets/index.html new file mode 100644 index 0000000..c91f616 --- /dev/null +++ b/test/assets/coverage/lcov-report/assets/index.html @@ -0,0 +1,93 @@ + + + + Code coverage report for assets/ + + + + + + + +
+
+

+ all files assets/ +

+
+
+ 100% + Statements + 3/3 +
+
+ 100% + Branches + 0/0 +
+
+ 100% + Functions + 1/1 +
+
+ 100% + Lines + 3/3 +
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
FileStatementsBranchesFunctionsLines
index.js
100%3/3100%0/0100%1/1100%3/3
+
+
+
+ Code coverage + generated by istanbul at Tue Feb 09 2016 05:39:17 GMT+0100 (CET) +
+ + + + + + diff --git a/test/assets/coverage/lcov-report/assets/index.js.html b/test/assets/coverage/lcov-report/assets/index.js.html new file mode 100644 index 0000000..85cc6ba --- /dev/null +++ b/test/assets/coverage/lcov-report/assets/index.js.html @@ -0,0 +1,92 @@ + + + + Code coverage report for assets/index.js + + + + + + + +
+
+

+ all files / assets/ index.js +

+
+
+ 100% + Statements + 3/3 +
+
+ 100% + Branches + 0/0 +
+
+ 100% + Functions + 1/1 +
+
+ 100% + Lines + 3/3 +
+
+
+
+

+
+
1
+2
+3
+4
+5
+6
+7
+8
+9
+10 
+ 
+ 
+1×
+ 
+1×
+ 
+ 
+1×
+ 
#!/usr/bin/env node
+ 
+/// <reference path="./typings/main.d.ts" />
+var testplugin = {
+    logSomething: function () {
+        console.log("only function executed");
+    }
+};
+module.exports = testplugin;
+ 
+
+
+
+ Code coverage + generated by istanbul at Tue Feb 09 2016 05:39:17 GMT+0100 (CET) +
+ + + + + + diff --git a/test/assets/coverage/lcov-report/base.css b/test/assets/coverage/lcov-report/base.css new file mode 100644 index 0000000..0c0571d --- /dev/null +++ b/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; +} diff --git a/test/assets/coverage/lcov-report/index.html b/test/assets/coverage/lcov-report/index.html new file mode 100644 index 0000000..04cc333 --- /dev/null +++ b/test/assets/coverage/lcov-report/index.html @@ -0,0 +1,93 @@ + + + + Code coverage report for All files + + + + + + + +
+
+

+ / +

+
+
+ 100% + Statements + 3/3 +
+
+ 100% + Branches + 0/0 +
+
+ 100% + Functions + 1/1 +
+
+ 100% + Lines + 3/3 +
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
FileStatementsBranchesFunctionsLines
assets/
100%3/3100%0/0100%1/1100%3/3
+
+
+
+ Code coverage + generated by istanbul at Tue Feb 09 2016 05:39:17 GMT+0100 (CET) +
+ + + + + + diff --git a/test/assets/coverage/lcov-report/prettify.css b/test/assets/coverage/lcov-report/prettify.css new file mode 100644 index 0000000..b317a7c --- /dev/null +++ b/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} diff --git a/test/assets/coverage/lcov-report/prettify.js b/test/assets/coverage/lcov-report/prettify.js new file mode 100644 index 0000000..ef51e03 --- /dev/null +++ b/test/assets/coverage/lcov-report/prettify.js @@ -0,0 +1 @@ +window.PR_SHOULD_USE_CONTINUATION=true;(function(){var h=["break,continue,do,else,for,if,return,while"];var u=[h,"auto,case,char,const,default,double,enum,extern,float,goto,int,long,register,short,signed,sizeof,static,struct,switch,typedef,union,unsigned,void,volatile"];var p=[u,"catch,class,delete,false,import,new,operator,private,protected,public,this,throw,true,try,typeof"];var l=[p,"alignof,align_union,asm,axiom,bool,concept,concept_map,const_cast,constexpr,decltype,dynamic_cast,explicit,export,friend,inline,late_check,mutable,namespace,nullptr,reinterpret_cast,static_assert,static_cast,template,typeid,typename,using,virtual,where"];var x=[p,"abstract,boolean,byte,extends,final,finally,implements,import,instanceof,null,native,package,strictfp,super,synchronized,throws,transient"];var R=[x,"as,base,by,checked,decimal,delegate,descending,dynamic,event,fixed,foreach,from,group,implicit,in,interface,internal,into,is,lock,object,out,override,orderby,params,partial,readonly,ref,sbyte,sealed,stackalloc,string,select,uint,ulong,unchecked,unsafe,ushort,var"];var r="all,and,by,catch,class,else,extends,false,finally,for,if,in,is,isnt,loop,new,no,not,null,of,off,on,or,return,super,then,true,try,unless,until,when,while,yes";var w=[p,"debugger,eval,export,function,get,null,set,undefined,var,with,Infinity,NaN"];var s="caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END";var I=[h,"and,as,assert,class,def,del,elif,except,exec,finally,from,global,import,in,is,lambda,nonlocal,not,or,pass,print,raise,try,with,yield,False,True,None"];var f=[h,"alias,and,begin,case,class,def,defined,elsif,end,ensure,false,in,module,next,nil,not,or,redo,rescue,retry,self,super,then,true,undef,unless,until,when,yield,BEGIN,END"];var H=[h,"case,done,elif,esac,eval,fi,function,in,local,set,then,until"];var A=[l,R,w,s+I,f,H];var e=/^(DIR|FILE|vector|(de|priority_)?queue|list|stack|(const_)?iterator|(multi)?(set|map)|bitset|u?(int|float)\d*)/;var C="str";var z="kwd";var j="com";var O="typ";var G="lit";var L="pun";var F="pln";var m="tag";var E="dec";var J="src";var P="atn";var n="atv";var N="nocode";var M="(?:^^\\.?|[+-]|\\!|\\!=|\\!==|\\#|\\%|\\%=|&|&&|&&=|&=|\\(|\\*|\\*=|\\+=|\\,|\\-=|\\->|\\/|\\/=|:|::|\\;|<|<<|<<=|<=|=|==|===|>|>=|>>|>>=|>>>|>>>=|\\?|\\@|\\[|\\^|\\^=|\\^\\^|\\^\\^=|\\{|\\||\\|=|\\|\\||\\|\\|=|\\~|break|case|continue|delete|do|else|finally|instanceof|return|throw|try|typeof)\\s*";function k(Z){var ad=0;var S=false;var ac=false;for(var V=0,U=Z.length;V122)){if(!(al<65||ag>90)){af.push([Math.max(65,ag)|32,Math.min(al,90)|32])}if(!(al<97||ag>122)){af.push([Math.max(97,ag)&~32,Math.min(al,122)&~32])}}}}af.sort(function(av,au){return(av[0]-au[0])||(au[1]-av[1])});var ai=[];var ap=[NaN,NaN];for(var ar=0;arat[0]){if(at[1]+1>at[0]){an.push("-")}an.push(T(at[1]))}}an.push("]");return an.join("")}function W(al){var aj=al.source.match(new RegExp("(?:\\[(?:[^\\x5C\\x5D]|\\\\[\\s\\S])*\\]|\\\\u[A-Fa-f0-9]{4}|\\\\x[A-Fa-f0-9]{2}|\\\\[0-9]+|\\\\[^ux0-9]|\\(\\?[:!=]|[\\(\\)\\^]|[^\\x5B\\x5C\\(\\)\\^]+)","g"));var ah=aj.length;var an=[];for(var ak=0,am=0;ak=2&&ai==="["){aj[ak]=X(ag)}else{if(ai!=="\\"){aj[ak]=ag.replace(/[a-zA-Z]/g,function(ao){var ap=ao.charCodeAt(0);return"["+String.fromCharCode(ap&~32,ap|32)+"]"})}}}}return aj.join("")}var aa=[];for(var V=0,U=Z.length;V=0;){S[ac.charAt(ae)]=Y}}var af=Y[1];var aa=""+af;if(!ag.hasOwnProperty(aa)){ah.push(af);ag[aa]=null}}ah.push(/[\0-\uffff]/);V=k(ah)})();var X=T.length;var W=function(ah){var Z=ah.sourceCode,Y=ah.basePos;var ad=[Y,F];var af=0;var an=Z.match(V)||[];var aj={};for(var ae=0,aq=an.length;ae=5&&"lang-"===ap.substring(0,5);if(am&&!(ai&&typeof ai[1]==="string")){am=false;ap=J}if(!am){aj[ag]=ap}}var ab=af;af+=ag.length;if(!am){ad.push(Y+ab,ap)}else{var al=ai[1];var ak=ag.indexOf(al);var ac=ak+al.length;if(ai[2]){ac=ag.length-ai[2].length;ak=ac-al.length}var ar=ap.substring(5);B(Y+ab,ag.substring(0,ak),W,ad);B(Y+ab+ak,al,q(ar,al),ad);B(Y+ab+ac,ag.substring(ac),W,ad)}}ah.decorations=ad};return W}function i(T){var W=[],S=[];if(T.tripleQuotedStrings){W.push([C,/^(?:\'\'\'(?:[^\'\\]|\\[\s\S]|\'{1,2}(?=[^\']))*(?:\'\'\'|$)|\"\"\"(?:[^\"\\]|\\[\s\S]|\"{1,2}(?=[^\"]))*(?:\"\"\"|$)|\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$))/,null,"'\""])}else{if(T.multiLineStrings){W.push([C,/^(?:\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$)|\`(?:[^\\\`]|\\[\s\S])*(?:\`|$))/,null,"'\"`"])}else{W.push([C,/^(?:\'(?:[^\\\'\r\n]|\\.)*(?:\'|$)|\"(?:[^\\\"\r\n]|\\.)*(?:\"|$))/,null,"\"'"])}}if(T.verbatimStrings){S.push([C,/^@\"(?:[^\"]|\"\")*(?:\"|$)/,null])}var Y=T.hashComments;if(Y){if(T.cStyleComments){if(Y>1){W.push([j,/^#(?:##(?:[^#]|#(?!##))*(?:###|$)|.*)/,null,"#"])}else{W.push([j,/^#(?:(?:define|elif|else|endif|error|ifdef|include|ifndef|line|pragma|undef|warning)\b|[^\r\n]*)/,null,"#"])}S.push([C,/^<(?:(?:(?:\.\.\/)*|\/?)(?:[\w-]+(?:\/[\w-]+)+)?[\w-]+\.h|[a-z]\w*)>/,null])}else{W.push([j,/^#[^\r\n]*/,null,"#"])}}if(T.cStyleComments){S.push([j,/^\/\/[^\r\n]*/,null]);S.push([j,/^\/\*[\s\S]*?(?:\*\/|$)/,null])}if(T.regexLiterals){var X=("/(?=[^/*])(?:[^/\\x5B\\x5C]|\\x5C[\\s\\S]|\\x5B(?:[^\\x5C\\x5D]|\\x5C[\\s\\S])*(?:\\x5D|$))+/");S.push(["lang-regex",new RegExp("^"+M+"("+X+")")])}var V=T.types;if(V){S.push([O,V])}var U=(""+T.keywords).replace(/^ | $/g,"");if(U.length){S.push([z,new RegExp("^(?:"+U.replace(/[\s,]+/g,"|")+")\\b"),null])}W.push([F,/^\s+/,null," \r\n\t\xA0"]);S.push([G,/^@[a-z_$][a-z_$@0-9]*/i,null],[O,/^(?:[@_]?[A-Z]+[a-z][A-Za-z_$@0-9]*|\w+_t\b)/,null],[F,/^[a-z_$][a-z_$@0-9]*/i,null],[G,new RegExp("^(?:0x[a-f0-9]+|(?:\\d(?:_\\d+)*\\d*(?:\\.\\d*)?|\\.\\d\\+)(?:e[+\\-]?\\d+)?)[a-z]*","i"),null,"0123456789"],[F,/^\\[\s\S]?/,null],[L,/^.[^\s\w\.$@\'\"\`\/\#\\]*/,null]);return g(W,S)}var K=i({keywords:A,hashComments:true,cStyleComments:true,multiLineStrings:true,regexLiterals:true});function Q(V,ag){var U=/(?:^|\s)nocode(?:\s|$)/;var ab=/\r\n?|\n/;var ac=V.ownerDocument;var S;if(V.currentStyle){S=V.currentStyle.whiteSpace}else{if(window.getComputedStyle){S=ac.defaultView.getComputedStyle(V,null).getPropertyValue("white-space")}}var Z=S&&"pre"===S.substring(0,3);var af=ac.createElement("LI");while(V.firstChild){af.appendChild(V.firstChild)}var W=[af];function ae(al){switch(al.nodeType){case 1:if(U.test(al.className)){break}if("BR"===al.nodeName){ad(al);if(al.parentNode){al.parentNode.removeChild(al)}}else{for(var an=al.firstChild;an;an=an.nextSibling){ae(an)}}break;case 3:case 4:if(Z){var am=al.nodeValue;var aj=am.match(ab);if(aj){var ai=am.substring(0,aj.index);al.nodeValue=ai;var ah=am.substring(aj.index+aj[0].length);if(ah){var ak=al.parentNode;ak.insertBefore(ac.createTextNode(ah),al.nextSibling)}ad(al);if(!ai){al.parentNode.removeChild(al)}}}break}}function ad(ak){while(!ak.nextSibling){ak=ak.parentNode;if(!ak){return}}function ai(al,ar){var aq=ar?al.cloneNode(false):al;var ao=al.parentNode;if(ao){var ap=ai(ao,1);var an=al.nextSibling;ap.appendChild(aq);for(var am=an;am;am=an){an=am.nextSibling;ap.appendChild(am)}}return aq}var ah=ai(ak.nextSibling,0);for(var aj;(aj=ah.parentNode)&&aj.nodeType===1;){ah=aj}W.push(ah)}for(var Y=0;Y=S){ah+=2}if(V>=ap){Z+=2}}}var t={};function c(U,V){for(var S=V.length;--S>=0;){var T=V[S];if(!t.hasOwnProperty(T)){t[T]=U}else{if(window.console){console.warn("cannot override language handler %s",T)}}}}function q(T,S){if(!(T&&t.hasOwnProperty(T))){T=/^\s*]*(?:>|$)/],[j,/^<\!--[\s\S]*?(?:-\->|$)/],["lang-",/^<\?([\s\S]+?)(?:\?>|$)/],["lang-",/^<%([\s\S]+?)(?:%>|$)/],[L,/^(?:<[%?]|[%?]>)/],["lang-",/^]*>([\s\S]+?)<\/xmp\b[^>]*>/i],["lang-js",/^]*>([\s\S]*?)(<\/script\b[^>]*>)/i],["lang-css",/^]*>([\s\S]*?)(<\/style\b[^>]*>)/i],["lang-in.tag",/^(<\/?[a-z][^<>]*>)/i]]),["default-markup","htm","html","mxml","xhtml","xml","xsl"]);c(g([[F,/^[\s]+/,null," \t\r\n"],[n,/^(?:\"[^\"]*\"?|\'[^\']*\'?)/,null,"\"'"]],[[m,/^^<\/?[a-z](?:[\w.:-]*\w)?|\/?>$/i],[P,/^(?!style[\s=]|on)[a-z](?:[\w:-]*\w)?/i],["lang-uq.val",/^=\s*([^>\'\"\s]*(?:[^>\'\"\s\/]|\/(?=\s)))/],[L,/^[=<>\/]+/],["lang-js",/^on\w+\s*=\s*\"([^\"]+)\"/i],["lang-js",/^on\w+\s*=\s*\'([^\']+)\'/i],["lang-js",/^on\w+\s*=\s*([^\"\'>\s]+)/i],["lang-css",/^style\s*=\s*\"([^\"]+)\"/i],["lang-css",/^style\s*=\s*\'([^\']+)\'/i],["lang-css",/^style\s*=\s*([^\"\'>\s]+)/i]]),["in.tag"]);c(g([],[[n,/^[\s\S]+/]]),["uq.val"]);c(i({keywords:l,hashComments:true,cStyleComments:true,types:e}),["c","cc","cpp","cxx","cyc","m"]);c(i({keywords:"null,true,false"}),["json"]);c(i({keywords:R,hashComments:true,cStyleComments:true,verbatimStrings:true,types:e}),["cs"]);c(i({keywords:x,cStyleComments:true}),["java"]);c(i({keywords:H,hashComments:true,multiLineStrings:true}),["bsh","csh","sh"]);c(i({keywords:I,hashComments:true,multiLineStrings:true,tripleQuotedStrings:true}),["cv","py"]);c(i({keywords:s,hashComments:true,multiLineStrings:true,regexLiterals:true}),["perl","pl","pm"]);c(i({keywords:f,hashComments:true,multiLineStrings:true,regexLiterals:true}),["rb"]);c(i({keywords:w,cStyleComments:true,regexLiterals:true}),["js"]);c(i({keywords:r,hashComments:3,cStyleComments:true,multilineStrings:true,tripleQuotedStrings:true,regexLiterals:true}),["coffee"]);c(g([],[[C,/^[\s\S]+/]]),["regex"]);function d(V){var U=V.langExtension;try{var S=a(V.sourceNode);var T=S.sourceCode;V.sourceCode=T;V.spans=S.spans;V.basePos=0;q(U,T)(V);D(V)}catch(W){if("console" in window){console.log(W&&W.stack?W.stack:W)}}}function y(W,V,U){var S=document.createElement("PRE");S.innerHTML=W;if(U){Q(S,U)}var T={langExtension:V,numberLines:U,sourceNode:S};d(T);return S.innerHTML}function b(ad){function Y(af){return document.getElementsByTagName(af)}var ac=[Y("pre"),Y("code"),Y("xmp")];var T=[];for(var aa=0;aa=0){var ah=ai.match(ab);var am;if(!ah&&(am=o(aj))&&"CODE"===am.tagName){ah=am.className.match(ab)}if(ah){ah=ah[1]}var al=false;for(var ak=aj.parentNode;ak;ak=ak.parentNode){if((ak.tagName==="pre"||ak.tagName==="code"||ak.tagName==="xmp")&&ak.className&&ak.className.indexOf("prettyprint")>=0){al=true;break}}if(!al){var af=aj.className.match(/\blinenums\b(?::(\d+))?/);af=af?af[1]&&af[1].length?+af[1]:true:false;if(af){Q(aj,af)}S={langExtension:ah,sourceNode:aj,numberLines:af};d(S)}}}if(X]*(?:>|$)/],[PR.PR_COMMENT,/^<\!--[\s\S]*?(?:-\->|$)/],[PR.PR_PUNCTUATION,/^(?:<[%?]|[%?]>)/],["lang-",/^<\?([\s\S]+?)(?:\?>|$)/],["lang-",/^<%([\s\S]+?)(?:%>|$)/],["lang-",/^]*>([\s\S]+?)<\/xmp\b[^>]*>/i],["lang-handlebars",/^]*type\s*=\s*['"]?text\/x-handlebars-template['"]?\b[^>]*>([\s\S]*?)(<\/script\b[^>]*>)/i],["lang-js",/^]*>([\s\S]*?)(<\/script\b[^>]*>)/i],["lang-css",/^]*>([\s\S]*?)(<\/style\b[^>]*>)/i],["lang-in.tag",/^(<\/?[a-z][^<>]*>)/i],[PR.PR_DECLARATION,/^{{[#^>/]?\s*[\w.][^}]*}}/],[PR.PR_DECLARATION,/^{{&?\s*[\w.][^}]*}}/],[PR.PR_DECLARATION,/^{{{>?\s*[\w.][^}]*}}}/],[PR.PR_COMMENT,/^{{![^}]*}}/]]),["handlebars","hbs"]);PR.registerLangHandler(PR.createSimpleLexer([[PR.PR_PLAIN,/^[ \t\r\n\f]+/,null," \t\r\n\f"]],[[PR.PR_STRING,/^\"(?:[^\n\r\f\\\"]|\\(?:\r\n?|\n|\f)|\\[\s\S])*\"/,null],[PR.PR_STRING,/^\'(?:[^\n\r\f\\\']|\\(?:\r\n?|\n|\f)|\\[\s\S])*\'/,null],["lang-css-str",/^url\(([^\)\"\']*)\)/i],[PR.PR_KEYWORD,/^(?:url|rgb|\!important|@import|@page|@media|@charset|inherit)(?=[^\-\w]|$)/i,null],["lang-css-kw",/^(-?(?:[_a-z]|(?:\\[0-9a-f]+ ?))(?:[_a-z0-9\-]|\\(?:\\[0-9a-f]+ ?))*)\s*:/i],[PR.PR_COMMENT,/^\/\*[^*]*\*+(?:[^\/*][^*]*\*+)*\//],[PR.PR_COMMENT,/^(?:)/],[PR.PR_LITERAL,/^(?:\d+|\d*\.\d+)(?:%|[a-z]+)?/i],[PR.PR_LITERAL,/^#(?:[0-9a-f]{3}){1,2}/i],[PR.PR_PLAIN,/^-?(?:[_a-z]|(?:\\[\da-f]+ ?))(?:[_a-z\d\-]|\\(?:\\[\da-f]+ ?))*/i],[PR.PR_PUNCTUATION,/^[^\s\w\'\"]+/]]),["css"]);PR.registerLangHandler(PR.createSimpleLexer([],[[PR.PR_KEYWORD,/^-?(?:[_a-z]|(?:\\[\da-f]+ ?))(?:[_a-z\d\-]|\\(?:\\[\da-f]+ ?))*/i]]),["css-kw"]);PR.registerLangHandler(PR.createSimpleLexer([],[[PR.PR_STRING,/^[^\)\"\']+/]]),["css-str"]); diff --git a/test/assets/coverage/lcov-report/sort-arrow-sprite.png b/test/assets/coverage/lcov-report/sort-arrow-sprite.png new file mode 100644 index 0000000..03f704a Binary files /dev/null and b/test/assets/coverage/lcov-report/sort-arrow-sprite.png differ diff --git a/test/assets/coverage/lcov-report/sorter.js b/test/assets/coverage/lcov-report/sorter.js new file mode 100644 index 0000000..6c5034e --- /dev/null +++ b/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 + ''; + } + } + 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); diff --git a/test/assets/coverage/lcov.info b/test/assets/coverage/lcov.info new file mode 100644 index 0000000..bf371cb --- /dev/null +++ b/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 diff --git a/test/assets/custom.d.ts b/test/assets/custom.d.ts deleted file mode 100644 index d8c1b2d..0000000 --- a/test/assets/custom.d.ts +++ /dev/null @@ -1 +0,0 @@ -declare var hello: string; diff --git a/test/assets/custom.js b/test/assets/custom.js deleted file mode 100644 index bed1bad..0000000 --- a/test/assets/custom.js +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env node - -var hello = "hello"; diff --git a/test/assets/index.d.ts b/test/assets/index.d.ts index e69de29..a631c78 100644 --- a/test/assets/index.d.ts +++ b/test/assets/index.d.ts @@ -0,0 +1,4 @@ +/// +declare var testplugin: { + logSomething: () => void; +}; diff --git a/test/assets/index.js b/test/assets/index.js index 0ce6740..9ae8e18 100644 --- a/test/assets/index.js +++ b/test/assets/index.js @@ -1,5 +1,9 @@ #!/usr/bin/env node -(function () { - console.log("test"); -}()); +/// +var testplugin = { + logSomething: function () { + console.log("only function executed"); + } +}; +module.exports = testplugin; diff --git a/test/assets/npmts.json b/test/assets/npmts.json index 04fe295..45d9311 100644 --- a/test/assets/npmts.json +++ b/test/assets/npmts.json @@ -1,5 +1,5 @@ { - "mode":"custom", + "mode":"default", "ts":{ "./customdir/*.ts":"./" }, diff --git a/test/assets/test/test.js b/test/assets/test/test.js index 68b07c4..9e11e30 100644 --- a/test/assets/test/test.js +++ b/test/assets/test/test.js @@ -1 +1,10 @@ +/// console.log("**** starting test ****"); +var testplugin = require("../index.js"); +describe("testplugins", function () { + describe(".logSomething", function () { + it("should log something", function () { + testplugin.logSomething(); + }); + }); +}); diff --git a/test/assets/ts/index.js b/test/assets/ts/index.js index f3511ee..3f8ddd7 100644 --- a/test/assets/ts/index.js +++ b/test/assets/ts/index.js @@ -1,4 +1,8 @@ -(function () { - console.log("test"); -}()); +/// +var testplugin = { + logSomething: function () { + console.log("only function executed"); + } +}; +module.exports = testplugin; //# sourceMappingURL=index.js.map \ No newline at end of file diff --git a/test/assets/ts/index.js.map b/test/assets/ts/index.js.map index 10a8e38..c8ff991 100644 --- a/test/assets/ts/index.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/test/assets/ts/index.ts b/test/assets/ts/index.ts index 82f74ec..75b4356 100644 --- a/test/assets/ts/index.ts +++ b/test/assets/ts/index.ts @@ -1,3 +1,7 @@ -(function(){ - console.log("test") -}()); \ No newline at end of file +/// +var testplugin = { + logSomething: function(){ + console.log("only function executed"); + } +}; +module.exports = testplugin; \ No newline at end of file diff --git a/test/assets/ts/test.js b/test/assets/ts/test.js index 9039870..df1e2ae 100644 --- a/test/assets/ts/test.js +++ b/test/assets/ts/test.js @@ -1,2 +1,11 @@ +/// 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 \ No newline at end of file diff --git a/test/assets/ts/test.js.map b/test/assets/ts/test.js.map index eba9974..f03e015 100644 --- a/test/assets/ts/test.js.map +++ b/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"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/test/assets/ts/test.ts b/test/assets/ts/test.ts index 9a2b561..3aed28b 100644 --- a/test/assets/ts/test.ts +++ b/test/assets/ts/test.ts @@ -1 +1,10 @@ -console.log("**** starting test ****"); \ No newline at end of file +/// +console.log("**** starting test ****"); +var testplugin = require("../index.js"); +describe("testplugins",function(){ + describe(".logSomething",function(){ + it("should log something",function(){ + testplugin.logSomething() + }); + }); +}); \ No newline at end of file diff --git a/ts/index.ts b/ts/index.ts index b4ce72d..27b9d4c 100644 --- a/ts/index.ts +++ b/ts/index.ts @@ -2,9 +2,9 @@ /// /// /// +/// /// -/// -/// +/// /// /// console.log("**** starting NPMTS ****") diff --git a/ts/npmts.compile.ts b/ts/npmts.compile.ts new file mode 100644 index 0000000..81a583a --- /dev/null +++ b/ts/npmts.compile.ts @@ -0,0 +1,93 @@ +/// +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; + } +} \ No newline at end of file diff --git a/ts/npmts.configfile.ts b/ts/npmts.configfile.ts new file mode 100644 index 0000000..f97a6f0 --- /dev/null +++ b/ts/npmts.configfile.ts @@ -0,0 +1,26 @@ +/// +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; + } +} \ No newline at end of file diff --git a/ts/npmts.custom.ts b/ts/npmts.custom.ts deleted file mode 100644 index 0b2ba88..0000000 --- a/ts/npmts.custom.ts +++ /dev/null @@ -1,95 +0,0 @@ -/// -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; - } -} \ No newline at end of file diff --git a/ts/npmts.default.ts b/ts/npmts.default.ts deleted file mode 100644 index 7b544ea..0000000 --- a/ts/npmts.default.ts +++ /dev/null @@ -1,58 +0,0 @@ -/// - -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; - } -} diff --git a/ts/npmts.options.ts b/ts/npmts.options.ts index 01a0de3..d271805 100644 --- a/ts/npmts.options.ts +++ b/ts/npmts.options.ts @@ -1,29 +1,20 @@ /// module NpmtsOptions { - export var config:any = {}; - export var run = function(){ + export var run = function(configArg){ var done = plugins.q.defer(); - 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": - plugins.beautylog.log("mode is " + config.mode.yellow); - 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); + var config = configArg; + if (config.mode == "default"){ + config.typings = [ + "./ts/" + ]; + config.ts = { + ["./ts/index.ts"]: "./index.js" }; + config.test = ["./index.js"]; + done.resolve(config); } else { - plugins.beautylog.log("no config file found: so mode is " + "default".yellow); - config.mode = "default"; - done.resolve(); - }; + done.resolve(config); + } return done.promise; } } \ No newline at end of file diff --git a/ts/npmts.plugins.ts b/ts/npmts.plugins.ts index 5e5f7b2..6d12610 100644 --- a/ts/npmts.plugins.ts +++ b/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"), diff --git a/ts/npmts.promisechain.ts b/ts/npmts.promisechain.ts index b74a30e..dd1ff03 100644 --- a/ts/npmts.promisechain.ts +++ b/ts/npmts.promisechain.ts @@ -2,9 +2,9 @@ module NpmtsPromisechain { export var init = function(){ var promisechain; - NpmtsOptions.run() - .then(NpmtsDefault.run) - .then(NpmtsCustom.run) + NpmtsConfigFile.run() + .then(NpmtsOptions.run) + .then(NpmtsCompile.run) .then(NpmtsTests.run); return promisechain; } diff --git a/ts/npmts.tests.ts b/ts/npmts.tests.ts index 2881867..e79ecda 100644 --- a/ts/npmts.tests.ts +++ b/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. - mocha.addFile( - plugins.path.join(paths.testDir, "test.js") - ); - mocha.run(function(failures){ - process.on('exit', function () { - process.exit(failures); - }); + plugins.gulp.task('istanbul', function () { + return plugins.gulp.src([plugins.path.join(paths.cwd,"index.js")]) + // Covering files + .pipe(plugins.g.istanbul()) + // Force `require` to return covered files + .pipe(plugins.g.istanbul.hookRequire()); }); + + 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; } } \ No newline at end of file