diff --git a/index.d.ts b/index.d.ts index 20843f8..440f313 100644 --- a/index.d.ts +++ b/index.d.ts @@ -18,9 +18,6 @@ declare module NpmtsPlugins { declare module NpmtsPaths { var init: () => any; } -declare module NpmtsInfo { - var init: () => void; -} declare module NpmtsDefault { var init: () => void; } diff --git a/index.js b/index.js index 004b108..3fa4270 100644 --- a/index.js +++ b/index.js @@ -34,30 +34,23 @@ var NpmtsPaths; return paths; }; })(NpmtsPaths || (NpmtsPaths = {})); -/// -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 = {})); /// /// var NpmtsDefault; (function (NpmtsDefault) { NpmtsDefault.init = function () { plugins.gulp.task("defaultTsd", function (cb) { - plugins.beautylog.log("now installing typings from" + " ts/tsd.json".blue); - plugins.g.if(process.env.TRAVIS, plugins.g.tsd({ - command: 'reinstall', - config: paths.tsd - }, cb)); + if (!process.env.TRAVIS) { + plugins.g.tsd({ + command: 'reinstall', + config: paths.tsd + }, 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.beautylog.log("now compiling" + " ts/index.ts".blue); @@ -95,10 +88,9 @@ var NpmtsDefault; /// /// /// -/// +/// /// /// var plugins = NpmtsPlugins.init(); var paths = NpmtsPaths.init(); -NpmtsInfo.init(); NpmtsDefault.init(); diff --git a/package.json b/package.json index bd43f0b..9755bf1 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,6 @@ "dependencies": { "beautylog": "2.0.2", "gulp": "3.9.0", - "gulp-if": "^2.0.0", "gulp-insert": "0.5.0", "gulp-sequence": "^0.4.4", "gulp-tsd": "^0.1.0", diff --git a/ts/index.ts b/ts/index.ts index a4dd2df..6bc3554 100644 --- a/ts/index.ts +++ b/ts/index.ts @@ -2,11 +2,10 @@ /// /// /// -/// +/// /// /// var plugins = NpmtsPlugins.init(); var paths = NpmtsPaths.init(); -NpmtsInfo.init(); NpmtsDefault.init(); diff --git a/ts/npmts.default.ts b/ts/npmts.default.ts index eabd304..5cdd3fc 100644 --- a/ts/npmts.default.ts +++ b/ts/npmts.default.ts @@ -3,14 +3,17 @@ module NpmtsDefault { export var init = function() { plugins.gulp.task("defaultTsd",function(cb){ - plugins.beautylog.log("now installing typings from" + " ts/tsd.json".blue); - plugins.g.if(process.env.TRAVIS, + if(!process.env.TRAVIS) { plugins.g.tsd({ command: 'reinstall', 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") + } + }); diff --git a/ts/npmts.info.ts b/ts/npmts.info.ts deleted file mode 100644 index aa09455..0000000 --- a/ts/npmts.info.ts +++ /dev/null @@ -1,12 +0,0 @@ -/// - -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."); - } - } -} diff --git a/ts/npmts.options.ts b/ts/npmts.options.ts new file mode 100644 index 0000000..e69de29