fix issue with CI detection

This commit is contained in:
Philipp Kunz 2016-01-25 20:52:29 +01:00
parent 9ff2453d7b
commit 8f13dbef9f
7 changed files with 21 additions and 43 deletions

3
index.d.ts vendored
View File

@ -18,9 +18,6 @@ declare module NpmtsPlugins {
declare module NpmtsPaths { declare module NpmtsPaths {
var init: () => any; var init: () => any;
} }
declare module NpmtsInfo {
var init: () => void;
}
declare module NpmtsDefault { declare module NpmtsDefault {
var init: () => void; var init: () => void;
} }

View File

@ -35,29 +35,22 @@ var NpmtsPaths;
}; };
})(NpmtsPaths || (NpmtsPaths = {})); })(NpmtsPaths || (NpmtsPaths = {}));
/// <reference path="./index.ts" /> /// <reference path="./index.ts" />
var NpmtsInfo;
(function (NpmtsInfo) {
NpmtsInfo.init = function () {
if (process.env.TRAVIS) {
plugins.beautylog.warn("We are on TRAVIS. Typings will not be installed due to GitHub API restrictions.");
plugins.beautylog.log("Make sure the repo tracks ting directories");
}
else {
plugins.beautylog.log("We are on a dev machine. Typings will be installed prior to TypeScript compilation.");
}
};
})(NpmtsInfo || (NpmtsInfo = {}));
/// <reference path="./index.ts" />
/// <reference path="./index.ts" /> /// <reference path="./index.ts" />
var NpmtsDefault; var NpmtsDefault;
(function (NpmtsDefault) { (function (NpmtsDefault) {
NpmtsDefault.init = function () { NpmtsDefault.init = function () {
plugins.gulp.task("defaultTsd", function (cb) { plugins.gulp.task("defaultTsd", function (cb) {
plugins.beautylog.log("now installing typings from" + " ts/tsd.json".blue); if (!process.env.TRAVIS) {
plugins.g.if(process.env.TRAVIS, plugins.g.tsd({ plugins.g.tsd({
command: 'reinstall', command: 'reinstall',
config: paths.tsd config: paths.tsd
}, cb)); }, cb);
plugins.beautylog.log("now installing typings from" + " ts/tsd.json".blue);
}
else {
plugins.beautylog.warn("We are on TRAVIS. Typings will not be installed due to GitHub API restrictions.");
plugins.beautylog.log("Make sure the repo tracks " + "typings".blue + " directories");
}
}); });
plugins.gulp.task("defaultIndexTS", function () { plugins.gulp.task("defaultIndexTS", function () {
plugins.beautylog.log("now compiling" + " ts/index.ts".blue); plugins.beautylog.log("now compiling" + " ts/index.ts".blue);
@ -95,10 +88,9 @@ var NpmtsDefault;
/// <reference path="./npmts.plugins.ts" /> /// <reference path="./npmts.plugins.ts" />
/// <reference path="./npmts.cli.ts" /> /// <reference path="./npmts.cli.ts" />
/// <reference path="./npmts.paths.ts" /> /// <reference path="./npmts.paths.ts" />
/// <reference path="./npmts.info.ts" /> /// <reference path="./npmts.options.ts" />
/// <reference path="./npmts.custom.ts" /> /// <reference path="./npmts.custom.ts" />
/// <reference path="./npmts.default.ts" /> /// <reference path="./npmts.default.ts" />
var plugins = NpmtsPlugins.init(); var plugins = NpmtsPlugins.init();
var paths = NpmtsPaths.init(); var paths = NpmtsPaths.init();
NpmtsInfo.init();
NpmtsDefault.init(); NpmtsDefault.init();

View File

@ -29,7 +29,6 @@
"dependencies": { "dependencies": {
"beautylog": "2.0.2", "beautylog": "2.0.2",
"gulp": "3.9.0", "gulp": "3.9.0",
"gulp-if": "^2.0.0",
"gulp-insert": "0.5.0", "gulp-insert": "0.5.0",
"gulp-sequence": "^0.4.4", "gulp-sequence": "^0.4.4",
"gulp-tsd": "^0.1.0", "gulp-tsd": "^0.1.0",

View File

@ -2,11 +2,10 @@
/// <reference path="./npmts.plugins.ts" /> /// <reference path="./npmts.plugins.ts" />
/// <reference path="./npmts.cli.ts" /> /// <reference path="./npmts.cli.ts" />
/// <reference path="./npmts.paths.ts" /> /// <reference path="./npmts.paths.ts" />
/// <reference path="./npmts.info.ts" /> /// <reference path="./npmts.options.ts" />
/// <reference path="./npmts.custom.ts" /> /// <reference path="./npmts.custom.ts" />
/// <reference path="./npmts.default.ts" /> /// <reference path="./npmts.default.ts" />
var plugins = NpmtsPlugins.init(); var plugins = NpmtsPlugins.init();
var paths = NpmtsPaths.init(); var paths = NpmtsPaths.init();
NpmtsInfo.init();
NpmtsDefault.init(); NpmtsDefault.init();

View File

@ -3,14 +3,17 @@
module NpmtsDefault { module NpmtsDefault {
export var init = function() { export var init = function() {
plugins.gulp.task("defaultTsd",function(cb){ plugins.gulp.task("defaultTsd",function(cb){
plugins.beautylog.log("now installing typings from" + " ts/tsd.json".blue); if(!process.env.TRAVIS) {
plugins.g.if(process.env.TRAVIS,
plugins.g.tsd({ plugins.g.tsd({
command: 'reinstall', command: 'reinstall',
config: paths.tsd config: paths.tsd
}, cb) }, cb);
) plugins.beautylog.log("now installing typings from" + " ts/tsd.json".blue);
; } else {
plugins.beautylog.warn("We are on TRAVIS. Typings will not be installed due to GitHub API restrictions.");
plugins.beautylog.log("Make sure the repo tracks " + "typings".blue + " directories")
}
}); });

View File

@ -1,12 +0,0 @@
/// <reference path="./index.ts" />
module NpmtsInfo {
export var init = function(){
if(process.env.TRAVIS){
plugins.beautylog.warn("We are on TRAVIS. Typings will not be installed due to GitHub API restrictions.");
plugins.beautylog.log("Make sure the repo tracks ting directories")
} else {
plugins.beautylog.log("We are on a dev machine. Typings will be installed prior to TypeScript compilation.");
}
}
}

0
ts/npmts.options.ts Normal file
View File