5.3.3

.gitlab-ci.yml

@@ -0,0 +1,61 @@
+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:
+    - npmci test lts
+  tags:
+    - docker
+    
+testSTABLE:
+  stage: test
+  script:
+    - npmci test stable
+  tags:
+    - docker
+
+release:
+  stage: release
+  script:
+    - npmci publish
+  only:
+    - tags
+  tags:
+    - docker
+
+trigger:
+  stage: trigger
+  script:
+    - npmci trigger
+  only:
+    - tags
+  tags:
+    - docker
+    
+pages:
+  stage: page
+  script:
+  - npmci test lts
+  - mkdir .public
+  - cp -r test/assets/docs/ .public
+  - cp -r test/assets/coverage/ .public
+  - mv .public public
+  artifacts:
+    paths:
+    - public
+  only:
+  - tags

.npmignore

@@ -1,6 +1,6 @@
 .idea/
-support
+compile/
-compile
+coverage/
 test/
 docs/
 examples

CHANGELOG

@@ -0,0 +1,7 @@
+Please view this file on the master branch, on stable branches it's out of date.
+
+v 6.0.0 (unreleased)
+    - handle bithound
+    - check package.json
+    - check .gitlab-ci-yml
+    - check appveyor.yml

CONTRIBUTING.md

@@ -0,0 +1,4 @@
+# Contribution Guide
+
+This module is developed on the fabulous GitLab.com:  
+https://gitlab.com/pushrocks/npmts

README.md

@@ -2,7 +2,8 @@
 Write npm modules with TypeScript without hassle.
 
 ## Status
