git.zone/tscoverage
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improved execution order

Browse Source
This commit is contained in:
Philipp Kunz 2016-03-26 14:08:48 +01:00
parent 48a9d19b8e
commit f0954b19e0
9 changed files with 92 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dist/npmts.jsdoc.js vendored
View File

@ -19,7 +19,7 @@ var genJsdoc = function (configArg) {
}));
return done.promise;
};
var publishDocs = function (configArg) {
exports.publishDocs = function (configArg) {
var done = plugins.Q.defer();
var gitUrl = plugins.projectinfo.npm(paths.cwd, {
gitAccessToken: process.env.GITHUB_TOKEN
@ -48,6 +48,7 @@ var publishDocs = function (configArg) {
done.resolve(configArg);
}
else {
console.log("GitHub documentation has not been uploaded.");
done.resolve(configArg);
}
return done.promise;
@ -55,7 +56,6 @@ var publishDocs = function (configArg) {
exports.run = function (configArg) {
var done = plugins.Q.defer();
genJsdoc(configArg)
.then(publishDocs)
.then(done.resolve);
return done.promise;
};

2
dist/npmts.options.js vendored
View File

@ -7,7 +7,7 @@ exports.isRelease = function () {
};
exports.doPublish = function () {
return exports.isRelease()
&& plugins.smartci.get.subJobNumber() != 1;
&& plugins.smartci.get.subJobNumber() == 1;
};
exports.run = function (configArg) {
var done = plugins.Q.defer();

2
dist/npmts.promisechain.js vendored
View File

@ -8,6 +8,7 @@ var NpmtsConfigFile = require("./npmts.configfile");
var NpmtsInstall = require("./npmts.install");
var NpmtsJsdoc = require("./npmts.jsdoc");
var NpmtsOptions = require("./npmts.options");
var NpmtsPublish = require("./npmts.publish");
var NpmtsTests = require("./npmts.tests");
exports.run = function () {
var promisechain;
@ -19,6 +20,7 @@ exports.run = function () {
.then(NpmtsAssets.run)
.then(NpmtsJsdoc.run)
.then(NpmtsTests.run)
.then(NpmtsPublish.run)
.then(function (configArg) {
var shipString = "" +
"\n" +

15
dist/npmts.publish.js vendored Normal file
View File

@ -0,0 +1,15 @@
"use strict";
/// <reference path="./typings/main.d.ts" />
var plugins = require("./npmts.plugins");
var NpmtsTests = require("./npmts.tests");
var NpmtsJsdoc = require("./npmts.jsdoc");
exports.run = function (configArg) {
var done = plugins.Q.defer();
var config = configArg;
var promiseArray = [];
config.coveralls ? promiseArray.push(NpmtsTests.publishCoverage(configArg)) : void (0);
config.docs.publish ? promiseArray.push(NpmtsJsdoc.publishDocs(configArg)) : void (0);
promiseArray.length === 0 ? plugins.beautylog.info("Did not publish anything!") : void (0);
plugins.Q.all(promiseArray).then(done.resolve());
return done.promise;
};

38
dist/npmts.tests.js vendored
View File

@ -2,6 +2,24 @@
/// <reference path="./typings/main.d.ts" />
var plugins = require("./npmts.plugins");
var paths = require("./npmts.paths");
exports.publishCoverage = function (configArg) {
var done = plugins.Q.defer();
plugins.beautylog.log("now uploading coverage data to coveralls");
var stream = plugins.gulp.src([plugins.path.join(paths.cwd, "./coverage/lcov.info")])
.pipe(plugins.g.coveralls())
.pipe(plugins.g.gFunction([
function () {
var done = plugins.Q.defer();
plugins.beautylog.ok("Coverage data has been uploaded to Coveralls!");
done.resolve();
return done.promise;
}
], "atEnd"));
stream.on("finish", function () {
done.resolve(configArg);
});
return done.promise;
};
exports.run = function (configArg) {
var done = plugins.Q.defer();
var config = configArg;
@ -18,27 +36,11 @@ exports.run = function (configArg) {
.pipe(plugins.g.istanbul.enforceThresholds({ thresholds: { global: 30 } }));
return stream;
};
var coveralls = function () {
plugins.beautylog.log("now uploading coverage data to coveralls");
var stream = plugins.gulp.src([plugins.path.join(paths.cwd, "./coverage/lcov.info")])
.pipe(plugins.g.coveralls())
.pipe(plugins.g.gFunction(function () {
plugins.beautylog.ok("Tests have passed and coverage data has been uploaded to Coveralls!");
}, "atEnd"));
return stream;
};
plugins.beautylog.log("now starting tests");
istanbul().on("finish", function () {
mocha().on("finish", function () {
if (plugins.smartenv.getEnv().isTravis && config.coveralls) {
coveralls().on("finish", function () {
done.resolve(config);
});
}
else {
plugins.beautylog.ok("Tests have passed!");
done.resolve(config);
}
plugins.beautylog.ok("Tests have passed!");
done.resolve(config);
});
});
return done.promise;

18
ts/npmts.jsdoc.ts
View File

@ -2,8 +2,8 @@
import plugins = require("./npmts.plugins");
import paths = require("./npmts.paths");
var genJsdoc = function(configArg){
var done = plugins.Q.defer();
let genJsdoc = function(configArg){
let done = plugins.Q.defer();
plugins.beautylog.log("now generating " + "JsDoc documentation".blue);
plugins.gulp.src([
plugins.path.join(paths.cwd,"README.md"),
@ -20,16 +20,16 @@ var genJsdoc = function(configArg){
return done.promise;
};
var publishDocs = function(configArg){
var done = plugins.Q.defer();
var gitUrl = plugins.projectinfo.npm(
export let publishDocs = function(configArg){
let done = plugins.Q.defer();
let gitUrl = plugins.projectinfo.npm(
paths.cwd,
{
gitAccessToken:process.env.GITHUB_TOKEN
}
).git.httpsUrl;
var deployScript = ""
let deployScript = ""
+ "cd " + paths.docsDir + " "
+ "&& git init " + "> /dev/null 2>&1 "
+ "&& git config user.name \"TRAVIS CI\" " + "> /dev/null 2>&1 "
@ -52,16 +52,16 @@ var publishDocs = function(configArg){
plugins.beautylog.ok("JsDoc documentation has been deployed to GitHub!");
done.resolve(configArg);
} else {
console.log("GitHub documentation has not been uploaded.");
done.resolve(configArg);
}
return done.promise;
};
export var run = function(configArg){
var done = plugins.Q.defer();
export let run = function(configArg){
let done = plugins.Q.defer();
genJsdoc(configArg)
.then(publishDocs)
.then(done.resolve);
return done.promise;
};

2
ts/npmts.promisechain.ts
View File

@ -8,6 +8,7 @@ import NpmtsConfigFile = require("./npmts.configfile");
import NpmtsInstall = require("./npmts.install");
import NpmtsJsdoc = require("./npmts.jsdoc");
import NpmtsOptions = require("./npmts.options");
import NpmtsPublish = require("./npmts.publish");
import NpmtsTests = require("./npmts.tests");
export var run = function(){
@ -20,6 +21,7 @@ export var run = function(){
.then(NpmtsAssets.run)
.then(NpmtsJsdoc.run)
.then(NpmtsTests.run)
.then(NpmtsPublish.run)
.then(function(configArg){
let shipString = "" +
"\n" +

19
ts/npmts.publish.ts Normal file
View File

@ -0,0 +1,19 @@
/// <reference path="./typings/main.d.ts" />
import plugins = require("./npmts.plugins");
import paths = require("./npmts.paths");
import NpmtsTests = require("./npmts.tests");
import NpmtsJsdoc = require("./npmts.jsdoc");
export let run = function(configArg){
let done = plugins.Q.defer();
let config = configArg;
let promiseArray = [];
config.coveralls ? promiseArray.push(NpmtsTests.publishCoverage(configArg)) : void(0);
config.docs.publish ? promiseArray.push(NpmtsJsdoc.publishDocs(configArg)) : void(0);
promiseArray.length === 0 ? plugins.beautylog.info("Did not publish anything!") : void(0);
plugins.Q.all(promiseArray).then(done.resolve());
return done.promise;
};

40
ts/npmts.tests.ts
View File

@ -1,6 +1,26 @@
/// <reference path="./typings/main.d.ts" />
import plugins = require("./npmts.plugins");
import paths = require("./npmts.paths");
export let publishCoverage = function(configArg){
let done = plugins.Q.defer();
plugins.beautylog.log("now uploading coverage data to coveralls");
var stream = plugins.gulp.src([plugins.path.join(paths.cwd,"./coverage/lcov.info")])
.pipe(plugins.g.coveralls())
.pipe(plugins.g.gFunction([
function(){
let done = plugins.Q.defer();
plugins.beautylog.ok("Coverage data has been uploaded to Coveralls!");
done.resolve();
return done.promise;
}
],"atEnd"));
stream.on("finish",function(){
done.resolve(configArg);
});
return done.promise;
};
export var run = function(configArg) {
var done = plugins.Q.defer();
var config = configArg;
@ -23,27 +43,11 @@ export var run = function(configArg) {
return stream;
};
var coveralls = function(){
plugins.beautylog.log("now uploading coverage data to coveralls");
var stream = plugins.gulp.src([plugins.path.join(paths.cwd,"./coverage/lcov.info")])
.pipe(plugins.g.coveralls())
.pipe(plugins.g.gFunction(function(){
plugins.beautylog.ok("Tests have passed and coverage data has been uploaded to Coveralls!");
},"atEnd"));
return stream;
};
plugins.beautylog.log("now starting tests");
istanbul().on("finish",function(){
mocha().on("finish",function(){
if(plugins.smartenv.getEnv().isTravis && config.coveralls){
coveralls().on("finish",function(){
done.resolve(config);
})
} else {
plugins.beautylog.ok("Tests have passed!");
done.resolve(config);
}
plugins.beautylog.ok("Tests have passed!");
done.resolve(config);
})
});
return done.promise;