2.0.0

.gitignore

@@ -1,4 +1,7 @@
 .idea/
 .c9/
 node_modules/
-test/node_modules
+test/**/node_modules/
+test/**/typings/
+ts/*.js
+ts/*.js.map

.npmignore

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

compile/compile.js

@@ -11,7 +11,7 @@ var plugins = {
 };
 
 
-plugins.beautylog.log('now compiling the mojo.io gulp tasks');
+plugins.beautylog.log('now compiling NPMTS');
 
 plugins.gulp.task('indexTS', function() {
     var tsResult = plugins.gulp.src('../ts/index.ts')

index.d.ts

@@ -1,32 +1,55 @@
-/// <reference path="../ts/typings/tsd.d.ts" />
+/// <reference path="../ts/typings/main.d.ts" />
 declare module NpmtsPlugins {
     var init: () => {
         beautylog: any;
+        fs: any;
         gulp: any;
         g: {
-            typescript: any;
             insert: any;
+            sequence: any;
+            typescript: any;
         };
         mergeStream: any;
+        mocha: any;
         path: any;
+        q: any;
         smartcli: any;
+        typings: any;
     };
 }
 declare module NpmtsPaths {
     var init: () => any;
 }
+declare module NpmtsOptions {
+    var run: () => any;
+}
+declare module NpmtsTypings {
+    var run: () => any;
+}
 declare module NpmtsDefault {
-    var init: () => void;
+    var run: () => any;
+}
+declare module NpmtsTests {
+    var run: () => any;
+}
+declare module NpmtsPromisechain {
+    var init: () => any;
 }
 declare var plugins: {
     beautylog: any;
+    fs: any;
     gulp: any;
     g: {
-        typescript: any;
         insert: any;
+        sequence: any;
+        typescript: any;
     };
     mergeStream: any;
+    mocha: any;
     path: any;
+    q: any;
     smartcli: any;
+    typings: any;
 };
 declare var paths: any;
+declare var promisechain: any;

index.js

@@ -6,14 +6,19 @@ var NpmtsPlugins;
     NpmtsPlugins.init = function () {
         var plugins = {
             beautylog: require("beautylog"),
+            fs: require("fs-extra"),
             gulp: require("gulp"),
             g: {
-                typescript: require("gulp-typescript"),
-                insert: require("gulp-insert")
+                insert: require("gulp-insert"),
+                sequence: require("gulp-sequence"),
+                typescript: require("gulp-typescript")
             },
             mergeStream: require("merge2"),
+            mocha: require("mocha"),
             path: require("path"),
-            smartcli: require("smartcli")
+            q: require("q"),
+            smartcli: require("smartcli"),
+            typings: require("typings")
         };
         return plugins;
     };
@@ -25,17 +30,43 @@ var NpmtsPaths;
     NpmtsPaths.init = function () {
         var paths = {};
         paths.cwd = plugins.smartcli.get.cwd().path;
+        paths.tsDir = plugins.path.join(paths.cwd, "ts/");
         paths.indexTS = plugins.path.join(paths.cwd, "ts/index.ts");
         paths.testTS = plugins.path.join(paths.cwd, "ts/test.ts");
+        paths.testDir = plugins.path.join(paths.cwd, "test/");
         return paths;
     };
 })(NpmtsPaths || (NpmtsPaths = {}));
 /// <reference path="./index.ts" />
+var NpmtsOptions;
+(function (NpmtsOptions) {
+    NpmtsOptions.run = function () {
+        var done = plugins.q.defer();
+        done.resolve(); //TODO: check for options
+        return done.promise;
+    };
+})(NpmtsOptions || (NpmtsOptions = {}));
+/// <reference path="./index.ts" />
+var NpmtsTypings;
+(function (NpmtsTypings) {
+    NpmtsTypings.run = function () {
+        var done = plugins.q.defer();
+        plugins.beautylog.log("now installing typings");
+        plugins.typings.install({ production: false, cwd: paths.tsDir })
+            .then(function () {
+            done.resolve();
+        });
+        return done.promise;
+    };
+})(NpmtsTypings || (NpmtsTypings = {}));
+/// <reference path="./index.ts" /> 
 /// <reference path="./index.ts" />
 var NpmtsDefault;
 (function (NpmtsDefault) {
-    NpmtsDefault.init = function () {
-        plugins.gulp.task("indexTS", function () {
+    NpmtsDefault.run = function () {
+        var done = plugins.q.defer();
+        plugins.gulp.task("defaultIndexTS", function () {
+            plugins.beautylog.log("now compiling" + " ts/index.ts".blue);
             var tsResult = plugins.gulp.src(paths.indexTS)
                 .pipe(plugins.g.typescript({
                 out: "index.js",
@@ -48,25 +79,73 @@ var NpmtsDefault;
                     .pipe(plugins.gulp.dest(paths.cwd))
             ]);
         });
-        plugins.gulp.task("testTS", function () {
+        plugins.gulp.task("defaultTestTS", function () {
+            plugins.beautylog.log("now compiling" + " ts/test.ts".blue);
             plugins.gulp.src(paths.testTS)
                 .pipe(plugins.g.typescript({
                 out: "test.js"
             }))
-                .pipe(plugins.gulp.dest(paths.cwd));
+                .pipe(plugins.gulp.dest(paths.testDir));
         });
-        plugins.gulp.task("default", ["indexTS", "testTS"], function () {
-            plugins.beautylog.success("TypeScript for this module was compiled successfully.");
+        plugins.gulp.task("defaultCleanup", function (cb) {
+            plugins.beautylog.success("TypeScript for this module compiled successfully.");
+            done.resolve();
+            cb();
+        });
+        plugins.gulp.task("default", function (cb) {
+            plugins.g.sequence("defaultIndexTS", "defaultTestTS", "defaultCleanup", cb);
         });
         plugins.gulp.start.apply(plugins.gulp, ['default']);
+        return done.promise;
     };
 })(NpmtsDefault || (NpmtsDefault = {}));
-/// <reference path="./typings/tsd.d.ts" />
+/// <reference path="./index.ts" />
+var NpmtsTests;
+(function (NpmtsTests) {
+    NpmtsTests.run = function () {
+        var done = plugins.q.defer();
+        plugins.fs.ensureDirSync(paths.testDir); //make sure that mocha has a directory to look for tests
+        plugins.beautylog.info("Now running mocha tests");
+        var mocha = new plugins.mocha(); // Instantiate a Mocha instance.
+        // Add each .js file to the mocha instance
+        plugins.fs.readdirSync(paths.testDir).filter(function (file) {
+            // Only keep the .js files
+            return file.substr(-3) === '.js';
+        }).forEach(function (file) {
+            mocha.addFile(plugins.path.join(paths.testDir, file));
+        });
+        // Run the tests.
+        mocha.run(function (failures) {
+            process.on('exit', function () {
+                process.exit(failures);
+            });
+        });
+        return done.promise;
+    };
+})(NpmtsTests || (NpmtsTests = {}));
+/// <reference path="./index.ts" />
+var NpmtsPromisechain;
+(function (NpmtsPromisechain) {
+    NpmtsPromisechain.init = function () {
+        var promisechain;
+        NpmtsOptions.run()
+            .then(NpmtsTypings.run)
+            .then(NpmtsDefault.run)
+            .then(NpmtsTests.run);
+        return promisechain;
+    };
+})(NpmtsPromisechain || (NpmtsPromisechain = {}));
+/// <reference path="./typings/main.d.ts" />
 /// <reference path="./npmts.plugins.ts" />
 /// <reference path="./npmts.cli.ts" />
 /// <reference path="./npmts.paths.ts" />
+/// <reference path="./npmts.options.ts" />
+/// <reference path="./npmts.typings.ts" />
 /// <reference path="./npmts.custom.ts" />
 /// <reference path="./npmts.default.ts" />
+/// <reference path="./npmts.tests.ts" />
+/// <reference path="./npmts.promisechain.ts" />
+console.log("** starting NPMTS **");
 var plugins = NpmtsPlugins.init();
 var paths = NpmtsPaths.init();
-NpmtsDefault.init();
+var promisechain = NpmtsPromisechain.init();

package.json

@@ -1,6 +1,6 @@
 {
   "name": "npmts",
-  "version": "1.0.6",
+  "version": "2.0.0",
   "description": "write npm modules with TypeScript",
   "main": "index.js",
   "typings": "./index.d.ts",
@@ -9,8 +9,8 @@
   },
   "scripts": {
     "test": "(cd compile && node compile.js)",
-    "release": "(git add -A && git commit -m 'update' && git push origin master && npm version patch && npm publish)",
-    "testm": "(cd test/ && npm update && npm test)"
+    "testm": "(npm test) && (cd test/assets && node ../../index.js)",
+    "release": "(git add -A && git commit -m 'update' && git push origin master && npm version patch && npm publish)"
   },
   "repository": {
     "type": "git",
@@ -28,10 +28,16 @@
   "homepage": "https://github.com/pushrocks/npmts#readme",
   "dependencies": {
     "beautylog": "2.0.2",
+    "fs-extra": "^0.26.5",
     "gulp": "3.9.0",
     "gulp-insert": "0.5.0",
+    "gulp-sequence": "^0.4.4",
     "gulp-typescript": "2.10.0",
+    "gulp-typings": "0.0.0",
     "merge2": "0.3.6",
-    "smartcli": "0.0.11"
+    "mocha": "^2.4.5",
+    "q": "^1.4.1",
+    "smartcli": "0.0.11",
+    "typings": "^0.6.3"
   }
 }

test/assets/package.json

@@ -9,6 +9,5 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "npmts": "*"
   }
 }

test/assets/test/test.js

@@ -0,0 +1 @@
+

test/assets/ts/test.js

@@ -0,0 +1 @@
+//# sourceMappingURL=test.js.map

test/assets/ts/test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":""}

test/assets/ts/typings.json

@@ -0,0 +1,7 @@
+{
+  "ambientDependencies": {
+    "node": "github:DefinitelyTyped/DefinitelyTyped/node/node.d.ts#78d36dd49b6b55b9fdfe61776a12bf05c8b07777",
+    "colors": "github:DefinitelyTyped/DefinitelyTyped/colors/colors.d.ts#09e37435ffb2c56a6f908081194a74756f24f99d",
+    "vinyl": "github:DefinitelyTyped/DefinitelyTyped/vinyl/vinyl.d.ts#78d36dd49b6b55b9fdfe61776a12bf05c8b07777"
+  }
+}

ts/index.js

@@ -1,10 +0,0 @@
-/// <reference path="./typings/tsd.d.ts" />
-/// <reference path="./npmts.plugins.ts" />
-/// <reference path="./npmts.cli.ts" />
-/// <reference path="./npmts.paths.ts" />
-/// <reference path="./npmts.custom.ts" />
-/// <reference path="./npmts.default.ts" />
-var plugins = NpmtsPlugins.init();
-var paths = NpmtsPaths.init();
-NpmtsDefault.init();
-//# sourceMappingURL=index.js.map

ts/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA,2CAA2C;AAC3C,2CAA2C;AAC3C,uCAAuC;AACvC,yCAAyC;AACzC,0CAA0C;AAC1C,2CAA2C;AAE3C,IAAI,OAAO,GAAG,YAAY,CAAC,IAAI,EAAE,CAAC;AAClC,IAAI,KAAK,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC;AAC9B,YAAY,CAAC,IAAI,EAAE,CAAC"}

ts/index.ts

@@ -1,10 +1,14 @@
-/// <reference path="./typings/tsd.d.ts" />
+/// <reference path="./typings/main.d.ts" />
 /// <reference path="./npmts.plugins.ts" />
 /// <reference path="./npmts.cli.ts" />
 /// <reference path="./npmts.paths.ts" />
+/// <reference path="./npmts.options.ts" />
+/// <reference path="./npmts.typings.ts" />
 /// <reference path="./npmts.custom.ts" />
 /// <reference path="./npmts.default.ts" />
-
+/// <reference path="./npmts.tests.ts" />
+/// <reference path="./npmts.promisechain.ts" />
+console.log("** starting NPMTS **")
 var plugins = NpmtsPlugins.init();
 var paths = NpmtsPaths.init();
-NpmtsDefault.init();
+var promisechain = NpmtsPromisechain.init();

ts/npmts.cli.js

@@ -1,2 +0,0 @@
-/// <reference path="./index.ts" /> 
-//# sourceMappingURL=npmts.cli.js.map

ts/npmts.cli.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"npmts.cli.js","sourceRoot":"","sources":["npmts.cli.ts"],"names":[],"mappings":"AAAA,mCAAmC"}

ts/npmts.custom.js

@@ -1,2 +0,0 @@
-/// <reference path="./index.ts" /> 
-//# sourceMappingURL=npmts.custom.js.map

ts/npmts.custom.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"npmts.custom.js","sourceRoot":"","sources":["npmts.custom.ts"],"names":[],"mappings":"AAAA,mCAAmC"}

ts/npmts.default.js

@@ -1,31 +0,0 @@
-/// <reference path="./index.ts" />
-var NpmtsDefault;
-(function (NpmtsDefault) {
-    NpmtsDefault.init = function () {
-        plugins.gulp.task("indexTS", function () {
-            var tsResult = plugins.gulp.src(paths.indexTS)
-                .pipe(plugins.g.typescript({
-                out: "index.js",
-                declaration: true
-            }));
-            return plugins.mergeStream([
-                tsResult.dts.pipe(plugins.gulp.dest(paths.cwd)),
-                tsResult.js
-                    .pipe(plugins.g.insert.prepend('#!/usr/bin/env node\n\n'))
-                    .pipe(plugins.gulp.dest(paths.cwd))
-            ]);
-        });
-        plugins.gulp.task("testTS", function () {
-            plugins.gulp.src(paths.testTS)
-                .pipe(plugins.g.typescript({
-                out: "test.js"
-            }))
-                .pipe(plugins.gulp.dest(paths.cwd));
-        });
-        plugins.gulp.task("default", ["indexTS", "testTS"], function () {
-            plugins.beautylog.success("TypeScript for this module was compiled successfully.");
-        });
-        plugins.gulp.start.apply(plugins.gulp, ['default']);
-    };
-})(NpmtsDefault || (NpmtsDefault = {}));
-//# sourceMappingURL=npmts.default.js.map

ts/npmts.default.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"npmts.default.js","sourceRoot":"","sources":["npmts.default.ts"],"names":["NpmtsDefault"],"mappings":"AAAA,mCAAmC;AAEnC,IAAO,YAAY,CA+BlB;AA/BD,WAAO,YAAY,EAAC,CAAC;IACNA,iBAAIA,GAAGA;QACd,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACzB,IAAI,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC;iBACzC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC;gBACvB,GAAG,EAAC,UAAU;gBACd,WAAW,EAAC,IAAI;aACnB,CAAC,CAAC,CAAC;YAER,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC;gBACvB,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAC/C,QAAQ,CAAC,EAAE;qBACN,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,yBAAyB,CAAC,CAAC;qBACzD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;aAC1C,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YACxB,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC;iBACzB,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC;gBACvB,GAAG,EAAE,SAAS;aACjB,CAAC,CAAC;iBACF,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAA;QAC3C,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAC,CAAC,SAAS,EAAC,QAAQ,CAAC,EAAC;YAC7C,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,uDAAuD,CAAC,CAAC;QACvF,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;IACxD,CAAC,CAAAA;AACLA,CAACA,EA/BM,YAAY,KAAZ,YAAY,QA+BlB"}

ts/npmts.default.ts

@@ -1,8 +1,12 @@
 /// <reference path="./index.ts" />
 
 module NpmtsDefault {
-    export var init = function() {
-        plugins.gulp.task("indexTS", function(){
+    export var run = function() {
+        var done = plugins.q.defer();
+
+
+        plugins.gulp.task("defaultIndexTS", function(){
+            plugins.beautylog.log("now compiling" + " ts/index.ts".blue);
             var tsResult = plugins.gulp.src(paths.indexTS)
                 .pipe(plugins.g.typescript({
                     out:"index.js",
@@ -17,18 +21,26 @@ module NpmtsDefault {
             ]);
         });
 
-        plugins.gulp.task("testTS", function(){
+        plugins.gulp.task("defaultTestTS", function(){
+            plugins.beautylog.log("now compiling" + " ts/test.ts".blue);
             plugins.gulp.src(paths.testTS)
                 .pipe(plugins.g.typescript({
                     out: "test.js"
                 }))
-                .pipe(plugins.gulp.dest(paths.cwd))
+                .pipe(plugins.gulp.dest(paths.testDir))
         });
 
-        plugins.gulp.task("default",["indexTS","testTS"],function(){
-            plugins.beautylog.success("TypeScript for this module was compiled successfully.");
+        plugins.gulp.task("defaultCleanup",function(cb){
+            plugins.beautylog.success("TypeScript for this module compiled successfully.");
+            done.resolve();
+            cb();
+        });
+
+        plugins.gulp.task("default",function(cb){
+            plugins.g.sequence("defaultIndexTS","defaultTestTS","defaultCleanup",cb);
         });
 
         plugins.gulp.start.apply(plugins.gulp, ['default']);
+        return done.promise;
     }
 }

ts/npmts.options.ts

@@ -0,0 +1,8 @@
+/// <reference path="./index.ts" />
+module NpmtsOptions {
+    export var run = function(){
+        var done = plugins.q.defer();
+        done.resolve(); //TODO: check for options
+        return done.promise;
+    }
+}

ts/npmts.paths.js

@@ -1,12 +0,0 @@
-/// <reference path="./index.ts" />
-var NpmtsPaths;
-(function (NpmtsPaths) {
-    NpmtsPaths.init = function () {
-        var paths = {};
-        paths.cwd = plugins.smartcli.get.cwd().path;
-        paths.indexTS = plugins.path.join(paths.cwd, "ts/index.ts");
-        paths.testTS = plugins.path.join(paths.cwd, "ts/test.ts");
-        return paths;
-    };
-})(NpmtsPaths || (NpmtsPaths = {}));
-//# sourceMappingURL=npmts.paths.js.map

ts/npmts.paths.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"npmts.paths.js","sourceRoot":"","sources":["npmts.paths.ts"],"names":["NpmtsPaths"],"mappings":"AAAA,mCAAmC;AACnC,IAAO,UAAU,CAQhB;AARD,WAAO,UAAU,EAAC,CAAC;IACJA,eAAIA,GAAGA;QACd,IAAI,KAAK,GAAO,EAAE,CAAC;QACnB,KAAK,CAAC,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC;QAC5C,KAAK,CAAC,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,EAAC,aAAa,CAAC,CAAC;QAC3D,KAAK,CAAC,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,EAAC,YAAY,CAAC,CAAC;QACzD,MAAM,CAAC,KAAK,CAAC;IACjB,CAAC,CAAAA;AACLA,CAACA,EARM,UAAU,KAAV,UAAU,QAQhB"}

ts/npmts.paths.ts

@@ -3,8 +3,10 @@ module NpmtsPaths {
     export var init = function() {
         var paths:any = {};
         paths.cwd = plugins.smartcli.get.cwd().path;
+        paths.tsDir = plugins.path.join(paths.cwd,"ts/");
         paths.indexTS = plugins.path.join(paths.cwd,"ts/index.ts");
         paths.testTS = plugins.path.join(paths.cwd,"ts/test.ts");
+        paths.testDir = plugins.path.join(paths.cwd,"test/");
         return paths;
     }
 }

ts/npmts.plugins.js

@@ -1,19 +0,0 @@
-/// <reference path="./index.ts" />
-var NpmtsPlugins;
-(function (NpmtsPlugins) {
-    NpmtsPlugins.init = function () {
-        var plugins = {
-            beautylog: require("beautylog"),
-            gulp: require("gulp"),
-            g: {
-                typescript: require("gulp-typescript"),
-                insert: require("gulp-insert")
-            },
-            mergeStream: require("merge2"),
-            path: require("path"),
-            smartcli: require("smartcli")
-        };
-        return plugins;
-    };
-})(NpmtsPlugins || (NpmtsPlugins = {}));
-//# sourceMappingURL=npmts.plugins.js.map

ts/npmts.plugins.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"npmts.plugins.js","sourceRoot":"","sources":["npmts.plugins.ts"],"names":["NpmtsPlugins"],"mappings":"AAAA,mCAAmC;AACnC,IAAO,YAAY,CAelB;AAfD,WAAO,YAAY,EAAC,CAAC;IACNA,iBAAIA,GAAGA;QACd,IAAI,OAAO,GAAG;YACV,SAAS,EAAE,OAAO,CAAC,WAAW,CAAC;YAC/B,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC;YACrB,CAAC,EAAE;gBACC,UAAU,EAAE,OAAO,CAAC,iBAAiB,CAAC;gBACtC,MAAM,EAAE,OAAO,CAAC,aAAa,CAAC;aACjC;YACD,WAAW,EAAE,OAAO,CAAC,QAAQ,CAAC;YAC9B,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC;YACrB,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC;SAChC,CAAC;QACF,MAAM,CAAC,OAAO,CAAC;IACnB,CAAC,CAAAA;AACLA,CAACA,EAfM,YAAY,KAAZ,YAAY,QAelB"}

ts/npmts.plugins.ts

@@ -3,14 +3,20 @@ module NpmtsPlugins {
     export var init = function() {
         var plugins = {
             beautylog: require("beautylog"),
+            fs: require("fs-extra"),
             gulp: require("gulp"),
             g: {
-                typescript: require("gulp-typescript"),
-                insert: require("gulp-insert")
+                insert: require("gulp-insert"),
+                sequence: require("gulp-sequence"),
+                typescript: require("gulp-typescript")
+
             },
             mergeStream: require("merge2"),
+            mocha: require("mocha"),
             path: require("path"),
-            smartcli: require("smartcli")
+            q:require("q"),
+            smartcli: require("smartcli"),
+            typings: require("typings")
         };
         return plugins;
     }

ts/npmts.promisechain.ts

@@ -0,0 +1,11 @@
+/// <reference path="./index.ts" />
+module NpmtsPromisechain {
+    export var init = function(){
+        var promisechain;
+        NpmtsOptions.run()
+            .then(NpmtsTypings.run)
+            .then(NpmtsDefault.run)
+            .then(NpmtsTests.run);
+        return promisechain;
+    }
+}

ts/npmts.tests.ts

@@ -0,0 +1,28 @@
+/// <reference path="./index.ts" />
+module NpmtsTests {
+    export var run = function() {
+        var done = plugins.q.defer();
+        plugins.fs.ensureDirSync(paths.testDir); //make sure that mocha has a directory to look for tests
+        plugins.beautylog.info("Now running mocha tests");
+        var mocha = new plugins.mocha(); // Instantiate a Mocha instance.
+
+        // Add each .js file to the mocha instance
+        plugins.fs.readdirSync(paths.testDir).filter(function(file){
+            // Only keep the .js files
+            return file.substr(-3) === '.js';
+
+        }).forEach(function(file){
+            mocha.addFile(
+                plugins.path.join(paths.testDir, file)
+            );
+        });
+
+        // Run the tests.
+        mocha.run(function(failures){
+            process.on('exit', function () {
+                process.exit(failures);
+            });
+        });
+        return done.promise;
+    }
+}

ts/npmts.typings.ts

@@ -0,0 +1,12 @@
+/// <reference path="./index.ts" />
+module NpmtsTypings {
+    export var run = function(){
+        var done = plugins.q.defer();
+        plugins.beautylog.log("now installing typings");
+        plugins.typings.install({production: false, cwd: paths.tsDir})
+            .then(function(){
+                done.resolve();
+            });
+        return done.promise;
+    }
+}

ts/tsd.json

@@ -1,18 +0,0 @@
-{
-  "version": "v4",
-  "repo": "borisyankov/DefinitelyTyped",
-  "ref": "master",
-  "path": "typings",
-  "bundle": "typings/tsd.d.ts",
-  "installed": {
-    "node/node.d.ts": {
-      "commit": "78d36dd49b6b55b9fdfe61776a12bf05c8b07777"
-    },
-    "colors/colors.d.ts": {
-      "commit": "09e37435ffb2c56a6f908081194a74756f24f99d"
-    },
-    "vinyl/vinyl.d.ts": {
-      "commit": "78d36dd49b6b55b9fdfe61776a12bf05c8b07777"
-    }
-  }
-}

ts/typings.json

@@ -0,0 +1,7 @@
+{
+  "ambientDependencies": {
+    "node": "github:DefinitelyTyped/DefinitelyTyped/node/node.d.ts#78d36dd49b6b55b9fdfe61776a12bf05c8b07777",
+    "colors": "github:DefinitelyTyped/DefinitelyTyped/colors/colors.d.ts#09e37435ffb2c56a6f908081194a74756f24f99d",
+    "vinyl": "github:DefinitelyTyped/DefinitelyTyped/vinyl/vinyl.d.ts#78d36dd49b6b55b9fdfe61776a12bf05c8b07777"
+  }
+}

ts/typings/browser.d.ts

@@ -0,0 +1,3 @@
+/// <reference path="browser/ambient/colors/colors.d.ts" />
+/// <reference path="browser/ambient/node/node.d.ts" />
+/// <reference path="browser/ambient/vinyl/vinyl.d.ts" />

ts/typings/browser/ambient/colors/colors.d.ts

@@ -1,3 +1,5 @@
+// Compiled using typings@0.6.3
+// Source: https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/09e37435ffb2c56a6f908081194a74756f24f99d/colors/colors.d.ts
 // Type definitions for Colors.js 0.6.0-1
 // Project: https://github.com/Marak/colors.js
 // Definitions by: Bart van der Schoor <https://github.com/Bartvds>

ts/typings/browser/ambient/node/node.d.ts

@@ -1,3 +1,5 @@
+// Compiled using typings@0.6.3
+// Source: https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/78d36dd49b6b55b9fdfe61776a12bf05c8b07777/node/node.d.ts
 // Type definitions for Node.js v4.x
 // Project: http://nodejs.org/
 // Definitions by: Microsoft TypeScript <http://typescriptlang.org>, DefinitelyTyped <https://github.com/borisyankov/DefinitelyTyped>

ts/typings/browser/ambient/vinyl/vinyl.d.ts

@@ -1,9 +1,10 @@
+// Compiled using typings@0.6.3
+// Source: https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/78d36dd49b6b55b9fdfe61776a12bf05c8b07777/vinyl/vinyl.d.ts
 // Type definitions for vinyl 0.4.3
 // Project: https://github.com/wearefractal/vinyl
 // Definitions by: vvakame <https://github.com/vvakame/>, jedmao <https://github.com/jedmao>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
-/// <reference path="../node/node.d.ts" />
 
 declare module 'vinyl' {
 

ts/typings/main.d.ts

@@ -0,0 +1,3 @@
+/// <reference path="main/ambient/colors/colors.d.ts" />
+/// <reference path="main/ambient/node/node.d.ts" />
+/// <reference path="main/ambient/vinyl/vinyl.d.ts" />

ts/typings/main/ambient/colors/colors.d.ts

@@ -0,0 +1,125 @@
+// Compiled using typings@0.6.3
+// Source: https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/09e37435ffb2c56a6f908081194a74756f24f99d/colors/colors.d.ts
+// Type definitions for Colors.js 0.6.0-1
+// Project: https://github.com/Marak/colors.js
+// Definitions by: Bart van der Schoor <https://github.com/Bartvds>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module "colors" {
+    interface Color {
+        (text: string): string;
+
+        black: Color;
+        red: Color;
+        green: Color;
+        yellow: Color;
+        blue: Color;
+        magenta: Color;
+        cyan: Color;
+        white: Color;
+        gray: Color;
+        grey: Color;
+
+        bgBlack: Color;
+        bgRed: Color;
+        bgGreen: Color;
+        bgYellow: Color;
+        bgBlue: Color;
+        bgMagenta: Color;
+        bgCyan: Color;
+        bgWhite: Color;
+
+        reset: Color;
+        bold: Color;
+        dim: Color;
+        italic: Color;
+        underline: Color;
+        inverse: Color;
+        hidden: Color;
+        strikethrough: Color;
+
+        rainbow: Color;
+        zebra: Color;
+        america: Color;
+        trap: Color;
+        random: Color;
+    }
+
+    module e {
+        export function setTheme(theme:any): void;
+
+        export var black: Color;
+        export var red: Color;
+        export var green: Color;
+        export var yellow: Color;
+        export var blue: Color;
+        export var magenta: Color;
+        export var cyan: Color;
+        export var white: Color;
+        export var gray: Color;
+        export var grey: Color;
+
+        export var bgBlack: Color;
+        export var bgRed: Color;
+        export var bgGreen: Color;
+        export var bgYellow: Color;
+        export var bgBlue: Color;
+        export var bgMagenta: Color;
+        export var bgCyan: Color;
+        export var bgWhite: Color;
+
+        export var reset: Color;
+        export var bold: Color;
+        export var dim: Color;
+        export var italic: Color;
+        export var underline: Color;
+        export var inverse: Color;
+        export var hidden: Color;
+        export var strikethrough: Color;
+
+        export var rainbow: Color;
+        export var zebra: Color;
+        export var america: Color;
+        export var trap: Color;
+        export var random: Color;
+    }
+
+    export = e;
+}
+
+interface String {
+    black: string;
+    red: string;
+    green: string;
+    yellow: string;
+    blue: string;
+    magenta: string;
+    cyan: string;
+    white: string;
+    gray: string;
+    grey: string;
+
+    bgBlack: string;
+    bgRed: string;
+    bgGreen: string;
+    bgYellow: string;
+    bgBlue: string;
+    bgMagenta: string;
+    bgCyan: string;
+    bgWhite: string;
+
+    reset: string;
+    bold: string;
+    dim: string;
+    italic: string;
+    underline: string;
+    inverse: string;
+    hidden: string;
+    strikethrough: string;
+
+    rainbow: string;
+    zebra: string;
+    america: string;
+    trap: string;
+    random: string;
+}

ts/typings/main/ambient/vinyl/vinyl.d.ts

@@ -0,0 +1,110 @@
+// Compiled using typings@0.6.3
+// Source: https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/78d36dd49b6b55b9fdfe61776a12bf05c8b07777/vinyl/vinyl.d.ts
+// Type definitions for vinyl 0.4.3
+// Project: https://github.com/wearefractal/vinyl
+// Definitions by: vvakame <https://github.com/vvakame/>, jedmao <https://github.com/jedmao>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+
+declare module 'vinyl' {
+
+	import fs = require('fs');
+
+	/**
+	* A virtual file format.
+	*/
+	class File {
+		constructor(options?: {
+			/**
+			* Default: process.cwd()
+			*/
+			cwd?: string;
+			/**
+			* Used for relative pathing. Typically where a glob starts.
+			*/
+			base?: string;
+			/**
+			* Full path to the file.
+			*/
+			path?: string;
+			/**
+			* Path history. Has no effect if options.path is passed.
+			*/
+			history?: string[];
+			/**
+			* The result of an fs.stat call. See fs.Stats for more information.
+			*/
+			stat?: fs.Stats;
+			/**
+			* File contents.
+			* Type: Buffer, Stream, or null
+			*/
+			contents?: Buffer | NodeJS.ReadWriteStream;
+		});
+
+		/**
+		* Default: process.cwd()
+		*/
+		public cwd: string;
+		/**
+		* Used for relative pathing. Typically where a glob starts.
+		*/
+		public base: string;
+		/**
+		* Full path to the file.
+		*/
+		public path: string;
+		public stat: fs.Stats;
+		/**
+		* Type: Buffer|Stream|null (Default: null)
+		*/
+		public contents: Buffer | NodeJS.ReadableStream;
+		/**
+		* Returns path.relative for the file base and file path.
+		* Example:
+		*  var file = new File({
+		*    cwd: "/",
+		*    base: "/test/",
+		*    path: "/test/file.js"
+		*  });
+		*  console.log(file.relative); // file.js
+		*/
+		public relative: string;
+
+		public isBuffer(): boolean;
+
+		public isStream(): boolean;
+
+		public isNull(): boolean;
+
+		public isDirectory(): boolean;
+
+		/**
+		* Returns a new File object with all attributes cloned. Custom attributes are deep-cloned.
+		*/
+		public clone(opts?: { contents?: boolean }): File;
+
+		/**
+		* If file.contents is a Buffer, it will write it to the stream.
+		* If file.contents is a Stream, it will pipe it to the stream.
+		* If file.contents is null, it will do nothing.
+		*/
+		public pipe<T extends NodeJS.ReadWriteStream>(
+			stream: T,
+			opts?: {
+				/**
+				* If false, the destination stream will not be ended (same as node core).
+				*/
+				end?: boolean;
+			}
+		): T;
+
+		/**
+		* Returns a pretty String interpretation of the File. Useful for console.log.
+		*/
+		public inspect(): string;
+	}
+
+	export = File;
+
+}

ts/typings/tsd.d.ts

@@ -1,3 +0,0 @@
-/// <reference path="node/node.d.ts" />
-/// <reference path="colors/colors.d.ts" />
-/// <reference path="vinyl/vinyl.d.ts" />