-[![Build Status](https://travis-ci.org/pushrocks/npmts.svg?branch=master)](https://travis-ci.org/pushrocks/npmts)
+[![build status](https://gitlab.com/pushrocks/npmts/badges/master/build.svg)](https://gitlab.com/pushrocks/npmts/commits/master)
+[![Build status](https://ci.appveyor.com/api/projects/status/22fuqa0uv21rcjh4/branch/master?svg=true)](https://ci.appveyor.com/project/philkunz/npmts/branch/master)
 [![Dependency Status](https://david-dm.org/pushrocks/npmts.svg)](https://david-dm.org/pushrocks/npmts)
 [![bitHound Dependencies](https://www.bithound.io/github/pushrocks/npmts/badges/dependencies.svg)](https://www.bithound.io/github/pushrocks/npmts/master/dependencies/npm)
 [![bitHound Code](https://www.bithound.io/github/pushrocks/npmts/badges/code.svg)](https://www.bithound.io/github/pushrocks/npmts)
@@ -10,18 +11,20 @@ Write npm modules with TypeScript without hassle.
 
 ## What is NPMTS?
 NPMTS is your friend when it comes to write, test, publish and document NPM modules written in TypeScript.
+By default NPMTS will **bundle declaration files**. As a result npm module **code completion in editors like Visual Studio Code** works.
 
 There is a docker image available that includes npmts to make CI a breeze:  
 [hosttoday/ht-docker-npmg on Dockerhub](https://hub.docker.com/r/hosttoday/ht-docker-npmg/)
 
 ### Install
-First install npmts as dev dependency:
+First install npmts globally, then install the npmts checker:
 
 ```sh
-npm install npmts --save-dev
+npm install npmts -g # installs npmts globally
+npm install npmts-g --save-dev # installs npmts-g checking tool as devDependency
 ```
 
-Then use it in package.json's script section to trigger a build:
+Then add it to your package.json's script section to trigger a build:
 
 ```json
 "scripts": {
@@ -29,9 +32,7 @@ Then use it in package.json's script section to trigger a build:
 }
 ```
 
-### Default behaviour
+### Default task execution order
-
-**Execution order of tasks**
 
 1. Check config in ./npmts.json
 1. Clean up from any previous builds (old js files)
@@ -42,8 +43,6 @@ Then use it in package.json's script section to trigger a build:
 1. Instrumentalize created JavaScript files with istanbul
 1. Run Tests
 1. Create Coverage report
-1. Upload Coverage reports to codecov.io (Tests must pass, codecov.io must be activated, by default only triggers on travis)
-1. Upload JsDoc Documentation to gh-pages branch on GitHub. (Tests must pass, requires GitHub Token)
 
 #### npmts.json
 the npmts.json is the main config file. You can use it to customize the behaviour of NPMTS.
@@ -51,9 +50,17 @@ the npmts.json is the main config file. You can use it to customize the behaviou
 ```json
 {
   "mode":"default",
+  "codecov":{
+    "publish":true,
+    "token":"sometoken"
+  },
   "ts":{
     "./customdir/*.ts":"./"
   },
+  "docs": {
+    "publish":true,
+    "destination":"github"
+  },
   "tsOptions":{
     "declaration":false,
     "target":"ES6"
@@ -65,21 +72,18 @@ the npmts.json is the main config file. You can use it to customize the behaviou
     "./customdir/typings.json"
   ],
   "typingsInclude":"auto",
-  "codecov":true,
-  "docs": {
-    "publish":true
-  },
   "cli":true
 }
 ```
 
-| key | description |
+| key | default value | description |
-| --- | --- |
+| --- | --- | --- |
-| codecov | if true, coverage data will be uploaded to codecov when running on travis |
+| `"codecov"` | `true` | if true, coverage data will be uploaded to codecov when running on travis |
-| docs | `{"publish":true, destination:"github"}` lets you control what happens with your module documentation |
+| `"docs"` | `{"publish":"false"}` | `{"publish":true, destination:"github"}` lets you control what happens with your module documentation |
-| mode | "default" will do some defualt stuff, "custom" only does what you specify |
+| `"mode"` | `"default"` | "default" will do some defualt stuff, "custom" only does what you specify |
-| tsOptions | specify options for tsc |
+| `"tsOptions"` | `{"target":"ES5", "declaration":"true"}` | specify options for tsc |
-|  |  |
+| `"typings"` | `["./ts/typings.json"]` | allows you to specify multiple locations for typings.json to install. This is needed for modules that do not yet bundle typings |
+| `"cli"` | "false" | some modules are designed to be used from cli. If set to true NPMTS will create a cli.js that wires you dist files up for cli use. |
 
 #### Typings
 **npmts** looks for `./ts/typings.json` by default and installs any defined typings to `.ts/typings/`.
@@ -121,12 +125,18 @@ Any errors will be shown with reference to their originating source in TypeScrip
 thanks to autogenerated source maps.
 
 ## Example Usage in modules:
-[gulp-typings](https://www.npmjs.com/package/gulp-typings)
+* [gulp-typings](https://www.npmjs.com/package/gulp-typings)
-[gulp-browser](https://www.npmjs.com/package/gulp-typings)
+* [gulp-browser](https://www.npmjs.com/package/gulp-typings)
 
 > We will add more options over time.
 
+## Tips and tricks:
+
+* Use [npmts-g](https://www.npmjs.com/package/npmts-g) to use globally installed npmts and install npmts locally if no global npmts is available.
+* Use [npmpage](https://www.npmjs.com/package/npmtspage) to create a webpage from coverage reports and JsDocs for the module
+* Use [hosttoday/ht-docker-node:npmts](https://hub.docker.com/r/hosttoday/ht-docker-node/) for speedy CI builds
+
 ## About the authors:
 [![Project Phase](https://mediaserve.lossless.digital/lossless.com/img/createdby_github.svg)](https://lossless.com/)
 
-[![PayPal](https://img.shields.io/badge/Support%20us-PayPal-blue.svg)](https://paypal.me/lossless)
+[![PayPal](https://img.shields.io/badge/Support%20us-PayPal-blue.svg)](https://paypal.me/lossless)

appveyor.yml

@@ -0,0 +1,10 @@
+environment:
+  nodejs_version: "4"
+install:
+  - ps: Install-Product node $env:nodejs_version
+  - npm install
+test_script:
+  - node --version
+  - npm --version
+  - npm test
+build: off

dist/index.js

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

dist/npmts.assets.js

@@ -1,14 +1,15 @@
 "use strict";
-/// <reference path="./typings/main.d.ts" />
+require("typings-global");
 var plugins = require("./npmts.plugins");
 var paths = require("./npmts.paths");
+var npmts_promisechain_1 = require("./npmts.promisechain");
 exports.run = function (configArg) {
     var done = plugins.Q.defer();
     var config = configArg;
-    plugins.beautylog.log("now looking at required assets");
+    npmts_promisechain_1.npmtsOra.text("now looking at " + "required assets".yellow);
     if (config.cli == true) {
         plugins.smartfile.fsaction.copy(plugins.path.join(paths.npmtsAssetsDir, "cli.js"), paths.distDir);
-        plugins.beautylog.ok("CLI asset has been installed!");
+        plugins.beautylog.ok("installed CLI assets!");
         done.resolve(config);
     }
     else {

dist/npmts.clean.js

@@ -1,13 +1,29 @@
 "use strict";
-/// <reference path="./typings/main.d.ts" />
+require("typings-global");
 var plugins = require("./npmts.plugins");
 var paths = require("./npmts.paths");
-exports.run = function (configArg) {
+var npmts_promisechain_1 = require("./npmts.promisechain");
-    plugins.beautylog.log("now cleaning up from previous builds...");
+var removeDist = function () {
+    npmts_promisechain_1.npmtsOra.text("cleaning " + "dist".yellow + " folder");
+    return plugins.smartfile.fsaction.remove(paths.distDir);
+};
+var removeTypings = function () {
     var done = plugins.Q.defer();
-    plugins.smartfile.fsaction.remove(paths.distDir)
+    npmts_promisechain_1.npmtsOra.text("cleaning " + "typings".yellow + " folder");
+    if (false) {
+    }
+    else {
+        done.resolve();
+    }
+    return done.promise;
+};
+exports.run = function (configArg) {
+    npmts_promisechain_1.npmtsOra.text("cleaning up from previous builds...");
+    var done = plugins.Q.defer();
+    removeDist()
+        .then(removeTypings)
         .then(function () {
-        plugins.beautylog.ok("Cleaned up!");
+        plugins.beautylog.ok("Cleaned up from previous builds!");
         done.resolve(configArg);
     });
     return done.promise;

dist/npmts.cli.js

@@ -1 +1,2 @@
-/// <reference path="./typings/main.d.ts" /> 
+"use strict";
+require("typings-global");

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) {
+var outputPathIsDir = function (tsArrayArg, keyArg) {
-    return plugins.smartpath.check.isDir(plugins.path.join(paths.cwd, configArg.ts[keyArg]));
+    return plugins.smartpath.check.isDir(plugins.path.join(paths.cwd, tsArrayArg[keyArg]));
 };
-exports.checkOutputPath = function (configArg, keyArg) {
+exports.checkOutputPath = function (tsArrayArg, keyArg) {
-    if (!outputPathIsDir(configArg, keyArg)) {
+    if (!outputPathIsDir(tsArrayArg, keyArg)) {
-        plugins.beautylog.warn("Skipping " + keyArg + " because " + configArg.ts[keyArg] + " it is no directory!");
+        plugins.beautylog.warn("Skipping " + keyArg + " because " + tsArrayArg[keyArg] + " it is no directory!");
         return false;
     }
     else {

dist/npmts.compile.js

@@ -1,16 +1,41 @@
 "use strict";
-/// <reference path="./typings/main.d.ts" />
+require("typings-global");
 var plugins = require("./npmts.plugins");
 var paths = require("./npmts.paths");
 var helpers = require("./npmts.compile.helpers");
-exports.run = function (configArg) {
+var npmts_promisechain_1 = require("./npmts.promisechain");
+/**
+ * handles definition to make them fit for modular use
+ */
+var definitionHandler = function (configArg) {
+    npmts_promisechain_1.npmtsOra.text("now making declaration files ready");
+    var done = plugins.Q.defer();
+    var configTsLenght = Object.keys(configArg.ts).length;
+    if (configTsLenght == 0) {
+        plugins.beautylog.warn("No TS file and thus no definitions found!");
+        done.resolve(configArg); //if there are no definition files, resolve...
+    }
+    var localCounter = 0;
+    for (var key in configArg.ts) {
+        var distPath = configArg.ts[key];
+        var stream = plugins.gulp.src(plugins.path.join(distPath, "**/*.d.ts"))
+            .pipe(plugins.g.replace(plugins.smartstring.typescript.regexReferencePath, ""))
+            .pipe(plugins.gulp.dest(distPath))
+            .pipe(plugins.g.gFunction(function () {
+            localCounter++;
+            if (localCounter == configTsLenght) {
+                plugins.beautylog.ok("made declaration files ready!");
+                done.resolve(configArg);
+            }
+            ;
+        }, "atEnd"));
+    }
+    return done.promise;
+};
+var compileTs = function (tsFileArrayArg, tsOptionsArg) {
+    if (tsOptionsArg === void 0) { tsOptionsArg = {}; }
     var done = plugins.Q.defer();
-    var config = configArg;
-    plugins.beautylog.log("now compiling " + "TypeScript".yellow);
     var moduleStream = plugins.merge2({ end: false });
-    /* -------------------------------------------------
-     * ----------- compile TypeScript --------------------------
-     * ----------------------------------------------- */
     var tsOptionsDefault = {
         declaration: true,
         target: "ES5",
@@ -20,34 +45,40 @@ 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) {
+    for (var keyArg in tsFileArrayArg) {
-        if (helpers.checkOutputPath(config, keyArg)) {
+        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 () {
-        plugins.beautylog.ok("TypeScript has been compiled!");
+        done.resolve();
-        moduleStream.on("finish", function () {
+    });
-            try {
+    return done.promise;
-                if (config.mode = "default")
+};
-                    plugins.fs.copySync(plugins.path.join(paths.cwd, "ts/typings"), plugins.path.join(paths.cwd, "dist/typings"));
+exports.run = function (configArg) {
-            }
+    var done = plugins.Q.defer();
-            catch (err) {
+    var config = configArg;
-                plugins.beautylog.warn("failed to copy external typings for full module declaration support");
+    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.configfile.js

@@ -1,11 +1,14 @@
 "use strict";
-/// <reference path="./typings/main.d.ts" />
+require("typings-global");
 var plugins = require("./npmts.plugins");
 var paths = require("./npmts.paths");
-exports.run = function () {
+exports.run = function (argvArg) {
     var done = plugins.Q.defer();
     var config = {};
     var configPath = plugins.path.join(paths.cwd, "npmts.json");
+    if (argvArg.notest) {
+        config.notest = true;
+    }
     if (plugins.smartfile.checks.fileExistsSync(configPath)) {
         plugins.beautylog.info("npmts.json".blue + " config file found!");
         config = plugins.smartfile.local.toObjectSync(configPath);

dist/npmts.install.js

@@ -1,19 +1,20 @@
 "use strict";
-/// <reference path="./typings/main.d.ts" />
+require("typings-global");
 var plugins = require("./npmts.plugins");
 var paths = require("./npmts.paths");
+var npmts_promisechain_1 = require("./npmts.promisechain");
 exports.run = function (configArg) {
     var config = configArg;
     var done = plugins.Q.defer();
     /* -------------------------------------------------
      * ----------- install typings ---------------
      * ----------------------------------------------- */
-    plugins.beautylog.log("now installing " + "typings".yellow);
+    npmts_promisechain_1.npmtsOra.text("now installing " + "typings".yellow);
     var absoluteTypingsArray = plugins.smartpath.transform.toAbsolute(config.typings, paths.cwd);
     plugins.gulp.src(absoluteTypingsArray)
         .pipe(plugins.g.typings())
         .pipe(plugins.g.gFunction(function () {
-        plugins.beautylog.ok("typings have been installed!");
+        plugins.beautylog.ok("typings installed!");
         done.resolve(config);
     }, "atEnd"));
     return done.promise;

dist/npmts.jsdoc.js

@@ -1,10 +1,11 @@
 "use strict";
-/// <reference path="./typings/main.d.ts" />
+require("typings-global");
 var plugins = require("./npmts.plugins");
 var paths = require("./npmts.paths");
+var npmts_promisechain_1 = require("./npmts.promisechain");
 var genJsdoc = function (configArg) {
     var done = plugins.Q.defer();
-    plugins.beautylog.log("now generating " + "JsDoc documentation".blue);
+    npmts_promisechain_1.npmtsOra.text("now generating " + "JsDoc documentation".yellow);
     plugins.gulp.src([
         plugins.path.join(paths.cwd, "README.md"),
         plugins.path.join(paths.distDir, "**/*.js")
@@ -19,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

@@ -1,21 +1,14 @@
 "use strict";
-/// <reference path="./typings/main.d.ts" />
+require("typings-global");
 var plugins = require("./npmts.plugins");
+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 () {
-    return exports.isRelease()
-        && plugins.smartci.get.subJobNumber() == 1;
-};
 exports.run = function (configArg) {
     var done = plugins.Q.defer();
     var config = configArg;
-    plugins.beautylog.log("now determining build options...");
+    npmts_promisechain_1.npmtsOra.text("now determining build options...");
     //handle default mode
     if (config.mode == "default") {
         config.typings = [
@@ -23,28 +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 coveralls
-    config.codecov ? void (0) : config.codecov = true;
-    exports.isCi() ? 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,16 +1,18 @@
 "use strict";
-/// <reference path="./typings/main.d.ts" />
+require("typings-global");
 var plugins = require("./npmts.plugins");
-var paths = {};
+//Npmts Paths
-paths.cwd = plugins.smartcli.get.cwd().path;
+exports.npmtsPackageRoot = plugins.path.join(__dirname, "../");
+//Project paths
+exports.cwd = process.cwd();
 //Directories
-paths.tsDir = plugins.path.join(paths.cwd, "ts/");
+exports.tsDir = plugins.path.join(exports.cwd, "ts/");
-paths.distDir = plugins.path.join(paths.cwd, "dist/");
+exports.distDir = plugins.path.join(exports.cwd, "dist/");
-paths.docsDir = plugins.path.join(paths.cwd, "docs/");
+exports.docsDir = plugins.path.join(exports.cwd, "docs/");
-paths.testDir = plugins.path.join(paths.cwd, "test/");
+exports.testDir = plugins.path.join(exports.cwd, "test/");
-paths.coverageDir = plugins.path.join(paths.cwd, "coverage/");
+exports.typingsDir = plugins.path.join(exports.cwd, "ts/typings/");
-paths.npmtsAssetsDir = plugins.path.join(__dirname, "../assets/");
+exports.coverageDir = plugins.path.join(exports.cwd, "coverage/");
+exports.npmtsAssetsDir = plugins.path.join(__dirname, "../assets/");
 //Files
-paths.indexTS = plugins.path.join(paths.cwd, "ts/index.ts");
+exports.indexTS = plugins.path.join(exports.cwd, "ts/index.ts");
-paths.testTS = plugins.path.join(paths.cwd, "ts/test.ts");
+exports.testTS = plugins.path.join(exports.cwd, "ts/test.ts");
-module.exports = paths;

dist/npmts.plugins.js

@@ -1,14 +1,14 @@
 "use strict";
-/// <reference path="./typings/main.d.ts" />
+require("typings-global");
 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"),
     mocha: require("gulp-mocha"),
+    replace: require("gulp-replace"),
     sourcemaps: require("gulp-sourcemaps"),
     typescript: require("gulp-typescript"),
     typings: require("gulp-typings")
@@ -25,4 +25,5 @@ exports.smartcov = require("smartcov");
 exports.smartenv = require("smartenv");
 exports.smartfile = require("smartfile");
 exports.smartpath = require("smartpath");
+exports.smartstring = require("smartstring");
 exports.sourceMapSupport = require("source-map-support").install(); // this is required to display errors correctly during testing

dist/npmts.promisechain.js

@@ -1,6 +1,7 @@
 "use strict";
-/// <reference path="./typings/main.d.ts" />
+require("typings-global");
 var plugins = require("./npmts.plugins");
+exports.npmtsOra = new plugins.beautylog.Ora("setting up TaskChain", "cyan");
 var NpmtsAssets = require("./npmts.assets");
 var NpmtsClean = require("./npmts.clean");
 var NpmtsCompile = require("./npmts.compile");
@@ -10,9 +11,10 @@ var NpmtsJsdoc = require("./npmts.jsdoc");
 var NpmtsOptions = require("./npmts.options");
 var NpmtsPublish = require("./npmts.publish");
 var NpmtsTests = require("./npmts.tests");
-exports.run = function () {
+exports.promisechain = function (argvArg) {
-    var promisechain;
+    var done = plugins.Q.defer();
-    NpmtsConfigFile.run()
+    exports.npmtsOra.start();
+    NpmtsConfigFile.run(argvArg)
         .then(NpmtsOptions.run)
         .then(NpmtsClean.run)
         .then(NpmtsInstall.run)
@@ -43,6 +45,7 @@ exports.run = function () {
         else {
             plugins.beautylog.success("Done!");
         }
+        done.resolve();
     });
-    return promisechain;
+    return done.promise;
 };

dist/npmts.publish.js

@@ -1,15 +1,9 @@
 "use strict";
-/// <reference path="./typings/main.d.ts" />
+require("typings-global");
 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 = [];
+    done.resolve();
-    config.codecov ? 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;
 };

dist/npmts.tests.js

@@ -1,28 +1,20 @@
 "use strict";
-/// <reference path="./typings/main.d.ts" />
+require("typings-global");
 var plugins = require("./npmts.plugins");
 var paths = require("./npmts.paths");
-exports.publishCoverage = function (configArg) {
+var npmts_promisechain_1 = require("./npmts.promisechain");
-    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;
-};
 /**
  *
  * @returns {*}
  */
 var istanbul = function (configArg) {
+    npmts_promisechain_1.npmtsOra.text("Instrumentalizing transpiled JS...");
     var done = plugins.Q.defer();
     var stream = plugins.gulp.src([plugins.path.join(paths.cwd, "dist/*.js")])
         .pipe(plugins.g.istanbul()) // Covering files
         .pipe(plugins.g.istanbul.hookRequire()) // Force `require` to return covered files
         .pipe(plugins.g.gFunction(function () {
+        plugins.beautylog.ok("JS has been instrumentalized to get test code coverage!");
         done.resolve(configArg);
     }, "atEnd"));
     return done.promise;
@@ -33,6 +25,7 @@ var istanbul = function (configArg) {
  */
 var mocha = function (configArg) {
     var done = plugins.Q.defer();
+    npmts_promisechain_1.npmtsOra.end(); // end npmtsOra for tests.
     var stream = plugins.gulp.src(["./test/test.js"])
         .pipe(plugins.g.mocha())
         .pipe(plugins.g.istanbul.writeReports()) // Creating the reports after tests ran
@@ -63,15 +56,20 @@ var coverage = function (configArg) {
 exports.run = function (configArg) {
     var done = plugins.Q.defer();
     var config = configArg;
-    plugins.beautylog.log("now starting tests");
+    if (!config.notest) {
-    console.log("--------------------------------------------------------------\n" +
+        npmts_promisechain_1.npmtsOra.text("now starting tests");
-        "***************************" +
+        plugins.beautylog.log("-------------------------------------------------------\n" +
-        " TESTS: ".blue +
+            "*************************** TESTS: ***************************\n" +
-        "***************************\n" +
+            "--------------------------------------------------------------");
-        "--------------------------------------------------------------");
+        istanbul(config)
-    istanbul(config)
+            .then(mocha)
-        .then(mocha)
+            .then(coverage)
-        .then(coverage)
+            .then(function () {
-        .then(done.resolve);
+            done.resolve(config);
+        });
+    }
+    else {
+        done.resolve(config);
+    }
     return done.promise;
 };

package.json

@@ -1,18 +1,20 @@
 {
   "name": "npmts",
-  "version": "5.1.3",
+  "version": "5.3.3",
   "description": "write npm modules with TypeScript",
   "main": "dist/index.js",
   "bin": {
     "npmts": "dist/cli.js"
   },
   "scripts": {
-    "test": "(cd compile && node compile.js) && (cd test/assets && node ../../dist/index.js)",
+    "test": "(npm run compile && npm run check && npm run checkVersion)",
-    "release": "(git add -A && git commit -m 'update' && git push origin master && npm version patch && npm publish)"
+    "check": "(cd ./test/assets && node ../../dist/index.js)",
+    "checkVersion": "cd ./test/assets && node ../../dist/index.js -v",
+    "compile": "(cd compile && node compile.js)"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/pushrocks/npmts.git"
+    "url": "git+https://gitlab.com/pushrocks/npmts.git"
   },
   "keywords": [
     "TypeScript",
@@ -21,35 +23,38 @@
   "author": "Lossless Digital UG (haftungsbeschraenkt)",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/pushrocks/npmts/issues"
+    "url": "https://gitlab.com/pushrocks/npmts/issues"
   },
-  "homepage": "https://github.com/pushrocks/npmts#readme",
+  "homepage": "https://gitlab.com/pushrocks/npmts#readme",
   "dependencies": {
-    "beautylog": "4.1.2",
+    "beautylog": "5.0.11",
+    "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.0",
+    "gulp-if": "^2.0.1",
-    "gulp-istanbul": "^0.10.4",
+    "gulp-istanbul": "^1.0.0",
-    "gulp-jsdoc3": "^0.2.1",
+    "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.0",
+    "gulp-typescript": "2.13.6",
-    "gulp-typings": "1.3.4",
+    "gulp-typings": "2.0.0",
-    "lodash": "^4.11.1",
+    "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.2",
     "smartcov": "0.0.6",
-    "smartenv": "1.2.2",
+    "smartenv": "1.2.5",
-    "smartfile": "3.0.5",
+    "smartfile": "3.0.10",
-    "smartpath": "3.1.5",
+    "smartpath": "3.2.2",
-    "source-map-support": "^0.4.0"
+    "smartstring": "^2.0.6",
+    "source-map-support": "^0.4.0",
+    "typings-global": "*"
   },
   "devDependencies": {}
 }

test/assets/dist/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference path="typings/main.d.ts" />
 declare let testplugin: {
     logSomething: () => void;
 };

test/assets/dist/index.js

@@ -1,4 +1,4 @@
-/// <reference path="./typings/main.d.ts" />
+/// <reference path="./typings/index.d.ts" />
 var testplugin = {
     logSomething: function () {
         console.log("only function executed");
@@ -6,4 +6,4 @@ var testplugin = {
 };
 module.exports = testplugin;
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLDRDQUE0QztBQUM1QyxJQUFJLFVBQVUsR0FBRztJQUNiLFlBQVksRUFBRTtRQUNWLE9BQU8sQ0FBQyxHQUFHLENBQUMsd0JBQXdCLENBQUMsQ0FBQztJQUMxQyxDQUFDO0NBQ0osQ0FBQztBQUNGLE1BQU0sQ0FBQyxPQUFPLEdBQUcsVUFBVSxDQUFDIiwiZmlsZSI6ImluZGV4LmpzIiwic291cmNlc0NvbnRlbnQiOlsiLy8vIDxyZWZlcmVuY2UgcGF0aD1cIi4vdHlwaW5ncy9tYWluLmQudHNcIiAvPlxubGV0IHRlc3RwbHVnaW4gPSB7XG4gICAgbG9nU29tZXRoaW5nOiBmdW5jdGlvbigpe1xuICAgICAgICBjb25zb2xlLmxvZyhcIm9ubHkgZnVuY3Rpb24gZXhlY3V0ZWRcIik7XG4gICAgfVxufTtcbm1vZHVsZS5leHBvcnRzID0gdGVzdHBsdWdpbjsiXX0=
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLDZDQUE2QztBQUM3QyxJQUFJLFVBQVUsR0FBRztJQUNiLFlBQVksRUFBRTtRQUNWLE9BQU8sQ0FBQyxHQUFHLENBQUMsd0JBQXdCLENBQUMsQ0FBQztJQUMxQyxDQUFDO0NBQ0osQ0FBQztBQUNGLE1BQU0sQ0FBQyxPQUFPLEdBQUcsVUFBVSxDQUFDIiwiZmlsZSI6ImluZGV4LmpzIiwic291cmNlc0NvbnRlbnQiOlsiLy8vIDxyZWZlcmVuY2UgcGF0aD1cIi4vdHlwaW5ncy9pbmRleC5kLnRzXCIgLz5cbmxldCB0ZXN0cGx1Z2luID0ge1xuICAgIGxvZ1NvbWV0aGluZzogZnVuY3Rpb24oKXtcbiAgICAgICAgY29uc29sZS5sb2coXCJvbmx5IGZ1bmN0aW9uIGV4ZWN1dGVkXCIpO1xuICAgIH1cbn07XG5tb2R1bGUuZXhwb3J0cyA9IHRlc3RwbHVnaW47Il19

test/assets/npmts.json

@@ -12,7 +12,6 @@
     "./subts2/typings.json",
     "./customdir/typings.json"
   ],
-  "codecov":true,
   "docs": {
     "publish":true
   },

test/assets/test/test.d.ts

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

test/assets/test/test.js

@@ -1,4 +1,4 @@
-/// <reference path="../ts/typings/main.d.ts" />
+/// <reference path="../ts/typings/index.d.ts" />
 var testplugin = require("../dist/index.js");
 describe("testplugins", function () {
     describe(".logSomething", function () {
@@ -8,4 +8,4 @@ describe("testplugins", function () {
     });
 });
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsZ0RBQWdEO0FBQ2hELElBQUksVUFBVSxHQUFHLE9BQU8sQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDO0FBQzdDLFFBQVEsQ0FBQyxhQUFhLEVBQUM7SUFDbkIsUUFBUSxDQUFDLGVBQWUsRUFBQztRQUNyQixFQUFFLENBQUMsc0JBQXNCLEVBQUM7WUFDdEIsVUFBVSxDQUFDLFlBQVksRUFBRSxDQUFBO1FBQzdCLENBQUMsQ0FBQyxDQUFDO0lBQ1AsQ0FBQyxDQUFDLENBQUM7QUFDUCxDQUFDLENBQUMsQ0FBQyIsImZpbGUiOiJ0ZXN0LmpzIiwic291cmNlc0NvbnRlbnQiOlsiLy8vIDxyZWZlcmVuY2UgcGF0aD1cIi4uL3RzL3R5cGluZ3MvbWFpbi5kLnRzXCIgLz5cbnZhciB0ZXN0cGx1Z2luID0gcmVxdWlyZShcIi4uL2Rpc3QvaW5kZXguanNcIik7XG5kZXNjcmliZShcInRlc3RwbHVnaW5zXCIsZnVuY3Rpb24oKXtcbiAgICBkZXNjcmliZShcIi5sb2dTb21ldGhpbmdcIixmdW5jdGlvbigpe1xuICAgICAgICBpdChcInNob3VsZCBsb2cgc29tZXRoaW5nXCIsZnVuY3Rpb24oKXtcbiAgICAgICAgICAgIHRlc3RwbHVnaW4ubG9nU29tZXRoaW5nKClcbiAgICAgICAgfSk7XG4gICAgfSk7XG59KTsiXX0=
+//# 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"}

test/assets/test/test.ts

@@ -1,4 +1,4 @@
-/// <reference path="../ts/typings/main.d.ts" />
+/// <reference path="../ts/typings/index.d.ts" />
 var testplugin = require("../dist/index.js");
 describe("testplugins",function(){
     describe(".logSomething",function(){

test/assets/ts/index.js

@@ -1,8 +0,0 @@
-/// <reference path="./typings/main.d.ts" />
-var testplugin = {
-    logSomething: function () {
-        console.log("only function executed");
-    }
-};
-module.exports = testplugin;
-//# sourceMappingURL=index.js.map

test/assets/ts/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA,4CAA4C;AAC5C,IAAI,UAAU,GAAG;IACb,YAAY,EAAE;QACV,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;IAC1C,CAAC;CACJ,CAAC;AACF,MAAM,CAAC,OAAO,GAAG,UAAU,CAAC"}

test/assets/ts/index.ts

@@ -1,4 +1,4 @@
-/// <reference path="./typings/main.d.ts" />
+/// <reference path="./typings/index.d.ts" />
 let testplugin = {
     logSomething: function(){
         console.log("only function executed");

test/assets/ts/typings.json

@@ -1,5 +1,5 @@
 {
-  "ambientDependencies": {
+  "globalDependencies": {
     "node": "github:DefinitelyTyped/DefinitelyTyped/node/node.d.ts",
     "mocha": "github:Bartvds/tsd-deftools/typings/DefinitelyTyped/mocha/mocha.d.ts",
     "colors": "github:DefinitelyTyped/DefinitelyTyped/colors/colors.d.ts",

ts/index.ts

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

ts/npmts.assets.ts

@@ -1,14 +1,15 @@
-/// <reference path="./typings/main.d.ts" />
+import "typings-global";
 import plugins = require("./npmts.plugins");
 import paths = require("./npmts.paths");
+import {npmtsOra} from "./npmts.promisechain";
 
 export var run = function(configArg){
     let done = plugins.Q.defer();
     let config = configArg;
-    plugins.beautylog.log("now looking at required assets");
+    npmtsOra.text("now looking at " + "required assets".yellow);
     if(config.cli == true){
         plugins.smartfile.fsaction.copy(plugins.path.join(paths.npmtsAssetsDir,"cli.js"),paths.distDir);
-        plugins.beautylog.ok("CLI asset has been installed!");
+        plugins.beautylog.ok("installed CLI assets!");
         done.resolve(config);
     } else {
         done.resolve(config);

ts/npmts.clean.ts

@@ -1,13 +1,32 @@
-/// <reference path="./typings/main.d.ts" />
+import "typings-global";
 import plugins = require("./npmts.plugins");
 import paths = require("./npmts.paths");
+import {npmtsOra} from "./npmts.promisechain";
+
+let removeDist = function(){
+    npmtsOra.text("cleaning " + "dist".yellow + " folder");
+    return plugins.smartfile.fsaction.remove(paths.distDir);
+};
+
+let removeTypings = function(){
+    let done = plugins.Q.defer();
+    npmtsOra.text("cleaning " + "typings".yellow + " folder");
+    if(false){
+        //plugins.smartfile.fsaction.remove(paths.typingsDir)
+        //    .then(done.resolve);
+    } else {
+        done.resolve();
+    }
+    return done.promise;
+};
 
 export let run = function(configArg){
-    plugins.beautylog.log("now cleaning up from previous builds...");
+    npmtsOra.text("cleaning up from previous builds...");
     let done = plugins.Q.defer();
-    plugins.smartfile.fsaction.remove(paths.distDir)
+    removeDist()
+        .then(removeTypings)
         .then(function(){
-            plugins.beautylog.ok("Cleaned up!");
+            plugins.beautylog.ok("Cleaned up from previous builds!");
             done.resolve(configArg);
         });
     return done.promise;

ts/npmts.cli.ts

@@ -1 +1 @@
-/// <reference path="./typings/main.d.ts" />
+import "typings-global";

ts/npmts.compile.helpers.ts

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

ts/npmts.compile.ts

@@ -1,18 +1,41 @@
-/// <reference path="./typings/main.d.ts" />
+import "typings-global";
 import plugins = require("./npmts.plugins");
 import paths = require("./npmts.paths");
-
 import helpers = require("./npmts.compile.helpers");
+import {npmtsOra} from "./npmts.promisechain";
 
-export let run = function (configArg) {
+/**
+ * handles definition to make them fit for modular use
+ */
+let definitionHandler = function(configArg){
+    npmtsOra.text("now making declaration files ready");
     let done = plugins.Q.defer();
-    let config = configArg;
+    let configTsLenght = Object.keys(configArg.ts).length;
-    plugins.beautylog.log("now compiling " + "TypeScript".yellow);
+    if(configTsLenght == 0) {
-    let moduleStream = plugins.merge2({ end: false });
+        plugins.beautylog.warn("No TS file and thus no definitions found!");
+        done.resolve(configArg); //if there are no definition files, resolve...
+    }
+    let localCounter = 0;
+    for (let key in configArg.ts){
+        let distPath = configArg.ts[key];
+        let stream = plugins.gulp.src(plugins.path.join(distPath,"**/*.d.ts"))
+            .pipe(plugins.g.replace(plugins.smartstring.typescript.regexReferencePath,""))
+            .pipe(plugins.gulp.dest(distPath))
+            .pipe(plugins.g.gFunction(function(){
+                localCounter++
+                if(localCounter == configTsLenght){
+                    plugins.beautylog.ok("made declaration files ready!");
+                    done.resolve(configArg)
+                };
+            },"atEnd"));
+        
+    }
+    return done.promise;
+}
 
-    /* -------------------------------------------------
+let compileTs = (tsFileArrayArg,tsOptionsArg = {}) => {
-     * ----------- compile TypeScript --------------------------
+    let done = plugins.Q.defer();
-     * ----------------------------------------------- */
+    let moduleStream = plugins.merge2({ end: false });
 
     let tsOptionsDefault = {
         declaration: true,
@@ -24,40 +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 tsFileArrayArg) {
-    for (let keyArg in config.ts) {
+        if (helpers.checkOutputPath(tsFileArrayArg,keyArg)) {
-        if (helpers.checkOutputPath(config,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 () {
+
-        plugins.beautylog.ok("TypeScript has been compiled!");
+export let run = function (configArg) {
-        moduleStream.on("finish", function () {
+    let done = plugins.Q.defer();
-            try {
+    let config = configArg;
-                if(config.mode = "default") plugins.fs.copySync(
+    npmtsOra.text("now compiling " + "TypeScript".yellow);
-                    plugins.path.join(paths.cwd,"ts/typings"),
+    
-                    plugins.path.join(paths.cwd,"dist/typings")
+    compileTs(config.ts,config.tsOptions)
-                );
+        .then(() => {
-            }
+            compileTs(config.testTs);
-            catch (err){
+        })
-                plugins.beautylog.warn("failed to copy external typings for full module declaration support");
+        .then(function () {
-            }
+            plugins.beautylog.ok("compiled TypeScript!");
-            done.resolve(config);
+            definitionHandler(config)
+            .then(function(){
+                done.resolve(config);
+            });
         });
-        moduleStream.end();
-    });
     /*==================== END TS Compilation =====================*/
 
 

ts/npmts.configfile.ts

@@ -1,10 +1,13 @@
-/// <reference path="./typings/main.d.ts" />
+import "typings-global";
 import plugins = require("./npmts.plugins");
 import paths = require("./npmts.paths");
-export var run = function(){
+export var run = function(argvArg){
     var done = plugins.Q.defer();
     var config:any = {};
     var configPath = plugins.path.join(paths.cwd,"npmts.json");
+    if(argvArg.notest){
+        config.notest = true;
+    }
     if(plugins.smartfile.checks.fileExistsSync(configPath)){
         plugins.beautylog.info("npmts.json".blue + " config file found!");
         config = plugins.smartfile.local.toObjectSync(configPath);

ts/npmts.install.ts

@@ -1,18 +1,20 @@
-/// <reference path="./typings/main.d.ts" />
+import "typings-global";
 import plugins = require("./npmts.plugins");
 import paths = require("./npmts.paths");
+import {npmtsOra} from "./npmts.promisechain";
+
 export var run = function(configArg){
     var config = configArg;
     var done = plugins.Q.defer();
     /* -------------------------------------------------
      * ----------- install typings ---------------
      * ----------------------------------------------- */
-    plugins.beautylog.log("now installing " + "typings".yellow);
+    npmtsOra.text("now installing " + "typings".yellow);
     var absoluteTypingsArray = plugins.smartpath.transform.toAbsolute(config.typings,paths.cwd);
     plugins.gulp.src(absoluteTypingsArray)
         .pipe(plugins.g.typings())
         .pipe(plugins.g.gFunction(function(){
-            plugins.beautylog.ok("typings have been installed!");
+            plugins.beautylog.ok("typings installed!");
             done.resolve(config);
         },"atEnd"));
     return done.promise;

ts/npmts.jsdoc.ts

@@ -1,10 +1,11 @@
-/// <reference path="./typings/main.d.ts" />
+import "typings-global";
 import plugins = require("./npmts.plugins");
 import paths = require("./npmts.paths");
+import {npmtsOra} from "./npmts.promisechain";
 
 let genJsdoc = function(configArg){
     let done = plugins.Q.defer();
-    plugins.beautylog.log("now generating " + "JsDoc documentation".blue);
+    npmtsOra.text("now generating " + "JsDoc documentation".yellow);
     plugins.gulp.src([
             plugins.path.join(paths.cwd,"README.md"),
             plugins.path.join(paths.distDir,"**/*.js")
@@ -20,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

@@ -1,25 +1,16 @@
-/// <reference path="./typings/main.d.ts" />
+import "typings-global";
 import plugins = require("./npmts.plugins");
+import {npmtsOra} from "./npmts.promisechain";
 
 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 {
-    return isRelease()
-        && plugins.smartci.get.subJobNumber() == 1;
-};
-
 export var run = function(configArg){
     var done = plugins.Q.defer();
     var config = configArg;
 
-    plugins.beautylog.log("now determining build options...");
+    npmtsOra.text("now determining build options...");
 
     //handle default mode
     if (config.mode == "default"){
@@ -27,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"];
@@ -36,23 +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 coveralls
-    config.codecov ? void(0) : config.codecov = true;
-    isCi() ? 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,19 +1,23 @@
-/// <reference path="./typings/main.d.ts" />
+import "typings-global";
 import plugins = require("./npmts.plugins");
-var paths:any = {};
+
-paths.cwd = plugins.smartcli.get.cwd().path;
+//Npmts Paths
+export let npmtsPackageRoot = plugins.path.join(__dirname,"../");
+
+
+//Project paths
+export let cwd = process.cwd();
 
 //Directories
-paths.tsDir = plugins.path.join(paths.cwd,"ts/");
+export let tsDir = plugins.path.join(cwd,"ts/");
-paths.distDir = plugins.path.join(paths.cwd,"dist/");
+export let distDir = plugins.path.join(cwd,"dist/");
-paths.docsDir = plugins.path.join(paths.cwd,"docs/");
+export let docsDir = plugins.path.join(cwd,"docs/");
-paths.testDir = plugins.path.join(paths.cwd,"test/");
+export let testDir = plugins.path.join(cwd,"test/");
-paths.coverageDir = plugins.path.join(paths.cwd,"coverage/");
+export let typingsDir = plugins.path.join(cwd,"ts/typings/");
+export let coverageDir = plugins.path.join(cwd,"coverage/");
 
-paths.npmtsAssetsDir = plugins.path.join(__dirname,"../assets/");
+export let npmtsAssetsDir = plugins.path.join(__dirname,"../assets/");
 
 //Files
-paths.indexTS = plugins.path.join(paths.cwd,"ts/index.ts");
+export let indexTS = plugins.path.join(cwd,"ts/index.ts");
-paths.testTS = plugins.path.join(paths.cwd,"ts/test.ts");
+export let testTS = plugins.path.join(cwd,"ts/test.ts");
-
-export = paths;

ts/npmts.plugins.ts

@@ -1,13 +1,13 @@
-/// <reference path="./typings/main.d.ts" />
+import "typings-global";
-export let beautylog = require("beautylog");
+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"),
     mocha: require("gulp-mocha"),
+    replace: require("gulp-replace"),
     sourcemaps: require("gulp-sourcemaps"),
     typescript: require("gulp-typescript"),
     typings: require("gulp-typings")
@@ -15,14 +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 import smartenv = require("smartenv");
-export let smartfile = require("smartfile");
+export import smartfile = require("smartfile");
-export let smartpath = require("smartpath");
+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

@@ -1,6 +1,8 @@
-/// <reference path="./typings/main.d.ts" />
+import "typings-global";
 import plugins = require("./npmts.plugins");
 
+export let npmtsOra = new plugins.beautylog.Ora("setting up TaskChain","cyan");
+
 import NpmtsAssets = require("./npmts.assets");
 import NpmtsClean = require("./npmts.clean");
 import NpmtsCompile = require("./npmts.compile");
@@ -11,9 +13,10 @@ import NpmtsOptions = require("./npmts.options");
 import NpmtsPublish = require("./npmts.publish");
 import NpmtsTests = require("./npmts.tests");
 
-export var run = function(){
+export let promisechain = function(argvArg){
-    var promisechain;
+    let done = plugins.Q.defer();
-    NpmtsConfigFile.run()
+    npmtsOra.start();
+    NpmtsConfigFile.run(argvArg)
         .then(NpmtsOptions.run)
         .then(NpmtsClean.run)
         .then(NpmtsInstall.run)
@@ -41,9 +44,9 @@ export var run = function(){
                 console.log(shipString);
                 plugins.beautylog.success("READY TO SHIP!");
             } else {
-                plugins.beautylog.success("Done!")
+                plugins.beautylog.success("Done!");
             }
-
+            done.resolve();
         });
-    return promisechain;
+        return done.promise;
 };

ts/npmts.publish.ts

@@ -1,18 +1,11 @@
-/// <reference path="./typings/main.d.ts" />
+import "typings-global";
 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 = [];
+    done.resolve();
-    config.codecov ? 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;
 };

ts/npmts.tests.ts

@@ -1,29 +1,20 @@
-/// <reference path="./typings/main.d.ts" />
+import "typings-global";
 import plugins = require("./npmts.plugins");
 import paths = require("./npmts.paths");
-
+import {npmtsOra} from "./npmts.promisechain";
-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;
-};
 
 /**
  *
  * @returns {*}
  */
 let istanbul = function (configArg) {
+    npmtsOra.text("Instrumentalizing transpiled JS...");
     let done = plugins.Q.defer();
     var stream = plugins.gulp.src([plugins.path.join(paths.cwd,"dist/*.js")])
         .pipe(plugins.g.istanbul()) // Covering files
         .pipe(plugins.g.istanbul.hookRequire()) // Force `require` to return covered files
         .pipe(plugins.g.gFunction(function(){
+            plugins.beautylog.ok("JS has been instrumentalized to get test code coverage!");
             done.resolve(configArg);
         },"atEnd"));
     return done.promise;
@@ -35,6 +26,7 @@ let istanbul = function (configArg) {
  */
 let mocha = function (configArg) {
     let done = plugins.Q.defer();
+    npmtsOra.end(); // end npmtsOra for tests.
     let stream = plugins.gulp.src(["./test/test.js"])
         .pipe(plugins.g.mocha())
         .pipe(plugins.g.istanbul.writeReports()) // Creating the reports after tests ran
@@ -70,19 +62,23 @@ let coverage = function(configArg){
 export let run = function(configArg) {
     let done = plugins.Q.defer();
     let config = configArg;
+    if(!config.notest){
 
-    plugins.beautylog.log("now starting tests");
+    npmtsOra.text("now starting tests");
-    console.log(
+    plugins.beautylog.log(
-        "--------------------------------------------------------------\n" +
+        "-------------------------------------------------------\n" +
-        "***************************" +
+        "*************************** TESTS: ***************************\n" +
-        " TESTS: ".blue +
-        "***************************\n" +
         "--------------------------------------------------------------"
     );
 
     istanbul(config)
         .then(mocha)
         .then(coverage)
-        .then(done.resolve);
+        .then(() => {
+            done.resolve(config);
+        });
+    } else {
+        done.resolve(config);
+    }
     return done.promise;
 };

ts/typings.json

@@ -1,5 +1,5 @@
 {
-  "ambientDependencies": {
+  "globalDependencies": {
     "colors": "github:DefinitelyTyped/DefinitelyTyped/colors/colors.d.ts#09e37435ffb2c56a6f908081194a74756f24f99d",
     "istanbul": "registry:dt/istanbul#0.4.0+20160316155526",
     "node": "github:DefinitelyTyped/DefinitelyTyped/node/node.d.ts#78d36dd49b6b55b9fdfe61776a12bf05c8b07777",