3.6.4

.gitignore

@@ -1,10 +1,10 @@
 .idea/
 .c9/
 node_modules/
-test/**/node_modules/
-test/assets/docs/
-test/**/typings/
-test/**/coverage/
+test/assets/**/node_modules/
+test/assets/**/docs/
+test/assets/**/typings/
+test/assets/**/coverage/
 ts/*.js
 ts/*.js.map
 ts/typings/

.npmignore

@@ -2,5 +2,6 @@
 support
 compile
 test/
+docs/
 examples
 .gitignore

dist/index.js

@@ -1,6 +1,12 @@
+"use strict";
 /// <reference path="./typings/main.d.ts" />
 console.log("**** starting NPMTS ****");
 var plugins = require("./npmts.plugins");
 var promisechain = require("./npmts.promisechain");
 plugins.beautylog.figletSync("NPMTS");
-promisechain.run();
+try {
+    promisechain.run();
+}
+catch (err) {
+    console.log(err);
+}

dist/npmts.assets.js

@@ -0,0 +1,18 @@
+"use strict";
+/// <reference path="./typings/main.d.ts" />
+var plugins = require("./npmts.plugins");
+var paths = require("./npmts.paths");
+exports.run = function (configArg) {
+    var done = plugins.Q.defer();
+    var config = configArg;
+    plugins.beautylog.log("now looking at required assets");
+    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!");
+        done.resolve(config);
+    }
+    else {
+        done.resolve(config);
+    }
+    return done.promise;
+};

dist/npmts.clean.js

@@ -0,0 +1,13 @@
+"use strict";
+/// <reference path="./typings/main.d.ts" />
+var plugins = require("./npmts.plugins");
+var paths = require("./npmts.paths");
+exports.run = function (configArg) {
+    plugins.beautylog.log("now cleaning up from previous builds");
+    var done = plugins.Q.defer();
+    plugins.smartfile.fsaction.remove(paths.distDir)
+        .then(function () {
+        done.resolve(configArg);
+    });
+    return done.promise;
+};

dist/npmts.compile.js

@@ -1,89 +1,62 @@
+"use strict";
 /// <reference path="./typings/main.d.ts" />
 var plugins = require("./npmts.plugins");
 var paths = require("./npmts.paths");
 exports.run = function (configArg) {
     var done = plugins.Q.defer();
     var config = configArg;
-    plugins.beautylog.log("now running custom tasks");
+    plugins.beautylog.log("now compiling " + "TypeScript".yellow);
     var moduleStream = plugins.merge2({ end: false });
     /* -------------------------------------------------
-     * ----------- first install typings ---------------
+     * ----------- compile TypeScript --------------------------
      * ----------------------------------------------- */
