3.6.6

dist/npmts.jsdoc.js

@@ -19,7 +19,7 @@ var genJsdoc = function (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
@@ -34,7 +34,6 @@ var publishDocs = function (configArg) {
         + "&& git push --force --quiet "
         + "\"" + gitUrl + "\" "
         + "master:gh-pages " + "> /dev/null 2>&1";
-    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!');
@@ -46,16 +45,11 @@ var publishDocs = function (configArg) {
     }
     plugins.beautylog.ok("JsDoc documentation has been deployed to GitHub!");
     done.resolve(configArg);
-    }
-    else {
-        done.resolve(configArg);
-    }
     return done.promise;
 };
 exports.run = function (configArg) {
     var done = plugins.Q.defer();
     genJsdoc(configArg)
-        .then(publishDocs)
         .then(done.resolve);
     return done.promise;
 };

dist/npmts.options.js

@@ -7,7 +7,7 @@ exports.isRelease = function () {
 };
 exports.doPublish = function () {
     return exports.isRelease()
-        && plugins.smartci.get.subJobNumber() != 1;
+        && plugins.smartci.get.subJobNumber() == 1;
 };
 exports.run = function (configArg) {
     var done = plugins.Q.defer();
@@ -27,7 +27,9 @@ exports.run = function (configArg) {
     }
     // handle state of current build
     exports.isRelease() ? plugins.beautylog.info("All right: This is a RELEASE build!")
-        : plugins.beautylog.info("NOT A RELEASE build! We are not publishing anything!");
+        : 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;

dist/npmts.promisechain.js

@@ -8,6 +8,7 @@ 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;
@@ -19,6 +20,7 @@ exports.run = function () {
         .then(NpmtsAssets.run)
         .then(NpmtsJsdoc.run)
         .then(NpmtsTests.run)
+        .then(NpmtsPublish.run)
         .then(function (configArg) {
         var shipString = "" +
             "\n" +
@@ -38,6 +40,9 @@ exports.run = function () {
             console.log(shipString);
             plugins.beautylog.success("READY TO SHIP!");
         }
+        else {
+            plugins.beautylog.success("Done!");
+        }
     });
     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

@@ -2,6 +2,17 @@
 /// <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 () {
+        plugins.beautylog.ok("Coverage data has been uploaded to Coveralls!");
+        done.resolve(configArg);
+    }, "atEnd"));
+    return done.promise;
+};
 exports.run = function (configArg) {
     var done = plugins.Q.defer();
     var config = configArg;
@@ -18,27 +29,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())
-            .pipe(plugins.g.gFunction(function () {
-            plugins.beautylog.ok("Tests have passed and coverage data has been uploaded to Coveralls!");
-        }, "atEnd"));
-        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 {
             plugins.beautylog.ok("Tests have passed!");
             done.resolve(config);
-            }
         });
     });
     return done.promise;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "npmts",
-  "version": "3.6.2",
+  "version": "3.6.6",
   "description": "write npm modules with TypeScript",
   "main": "dist/index.js",
   "bin": {

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"),
@@ -20,16 +20,16 @@ var genJsdoc = function(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 "
@@ -40,7 +40,7 @@ var publishDocs = function(configArg){
         + "\"" + gitUrl + "\" "
         + "master:gh-pages " + "> /dev/null 2>&1";
 
-    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!');
@@ -51,17 +51,14 @@ var publishDocs = function(configArg){
     }
     plugins.beautylog.ok("JsDoc documentation has been deployed to GitHub!");
     done.resolve(configArg);
-    } else {
-        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

@@ -8,7 +8,7 @@ export let isRelease = function():boolean {
 
 export let doPublish = function():boolean {
     return isRelease()
-        && plugins.smartci.get.subJobNumber() != 1;
+        && plugins.smartci.get.subJobNumber() == 1;
 };
 
 export var run = function(configArg){
@@ -32,7 +32,9 @@ export var run = function(configArg){
     // handle state of current build
 
     isRelease() ? plugins.beautylog.info("All right: This is a RELEASE build!")
-        : plugins.beautylog.info("NOT A RELEASE build! We are not publishing anything!");
+        : 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;

ts/npmts.promisechain.ts

@@ -8,6 +8,7 @@ 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(){
@@ -20,6 +21,7 @@ export var run = function(){
         .then(NpmtsAssets.run)
         .then(NpmtsJsdoc.run)
         .then(NpmtsTests.run)
+        .then(NpmtsPublish.run)
         .then(function(configArg){
             let shipString = "" +
                 "\n" +
@@ -38,6 +40,8 @@ export var run = function(){
             if (process.env.CI){
                 console.log(shipString);
                 plugins.beautylog.success("READY TO SHIP!");
+            } else {
+                plugins.beautylog.success("Done!")
             }
 
         });

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,19 @@
 /// <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(){
+            plugins.beautylog.ok("Coverage data has been uploaded to Coveralls!");
+            done.resolve(configArg);
+        },"atEnd"));
+    return done.promise;
+};
+
 export var run = function(configArg) {
     var done = plugins.Q.defer();
     var config = configArg;
@@ -23,27 +36,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())
-            .pipe(plugins.g.gFunction(function(){
-                plugins.beautylog.ok("Tests have passed and coverage data has been uploaded to Coveralls!");
-            },"atEnd"));
-        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 {
             plugins.beautylog.ok("Tests have passed!");
             done.resolve(config);
-            }
         })
     });
     return done.promise;