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

made options handling easier

Browse Source
This commit is contained in:
Philipp Kunz 2016-03-23 15:47:28 +01:00
parent 50b14e60c6
commit 2f4fb28b5d
4 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/npmts.jsdoc.js vendored
View File

@ -34,7 +34,7 @@ var publishDocs = function (configArg) {
+ "&& git push --force --quiet " + "&& git push --force --quiet "
+ "\"" + gitUrl + "\" " + "\"" + gitUrl + "\" "
+ "master:gh-pages " + "> /dev/null 2>&1"; + "master:gh-pages " + "> /dev/null 2>&1";
if (plugins.smartenv.getEnv().isTravis && configArg.docs && configArg.docs.publish) { if (configArg.docs.publish) {
plugins.beautylog.log("now publishing JsDoc documentation to GitHub"); plugins.beautylog.log("now publishing JsDoc documentation to GitHub");
if (!plugins.shelljs.which('git')) { if (!plugins.shelljs.which('git')) {
plugins.beautylog.error('Git is not installed!'); plugins.beautylog.error('Git is not installed!');

26
dist/npmts.options.js vendored
View File

@ -2,12 +2,12 @@
/// <reference path="./typings/main.d.ts" /> /// <reference path="./typings/main.d.ts" />
var plugins = require("./npmts.plugins"); var plugins = require("./npmts.plugins");
exports.isRelease = function () { exports.isRelease = function () {
if (plugins.smartci.check.isCi() && plugins.smartci.check.isTaggedCommit()) { return plugins.smartci.check.isCi()
return true; && plugins.smartci.check.isTaggedCommit();
} };
else { exports.doPublish = function () {
return false; return exports.isRelease()
} && plugins.smartci.get.subJobNumber() != 1;
}; };
exports.run = function (configArg) { exports.run = function (configArg) {
var done = plugins.Q.defer(); var done = plugins.Q.defer();
@ -26,13 +26,15 @@ exports.run = function (configArg) {
config.test = ["./index.js"]; config.test = ["./index.js"];
} }
// handle state of current build // handle state of current build
exports.isRelease() ? plugins.beautylog.info("All right this is a release build!") exports.isRelease() ? plugins.beautylog.info("All right: This is a RELEASE build!")
: plugins.beautylog.info("not a release build!"); : plugins.beautylog.info("NOT A RELEASE build! We are not publishing anything!");
// handle coveralls // handle coveralls
if ((typeof config.coveralls === "undefined" || !exports.isRelease()) config.coveralls ? void (0) : config.coveralls = false;
&& plugins.smartci.get.subJobNumber == 1) { exports.doPublish() ? void (0) : config.coveralls = false;
config.coveralls = false; // handle docs
} config.docs ? void (0) : config.docs = {};
config.docs.publish ? void (0) : config.docs.publish = false;
exports.doPublish() ? void (0) : config.docs.publish = false;
done.resolve(config); done.resolve(config);
return done.promise; return done.promise;
var _a; var _a;

2
ts/npmts.jsdoc.ts
View File

@ -40,7 +40,7 @@ var publishDocs = function(configArg){
+ "\"" + gitUrl + "\" " + "\"" + gitUrl + "\" "
+ "master:gh-pages " + "> /dev/null 2>&1"; + "master:gh-pages " + "> /dev/null 2>&1";
if(plugins.smartenv.getEnv().isTravis && configArg.docs && configArg.docs.publish){ if(configArg.docs.publish){
plugins.beautylog.log("now publishing JsDoc documentation to GitHub"); plugins.beautylog.log("now publishing JsDoc documentation to GitHub");
if (!plugins.shelljs.which('git')) { if (!plugins.shelljs.which('git')) {
plugins.beautylog.error('Git is not installed!'); plugins.beautylog.error('Git is not installed!');

29
ts/npmts.options.ts
View File

@ -2,11 +2,13 @@
import plugins = require("./npmts.plugins"); import plugins = require("./npmts.plugins");
export let isRelease = function():boolean { export let isRelease = function():boolean {
if (plugins.smartci.check.isCi() && plugins.smartci.check.isTaggedCommit()){ return plugins.smartci.check.isCi()
return true; && plugins.smartci.check.isTaggedCommit();
} else { };
return false;
} export let doPublish = function():boolean {
return isRelease()
&& plugins.smartci.get.subJobNumber() != 1;
}; };
export var run = function(configArg){ export var run = function(configArg){
@ -29,16 +31,17 @@ export var run = function(configArg){
// handle state of current build // handle state of current build
isRelease() ? plugins.beautylog.info("All right this is a release build!") isRelease() ? plugins.beautylog.info("All right: This is a RELEASE build!")
: plugins.beautylog.info("not a release build!"); : plugins.beautylog.info("NOT A RELEASE build! We are not publishing anything!");
// handle coveralls // handle coveralls
if ( config.coveralls ? void(0) : config.coveralls = false;
(typeof config.coveralls === "undefined" || !isRelease()) doPublish() ? void(0) : config.coveralls = false;
&& plugins.smartci.get.subJobNumber == 1
){ // handle docs
config.coveralls = false; config.docs ? void(0) : config.docs = {};
} config.docs.publish ? void(0) : config.docs.publish = false;
doPublish() ? void(0) : config.docs.publish = false;
done.resolve(config); done.resolve(config);
return done.promise; return done.promise;