5.3.1

.gitlab-ci.yml

@@ -1,10 +1,19 @@
-image: hosttoday/ht-docker-node
+image: hosttoday/ht-docker-node:npmts
 
 stages:
 - test
 - release
+- trigger
 - page
 
+testLEGACY:
+  stage: test
+  script:
+    - npmci test legacy
+  tags:
+    - docker
+  allow_failure: true
+
 testLTS:
   stage: test
   script:
@@ -28,6 +37,15 @@ release:
   tags:
     - docker
 
+trigger:
+  stage: trigger
+  script:
+    - npmci trigger
+  only:
+    - tags
+  tags:
+    - docker
+    
 pages:
   stage: page
   script:
@@ -40,4 +58,4 @@ pages:
     paths:
     - public
   only:
-  - master
+  - tags

dist/index.js

@@ -1,14 +1,28 @@
 "use strict";
 require("typings-global");
+/* ================================================== *
+    Starting NPMTS main process.
+ * ================================================== */
 var early = require("early");
 early.start("NPMTS");
 var plugins = require("./npmts.plugins");
+var paths = require("./npmts.paths");
 var npmts_promisechain_1 = require("./npmts.promisechain");
-early.stop();
+early.stop()
+    .done(function () {
+    var npmtsProjectInfo = new plugins.projectinfo.ProjectinfoNpm(paths.npmtsPackageRoot);
+    var npmtsCli = new plugins.smartcli.Smartcli();
+    npmtsCli.standardTask()
+        .then(function () {
         plugins.beautylog.figletSync("NPMTS");
+        plugins.beautylog.info("npmts version: " + npmtsProjectInfo.version);
         try {
             npmts_promisechain_1.promisechain();
         }
         catch (err) {
             console.log(err);
         }
+    });
+    npmtsCli.addVersion(npmtsProjectInfo.version);
+    npmtsCli.startParse();
+});

dist/npmts.compile.helpers.js

@@ -1,12 +1,12 @@
 "use strict";
 var plugins = require("./npmts.plugins");
 var paths = require("./npmts.paths");