-    var typingsDone = plugins.Q.defer();
-    var typingsCounter = 0;
-    var typingsCounterAdvance = function () {
-        typingsCounter++;
-        if (typeof config.typings[typingsCounter] != "undefined") {
-            installTypings();
-        }
-        else {
-            plugins.beautylog.success("custom typings installed successfully");
-            typingsDone.resolve();
-        }
-    };
-    var installTypings = function () {
-        plugins.beautylog.log("now installing " + "typings.json".yellow + " from " + config.typings[typingsCounter].blue);
-        plugins.typings.install({ production: false, cwd: plugins.path.join(paths.cwd, config.typings[typingsCounter]) })
-            .then(function () {
-            typingsCounterAdvance();
-        }, function () {
-            plugins.beautylog.error("something went wrong: Check if path is correct: " + config.typings[typingsCounter].blue);
-            typingsCounterAdvance();
-        });
-    };
-    installTypings();
-    /* -------------------------------------------------
-     * ----------- second compile TS -------------------
-     * ----------------------------------------------- */
-    typingsDone.promise.then(function () {
-        for (var key in config.ts) {
-            plugins.beautylog.log("now compiling" + key.blue);
-            var outputPathIsDir;
-            try {
-                if (plugins.fs.statSync(plugins.path.join(paths.cwd, config.ts[key])).isDirectory()) {
-                    outputPathIsDir = true;
-                }
+    for (var key in config.ts) {
+        var outputPathIsDir;
+        try {
+            if (plugins.fs.statSync(plugins.path.join(paths.cwd, config.ts[key])).isDirectory()) {
+                outputPathIsDir = true;
             }
-            catch (err) {
-                outputPathIsDir = false;
-            }
-            //do some evaluation of the environment
-            var outputNameSpecified = (!outputPathIsDir
-                && (plugins.path.extname(config.ts[key]) == ".js"));
-            var outputName = (function () {
-                if (outputNameSpecified) {
-                    return plugins.path.basename(config.ts[key]);
-                }
-                else {
-                    return undefined;
-                }
-            })();
-            var outputDir = (function () {
-                if (outputNameSpecified) {
-                    return plugins.path.dirname(plugins.path.join(paths.cwd, config.ts[key]));
-                }
-                else {
-                    return plugins.path.join(paths.cwd, config.ts[key]);
-                }
-            })();
-            var stream = plugins.gulp.src([plugins.path.join(paths.cwd, key), "!**/typings/**"])
-                .pipe(plugins.g.sourcemaps.init()) // This means sourcemaps will be generated
-                .pipe(plugins.g.typescript({
-                out: outputName,
-                target: "ES5",
-                module: "commonjs"
-            }))
-                .pipe(plugins.g.sourcemaps.write()) // Now the sourcemaps are added to the .js file
-                .pipe(plugins.gulp.dest(outputDir));
-            moduleStream.add(stream);
         }
-        moduleStream.on("queueDrain", function () {
-            plugins.beautylog.success("custom TypeScript installed successfully");
-            moduleStream.on("finish", function () {
-                done.resolve(config);
-            });
-            moduleStream.end();
+        catch (err) {
+            outputPathIsDir = false;
+        }
+        //do some evaluation of the environment
+        var outputNameSpecified = (!outputPathIsDir
+            && (plugins.path.extname(config.ts[key]) == ".js"));
+        var outputName = (function () {
+            if (outputNameSpecified) {
+                return plugins.path.basename(config.ts[key]);
+            }
+            else {
+                return undefined;
+            }
+        })();
+        var outputDir = (function () {
+            if (outputNameSpecified) {
+                return plugins.path.dirname(plugins.path.join(paths.cwd, config.ts[key]));
+            }
+            else {
+                return plugins.path.join(paths.cwd, config.ts[key]);
+            }
+        })();
+        var stream = plugins.gulp.src([plugins.path.join(paths.cwd, key), "!**/typings/**"])
+            .pipe(plugins.g.sourcemaps.init()) // This means sourcemaps will be generated
+            .pipe(plugins.g.typescript({
+            out: outputName,
+            target: "ES5",
+            module: "commonjs"
+        }))
+            .pipe(plugins.g.sourcemaps.write()) // Now the sourcemaps are added to the .js file
+            .pipe(plugins.gulp.dest(outputDir));
+        moduleStream.add(stream);
+    }
+    moduleStream.on("queueDrain", function () {
+        plugins.beautylog.ok("TypeScript has been compiled!");
+        moduleStream.on("finish", function () {
+            done.resolve(config);
         });
+        moduleStream.end();
     });
+    /*==================== END TYPESCRIPT =====================*/
     return done.promise;
 };

dist/npmts.configfile.js

@@ -1,3 +1,4 @@
+"use strict";
 /// <reference path="./typings/main.d.ts" />
 var plugins = require("./npmts.plugins");
 var paths = require("./npmts.paths");
@@ -7,7 +8,7 @@ exports.run = function () {
     var configPath = plugins.path.join(paths.cwd, "npmts.json");
     if (plugins.smartfile.checks.fileExistsSync(configPath)) {
         plugins.beautylog.info("npmts.json".blue + " config file found!");
-        config = plugins.smartfile.readFileToObject(configPath);
+        config = plugins.smartfile.local.toObjectSync(configPath);
         switch (config.mode) {
             case "default":
             case "custom":
@@ -16,6 +17,7 @@ exports.run = function () {
                 break;
             default:
                 plugins.beautylog.error("mode " + config.mode.yellow + " not recognised!".red);
+                process.exit(1);
         }
         ;
     }

dist/npmts.install.js

@@ -0,0 +1,20 @@
+"use strict";
+/// <reference path="./typings/main.d.ts" />
+var plugins = require("./npmts.plugins");
+var paths = require("./npmts.paths");
+exports.run = function (configArg) {
+    var config = configArg;
+    var done = plugins.Q.defer();
+    /* -------------------------------------------------
+     * ----------- install typings ---------------
+     * ----------------------------------------------- */
+    plugins.beautylog.log("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!");
+        done.resolve(config);
+    }, "atEnd"));
+    return done.promise;
+};

dist/npmts.jsdoc.js

@@ -1,3 +1,4 @@
+"use strict";
 /// <reference path="./typings/main.d.ts" />
 var plugins = require("./npmts.plugins");
 var paths = require("./npmts.paths");
@@ -13,11 +14,12 @@ var genJsdoc = function (configArg) {
             destination: paths.docsDir
         }
     }, function () {
+        plugins.beautylog.ok("JsDoc documentation has been generated!");
         done.resolve(configArg);
     }));
     return done.promise;
 };
