5.3.4

dist/index.js

@@ -9,15 +9,15 @@ var plugins = require("./npmts.plugins");
 var paths = require("./npmts.paths");
 var npmts_promisechain_1 = require("./npmts.promisechain");
 early.stop()
-    .done(function () {
+    .then(function () {
     var npmtsProjectInfo = new plugins.projectinfo.ProjectinfoNpm(paths.npmtsPackageRoot);
     var npmtsCli = new plugins.smartcli.Smartcli();
     npmtsCli.standardTask()
-        .then(function () {
+        .then(function (argvArg) {
         plugins.beautylog.figletSync("NPMTS");
         plugins.beautylog.info("npmts version: " + npmtsProjectInfo.version);
         try {
-            npmts_promisechain_1.promisechain();
+            npmts_promisechain_1.promisechain(argvArg);
         }
         catch (err) {
             console.log(err);

dist/npmts.configfile.js

@@ -2,13 +2,16 @@
 require("typings-global");
 var plugins = require("./npmts.plugins");
 var paths = require("./npmts.paths");
-exports.run = function () {
+exports.run = function (argvArg) {
     var done = plugins.Q.defer();
     var config = {};
     var configPath = plugins.path.join(paths.cwd, "npmts.json");
+    if (argvArg.notest) {
+        config.notest = true;
+    }
     if (plugins.smartfile.checks.fileExistsSync(configPath)) {
         plugins.beautylog.info("npmts.json".blue + " config file found!");
-        config = plugins.smartfile.local.toObjectSync(configPath);
+        config = plugins.lodashObject.assign(config, plugins.smartfile.local.toObjectSync(configPath));
         switch (config.mode) {
             case "default":
             case "custom":

dist/npmts.promisechain.js

@@ -9,12 +9,11 @@ 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.promisechain = function () {
+exports.promisechain = function (argvArg) {
     var done = plugins.Q.defer();
     exports.npmtsOra.start();
-    NpmtsConfigFile.run()
+    NpmtsConfigFile.run(argvArg)
         .then(NpmtsOptions.run)
         .then(NpmtsClean.run)
         .then(NpmtsInstall.run)
@@ -22,7 +21,6 @@ exports.promisechain = function () {
         .then(NpmtsAssets.run)
         .then(NpmtsJsdoc.run)
         .then(NpmtsTests.run)
-        .then(NpmtsPublish.run)
         .then(function (configArg) {
         var shipString = "" +
             "\n" +

dist/npmts.tests.js

@@ -56,6 +56,7 @@ var coverage = function (configArg) {
 exports.run = function (configArg) {
     var done = plugins.Q.defer();
     var config = configArg;
+    if (config.notest != true) {
         npmts_promisechain_1.npmtsOra.text("now starting tests");
         plugins.beautylog.log("-------------------------------------------------------\n" +
             "*************************** TESTS: ***************************\n" +
@@ -63,6 +64,13 @@ exports.run = function (configArg) {
         istanbul(config)
             .then(mocha)
             .then(coverage)
-        .then(done.resolve);
+            .then(function () {
+            done.resolve(config);
+        });
+    }
+    else {
+        npmts_promisechain_1.npmtsOra.end();
+        done.resolve(config);
+    }
     return done.promise;
 };

package.json

@@ -1,15 +1,16 @@
 {
   "name": "npmts",
-  "version": "5.3.2",
+  "version": "5.3.4",
   "description": "write npm modules with TypeScript",
   "main": "dist/index.js",
   "bin": {
     "npmts": "dist/cli.js"
   },
   "scripts": {
-    "test": "(npm run compile && npm run check && npm run checkVersion)",
+    "test": "(npm run compile && npm run check && npm run checkVersion && npm run checkNoTest)",
     "check": "(cd ./test/assets && node ../../dist/index.js)",
     "checkVersion": "cd ./test/assets && node ../../dist/index.js -v",
+    "checkNoTest": "cd ./test/assets && node ../../dist/index.js --notest",
     "compile": "(cd compile && node compile.js)"
   },
   "repository": {
@@ -27,7 +28,7 @@
   },
   "homepage": "https://gitlab.com/pushrocks/npmts#readme",
   "dependencies": {
-    "beautylog": "5.0.8",
+    "beautylog": "5.0.11",
     "early": "^2.0.13",
     "fs-extra": "^0.30.0",
     "gulp": "3.9.1",
@@ -47,7 +48,7 @@
     "q": "^1.4.1",
     "shelljs": "^0.7.0",
     "smartci": "0.0.1",
-    "smartcli": "1.0.1",
+    "smartcli": "1.0.2",
     "smartcov": "0.0.6",
     "smartenv": "1.2.5",
     "smartfile": "3.0.10",

ts/index.ts

@@ -9,16 +9,16 @@ import * as plugins from "./npmts.plugins"
 import * as paths from "./npmts.paths";
 import {promisechain} from "./npmts.promisechain";
 early.stop()
-    .done(() => {
+    .then(() => {
         let npmtsProjectInfo = new plugins.projectinfo.ProjectinfoNpm(paths.npmtsPackageRoot);
 
         let npmtsCli = new plugins.smartcli.Smartcli();
         npmtsCli.standardTask()
-            .then(() => {
+            .then((argvArg) => {
                 plugins.beautylog.figletSync("NPMTS");
                 plugins.beautylog.info("npmts version: " + npmtsProjectInfo.version);
                 try {
-                    promisechain();
+                    promisechain(argvArg);
                 }
                 catch(err){
                     console.log(err);

ts/npmts.configfile.ts

@@ -1,13 +1,19 @@
 import "typings-global";
 import plugins = require("./npmts.plugins");
 import paths = require("./npmts.paths");
-export var run = function(){
+export var run = function(argvArg){
     var done = plugins.Q.defer();
     var config:any = {};
     var configPath = plugins.path.join(paths.cwd,"npmts.json");
+    if(argvArg.notest){
+        config.notest = true;
+    }
     if(plugins.smartfile.checks.fileExistsSync(configPath)){
         plugins.beautylog.info("npmts.json".blue + " config file found!");
-        config = plugins.smartfile.local.toObjectSync(configPath);
+        config = plugins.lodashObject.assign(
+            config,
+            plugins.smartfile.local.toObjectSync(configPath)
+        );
         switch (config.mode){
             case "default":
             case "custom":

ts/npmts.promisechain.ts

@@ -10,13 +10,12 @@ 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 let promisechain = function(){
+export let promisechain = function(argvArg){
     let done = plugins.Q.defer();
     npmtsOra.start();
-    NpmtsConfigFile.run()
+    NpmtsConfigFile.run(argvArg)
         .then(NpmtsOptions.run)
         .then(NpmtsClean.run)
         .then(NpmtsInstall.run)
@@ -24,7 +23,6 @@ export let promisechain = function(){
         .then(NpmtsAssets.run)
         .then(NpmtsJsdoc.run)
         .then(NpmtsTests.run)
-        .then(NpmtsPublish.run)
         .then(function(configArg){
             let shipString = "" +
                 "\n" +

ts/npmts.publish.ts

@@ -1,11 +0,0 @@
-import "typings-global";
-import plugins = require("./npmts.plugins");
-import paths = require("./npmts.paths");
-import NpmtsJsdoc = require("./npmts.jsdoc");
-
-export let run = function(configArg){
-    let done = plugins.Q.defer();
-    let config = configArg;
-    done.resolve();
-    return done.promise;
-};

ts/npmts.tests.ts

@@ -62,7 +62,7 @@ let coverage = function(configArg){
 export let run = function(configArg) {
     let done = plugins.Q.defer();
     let config = configArg;
-
+    if(config.notest != true){
         npmtsOra.text("now starting tests");
         plugins.beautylog.log(
             "-------------------------------------------------------\n" +
@@ -73,6 +73,12 @@ export let run = function(configArg) {
         istanbul(config)
             .then(mocha)
             .then(coverage)
-        .then(done.resolve);
+            .then(() => {
+                done.resolve(config);
+            });
+    } else {
+        npmtsOra.end();
+        done.resolve(config);
+    }
     return done.promise;
 };