-var outputPathIsDir = function (configArg, keyArg) {
-    return plugins.smartpath.check.isDir(plugins.path.join(paths.cwd, configArg.ts[keyArg]));
+var outputPathIsDir = function (tsArrayArg, keyArg) {
+    return plugins.smartpath.check.isDir(plugins.path.join(paths.cwd, tsArrayArg[keyArg]));
 };
-exports.checkOutputPath = function (configArg, keyArg) {
-    if (!outputPathIsDir(configArg, keyArg)) {
-        plugins.beautylog.warn("Skipping " + keyArg + " because " + configArg.ts[keyArg] + " it is no directory!");
+exports.checkOutputPath = function (tsArrayArg, keyArg) {
+    if (!outputPathIsDir(tsArrayArg, keyArg)) {
+        plugins.beautylog.warn("Skipping " + keyArg + " because " + tsArrayArg[keyArg] + " it is no directory!");
         return false;
     }
     else {

dist/npmts.compile.js

@@ -12,7 +12,7 @@ var definitionHandler = function (configArg) {
     var done = plugins.Q.defer();
     var configTsLenght = Object.keys(configArg.ts).length;
     if (configTsLenght == 0) {
-        plugins.beautylog.warn("No declaration files found... Are you sure you don't want them?");
+        plugins.beautylog.warn("No TS file and thus no definitions found!");
         done.resolve(configArg); //if there are no definition files, resolve...
     }
     var localCounter = 0;
@@ -32,14 +32,10 @@ var definitionHandler = function (configArg) {
     }
     return done.promise;
 };
-exports.run = function (configArg) {
+var compileTs = function (tsFileArrayArg, tsOptionsArg) {
+    if (tsOptionsArg === void 0) { tsOptionsArg = {}; }
     var done = plugins.Q.defer();
-    var config = configArg;
-    npmts_promisechain_1.npmtsOra.text("now compiling " + "TypeScript".yellow);
     var moduleStream = plugins.merge2({ end: false });
-    /* -------------------------------------------------
-     * ----------- compile TypeScript --------------------------
-     * ----------------------------------------------- */
     var tsOptionsDefault = {
         declaration: true,
         target: "ES5",
@@ -49,31 +45,41 @@ exports.run = function (configArg) {
      * merges default ts options with those found in npmts.json
      */
     var tsOptions = function (keyArg) {
-        return plugins.lodashObject.assign(tsOptionsDefault, config.tsOptions);
+        return plugins.lodashObject.assign(tsOptionsDefault, tsOptionsArg);
     };
-    for (var keyArg in config.ts) {
-        if (helpers.checkOutputPath(config, keyArg)) {
+    for (var keyArg in tsFileArrayArg) {
+        if (helpers.checkOutputPath(tsFileArrayArg, keyArg)) {
             var tsStream = plugins.gulp.src([plugins.path.join(paths.cwd, keyArg), "!**/typings/**"])
                 .pipe(plugins.g.sourcemaps.init()) // This means sourcemaps will be generated
                 .pipe(plugins.g.typescript(tsOptions(keyArg)));
             var jsStream = tsStream.js
                 .pipe(plugins.g.sourcemaps.write()) // Now the sourcemaps are added to the .js file
-                .pipe(plugins.gulp.dest(config.ts[keyArg]));
+                .pipe(plugins.gulp.dest(tsFileArrayArg[keyArg]));
             var declarationStream = tsStream.dts
-                .pipe(plugins.gulp.dest(config.ts[keyArg]));
+                .pipe(plugins.gulp.dest(tsFileArrayArg[keyArg]));
             moduleStream.add(tsStream, jsStream, declarationStream);
         }
     }
     moduleStream.on("queueDrain", function () {
-        moduleStream.on("finish", function () {
+        done.resolve();
+    });
+    return done.promise;
+};
+exports.run = function (configArg) {
+    var done = plugins.Q.defer();
+    var config = configArg;
+    npmts_promisechain_1.npmtsOra.text("now compiling " + "TypeScript".yellow);
+    compileTs(config.ts, config.tsOptions)
+        .then(function () {
+        compileTs(config.testTs);
+    })
+        .then(function () {
         plugins.beautylog.ok("compiled TypeScript!");
         definitionHandler(config)
             .then(function () {
             done.resolve(config);
         });
     });
-        moduleStream.end();
-    });
     /*==================== END TS Compilation =====================*/
     return done.promise;
 };

dist/npmts.jsdoc.js

@@ -20,34 +20,6 @@ var genJsdoc = function (configArg) {
     }));
     return done.promise;
 };
-exports.publishDocs = function (configArg) {
-    var done = plugins.Q.defer();
-    var gitUrl = plugins.projectinfo.npm(paths.cwd, {
-        gitAccessToken: process.env.GITHUB_TOKEN
-    }).git.httpsUrl;
-    var deployScript = ""
-        + "cd " + paths.docsDir + " "
-        + "&& git init " + "> /dev/null 2>&1 "
-        + "&& git config user.name \"TRAVIS CI\" " + "> /dev/null 2>&1 "
-        + "&& git config user.email \"travis@shipzone.io\" " + "> /dev/null 2>&1 "
-        + "&& git add . " + "> /dev/null 2>&1 "
-        + "&& git commit -m \"Deploy to GitHub Pages\" " + "> /dev/null 2>&1 "
-        + "&& git push --force --quiet "
-        + "\"" + gitUrl + "\" "
-        + "master:gh-pages " + "> /dev/null 2>&1";
-    plugins.beautylog.log("now publishing JsDoc documentation to GitHub");
-    if (!plugins.shelljs.which('git')) {
-        plugins.beautylog.error('Git is not installed!');
-        plugins.shelljs.exit(1);
-    }
-    else if (plugins.shelljs.exec(deployScript).code !== 0) {
-        plugins.beautylog.error('Git failed!');
-        plugins.shelljs.exit(1);
-    }
-    plugins.beautylog.ok("JsDoc documentation has been deployed to GitHub!");
-    done.resolve(configArg);
-    return done.promise;
-};
 exports.run = function (configArg) {
     var done = plugins.Q.defer();
     genJsdoc(configArg)

dist/npmts.options.js

@@ -5,19 +5,6 @@ var npmts_promisechain_1 = require("./npmts.promisechain");
 exports.isCi = function () {
     return plugins.smartci.check.isCi();
 };
-exports.isRelease = function () {
-    return plugins.smartci.check.isCi()
-        && plugins.smartci.check.isTaggedCommit();
-};
-exports.doPublish = function () {
-    try {
-        return exports.isRelease()
-            && plugins.smartci.get.subJobNumber() == 1;
-    }
-    catch (err) {
-        return false;
-    }
-};
 exports.run = function (configArg) {
     var done = plugins.Q.defer();
     var config = configArg;
@@ -29,29 +16,21 @@ exports.run = function (configArg) {
         ];
         config.ts = (_a = {},
             _a["./ts/**/*.ts"] = "./dist/",
-            _a["./test/test.ts"] = "./test/",
             _a
         );
+        config.testTs = (_b = {},
+            _b["./test/test.ts"] = "./test/",
+            _b
+        );
         config.test = ["./index.js"];
     }
     //check if config.tsOptions is available
     config.tsOptions ? void (0) : config.tsOptions = {};
-    // handle state of current build
-    exports.isRelease() ? plugins.beautylog.info("All right: This is a RELEASE build!")
-        : plugins.beautylog.info("NOT A RELEASE build!");
-    exports.isRelease() && exports.doPublish() ? plugins.beautylog.info("All right: This is the first subBuild, so this one publishes COVERAGE + DOCS when tests succeed!")
-        : plugins.beautylog.info("We are not publishing anything!");
-    // handle codecov
-    config.codecov ? void (0) : config.codecov = {};
-    config.codecov.publish ? void (0) : config.codecov.publish = false;
-    exports.isCi() && (process.env.TRAVIS || config.codecov.token) ? void (0) : config.codecov = false;
     config.coverageTreshold ? void (0) : config.coverageTreshold = 70;
     // 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;
     plugins.beautylog.ok("build options are ready!");
     done.resolve(config);
     return done.promise;
-    var _a;
+    var _a, _b;
 };

dist/npmts.paths.js

@@ -1,7 +1,10 @@
 "use strict";
 require("typings-global");
 var plugins = require("./npmts.plugins");
-exports.cwd = plugins.smartcli.get.cwd().path;
+//Npmts Paths
+exports.npmtsPackageRoot = plugins.path.join(__dirname, "../");
+//Project paths
+exports.cwd = process.cwd();
 //Directories
 exports.tsDir = plugins.path.join(exports.cwd, "ts/");
 exports.distDir = plugins.path.join(exports.cwd, "dist/");

dist/npmts.plugins.js

@@ -4,7 +4,6 @@ exports.beautylog = require("beautylog");
 exports.fs = require("fs-extra");
 exports.gulp = require("gulp");
 exports.g = {
-    codecov: require("gulp-codecov"),
     gFunction: require("gulp-function"),
     istanbul: require("gulp-istanbul"),
     jsdoc3: require("gulp-jsdoc3"),

dist/npmts.promisechain.js

@@ -2,7 +2,6 @@
 require("typings-global");
 var plugins = require("./npmts.plugins");
 exports.npmtsOra = new plugins.beautylog.Ora("setting up TaskChain", "cyan");
-exports.npmtsOra.start();
 var NpmtsAssets = require("./npmts.assets");
 var NpmtsClean = require("./npmts.clean");
 var NpmtsCompile = require("./npmts.compile");
@@ -14,6 +13,7 @@ var NpmtsPublish = require("./npmts.publish");
 var NpmtsTests = require("./npmts.tests");
 exports.promisechain = function () {
     var done = plugins.Q.defer();
+    exports.npmtsOra.start();
     NpmtsConfigFile.run()
         .then(NpmtsOptions.run)
         .then(NpmtsClean.run)

dist/npmts.publish.js

@@ -1,26 +1,9 @@
 "use strict";
 require("typings-global");
 var plugins = require("./npmts.plugins");
-var paths = require("./npmts.paths");
-var NpmtsJsdoc = require("./npmts.jsdoc");
-exports.publishCoverage = function (configArg) {
-    var done = plugins.Q.defer();
-    plugins.beautylog.log("now uploading coverage data to codecov.io");
-    var stream = plugins.gulp.src([plugins.path.join(paths.cwd, "./coverage/lcov.info")])
-        .pipe(plugins.g.codecov())
-        .pipe(plugins.g.gFunction(function () {
-        plugins.beautylog.ok("Coverage data has been uploaded to codecov.io!");
-        done.resolve(configArg);
-    }, "atEnd"));
-    return done.promise;
-};
 exports.run = function (configArg) {
     var done = plugins.Q.defer();
     var config = configArg;
-    var promiseArray = [];
-    config.codecov.publish ? promiseArray.push(exports.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);
+    done.resolve();
     return done.promise;
 };

package.json

@@ -1,14 +1,15 @@
 {
   "name": "npmts",
-  "version": "5.1.20",
+  "version": "5.3.1",
   "description": "write npm modules with TypeScript",
   "main": "dist/index.js",
   "bin": {
     "npmts": "dist/cli.js"
   },
   "scripts": {
-    "test": "(npm run compile && npm run check)",
+    "test": "(npm run compile && npm run check && npm run checkVersion)",
     "check": "(cd ./test/assets && node ../../dist/index.js)",
+    "checkVersion": "cd ./test/assets && node ../../dist/index.js -v",
     "compile": "(cd compile && node compile.js)"
   },
   "repository": {
@@ -26,33 +27,32 @@
   },
   "homepage": "https://gitlab.com/pushrocks/npmts#readme",
   "dependencies": {
-    "beautylog": "5.0.6",
-    "early": "^2.0.1",
+    "beautylog": "5.0.8",
+    "early": "^2.0.13",
     "fs-extra": "^0.30.0",
     "gulp": "3.9.1",
-    "gulp-codecov": "^2.0.1",
     "gulp-concat": "^2.6.0",
-    "gulp-function": "^1.3.1",
+    "gulp-function": "^1.3.6",
     "gulp-if": "^2.0.1",
-    "gulp-istanbul": "^0.10.4",
-    "gulp-jsdoc3": "^0.2.1",
+    "gulp-istanbul": "^1.0.0",
+    "gulp-jsdoc3": "^0.3.0",
     "gulp-mocha": "^2.2.0",
     "gulp-replace": "^0.5.4",
     "gulp-sourcemaps": "^2.0.0-alpha",
-    "gulp-typescript": "2.13.4",
+    "gulp-typescript": "2.13.6",
     "gulp-typings": "2.0.0",
     "lodash": "^4.13.1",
     "merge2": "1.0.2",
-    "projectinfo": "1.0.1",
+    "projectinfo": "1.0.3",
     "q": "^1.4.1",
     "shelljs": "^0.7.0",
     "smartci": "0.0.1",
-    "smartcli": "0.0.11",
+    "smartcli": "1.0.1",
     "smartcov": "0.0.6",
     "smartenv": "1.2.5",
     "smartfile": "3.0.10",
-    "smartpath": "3.2.1",
-    "smartstring": "^2.0.1",
+    "smartpath": "3.2.2",
+    "smartstring": "^2.0.6",
     "source-map-support": "^0.4.0",
     "typings-global": "*"
   },

test/assets/dist/index.js

@@ -6,4 +6,4 @@ var testplugin = {
 };
 module.exports = testplugin;
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLDZDQUE2QztBQUM3QyxJQUFJLFVBQVUsR0FBRztJQUNiLFlBQVksRUFBRTtRQUNWLE9BQU8sQ0FBQyxHQUFHLENBQUMsd0JBQXdCLENBQUMsQ0FBQztJQUMxQyxDQUFDO0NBQ0osQ0FBQztBQUNGLE1BQU0sQ0FBQyxPQUFPLEdBQUcsVUFBVSxDQUFDIiwiZmlsZSI6ImluZGV4LmpzIiwic291cmNlc0NvbnRlbnQiOlsiLy8vIDxyZWZlcmVuY2UgcGF0aD1cIi4vdHlwaW5ncy9pbmRleC5kLnRzXCIgLz5cclxubGV0IHRlc3RwbHVnaW4gPSB7XHJcbiAgICBsb2dTb21ldGhpbmc6IGZ1bmN0aW9uKCl7XHJcbiAgICAgICAgY29uc29sZS5sb2coXCJvbmx5IGZ1bmN0aW9uIGV4ZWN1dGVkXCIpO1xyXG4gICAgfVxyXG59O1xyXG5tb2R1bGUuZXhwb3J0cyA9IHRlc3RwbHVnaW47Il19
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLDZDQUE2QztBQUM3QyxJQUFJLFVBQVUsR0FBRztJQUNiLFlBQVksRUFBRTtRQUNWLE9BQU8sQ0FBQyxHQUFHLENBQUMsd0JBQXdCLENBQUMsQ0FBQztJQUMxQyxDQUFDO0NBQ0osQ0FBQztBQUNGLE1BQU0sQ0FBQyxPQUFPLEdBQUcsVUFBVSxDQUFDIiwiZmlsZSI6ImluZGV4LmpzIiwic291cmNlc0NvbnRlbnQiOlsiLy8vIDxyZWZlcmVuY2UgcGF0aD1cIi4vdHlwaW5ncy9pbmRleC5kLnRzXCIgLz5cbmxldCB0ZXN0cGx1Z2luID0ge1xuICAgIGxvZ1NvbWV0aGluZzogZnVuY3Rpb24oKXtcbiAgICAgICAgY29uc29sZS5sb2coXCJvbmx5IGZ1bmN0aW9uIGV4ZWN1dGVkXCIpO1xuICAgIH1cbn07XG5tb2R1bGUuZXhwb3J0cyA9IHRlc3RwbHVnaW47Il19

test/assets/test/test.d.ts

@@ -1 +1,2 @@
+/// <reference path="../ts/typings/index.d.ts" />
 declare var testplugin: any;

test/assets/test/test.js

@@ -8,4 +8,4 @@ describe("testplugins", function () {
     });
 });
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsaURBQWlEO0FBQ2pELElBQUksVUFBVSxHQUFHLE9BQU8sQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDO0FBQzdDLFFBQVEsQ0FBQyxhQUFhLEVBQUM7SUFDbkIsUUFBUSxDQUFDLGVBQWUsRUFBQztRQUNyQixFQUFFLENBQUMsc0JBQXNCLEVBQUM7WUFDdEIsVUFBVSxDQUFDLFlBQVksRUFBRSxDQUFBO1FBQzdCLENBQUMsQ0FBQyxDQUFDO0lBQ1AsQ0FBQyxDQUFDLENBQUM7QUFDUCxDQUFDLENBQUMsQ0FBQyIsImZpbGUiOiJ0ZXN0LmpzIiwic291cmNlc0NvbnRlbnQiOlsiLy8vIDxyZWZlcmVuY2UgcGF0aD1cIi4uL3RzL3R5cGluZ3MvaW5kZXguZC50c1wiIC8+XHJcbnZhciB0ZXN0cGx1Z2luID0gcmVxdWlyZShcIi4uL2Rpc3QvaW5kZXguanNcIik7XHJcbmRlc2NyaWJlKFwidGVzdHBsdWdpbnNcIixmdW5jdGlvbigpe1xyXG4gICAgZGVzY3JpYmUoXCIubG9nU29tZXRoaW5nXCIsZnVuY3Rpb24oKXtcclxuICAgICAgICBpdChcInNob3VsZCBsb2cgc29tZXRoaW5nXCIsZnVuY3Rpb24oKXtcclxuICAgICAgICAgICAgdGVzdHBsdWdpbi5sb2dTb21ldGhpbmcoKVxyXG4gICAgICAgIH0pO1xyXG4gICAgfSk7XHJcbn0pOyJdfQ==
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsaURBQWlEO0FBQ2pELElBQUksVUFBVSxHQUFHLE9BQU8sQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDO0FBQzdDLFFBQVEsQ0FBQyxhQUFhLEVBQUM7SUFDbkIsUUFBUSxDQUFDLGVBQWUsRUFBQztRQUNyQixFQUFFLENBQUMsc0JBQXNCLEVBQUM7WUFDdEIsVUFBVSxDQUFDLFlBQVksRUFBRSxDQUFBO1FBQzdCLENBQUMsQ0FBQyxDQUFDO0lBQ1AsQ0FBQyxDQUFDLENBQUM7QUFDUCxDQUFDLENBQUMsQ0FBQyIsImZpbGUiOiJ0ZXN0LmpzIiwic291cmNlc0NvbnRlbnQiOlsiLy8vIDxyZWZlcmVuY2UgcGF0aD1cIi4uL3RzL3R5cGluZ3MvaW5kZXguZC50c1wiIC8+XG52YXIgdGVzdHBsdWdpbiA9IHJlcXVpcmUoXCIuLi9kaXN0L2luZGV4LmpzXCIpO1xuZGVzY3JpYmUoXCJ0ZXN0cGx1Z2luc1wiLGZ1bmN0aW9uKCl7XG4gICAgZGVzY3JpYmUoXCIubG9nU29tZXRoaW5nXCIsZnVuY3Rpb24oKXtcbiAgICAgICAgaXQoXCJzaG91bGQgbG9nIHNvbWV0aGluZ1wiLGZ1bmN0aW9uKCl7XG4gICAgICAgICAgICB0ZXN0cGx1Z2luLmxvZ1NvbWV0aGluZygpXG4gICAgICAgIH0pO1xuICAgIH0pO1xufSk7Il19

test/assets/test/test.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":"AAAA,gDAAgD;AAChD,IAAI,UAAU,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;AAC7C,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"}

ts/index.ts

@@ -1,16 +1,30 @@
 import "typings-global";
+
+/* ================================================== *
+    Starting NPMTS main process.
+ * ================================================== */
 import * as early from "early";
 early.start("NPMTS");
 import * as plugins from "./npmts.plugins"
+import * as paths from "./npmts.paths";
 import {promisechain} from "./npmts.promisechain";
-early.stop();
+early.stop()
+    .done(() => {
+        let npmtsProjectInfo = new plugins.projectinfo.ProjectinfoNpm(paths.npmtsPackageRoot);
 
+        let npmtsCli = new plugins.smartcli.Smartcli();
+        npmtsCli.standardTask()
+            .then(() => {
                 plugins.beautylog.figletSync("NPMTS");
-
+                plugins.beautylog.info("npmts version: " + npmtsProjectInfo.version);
                 try {
                     promisechain();
                 }
                 catch(err){
                     console.log(err);
                 }
+            });
 
+        npmtsCli.addVersion(npmtsProjectInfo.version);
+        npmtsCli.startParse();
+    });

ts/npmts.compile.helpers.ts

@@ -1,13 +1,13 @@
 import plugins = require("./npmts.plugins");
 import paths = require("./npmts.paths");
 
-let outputPathIsDir = function (configArg,keyArg) {
-        return plugins.smartpath.check.isDir(plugins.path.join(paths.cwd, configArg.ts[keyArg]));
+let outputPathIsDir = function (tsArrayArg,keyArg) {
+        return plugins.smartpath.check.isDir(plugins.path.join(paths.cwd, tsArrayArg[keyArg]));
 };
 
-export let checkOutputPath = function(configArg,keyArg){
-    if(!outputPathIsDir(configArg,keyArg)) {
-        plugins.beautylog.warn("Skipping " + keyArg + " because " + configArg.ts[keyArg] + " it is no directory!")
+export let checkOutputPath = function(tsArrayArg,keyArg){
+    if(!outputPathIsDir(tsArrayArg,keyArg)) {
+        plugins.beautylog.warn("Skipping " + keyArg + " because " + tsArrayArg[keyArg] + " it is no directory!")
         return false
     } else {
         return true;

ts/npmts.compile.ts

@@ -12,7 +12,7 @@ let definitionHandler = function(configArg){
     let done = plugins.Q.defer();
     let configTsLenght = Object.keys(configArg.ts).length;
     if(configTsLenght == 0) {
-        plugins.beautylog.warn("No declaration files found... Are you sure you don't want them?");
+        plugins.beautylog.warn("No TS file and thus no definitions found!");
         done.resolve(configArg); //if there are no definition files, resolve...
     }
     let localCounter = 0;
@@ -33,17 +33,10 @@ let definitionHandler = function(configArg){
     return done.promise;
 }
 
-
-export let run = function (configArg) {
+let compileTs = (tsFileArrayArg,tsOptionsArg = {}) => {
     let done = plugins.Q.defer();
-    let config = configArg;
-    npmtsOra.text("now compiling " + "TypeScript".yellow);
     let moduleStream = plugins.merge2({ end: false });
 
-    /* -------------------------------------------------
-     * ----------- compile TypeScript --------------------------
-     * ----------------------------------------------- */
-
     let tsOptionsDefault = {
         declaration: true,
         target: "ES5",
@@ -54,34 +47,45 @@ export let run = function (configArg) {
      * merges default ts options with those found in npmts.json
      */
     let tsOptions = function (keyArg:string) {
-        return plugins.lodashObject.assign(tsOptionsDefault, config.tsOptions)
+        return plugins.lodashObject.assign(tsOptionsDefault, tsOptionsArg)
     };
-
-    for (let keyArg in config.ts) {
-        if (helpers.checkOutputPath(config,keyArg)) {
+    for (let keyArg in tsFileArrayArg) {
+        if (helpers.checkOutputPath(tsFileArrayArg,keyArg)) {
             let tsStream = plugins.gulp.src([plugins.path.join(paths.cwd, keyArg), "!**/typings/**"])
                 .pipe(plugins.g.sourcemaps.init()) // This means sourcemaps will be generated
                 .pipe(plugins.g.typescript(tsOptions(keyArg)));
             
             let jsStream = tsStream.js
                 .pipe(plugins.g.sourcemaps.write()) // Now the sourcemaps are added to the .js file
-                .pipe(plugins.gulp.dest(config.ts[keyArg]));
+                .pipe(plugins.gulp.dest(tsFileArrayArg[keyArg]));
             let declarationStream = tsStream.dts
-                .pipe(plugins.gulp.dest(config.ts[keyArg])); 
+                .pipe(plugins.gulp.dest(tsFileArrayArg[keyArg])); 
             moduleStream.add(tsStream,jsStream,declarationStream);
         }
     }
+    moduleStream.on("queueDrain",() => {
+        done.resolve();
+    })
+    return done.promise;
+}
 
-    moduleStream.on("queueDrain", function () {
-        moduleStream.on("finish", function () {
+
+export let run = function (configArg) {
+    let done = plugins.Q.defer();
+    let config = configArg;
+    npmtsOra.text("now compiling " + "TypeScript".yellow);
+    
+    compileTs(config.ts,config.tsOptions)
+        .then(() => {
+            compileTs(config.testTs);
+        })
+        .then(function () {
             plugins.beautylog.ok("compiled TypeScript!");
             definitionHandler(config)
             .then(function(){
                 done.resolve(config);
             });
         });
-        moduleStream.end();
-    });
     /*==================== END TS Compilation =====================*/
 
 

ts/npmts.jsdoc.ts

@@ -21,41 +21,6 @@ let genJsdoc = function(configArg){
     return done.promise;
 };
 
-export let publishDocs = function(configArg){
-    let done = plugins.Q.defer();
-    let gitUrl = plugins.projectinfo.npm(
-        paths.cwd,
-        {
-            gitAccessToken:process.env.GITHUB_TOKEN
-        }
-    ).git.httpsUrl;
-
-    let deployScript = ""
-        + "cd " + paths.docsDir + " "
-        + "&& git init " + "> /dev/null 2>&1 "
-        + "&& git config user.name \"TRAVIS CI\" " + "> /dev/null 2>&1 "
-        + "&& git config user.email \"travis@shipzone.io\" " + "> /dev/null 2>&1 "
-        + "&& git add . " + "> /dev/null 2>&1 "
-        + "&& git commit -m \"Deploy to GitHub Pages\" " + "> /dev/null 2>&1 "
-        + "&& git push --force --quiet "
-        + "\"" + gitUrl + "\" "
-        + "master:gh-pages " + "> /dev/null 2>&1";
-
-
-    plugins.beautylog.log("now publishing JsDoc documentation to GitHub");
-    if (!plugins.shelljs.which('git')) {
-        plugins.beautylog.error('Git is not installed!');
-        plugins.shelljs.exit(1);
-    } else if (plugins.shelljs.exec(deployScript).code !== 0) {
-        plugins.beautylog.error('Git failed!');
-        plugins.shelljs.exit(1);
-    }
-    plugins.beautylog.ok("JsDoc documentation has been deployed to GitHub!");
-    done.resolve(configArg);
-
-    return done.promise;
-};
-
 
 export let run = function(configArg){
     let done = plugins.Q.defer();

ts/npmts.options.ts

@@ -6,21 +6,6 @@ export let isCi = function(){
     return plugins.smartci.check.isCi();
 };
 
-export let isRelease = function():boolean {
-    return plugins.smartci.check.isCi()
-        && plugins.smartci.check.isTaggedCommit();
-};
-
-export let doPublish = function():boolean {
-    try {
-        return isRelease()
-            && plugins.smartci.get.subJobNumber() == 1;
-    }
-    catch (err){
-        return false;
-    }  
-};
-
 export var run = function(configArg){
     var done = plugins.Q.defer();
     var config = configArg;
@@ -33,7 +18,9 @@ export var run = function(configArg){
             "./ts/typings.json"
         ];
         config.ts = {
-            ["./ts/**/*.ts"]: "./dist/",
+            ["./ts/**/*.ts"]: "./dist/"
+        };
+        config.testTs = {
             ["./test/test.ts"]: "./test/"
         };
         config.test = ["./index.js"];
@@ -42,25 +29,12 @@ export var run = function(configArg){
     //check if config.tsOptions is available
     config.tsOptions ? void(0) : config.tsOptions = {};
 
-    // handle state of current build
-
-    isRelease() ? plugins.beautylog.info("All right: This is a RELEASE build!")
-        : plugins.beautylog.info("NOT A RELEASE build!");
-    isRelease() && doPublish() ? plugins.beautylog.info("All right: This is the first subBuild, so this one publishes COVERAGE + DOCS when tests succeed!")
-        : plugins.beautylog.info("We are not publishing anything!");
-
-    // handle codecov
-    config.codecov ? void(0) : config.codecov = {};
-    config.codecov.publish ? void(0) : config.codecov.publish = false;
-    isCi() && (process.env.TRAVIS || config.codecov.token) ? void(0) : config.codecov = false;
     
 
     config.coverageTreshold ? void(0) : config.coverageTreshold = 70;
 
     // handle docs
     config.docs ? void(0) : config.docs = {};
-    config.docs.publish ? void(0) : config.docs.publish = false;
-    doPublish() ? void(0) : config.docs.publish = false;
 
     plugins.beautylog.ok("build options are ready!");
     done.resolve(config);

ts/npmts.paths.ts

@@ -1,7 +1,12 @@
 import "typings-global";
 import plugins = require("./npmts.plugins");
 
-export let cwd = plugins.smartcli.get.cwd().path;
+//Npmts Paths
+export let npmtsPackageRoot = plugins.path.join(__dirname,"../");
+
+
+//Project paths
+export let cwd = process.cwd();
 
 //Directories
 export let tsDir = plugins.path.join(cwd,"ts/");

ts/npmts.plugins.ts

@@ -3,7 +3,6 @@ export import beautylog = require("beautylog");
 export let fs = require("fs-extra");
 export let gulp = require("gulp");
 export let g = {
-    codecov: require("gulp-codecov"),
     gFunction: require("gulp-function"),
     istanbul: require("gulp-istanbul"),
     jsdoc3: require("gulp-jsdoc3"),
@@ -16,15 +15,15 @@ export let g = {
 };
 export let lodashObject = require('lodash/fp/object');
 export let merge2 = require("merge2");
-export let projectinfo = require("projectinfo");
+export import projectinfo = require("projectinfo");
 export let path = require("path");
 export let Q = require("q");
 export let shelljs = require("shelljs");
 export let smartci = require("smartci");
-export let smartcli = require("smartcli");
+export import smartcli = require("smartcli");
 export let smartcov = require("smartcov");
-export let smartenv = require("smartenv");
-export let smartfile = require("smartfile");
+export import smartenv = require("smartenv");
+export import smartfile = require("smartfile");
 export import smartpath = require("smartpath");
 export import smartstring = require("smartstring");
 export let sourceMapSupport = require("source-map-support").install(); // this is required to display errors correctly during testing

ts/npmts.promisechain.ts

@@ -2,7 +2,6 @@ import "typings-global";
 import plugins = require("./npmts.plugins");
 
 export let npmtsOra = new plugins.beautylog.Ora("setting up TaskChain","cyan");
-npmtsOra.start();
 
 import NpmtsAssets = require("./npmts.assets");
 import NpmtsClean = require("./npmts.clean");
@@ -16,6 +15,7 @@ import NpmtsTests = require("./npmts.tests");
 
 export let promisechain = function(){
     let done = plugins.Q.defer();
+    npmtsOra.start();
     NpmtsConfigFile.run()
         .then(NpmtsOptions.run)
         .then(NpmtsClean.run)

ts/npmts.publish.ts

@@ -3,26 +3,9 @@ import plugins = require("./npmts.plugins");
 import paths = require("./npmts.paths");
 import NpmtsJsdoc = require("./npmts.jsdoc");
 
-export let publishCoverage = function(configArg){
-    let done = plugins.Q.defer();
-    plugins.beautylog.log("now uploading coverage data to codecov.io");
-    var stream = plugins.gulp.src([plugins.path.join(paths.cwd,"./coverage/lcov.info")])
-        .pipe(plugins.g.codecov())
-        .pipe(plugins.g.gFunction(function(){
-            plugins.beautylog.ok("Coverage data has been uploaded to codecov.io!");
-            done.resolve(configArg);
-        },"atEnd"));
-    return done.promise;
-};
-
 export let run = function(configArg){
     let done = plugins.Q.defer();
     let config = configArg;
-    let promiseArray = [];
-    config.codecov.publish ? promiseArray.push(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);
+    done.resolve();
     return done.promise;
 };