-var publishDocs = function (configArg) {
+exports.publishDocs = function (configArg) {
     var done = plugins.Q.defer();
     var gitUrl = plugins.projectinfo.npm(paths.cwd, {
         gitAccessToken: process.env.GITHUB_TOKEN
@@ -32,20 +34,21 @@ var publishDocs = function (configArg) {
         + "&& git push --force --quiet "
         + "\"" + gitUrl + "\" "
         + "master:gh-pages " + "> /dev/null 2>&1";
-    if (plugins.smartenv.getEnv().isTravis) {
-        plugins.beautylog.log("now publishing docs to GitHub");
+    if (configArg.docs.publish) {
+        plugins.beautylog.log("now publishing JsDoc documentation to GitHub");
         if (!plugins.shelljs.which('git')) {
-            plugins.beautylog.error('Git is not installed');
+            plugins.beautylog.error('Git is not installed!');
             plugins.shelljs.exit(1);
         }
         else if (plugins.shelljs.exec(deployScript).code !== 0) {
-            plugins.beautylog.error('Error: Git failed');
+            plugins.beautylog.error('Git failed!');
             plugins.shelljs.exit(1);
         }
-        plugins.beautylog.success("Docs have been deployed to GitHub");
+        plugins.beautylog.ok("JsDoc documentation has been deployed to GitHub!");
         done.resolve(configArg);
     }
     else {
+        console.log("GitHub documentation has not been uploaded.");
         done.resolve(configArg);
     }
     return done.promise;
@@ -53,7 +56,6 @@ var publishDocs = function (configArg) {
 exports.run = function (configArg) {
     var done = plugins.Q.defer();
     genJsdoc(configArg)
-        .then(publishDocs)
         .then(done.resolve);
     return done.promise;
 };

dist/npmts.options.js

@@ -1,14 +1,22 @@
+"use strict";
 /// <reference path="./typings/main.d.ts" />
 var plugins = require("./npmts.plugins");
+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;
-    if (typeof config.coveralls === "undefined") {
-        config.coveralls = false;
-    }
+    plugins.beautylog.log("now determining build options");
+    //handle default mode
     if (config.mode == "default") {
         config.typings = [
-            "./ts/"
+            "./ts/typings.json"
         ];
         config.ts = (_a = {},
             _a["./ts/**/*.ts"] = "./dist/",
@@ -16,11 +24,20 @@ exports.run = function (configArg) {
             _a
         );
         config.test = ["./index.js"];
-        done.resolve(config);
-    }
-    else {
-        done.resolve(config);
     }
+    // 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 and docs when tests succeed!")
+        : plugins.beautylog.info("We are not publishing anything!");
+    // handle coveralls
+    config.coveralls ? void (0) : config.coveralls = false;
+    exports.doPublish() ? void (0) : config.coveralls = false;
+    // handle docs
+    config.docs ? void (0) : config.docs = {};
+    config.docs.publish ? void (0) : config.docs.publish = false;
+    exports.doPublish() ? void (0) : config.docs.publish = false;
+    done.resolve(config);
     return done.promise;
     var _a;
 };

dist/npmts.paths.js

@@ -1,3 +1,4 @@
+"use strict";
 /// <reference path="./typings/main.d.ts" />
 var plugins = require("./npmts.plugins");
 var paths = {};
@@ -7,6 +8,7 @@ paths.tsDir = plugins.path.join(paths.cwd, "ts/");
 paths.distDir = plugins.path.join(paths.cwd, "dist/");
 paths.docsDir = plugins.path.join(paths.cwd, "docs/");
 paths.testDir = plugins.path.join(paths.cwd, "test/");
+paths.npmtsAssetsDir = plugins.path.join(__dirname, "../assets/");
 //Files
 paths.indexTS = plugins.path.join(paths.cwd, "ts/index.ts");
 paths.testTS = plugins.path.join(paths.cwd, "ts/test.ts");

dist/npmts.plugins.js

@@ -1,26 +1,26 @@
+"use strict";
 /// <reference path="./typings/main.d.ts" />
-var plugins = {
-    beautylog: require("beautylog"),
-    fs: require("fs-extra"),
-    gulp: require("gulp"),
-    g: {
-        coveralls: require("gulp-coveralls"),
-        gFunction: require("gulp-function"),
-        istanbul: require("gulp-istanbul"),
-        jsdoc3: require("gulp-jsdoc3"),
-        mocha: require("gulp-mocha"),
-        sourcemaps: require("gulp-sourcemaps"),
-        typescript: require("gulp-typescript")
-    },
-    merge2: require("merge2"),
-    projectinfo: require("projectinfo"),
-    sourceMapSupport: require("source-map-support").install(),
-    path: require("path"),
-    Q: require("q"),
-    shelljs: require("shelljs"),
-    smartcli: require("smartcli"),
-    smartenv: require("smartenv"),
-    smartfile: require("smartfile"),
-    typings: require("typings")
+exports.beautylog = require("beautylog");
+exports.fs = require("fs-extra");
+exports.gulp = require("gulp");
+exports.g = {
+    coveralls: require("gulp-coveralls"),
+    gFunction: require("gulp-function"),
+    istanbul: require("gulp-istanbul"),
+    jsdoc3: require("gulp-jsdoc3"),
+    mocha: require("gulp-mocha"),
+    sourcemaps: require("gulp-sourcemaps"),
+    typescript: require("gulp-typescript"),
+    typings: require("gulp-typings")
 };
-module.exports = plugins;
+exports.merge2 = require("merge2");
+exports.projectinfo = require("projectinfo");
+exports.sourceMapSupport = require("source-map-support").install();
+exports.path = require("path");
+exports.Q = require("q");
+exports.shelljs = require("shelljs");
+exports.smartci = require("smartci");
+exports.smartcli = require("smartcli");
+exports.smartenv = require("smartenv");
+exports.smartfile = require("smartfile");
+exports.smartpath = require("smartpath");

dist/npmts.promisechain.js

@@ -1,15 +1,45 @@
+"use strict";
 /// <reference path="./typings/main.d.ts" />
-var NpmtsConfigFile = require("./npmts.configfile");
-var NpmtsOptions = require("./npmts.options");
+var plugins = require("./npmts.plugins");
+var NpmtsAssets = require("./npmts.assets");
+var NpmtsClean = require("./npmts.clean");
 var NpmtsCompile = require("./npmts.compile");
+var NpmtsConfigFile = require("./npmts.configfile");
+var NpmtsInstall = require("./npmts.install");
 var NpmtsJsdoc = require("./npmts.jsdoc");
+var NpmtsOptions = require("./npmts.options");
+var NpmtsPublish = require("./npmts.publish");
 var NpmtsTests = require("./npmts.tests");
 exports.run = function () {
     var promisechain;
     NpmtsConfigFile.run()
         .then(NpmtsOptions.run)
+        .then(NpmtsClean.run)
+        .then(NpmtsInstall.run)
         .then(NpmtsCompile.run)
+        .then(NpmtsAssets.run)
         .then(NpmtsJsdoc.run)
-        .then(NpmtsTests.run);
+        .then(NpmtsTests.run)
+        .then(NpmtsPublish.run)
+        .then(function (configArg) {
+        var shipString = "" +
+            "\n" +
+            "\n" +
+            "                                         # #  ( )\n" +
+            "                                      ___#_#___|__\n" +
+            "                                  _  |____________|  _\n" +
+            "                           _=====| | |            | | |==== _\n" +
+            "                     =====| |.---------------------------. | |====\n" +
+            "       <--------------------'   .  .  .  .  .  .  .  .   '--------------/\n" +
+            "         \\                                                             /\n" +
+            "          \\___________________________________________________________/\n" +
+            "    wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww\n" +
+            "   wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww\n" +
+            "     wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww\n";
+        if (process.env.CI) {
+            console.log(shipString);
+            plugins.beautylog.success("READY TO SHIP!");
+        }
+    });
     return promisechain;
 };

dist/npmts.publish.js

@@ -0,0 +1,15 @@
+"use strict";
+/// <reference path="./typings/main.d.ts" />
+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 = [];
+    config.coveralls ? 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,6 +1,25 @@
+"use strict";
 /// <reference path="./typings/main.d.ts" />
 var plugins = require("./npmts.plugins");
 var paths = require("./npmts.paths");
+exports.publishCoverage = function (configArg) {
+    var done = plugins.Q.defer();
+    plugins.beautylog.log("now uploading coverage data to coveralls");
+    var stream = plugins.gulp.src([plugins.path.join(paths.cwd, "./coverage/lcov.info")])
+        .pipe(plugins.g.coveralls())
+        .pipe(plugins.g.gFunction([
+        function () {
+            var done = plugins.Q.defer();
+            plugins.beautylog.ok("Coverage data has been uploaded to Coveralls!");
+            done.resolve();
+            return done.promise;
+        }
+    ], "atEnd"));
+    stream.on("finish", function () {
+        done.resolve(configArg);
+    });
+    return done.promise;
+};
 exports.run = function (configArg) {
     var done = plugins.Q.defer();
     var config = configArg;
@@ -17,22 +36,11 @@ exports.run = function (configArg) {
             .pipe(plugins.g.istanbul.enforceThresholds({ thresholds: { global: 30 } }));
         return stream;
     };
-    var coveralls = function () {
-        plugins.beautylog.log("now uploading coverage data to coveralls");
-        var stream = plugins.gulp.src([plugins.path.join(paths.cwd, "./coverage/lcov.info")])
-            .pipe(plugins.g.coveralls());
-        return stream;
-    };
+    plugins.beautylog.log("now starting tests");
     istanbul().on("finish", function () {
         mocha().on("finish", function () {
-            if (plugins.smartenv.getEnv().isTravis && config.coveralls) {
-                coveralls().on("finish", function () {
-                    done.resolve(config);
-                });
-            }
-            else {
-                done.resolve(config);
-            }
+            plugins.beautylog.ok("Tests have passed!");
+            done.resolve(config);
         });
     });
     return done.promise;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "npmts",
-  "version": "3.3.1",
+  "version": "3.6.4",
   "description": "write npm modules with TypeScript",
   "main": "dist/index.js",
   "bin": {
@@ -26,29 +26,28 @@
   "homepage": "https://github.com/pushrocks/npmts#readme",
   "dependencies": {
     "beautylog": "3.1.2",
-    "fs-extra": "^0.26.5",
+    "fs-extra": "^0.26.7",
     "gulp": "3.9.1",
     "gulp-concat": "^2.6.0",
     "gulp-coveralls": "^0.1.4",
     "gulp-function": "^1.1.1",
     "gulp-if": "^2.0.0",
     "gulp-istanbul": "^0.10.3",
-    "gulp-jsdoc3": "^0.2.0",
+    "gulp-jsdoc3": "^0.2.1",
     "gulp-mocha": "^2.2.0",
     "gulp-sourcemaps": "^1.6.0",
-    "gulp-typescript": "2.11.0",
-    "gulp-typings": "1.1.0",
+    "gulp-typescript": "2.12.1",
+    "gulp-typings": "1.3.0",
     "merge2": "1.0.1",
     "projectinfo": "1.0.1",
     "q": "^1.4.1",
     "shelljs": "^0.6.0",
+    "smartci": "0.0.1",
     "smartcli": "0.0.11",
-    "smartenv": "1.1.0",
-    "smartfile": "0.0.11",
-    "source-map-support": "^0.4.0",
-    "typings": "^0.6.8"
+    "smartenv": "1.2.0",
+    "smartfile": "2.2.0",
+    "smartpath": "3.0.1",
+    "source-map-support": "^0.4.0"
   },
-  "devDependencies": {
-    "gulp-typings": "^1.1.0"
-  }
+  "devDependencies": {}
 }

test/assets/custom.js

@@ -0,0 +1,3 @@
+var hello = "hello";
+
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImN1c3RvbS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxJQUFJLEtBQUssR0FBRyxPQUFPLENBQUMiLCJmaWxlIjoiY3VzdG9tLmpzIiwic291cmNlc0NvbnRlbnQiOlsidmFyIGhlbGxvID0gXCJoZWxsb1wiOyJdLCJzb3VyY2VSb290IjoiL3NvdXJjZS8ifQ==

test/assets/npmts.json

@@ -4,10 +4,14 @@
     "./customdir/*.ts":"./"
   },
   "typings":[
-    "./ts",
-    "./subts1/",
-    "./subts2/",
-    "./customdir"
+    "./ts/typings.json",
+    "./subts1/typings.json",
+    "./subts2/typings.json",
+    "./customdir/typings.json"
   ],
-  "coveralls":true
+  "coveralls":true,
+  "docs": {
+    "publish":true
+  },
+  "cli":true
 }

test/assets/ts/typings.json

@@ -1,8 +1,8 @@
 {
   "ambientDependencies": {
-    "node": "github:DefinitelyTyped/DefinitelyTyped/node/node.d.ts#78d36dd49b6b55b9fdfe61776a12bf05c8b07777",
+    "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#09e37435ffb2c56a6f908081194a74756f24f99d",
-    "vinyl": "github:DefinitelyTyped/DefinitelyTyped/vinyl/vinyl.d.ts#78d36dd49b6b55b9fdfe61776a12bf05c8b07777"
+    "colors": "github:DefinitelyTyped/DefinitelyTyped/colors/colors.d.ts",
+    "vinyl": "github:DefinitelyTyped/DefinitelyTyped/vinyl/vinyl.d.ts"
   }
 }

test/assets/tsfile1.js

@@ -0,0 +1,3 @@
+var something = "something";
+
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInRzZmlsZTEudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsSUFBSSxTQUFTLEdBQUcsV0FBVyxDQUFDIiwiZmlsZSI6InRzZmlsZTEuanMiLCJzb3VyY2VzQ29udGVudCI6WyJ2YXIgc29tZXRoaW5nID0gXCJzb21ldGhpbmdcIjsiXSwic291cmNlUm9vdCI6Ii9zb3VyY2UvIn0=

ts/index.ts

@@ -3,4 +3,11 @@ console.log("**** starting NPMTS ****");
 import plugins = require("./npmts.plugins");
 import promisechain = require("./npmts.promisechain");
 plugins.beautylog.figletSync("NPMTS");
-promisechain.run();
+
+try {
+    promisechain.run();
+}
+catch(err){
+    console.log(err);
+}
+

ts/npmts.assets.ts

@@ -0,0 +1,17 @@
+/// <reference path="./typings/main.d.ts" />
+import plugins = require("./npmts.plugins");
+import paths = require("./npmts.paths");
+
+export var run = function(configArg){
+    let done = plugins.Q.defer();
+    let config = configArg;
+    plugins.beautylog.log("now looking at required assets");
+    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!");
+        done.resolve(config);
+    } else {
+        done.resolve(config);
+    }
+    return done.promise;
+};

ts/npmts.clean.ts

@@ -0,0 +1,13 @@
+/// <reference path="./typings/main.d.ts" />
+import plugins = require("./npmts.plugins");
+import paths = require("./npmts.paths");
+
+export let run = function(configArg){
+    plugins.beautylog.log("now cleaning up from previous builds");
+    let done = plugins.Q.defer();
+    plugins.smartfile.fsaction.remove(paths.distDir)
+        .then(function(){
+            done.resolve(configArg);
+        });
+    return done.promise;
+};

ts/npmts.compile.ts

@@ -4,89 +4,66 @@ import paths = require("./npmts.paths");
 export var run = function(configArg){
     var done = plugins.Q.defer();
     var config = configArg;
-    plugins.beautylog.log("now running custom tasks");
+    plugins.beautylog.log("now compiling " + "TypeScript".yellow);
     var moduleStream = plugins.merge2({end: false});
-    /* -------------------------------------------------
-     * ----------- first install typings ---------------
-     * ----------------------------------------------- */
-    var typingsDone = plugins.Q.defer();
-    var typingsCounter:number = 0;
-    var typingsCounterAdvance = function(){
-        typingsCounter++;
-        if(typeof config.typings[typingsCounter] != "undefined"){
-            installTypings();
-        } else {
-            plugins.beautylog.success("custom typings installed successfully");
-            typingsDone.resolve();
-        }
-    };
-    var installTypings = function() {
-        plugins.beautylog.log("now installing " + "typings.json".yellow + " from " + config.typings[typingsCounter].blue);
-        plugins.typings.install({production: false, cwd: plugins.path.join(paths.cwd,config.typings[typingsCounter])})
-            .then(function(){
-                typingsCounterAdvance();
-            },function(){
-                plugins.beautylog.error("something went wrong: Check if path is correct: " + config.typings[typingsCounter].blue);
-                typingsCounterAdvance();
-            });
-    };
-    installTypings();
-    /* -------------------------------------------------
-     * ----------- second compile TS -------------------
-     * ----------------------------------------------- */
-    typingsDone.promise.then(function(){
-        for (var key in config.ts) {
-            plugins.beautylog.log("now compiling" + key.blue);
-            var outputPathIsDir:boolean;
-            try {
-                if(plugins.fs.statSync(plugins.path.join(paths.cwd,config.ts[key])).isDirectory()){
-                    outputPathIsDir = true;
-                }
-            }
-            catch(err) {
-                outputPathIsDir = false;
-            }
-            //do some evaluation of the environment
-            var outputNameSpecified:boolean = (
-                !outputPathIsDir
-                && (plugins.path.extname(config.ts[key]) == ".js")
-            );
-            var outputName = (function(){
-                if(outputNameSpecified){
-                    return plugins.path.basename(config.ts[key])
-                } else {
-                    return undefined
-                }
-            })();
-            var outputDir = (function(){
-                if(outputNameSpecified){
-                    return plugins.path.dirname(
-                        plugins.path.join(paths.cwd,config.ts[key])
-                    )
-                } else {
-                    return plugins.path.join(paths.cwd,config.ts[key])
-                }
-            })();
 
-            var stream = plugins.gulp.src([plugins.path.join(paths.cwd,key),"!**/typings/**"])
-                .pipe(plugins.g.sourcemaps.init()) // This means sourcemaps will be generated
-                .pipe(plugins.g.typescript({
-                    out: outputName,
-                    target: "ES5",
-                    module: "commonjs"
-                }))
-                .pipe(plugins.g.sourcemaps.write()) // Now the sourcemaps are added to the .js file
-                //.pipe(plugins.g.header('#!/usr/bin/env node\n\n'))
-                .pipe(plugins.gulp.dest(outputDir));
-            moduleStream.add(stream);
+    /* -------------------------------------------------
+     * ----------- compile TypeScript --------------------------
+     * ----------------------------------------------- */
+    for (var key in config.ts) {
+        var outputPathIsDir:boolean;
+        try {
+            if(plugins.fs.statSync(plugins.path.join(paths.cwd,config.ts[key])).isDirectory()){
+                outputPathIsDir = true;
+            }
         }
-        moduleStream.on("queueDrain",function(){
-            plugins.beautylog.success("custom TypeScript installed successfully");
-            moduleStream.on("finish",function(){
-                done.resolve(config);
-            });
-            moduleStream.end();
+        catch(err) {
+            outputPathIsDir = false;
+        }
+        //do some evaluation of the environment
+        var outputNameSpecified:boolean = (
+            !outputPathIsDir
+            && (plugins.path.extname(config.ts[key]) == ".js")
+        );
+        var outputName = (function(){
+            if(outputNameSpecified){
+                return plugins.path.basename(config.ts[key])
+            } else {
+                return undefined
+            }
+        })();
+        var outputDir = (function(){
+            if(outputNameSpecified){
+                return plugins.path.dirname(
+                    plugins.path.join(paths.cwd,config.ts[key])
+                )
+            } else {
+                return plugins.path.join(paths.cwd,config.ts[key])
+            }
+        })();
+
+        var stream = plugins.gulp.src([plugins.path.join(paths.cwd,key),"!**/typings/**"])
+            .pipe(plugins.g.sourcemaps.init()) // This means sourcemaps will be generated
+            .pipe(plugins.g.typescript({
+                out: outputName,
+                target: "ES5",
+                module: "commonjs"
+            }))
+            .pipe(plugins.g.sourcemaps.write()) // Now the sourcemaps are added to the .js file
+            //.pipe(plugins.g.header('#!/usr/bin/env node\n\n'))
+            .pipe(plugins.gulp.dest(outputDir));
+        moduleStream.add(stream);
+    }
+    moduleStream.on("queueDrain",function(){
+        plugins.beautylog.ok("TypeScript has been compiled!");
+        moduleStream.on("finish",function(){
+            done.resolve(config);
         });
+        moduleStream.end();
     });
+    /*==================== END TYPESCRIPT =====================*/
+
+
+
     return done.promise;
 };

ts/npmts.configfile.ts

@@ -7,7 +7,7 @@ export var run = function(){
     var configPath = plugins.path.join(paths.cwd,"npmts.json");
     if(plugins.smartfile.checks.fileExistsSync(configPath)){
         plugins.beautylog.info("npmts.json".blue + " config file found!");
-        config = plugins.smartfile.readFileToObject(configPath);
+        config = plugins.smartfile.local.toObjectSync(configPath);
         switch (config.mode){
             case "default":
             case "custom":
@@ -16,6 +16,7 @@ export var run = function(){
                 break;
             default:
                 plugins.beautylog.error("mode " + config.mode.yellow + " not recognised!".red);
+                process.exit(1);
         };
     } else {
         plugins.beautylog.log("no config file found: so mode is " + "default".yellow);

ts/npmts.install.ts

@@ -0,0 +1,19 @@
+/// <reference path="./typings/main.d.ts" />
+import plugins = require("./npmts.plugins");
+import paths = require("./npmts.paths");
+export var run = function(configArg){
+    var config = configArg;
+    var done = plugins.Q.defer();
+    /* -------------------------------------------------
+     * ----------- install typings ---------------
+     * ----------------------------------------------- */
+    plugins.beautylog.log("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!");
+            done.resolve(config);
+        },"atEnd"));
+    return done.promise;
+};

ts/npmts.jsdoc.ts

@@ -2,8 +2,8 @@
 import plugins = require("./npmts.plugins");
 import paths = require("./npmts.paths");
 
-var genJsdoc = function(configArg){
-    var done = plugins.Q.defer();
+let genJsdoc = function(configArg){
+    let done = plugins.Q.defer();
     plugins.beautylog.log("now generating " + "JsDoc documentation".blue);
     plugins.gulp.src([
             plugins.path.join(paths.cwd,"README.md"),
@@ -14,21 +14,22 @@ var genJsdoc = function(configArg){
                 destination: paths.docsDir
             }
         }, function(){
+            plugins.beautylog.ok("JsDoc documentation has been generated!");
             done.resolve(configArg)
         }));
     return done.promise;
 };
 
-var publishDocs = function(configArg){
-    var done = plugins.Q.defer();
-    var gitUrl = plugins.projectinfo.npm(
+export let publishDocs = function(configArg){
+    let done = plugins.Q.defer();
+    let gitUrl = plugins.projectinfo.npm(
         paths.cwd,
         {
             gitAccessToken:process.env.GITHUB_TOKEN
         }
     ).git.httpsUrl;
 
-    var deployScript = ""
+    let deployScript = ""
         + "cd " + paths.docsDir + " "
         + "&& git init " + "> /dev/null 2>&1 "
         + "&& git config user.name \"TRAVIS CI\" " + "> /dev/null 2>&1 "
@@ -39,28 +40,28 @@ var publishDocs = function(configArg){
         + "\"" + gitUrl + "\" "
         + "master:gh-pages " + "> /dev/null 2>&1";
 
-    if(plugins.smartenv.getEnv().isTravis){
-        plugins.beautylog.log("now publishing docs to GitHub")
+    if(configArg.docs.publish){
+        plugins.beautylog.log("now publishing JsDoc documentation to GitHub");
         if (!plugins.shelljs.which('git')) {
-            plugins.beautylog.error('Git is not installed');
+            plugins.beautylog.error('Git is not installed!');
             plugins.shelljs.exit(1);
         } else if (plugins.shelljs.exec(deployScript).code !== 0) {
-            plugins.beautylog.error('Error: Git failed');
+            plugins.beautylog.error('Git failed!');
             plugins.shelljs.exit(1);
         }
-        plugins.beautylog.success("Docs have been deployed to GitHub");
+        plugins.beautylog.ok("JsDoc documentation has been deployed to GitHub!");
         done.resolve(configArg);
     } else {
+        console.log("GitHub documentation has not been uploaded.");
         done.resolve(configArg);
     }
     return done.promise;
 };
 
 
-export var run = function(configArg){
-    var done = plugins.Q.defer();
+export let run = function(configArg){
+    let done = plugins.Q.defer();
     genJsdoc(configArg)
-        .then(publishDocs)
         .then(done.resolve);
     return done.promise;
 };

ts/npmts.options.ts

@@ -1,23 +1,50 @@
 /// <reference path="./typings/main.d.ts" />
 import plugins = require("./npmts.plugins");
+
+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;
-    if (typeof config.coveralls === "undefined"){
-        config.coveralls = false;
-    }
+
+    plugins.beautylog.log("now determining build options");
+
+    //handle default mode
     if (config.mode == "default"){
         config.typings = [
-            "./ts/"
+            "./ts/typings.json"
         ];
         config.ts = {
             ["./ts/**/*.ts"]: "./dist/",
             ["./test/test.ts"]: "./test/"
         };
         config.test = ["./index.js"];
-        done.resolve(config);
-    } else {
-        done.resolve(config);
     }
+
+    // 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 and docs when tests succeed!")
+        : plugins.beautylog.info("We are not publishing anything!");
+
+    // handle coveralls
+    config.coveralls ? void(0) : config.coveralls = false;
+    doPublish() ? void(0) : config.coveralls = false;
+
+    // handle docs
+    config.docs ? void(0) : config.docs = {};
+    config.docs.publish ? void(0) : config.docs.publish = false;
+    doPublish() ? void(0) : config.docs.publish = false;
+
+    done.resolve(config);
     return done.promise;
 };

ts/npmts.paths.ts

@@ -9,6 +9,8 @@ paths.distDir = plugins.path.join(paths.cwd,"dist/");
 paths.docsDir = plugins.path.join(paths.cwd,"docs/");
 paths.testDir = plugins.path.join(paths.cwd,"test/");
 
+paths.npmtsAssetsDir = plugins.path.join(__dirname,"../assets/");
+
 //Files
 paths.indexTS = plugins.path.join(paths.cwd,"ts/index.ts");
 paths.testTS = plugins.path.join(paths.cwd,"ts/test.ts");

ts/npmts.plugins.ts

@@ -1,27 +1,26 @@
 /// <reference path="./typings/main.d.ts" />
-var plugins = {
-    beautylog: require("beautylog"),
-    fs: require("fs-extra"),
-    gulp: require("gulp"),
-    g: {
-        coveralls: require("gulp-coveralls"),
-        gFunction: require("gulp-function"),
-        istanbul: require("gulp-istanbul"),
-        jsdoc3: require("gulp-jsdoc3"),
-        mocha: require("gulp-mocha"),
-        sourcemaps: require("gulp-sourcemaps"),
-        typescript: require("gulp-typescript")
+export let beautylog = require("beautylog");
+export let fs = require("fs-extra");
+export let gulp = require("gulp");
+export let g = {
+    coveralls: require("gulp-coveralls"),
+    gFunction: require("gulp-function"),
+    istanbul: require("gulp-istanbul"),
+    jsdoc3: require("gulp-jsdoc3"),
+    mocha: require("gulp-mocha"),
+    sourcemaps: require("gulp-sourcemaps"),
+    typescript: require("gulp-typescript"),
+    typings: require("gulp-typings")
 
-    },
-    merge2: require("merge2"),
-    projectinfo: require("projectinfo"),
-    sourceMapSupport:require("source-map-support").install(),
-    path: require("path"),
-    Q:require("q"),
-    shelljs: require("shelljs"),
-    smartcli: require("smartcli"),
-    smartenv: require("smartenv"),
-    smartfile: require("smartfile"),
-    typings: require("typings")
 };
-export = plugins;
+export let merge2 = require("merge2");
+export let projectinfo = require("projectinfo");
+export let sourceMapSupport = require("source-map-support").install();
+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 let smartenv = require("smartenv");
+export let smartfile = require("smartfile");
+export let smartpath = require("smartpath");

ts/npmts.promisechain.ts

@@ -1,15 +1,47 @@
 /// <reference path="./typings/main.d.ts" />
-import NpmtsConfigFile = require("./npmts.configfile");
-import NpmtsOptions = require("./npmts.options");
+import plugins = require("./npmts.plugins");
+
+import NpmtsAssets = require("./npmts.assets");
+import NpmtsClean = require("./npmts.clean");
 import NpmtsCompile = require("./npmts.compile");
+import NpmtsConfigFile = require("./npmts.configfile");
+import NpmtsInstall = require("./npmts.install");
 import NpmtsJsdoc = require("./npmts.jsdoc");
+import NpmtsOptions = require("./npmts.options");
+import NpmtsPublish = require("./npmts.publish");
 import NpmtsTests = require("./npmts.tests");
+
 export var run = function(){
     var promisechain;
     NpmtsConfigFile.run()
         .then(NpmtsOptions.run)
+        .then(NpmtsClean.run)
+        .then(NpmtsInstall.run)
         .then(NpmtsCompile.run)
+        .then(NpmtsAssets.run)
         .then(NpmtsJsdoc.run)
-        .then(NpmtsTests.run);
+        .then(NpmtsTests.run)
+        .then(NpmtsPublish.run)
+        .then(function(configArg){
+            let shipString = "" +
+                "\n" +
+                "\n" +
+                "                                         # #  ( )\n" +
+                "                                      ___#_#___|__\n" +
+                "                                  _  |____________|  _\n" +
+                "                           _=====| | |            | | |==== _\n" +
+                "                     =====| |.---------------------------. | |====\n" +
+                "       <--------------------'   .  .  .  .  .  .  .  .   '--------------/\n" +
+                "         \\                                                             /\n" +
+                "          \\___________________________________________________________/\n" +
+                "    wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww\n" +
+                "   wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww\n" +
+                "     wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww\n"
+            if (process.env.CI){
+                console.log(shipString);
+                plugins.beautylog.success("READY TO SHIP!");
+            }
+
+        });
     return promisechain;
 };

ts/npmts.publish.ts

@@ -0,0 +1,19 @@
+/// <reference path="./typings/main.d.ts" />
+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 = [];
+    config.coveralls ? 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,6 +1,26 @@
 /// <reference path="./typings/main.d.ts" />
 import plugins = require("./npmts.plugins");
 import paths = require("./npmts.paths");
+
+export let publishCoverage = function(configArg){
+    let done = plugins.Q.defer();
+    plugins.beautylog.log("now uploading coverage data to coveralls");
+    var stream = plugins.gulp.src([plugins.path.join(paths.cwd,"./coverage/lcov.info")])
+        .pipe(plugins.g.coveralls())
+        .pipe(plugins.g.gFunction([
+            function(){
+                let done = plugins.Q.defer();
+                plugins.beautylog.ok("Coverage data has been uploaded to Coveralls!");
+                done.resolve();
+                return done.promise;
+            }
+        ],"atEnd"));
+    stream.on("finish",function(){
+        done.resolve(configArg);
+    });
+    return done.promise;
+};
+
 export var run = function(configArg) {
     var done = plugins.Q.defer();
     var config = configArg;
@@ -23,22 +43,11 @@ export var run = function(configArg) {
         return stream;
     };
 
-    var coveralls = function(){
-        plugins.beautylog.log("now uploading coverage data to coveralls");
-        var stream = plugins.gulp.src([plugins.path.join(paths.cwd,"./coverage/lcov.info")])
-            .pipe(plugins.g.coveralls());
-        return stream;
-    };
-
+    plugins.beautylog.log("now starting tests");
     istanbul().on("finish",function(){
         mocha().on("finish",function(){
-            if(plugins.smartenv.getEnv().isTravis && config.coveralls){
-                coveralls().on("finish",function(){
-                    done.resolve(config);
-                })
-            } else {
-                done.resolve(config);
-            }
+            plugins.beautylog.ok("Tests have passed!");
+            done.resolve(config);
         })
     });
     return done.promise;