2.2.2

README.md

@@ -1,6 +1,9 @@
 # npmts
 Write npm modules with TypeScript without hassle.
 
+## Status
+[![Coverage Status](https://coveralls.io/repos/github/pushrocks/npmts/badge.svg?branch=master)](https://coveralls.io/github/pushrocks/npmts?branch=master)
+
 ## How to use npmts
 
 ### Install

index.d.ts

@@ -6,7 +6,6 @@ declare module NpmtsPlugins {
         gulp: any;
         g: {
             coveralls: any;
-            if: any;
             insert: any;
             istanbul: any;
             mocha: any;
@@ -44,7 +43,6 @@ declare var plugins: {
     gulp: any;
     g: {
         coveralls: any;
-        if: any;
         insert: any;
         istanbul: any;
         mocha: any;

index.js

@@ -10,7 +10,6 @@ var NpmtsPlugins;
             gulp: require("gulp"),
             g: {
                 coveralls: require("gulp-coveralls"),
-                if: require("gulp-if"),
                 insert: require("gulp-insert"),
                 istanbul: require("gulp-istanbul"),
                 mocha: require("gulp-mocha"),
@@ -77,7 +76,7 @@ var NpmtsOptions;
         var done = plugins.q.defer();
         var config = configArg;
         if (typeof config.coveralls === "undefined") {
-            config.coveralls = true;
+            config.coveralls = false;
         }
         if (config.mode == "default") {
             config.typings = [
@@ -85,6 +84,7 @@ var NpmtsOptions;
             ];
             config.ts = (_a = {},
                 _a["./ts/index.ts"] = "./index.js",
+                _a["./ts/test.ts"] = "./test/test.js",
                 _a
             );
             config.test = ["./index.js"];
@@ -209,15 +209,20 @@ var NpmtsTests;
             return stream;
         };
         var coveralls = function () {
-            var stream = plugins.gulp.src("./coverage/**/lcov.info")
+            var stream = plugins.gulp.src([plugins.path.join(paths.cwd, "./coverage/lcov.info")])
-                .pipe(plugins.g.if((process.env.TRAVIS && config.coveralls), plugins.g.coveralls()));
+                .pipe(plugins.g.coveralls());
             return stream;
         };
         istanbul().on("finish", function () {
             mocha().on("finish", function () {
-                coveralls().on("finish", function () {
+                if (process.env.TRAVIS && config.coveralls) {
+                    coveralls().on("finish", function () {
+                        done.resolve(config);
+                    });
+                }
+                else {
                     done.resolve(config);
-                });
+                }
             });
         });
         return done.promise;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "npmts",
-  "version": "2.1.10",
+  "version": "2.2.2",
   "description": "write npm modules with TypeScript",
   "main": "index.js",
   "typings": "./index.d.ts",
@@ -30,7 +30,6 @@
     "fs-extra": "^0.26.5",
     "gulp": "3.9.0",
     "gulp-coveralls": "^0.1.4",
-    "gulp-if": "^2.0.0",
     "gulp-insert": "0.5.0",
     "gulp-istanbul": "^0.10.3",
     "gulp-mocha": "^2.2.0",

test/assets/coverage/lcov-report/assets/index.html

@@ -77,7 +77,7 @@
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
   Code coverage
-  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Feb 09 2016 17:01:13 GMT+0100 (CET)
+  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Feb 09 2016 20:36:12 GMT+0100 (CET)
 </div>
 </div>
 <script src="../prettify.js"></script>

test/assets/coverage/lcov-report/assets/index.js.html

@@ -76,7 +76,7 @@ module.exports = testplugin;
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
   Code coverage
-  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Feb 09 2016 17:01:13 GMT+0100 (CET)
+  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Feb 09 2016 20:36:12 GMT+0100 (CET)
 </div>
 </div>
 <script src="../prettify.js"></script>

test/assets/coverage/lcov-report/index.html

@@ -77,7 +77,7 @@
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
   Code coverage
-  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Feb 09 2016 17:01:13 GMT+0100 (CET)
+  generated by <a href="http://istanbul-js.org/" target="_blank">istanbul</a> at Tue Feb 09 2016 20:36:12 GMT+0100 (CET)
 </div>
 </div>
 <script src="prettify.js"></script>

test/assets/test/test.d.ts

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

test/assets/test/test.js

@@ -1,3 +1,5 @@
+#!/usr/bin/env node
+
 /// <reference path="./typings/main.d.ts" />
 console.log("**** starting test ****");
 var testplugin = require("../index.js");

ts/npmts.options.ts

@@ -4,14 +4,15 @@ module NpmtsOptions {
         var done = plugins.q.defer();
         var config = configArg;
         if (typeof config.coveralls === "undefined"){
-            config.coveralls = true;
+            config.coveralls = false;
         }
         if (config.mode == "default"){
             config.typings = [
                 "./ts/"
             ];
             config.ts = {
-                ["./ts/index.ts"]: "./index.js"
+                ["./ts/index.ts"]: "./index.js",
+                ["./ts/test.ts"]: "./test/test.js"
             };
             config.test = ["./index.js"];
             done.resolve(config);

ts/npmts.plugins.ts

@@ -7,7 +7,6 @@ module NpmtsPlugins {
             gulp: require("gulp"),
             g: {
                 coveralls: require("gulp-coveralls"),
-                if: require("gulp-if"),
                 insert: require("gulp-insert"),
                 istanbul: require("gulp-istanbul"),
                 mocha: require("gulp-mocha"),

ts/npmts.tests.ts

@@ -23,19 +23,20 @@ module NpmtsTests {
         };
 
         var coveralls = function(){
-            var stream = plugins.gulp.src("./coverage/**/lcov.info")
+            var stream = plugins.gulp.src([plugins.path.join(paths.cwd,"./coverage/lcov.info")])
-                .pipe(plugins.g.if(
+                .pipe(plugins.g.coveralls());
-                    (process.env.TRAVIS && config.coveralls),
-                    plugins.g.coveralls()
-                ));
             return stream;
         };
 
         istanbul().on("finish",function(){
             mocha().on("finish",function(){
-                coveralls().on("finish",function(){
+                if(process.env.TRAVIS && config.coveralls){
+                    coveralls().on("finish",function(){
+                        done.resolve(config);
+                    })
+                } else {
                     done.resolve(config);
-                })
+                }
             })
         });
         return done.promise;