diff --git a/dist/npmts.configfile.js b/dist/npmts.configfile.js index 81eca2d..be0ea8f 100644 --- a/dist/npmts.configfile.js +++ b/dist/npmts.configfile.js @@ -11,7 +11,7 @@ exports.run = function (argvArg) { } 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": diff --git a/dist/npmts.promisechain.js b/dist/npmts.promisechain.js index c05e9ec..f6c72a0 100644 --- a/dist/npmts.promisechain.js +++ b/dist/npmts.promisechain.js @@ -9,7 +9,6 @@ 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 (argvArg) { var done = plugins.Q.defer(); @@ -22,7 +21,6 @@ exports.promisechain = function (argvArg) { .then(NpmtsAssets.run) .then(NpmtsJsdoc.run) .then(NpmtsTests.run) - .then(NpmtsPublish.run) .then(function (configArg) { var shipString = "" + "\n" + diff --git a/dist/npmts.tests.js b/dist/npmts.tests.js index afefff3..c13542a 100644 --- a/dist/npmts.tests.js +++ b/dist/npmts.tests.js @@ -56,7 +56,7 @@ var coverage = function (configArg) { exports.run = function (configArg) { var done = plugins.Q.defer(); var config = configArg; - if (!config.notest) { + if (config.notest != true) { npmts_promisechain_1.npmtsOra.text("now starting tests"); plugins.beautylog.log("-------------------------------------------------------\n" + "*************************** TESTS: ***************************\n" + @@ -69,6 +69,7 @@ exports.run = function (configArg) { }); } else { + npmts_promisechain_1.npmtsOra.end(); done.resolve(config); } return done.promise; diff --git a/package.json b/package.json index 98cfc19..194af65 100644 --- a/package.json +++ b/package.json @@ -7,9 +7,10 @@ "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": { diff --git a/ts/npmts.configfile.ts b/ts/npmts.configfile.ts index f9be231..4dff988 100644 --- a/ts/npmts.configfile.ts +++ b/ts/npmts.configfile.ts @@ -10,7 +10,10 @@ export var run = function(argvArg){ } 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": diff --git a/ts/npmts.promisechain.ts b/ts/npmts.promisechain.ts index 6b863ad..4c10326 100644 --- a/ts/npmts.promisechain.ts +++ b/ts/npmts.promisechain.ts @@ -10,7 +10,6 @@ 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(argvArg){ @@ -24,7 +23,6 @@ export let promisechain = function(argvArg){ .then(NpmtsAssets.run) .then(NpmtsJsdoc.run) .then(NpmtsTests.run) - .then(NpmtsPublish.run) .then(function(configArg){ let shipString = "" + "\n" + diff --git a/ts/npmts.publish.ts b/ts/npmts.publish.ts deleted file mode 100644 index 36c0330..0000000 --- a/ts/npmts.publish.ts +++ /dev/null @@ -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; -}; \ No newline at end of file diff --git a/ts/npmts.tests.ts b/ts/npmts.tests.ts index fe05f3d..42871b9 100644 --- a/ts/npmts.tests.ts +++ b/ts/npmts.tests.ts @@ -62,22 +62,22 @@ let coverage = function(configArg){ export let run = function(configArg) { let done = plugins.Q.defer(); let config = configArg; - if(!config.notest){ + if(config.notest != true){ + npmtsOra.text("now starting tests"); + plugins.beautylog.log( + "-------------------------------------------------------\n" + + "*************************** TESTS: ***************************\n" + + "--------------------------------------------------------------" + ); - npmtsOra.text("now starting tests"); - plugins.beautylog.log( - "-------------------------------------------------------\n" + - "*************************** TESTS: ***************************\n" + - "--------------------------------------------------------------" - ); - - istanbul(config) - .then(mocha) - .then(coverage) - .then(() => { - done.resolve(config); - }); + istanbul(config) + .then(mocha) + .then(coverage) + .then(() => { + done.resolve(config); + }); } else { + npmtsOra.end(); done.resolve(config); } return done.promise;