2.0.0

.gitignore

@@ -1,6 +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,36 +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: {
             insert: any;
             sequence: any;
-            tsd: 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: {
         insert: any;
         sequence: any;
-        tsd: 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,16 +6,19 @@ var NpmtsPlugins;
     NpmtsPlugins.init = function () {
         var plugins = {
             beautylog: require("beautylog"),
+            fs: require("fs-extra"),
             gulp: require("gulp"),
             g: {
                 insert: require("gulp-insert"),
                 sequence: require("gulp-sequence"),
-                tsd: require("gulp-tsd"),
                 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;
     };
@@ -27,30 +30,41 @@ var NpmtsPaths;
     NpmtsPaths.init = function () {
         var paths = {};
         paths.cwd = plugins.smartcli.get.cwd().path;
-        paths.tsd = plugins.path.join(paths.cwd, "ts/tsd.json");
+        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("defaultTsd", function (cb) {
-            if (!process.env.TRAVIS) {
-                plugins.g.tsd({
-                    command: 'reinstall',
-                    config: paths.tsd
-                }, cb);
-                plugins.beautylog.log("now installing typings from" + " ts/tsd.json".blue);
-            }
-            else {
-                plugins.beautylog.warn("We are on TRAVIS. Typings will not be installed due to GitHub API restrictions.");
-                plugins.beautylog.log("Make sure the repo tracks " + "typings".blue + " directories");
-            }
-        });
+    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)
@@ -71,25 +85,67 @@ var NpmtsDefault;
                 .pipe(plugins.g.typescript({
                 out: "test.js"
             }))
-                .pipe(plugins.gulp.dest(paths.cwd));
+                .pipe(plugins.gulp.dest(paths.testDir));
         });
         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("defaultTsd", "defaultIndexTS", "defaultTestTS", "defaultCleanup", 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.12",
+  "version": "2.0.0",
   "description": "write npm modules with TypeScript",
   "main": "index.js",
   "typings": "./index.d.ts",
@@ -9,7 +9,7 @@
   },
   "scripts": {
     "test": "(cd compile && node compile.js)",
-    "testm": "(npm test) && (cd test/ && node ../index.js)",
+    "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": {
@@ -28,12 +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-tsd": "^0.1.0",
     "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"
+  }
+}

test/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"
-    }
-  }
-}

test/ts/typings/tsd.d.ts

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

ts/index.ts

@@ -1,11 +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.default.ts

@@ -1,20 +1,8 @@
 /// <reference path="./index.ts" />
 
 module NpmtsDefault {
-    export var init = function() {
-        plugins.gulp.task("defaultTsd",function(cb){
-            if(!process.env.TRAVIS) {
-                plugins.g.tsd({
-                    command: 'reinstall',
-                    config: paths.tsd
-                }, cb);
-                plugins.beautylog.log("now installing typings from" + " ts/tsd.json".blue);
-            } else {
-                plugins.beautylog.warn("We are on TRAVIS. Typings will not be installed due to GitHub API restrictions.");
-                plugins.beautylog.log("Make sure the repo tracks " + "typings".blue + " directories")
-            }
-
-        });
+    export var run = function() {
+        var done = plugins.q.defer();
 
 
         plugins.gulp.task("defaultIndexTS", function(){
@@ -39,18 +27,20 @@ module NpmtsDefault {
                 .pipe(plugins.g.typescript({
                     out: "test.js"
                 }))
-                .pipe(plugins.gulp.dest(paths.cwd))
+                .pipe(plugins.gulp.dest(paths.testDir))
         });
 
         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("defaultTsd","defaultIndexTS","defaultTestTS","defaultCleanup",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.ts

@@ -3,9 +3,10 @@ module NpmtsPaths {
     export var init = function() {
         var paths:any = {};
         paths.cwd = plugins.smartcli.get.cwd().path;
-        paths.tsd = plugins.path.join(paths.cwd,"ts/tsd.json");
+        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.ts

@@ -3,17 +3,20 @@ module NpmtsPlugins {
     export var init = function() {
         var plugins = {
             beautylog: require("beautylog"),
+            fs: require("fs-extra"),
             gulp: require("gulp"),
             g: {
                 insert: require("gulp-insert"),
                 sequence: require("gulp-sequence"),
-                tsd: require("gulp-tsd"),
                 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

@@ -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/main/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/main/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/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" />