added --watch option

This commit is contained in:
Philipp Kunz 2016-09-22 23:23:16 +02:00
parent 3dae49b8a1
commit 5f15fe1b30
35 changed files with 270 additions and 203 deletions

23
dist/index.js vendored
View File

@ -3,25 +3,20 @@ require("typings-global");
/* ================================================== * /* ================================================== *
Starting NPMTS main process. Starting NPMTS main process.
* ================================================== */ * ================================================== */
var early = require("early"); const early = require("early");
early.start('NPMTS'); early.start('NPMTS');
var plugins = require("./npmts.plugins"); const plugins = require("./npmts.plugins");
var paths = require("./npmts.paths"); const paths = require("./npmts.paths");
var npmts_promisechain_1 = require("./npmts.promisechain"); const promisechain = require("./npmts.promisechain");
early.stop() early.stop()
.then(function () { .then(() => {
var npmtsProjectInfo = new plugins.projectinfo.ProjectinfoNpm(paths.npmtsPackageRoot); let npmtsProjectInfo = new plugins.projectinfo.ProjectinfoNpm(paths.npmtsPackageRoot);
var npmtsCli = new plugins.smartcli.Smartcli(); let npmtsCli = new plugins.smartcli.Smartcli();
npmtsCli.standardTask() npmtsCli.standardTask()
.then(function (argvArg) { .then((argvArg) => {
plugins.beautylog.figletSync('NPMTS'); plugins.beautylog.figletSync('NPMTS');
plugins.beautylog.info('npmts version: ' + npmtsProjectInfo.version); plugins.beautylog.info('npmts version: ' + npmtsProjectInfo.version);
try { promisechain.run(argvArg).catch((err) => { console.log(err); });
npmts_promisechain_1.promisechain(argvArg);
}
catch (err) {
console.log(err);
}
}); });
npmtsCli.addVersion(npmtsProjectInfo.version); npmtsCli.addVersion(npmtsProjectInfo.version);
npmtsCli.startParse(); npmtsCli.startParse();

View File

@ -1,4 +1,4 @@
/// <reference types="q" /> /// <reference types="q" />
import 'typings-global'; import 'typings-global';
import plugins = require('./npmts.plugins'); import plugins = require('./npmts.plugins');
export declare var run: (configArg: any) => plugins.Q.Promise<{}>; export declare var run: (configArg: any) => plugins.q.Promise<{}>;

10
dist/npmts.assets.js vendored
View File

@ -1,11 +1,11 @@
"use strict"; "use strict";
require("typings-global"); require("typings-global");
var plugins = require("./npmts.plugins"); const plugins = require("./npmts.plugins");
var paths = require("./npmts.paths"); const paths = require("./npmts.paths");
var npmts_promisechain_1 = require("./npmts.promisechain"); const npmts_promisechain_1 = require("./npmts.promisechain");
exports.run = function (configArg) { exports.run = function (configArg) {
var done = plugins.Q.defer(); let done = plugins.q.defer();
var config = configArg; let config = configArg;
npmts_promisechain_1.npmtsOra.text('now looking at ' + 'required assets'.yellow); npmts_promisechain_1.npmtsOra.text('now looking at ' + 'required assets'.yellow);
if (config.cli === true) { if (config.cli === true) {
plugins.smartfile.fs.copySync(plugins.path.join(paths.npmtsAssetsDir, 'cli.js'), plugins.path.join(paths.distDir, 'cli.js')); plugins.smartfile.fs.copySync(plugins.path.join(paths.npmtsAssetsDir, 'cli.js'), plugins.path.join(paths.distDir, 'cli.js'));

View File

@ -2,4 +2,4 @@
import * as plugins from './npmts.plugins'; import * as plugins from './npmts.plugins';
import { ProjectinfoNpm } from 'projectinfo'; import { ProjectinfoNpm } from 'projectinfo';
export declare let projectInfo: ProjectinfoNpm; export declare let projectInfo: ProjectinfoNpm;
export declare let run: (configArg: any) => plugins.Q.Promise<{}>; export declare let run: (configArg: any) => plugins.q.Promise<{}>;

94
dist/npmts.check.js vendored
View File

@ -1,20 +1,21 @@
"use strict"; "use strict";
var plugins = require("./npmts.plugins"); const plugins = require("./npmts.plugins");
var paths = require("./npmts.paths"); const paths = require("./npmts.paths");
var npmts_promisechain_1 = require("./npmts.promisechain"); const npmts_promisechain_1 = require("./npmts.promisechain");
var projectinfo_1 = require("projectinfo"); const projectinfo_1 = require("projectinfo");
var checkProjectTypings = function (configArg) { let checkProjectTypings = (configArg) => {
var done = plugins.Q.defer(); let done = plugins.q.defer();
npmts_promisechain_1.npmtsOra.text('Check Module: Check Project Typings...');
exports.projectInfo = new projectinfo_1.ProjectinfoNpm(paths.cwd); exports.projectInfo = new projectinfo_1.ProjectinfoNpm(paths.cwd);
if (typeof exports.projectInfo.packageJson.typings === 'undefined') { if (typeof exports.projectInfo.packageJson.typings === 'undefined') {
plugins.beautylog.error("please add typings field to package.json"); plugins.beautylog.error(`please add typings field to package.json`);
process.exit(1); process.exit(1);
} }
; ;
done.resolve(configArg); done.resolve(configArg);
return done.promise; return done.promise;
}; };
var depcheckOptions = { const depcheckOptions = {
ignoreBinPackage: false, ignoreBinPackage: false,
parsers: { parsers: {
'*.ts': plugins.depcheck.parser.typescript '*.ts': plugins.depcheck.parser.typescript
@ -28,9 +29,10 @@ var depcheckOptions = {
plugins.depcheck.special.webpack plugins.depcheck.special.webpack
] ]
}; };
var checkDependencies = function (configArg) { let checkDependencies = (configArg) => {
var done = plugins.Q.defer(); let done = plugins.q.defer();
var depcheckOptionsMerged = plugins.lodash.merge(depcheckOptions, { npmts_promisechain_1.npmtsOra.text('Check Module: Check Dependencies...');
let depcheckOptionsMerged = plugins.lodash.merge(depcheckOptions, {
ignoreDirs: [ ignoreDirs: [
'test', 'test',
'dist', 'dist',
@ -41,38 +43,32 @@ var checkDependencies = function (configArg) {
'babel-preset-*' 'babel-preset-*'
] ]
}); });
plugins.depcheck(paths.cwd, depcheckOptionsMerged, function (unused) { plugins.depcheck(paths.cwd, depcheckOptionsMerged, (unused) => {
for (var _i = 0, _a = unused.dependencies; _i < _a.length; _i++) { for (let item of unused.dependencies) {
var item = _a[_i]; plugins.beautylog.warn(`Watch out: unused dependency "${item}"`);
plugins.beautylog.warn("Watch out: unused dependency " + item.red);
} }
; for (let item in unused.missing) {
for (var _b = 0, _c = unused.missing; _b < _c.length; _b++) { plugins.beautylog.error(`unused devDependency "${item}"`);
var item = _c[_b];
plugins.beautylog.error("unused devDependency " + item.red);
} }
;
if (unused.missing.length > 0) { if (unused.missing.length > 0) {
plugins.beautylog.info('exiting due to missing dependencies in package.json'); plugins.beautylog.info('exiting due to missing dependencies in package.json');
process.exit(1); process.exit(1);
} }
for (var _d = 0, _e = unused.invalidFiles; _d < _e.length; _d++) { for (let item in unused.invalidFiles) {
var item = _e[_d]; plugins.beautylog.warn(`Watch out: could not parse file ${item.red}`);
plugins.beautylog.warn("Watch out: could not parse file " + item.red);
} }
; ;
for (var _f = 0, _g = unused.invalidDirs; _f < _g.length; _f++) { for (let item in unused.invalidDirs) {
var item = _g[_f]; plugins.beautylog.warn(`Watch out: could not parse directory ${item.red}`);
plugins.beautylog.warn("Watch out: could not parse directory " + item.red);
} }
;
done.resolve(configArg); done.resolve(configArg);
}); });
return done.promise; return done.promise;
}; };
var checkDevDependencies = function (configArg) { let checkDevDependencies = (configArg) => {
var done = plugins.Q.defer(); let done = plugins.q.defer();
var depcheckOptionsMerged = plugins.lodash.merge(depcheckOptions, { npmts_promisechain_1.npmtsOra.text('Check Module: Check devDependencies...');
let depcheckOptionsMerged = plugins.lodash.merge(depcheckOptions, {
ignoreDirs: [ ignoreDirs: [
'ts', 'ts',
'dist', 'dist',
@ -83,45 +79,41 @@ var checkDevDependencies = function (configArg) {
'babel-preset-*' 'babel-preset-*'
] ]
}); });
plugins.depcheck(paths.cwd, depcheckOptionsMerged, function (unused) { plugins.depcheck(paths.cwd, depcheckOptionsMerged, (unused) => {
for (var _i = 0, _a = unused.devDependencies; _i < _a.length; _i++) { for (let item of unused.devDependencies) {
var item = _a[_i]; plugins.beautylog.log(`unused devDependency ${item.red}`);
plugins.beautylog.log("unused devDependency " + item.red);
} }
; for (let item in unused.missing) {
for (var _b = 0, _c = unused.missing; _b < _c.length; _b++) { plugins.beautylog.error(`unused devDependency ${item.red}`);
var item = _c[_b];
plugins.beautylog.error("unused devDependency " + item.red);
} }
;
if (unused.missing.length > 0) { if (unused.missing.length > 0) {
plugins.beautylog.info('exiting due to missing dependencies in package.json'); plugins.beautylog.info('exiting due to missing dependencies in package.json');
process.exit(1); process.exit(1);
} }
for (var _d = 0, _e = unused.invalidFiles; _d < _e.length; _d++) { for (let item in unused.invalidFiles) {
var item = _e[_d]; plugins.beautylog.warn(`Watch out: could not parse file ${item.red}`);
plugins.beautylog.warn("Watch out: could not parse file " + item.red);
} }
for (var _f = 0, _g = unused.invalidDirs; _f < _g.length; _f++) { for (let item in unused.invalidDirs) {
var item = _g[_f]; plugins.beautylog.warn(`Watch out: could not parse directory ${item.red}`);
plugins.beautylog.warn("Watch out: could not parse directory " + item.red);
} }
done.resolve(configArg); done.resolve(configArg);
}); });
return done.promise; return done.promise;
}; };
var checkNodeVersion = function (configArg) { let checkNodeVersion = (configArg) => {
var done = plugins.Q.defer(); let done = plugins.q.defer();
npmts_promisechain_1.npmtsOra.text('checking node version');
done.resolve(configArg); done.resolve(configArg);
return done.promise; return done.promise;
}; };
exports.run = function (configArg) { exports.run = (configArg) => {
var done = plugins.Q.defer(); let done = plugins.q.defer();
npmts_promisechain_1.npmtsOra.text('running project checks...'); npmts_promisechain_1.npmtsOra.text('Check Module: ...');
checkProjectTypings(configArg) checkProjectTypings(configArg)
.then(checkDependencies) .then(checkDependencies)
.then(checkDevDependencies) .then(checkDevDependencies)
.then(checkNodeVersion) .then(checkNodeVersion)
.then(done.resolve); .then(done.resolve)
.catch((err) => { console.log(err); });
return done.promise; return done.promise;
}; };

View File

@ -1,4 +1,4 @@
/// <reference types="q" /> /// <reference types="q" />
import 'typings-global'; import 'typings-global';
import plugins = require('./npmts.plugins'); import plugins = require('./npmts.plugins');
export declare let run: (configArg: any) => plugins.Q.Promise<{}>; export declare let run: (configArg: any) => plugins.q.Promise<{}>;

12
dist/npmts.clean.js vendored
View File

@ -1,19 +1,19 @@
"use strict"; "use strict";
require("typings-global"); require("typings-global");
var plugins = require("./npmts.plugins"); const plugins = require("./npmts.plugins");
var paths = require("./npmts.paths"); const paths = require("./npmts.paths");
var npmts_promisechain_1 = require("./npmts.promisechain"); const npmts_promisechain_1 = require("./npmts.promisechain");
var removeDist = function () { let removeDist = function () {
npmts_promisechain_1.npmtsOra.text('cleaning dist folder'); npmts_promisechain_1.npmtsOra.text('cleaning dist folder');
return plugins.smartfile.fs.remove(paths.distDir); return plugins.smartfile.fs.remove(paths.distDir);
}; };
var removePages = function () { let removePages = function () {
npmts_promisechain_1.npmtsOra.text('cleaning pages folder'); npmts_promisechain_1.npmtsOra.text('cleaning pages folder');
return plugins.smartfile.fs.remove(paths.pagesDir); return plugins.smartfile.fs.remove(paths.pagesDir);
}; };
exports.run = function (configArg) { exports.run = function (configArg) {
npmts_promisechain_1.npmtsOra.text('cleaning up from previous builds...'); npmts_promisechain_1.npmtsOra.text('cleaning up from previous builds...');
var done = plugins.Q.defer(); let done = plugins.q.defer();
removeDist() removeDist()
.then(removePages) .then(removePages)
.then(function () { .then(function () {

View File

@ -1,4 +1,4 @@
/// <reference types="q" /> /// <reference types="q" />
import 'typings-global'; import 'typings-global';
import plugins = require('./npmts.plugins'); import plugins = require('./npmts.plugins');
export declare let run: (configArg: any) => plugins.Q.Promise<{}>; export declare let run: (configArg: any) => plugins.q.Promise<{}>;

12
dist/npmts.compile.js vendored
View File

@ -1,14 +1,14 @@
"use strict"; "use strict";
require("typings-global"); require("typings-global");
var plugins = require("./npmts.plugins"); const plugins = require("./npmts.plugins");
var paths = require("./npmts.paths"); const paths = require("./npmts.paths");
var npmts_promisechain_1 = require("./npmts.promisechain"); const npmts_promisechain_1 = require("./npmts.promisechain");
exports.run = function (configArg) { exports.run = function (configArg) {
var done = plugins.Q.defer(); let done = plugins.q.defer();
var config = configArg; let config = configArg;
npmts_promisechain_1.npmtsOra.text('now compiling ' + 'TypeScript'.yellow); npmts_promisechain_1.npmtsOra.text('now compiling ' + 'TypeScript'.yellow);
plugins.tsn.compileGlobStringObject(config.ts, config.tsOptions, paths.cwd) plugins.tsn.compileGlobStringObject(config.ts, config.tsOptions, paths.cwd)
.then(function () { .then(() => {
plugins.beautylog.ok('compiled main TypeScript!'); plugins.beautylog.ok('compiled main TypeScript!');
plugins.beautylog.log('now compiling tests!'); plugins.beautylog.log('now compiling tests!');
return plugins.tsn.compileGlobStringObject(config.testTs); return plugins.tsn.compileGlobStringObject(config.testTs);

View File

@ -11,5 +11,6 @@ export interface INpmtsConfig {
testTs: any; testTs: any;
ts: any; ts: any;
tsOptions: any; tsOptions: any;
watch: boolean;
} }
export declare var run: (argvArg: any) => plugins.Q.Promise<{}>; export declare var run: (argvArg: any) => plugins.q.Promise<{}>;

34
dist/npmts.options.js vendored
View File

@ -1,12 +1,12 @@
"use strict"; "use strict";
require("typings-global"); require("typings-global");
var plugins = require("./npmts.plugins"); const plugins = require("./npmts.plugins");
var paths = require("./npmts.paths"); const paths = require("./npmts.paths");
var npmts_promisechain_1 = require("./npmts.promisechain"); const npmts_promisechain_1 = require("./npmts.promisechain");
; ;
exports.run = function (argvArg) { exports.run = function (argvArg) {
var done = plugins.Q.defer(); let done = plugins.q.defer();
var defaultConfig = { let defaultConfig = {
argv: undefined, argv: undefined,
coverageTreshold: 70, coverageTreshold: 70,
docs: true, docs: true,
@ -14,11 +14,12 @@ exports.run = function (argvArg) {
test: true, test: true,
testTs: {}, testTs: {},
ts: {}, ts: {},
tsOptions: {} tsOptions: {},
watch: false
}; };
// mix with configfile // mix with configfile
npmts_promisechain_1.npmtsOra.text('looking for npmextra.json'); npmts_promisechain_1.npmtsOra.text('looking for npmextra.json');
var config = plugins.npmextra.dataFor({ let config = plugins.npmextra.dataFor({
toolName: 'npmts', toolName: 'npmts',
defaultSettings: defaultConfig, defaultSettings: defaultConfig,
cwd: paths.cwd cwd: paths.cwd
@ -33,18 +34,18 @@ exports.run = function (argvArg) {
done.resolve(config); done.resolve(config);
break; break;
default: default:
plugins.beautylog.error("mode not recognised!"); plugins.beautylog.error(`mode not recognised!`);
process.exit(1); process.exit(1);
} }
; ;
// handle default mode // handle default mode
if (config.mode === 'default') { if (config.mode === 'default') {
config.ts = (_a = {}, config.ts = {
_a['./ts/**/*.ts'] = './dist/', ['./ts/**/*.ts']: './dist/'
_a); };
config.testTs = (_b = {}, config.testTs = {
_b['./test/test.ts'] = './test/', ['./test/test.ts']: './test/'
_b); };
} }
; ;
// mix with commandline // mix with commandline
@ -56,8 +57,11 @@ exports.run = function (argvArg) {
config.docs = false; config.docs = false;
} }
; ;
if (config.argv.watch) {
config.watch = true;
}
;
plugins.beautylog.ok('build options are ready!'); plugins.beautylog.ok('build options are ready!');
done.resolve(config); done.resolve(config);
return done.promise; return done.promise;
var _a, _b;
}; };

2
dist/npmts.paths.js vendored
View File

@ -1,6 +1,6 @@
"use strict"; "use strict";
require("typings-global"); require("typings-global");
var plugins = require("./npmts.plugins"); const plugins = require("./npmts.plugins");
// NPMTS Paths // NPMTS Paths
exports.npmtsPackageRoot = plugins.path.join(__dirname, '../'); exports.npmtsPackageRoot = plugins.path.join(__dirname, '../');
// Project paths // Project paths

View File

@ -15,8 +15,9 @@ export import lodash = require('lodash');
export import npmextra = require('npmextra'); export import npmextra = require('npmextra');
export import projectinfo = require('projectinfo'); export import projectinfo = require('projectinfo');
export import path = require('path'); export import path = require('path');
export import Q = require('q'); export import q = require('q');
export import shelljs = require('shelljs'); export import shelljs = require('shelljs');
export import smartchok = require('smartchok');
export import smartcli = require('smartcli'); export import smartcli = require('smartcli');
export import smartcov = require('smartcov'); export import smartcov = require('smartcov');
export import smartenv = require('smartenv'); export import smartenv = require('smartenv');

View File

@ -16,8 +16,9 @@ exports.lodash = require("lodash");
exports.npmextra = require("npmextra"); exports.npmextra = require("npmextra");
exports.projectinfo = require("projectinfo"); exports.projectinfo = require("projectinfo");
exports.path = require("path"); exports.path = require("path");
exports.Q = require("q"); exports.q = require("q");
exports.shelljs = require("shelljs"); exports.shelljs = require("shelljs");
exports.smartchok = require("smartchok");
exports.smartcli = require("smartcli"); exports.smartcli = require("smartcli");
exports.smartcov = require("smartcov"); exports.smartcov = require("smartcov");
exports.smartenv = require("smartenv"); exports.smartenv = require("smartenv");

View File

@ -3,4 +3,4 @@ import 'typings-global';
import plugins = require('./npmts.plugins'); import plugins = require('./npmts.plugins');
import { Ora } from 'beautylog'; import { Ora } from 'beautylog';
export declare let npmtsOra: Ora; export declare let npmtsOra: Ora;
export declare let promisechain: (argvArg: any) => plugins.Q.Promise<{}>; export declare let run: (argvArg: any) => plugins.q.Promise<{}>;

View File

@ -1,17 +1,18 @@
"use strict"; "use strict";
require("typings-global"); require("typings-global");
var plugins = require("./npmts.plugins"); const plugins = require("./npmts.plugins");
var beautylog_1 = require("beautylog"); const beautylog_1 = require("beautylog");
exports.npmtsOra = new beautylog_1.Ora('setting up TaskChain', 'cyan'); exports.npmtsOra = new beautylog_1.Ora('setting up TaskChain', 'cyan');
var NpmtsAssets = require("./npmts.assets"); const NpmtsAssets = require("./npmts.assets");
var NpmtsCheck = require("./npmts.check"); const NpmtsCheck = require("./npmts.check");
var NpmtsClean = require("./npmts.clean"); const NpmtsClean = require("./npmts.clean");
var NpmtsCompile = require("./npmts.compile"); const NpmtsCompile = require("./npmts.compile");
var NpmtsTypeDoc = require("./npmts.typedoc"); const NpmtsTypeDoc = require("./npmts.typedoc");
var NpmtsOptions = require("./npmts.options"); const NpmtsOptions = require("./npmts.options");
var NpmtsTests = require("./npmts.tests"); const NpmtsTests = require("./npmts.tests");
exports.promisechain = function (argvArg) { const NpmtsWatch = require("./npmts.watch");
var done = plugins.Q.defer(); exports.run = function (argvArg) {
let done = plugins.q.defer();
exports.npmtsOra.start(); exports.npmtsOra.start();
NpmtsOptions.run(argvArg) NpmtsOptions.run(argvArg)
.then(NpmtsClean.run) .then(NpmtsClean.run)
@ -20,8 +21,9 @@ exports.promisechain = function (argvArg) {
.then(NpmtsAssets.run) .then(NpmtsAssets.run)
.then(NpmtsTypeDoc.run) .then(NpmtsTypeDoc.run)
.then(NpmtsTests.run) .then(NpmtsTests.run)
.then(NpmtsWatch.run)
.then(function (configArg) { .then(function (configArg) {
var shipString = '' + let shipString = '' +
'\n' + '\n' +
'\n' + '\n' +
' # # ( )\n' + ' # # ( )\n' +
@ -42,7 +44,7 @@ exports.promisechain = function (argvArg) {
else { else {
plugins.beautylog.success('Done!'); plugins.beautylog.success('Done!');
} }
done.resolve(); done.resolve(configArg);
}); });
return done.promise; return done.promise;
}; };

View File

@ -1,4 +1,4 @@
/// <reference types="q" /> /// <reference types="q" />
import 'typings-global'; import 'typings-global';
import plugins = require('./npmts.plugins'); import plugins = require('./npmts.plugins');
export declare let run: (configArg: any) => plugins.Q.Promise<{}>; export declare let run: (configArg: any) => plugins.q.Promise<{}>;

32
dist/npmts.tests.js vendored
View File

@ -1,16 +1,16 @@
"use strict"; "use strict";
require("typings-global"); require("typings-global");
var plugins = require("./npmts.plugins"); const plugins = require("./npmts.plugins");
var paths = require("./npmts.paths"); const paths = require("./npmts.paths");
var npmts_promisechain_1 = require("./npmts.promisechain"); const npmts_promisechain_1 = require("./npmts.promisechain");
/** /**
* *
* @returns {*} * @returns {*}
*/ */
var mocha = function (configArg) { let mocha = function (configArg) {
npmts_promisechain_1.npmtsOra.text('Instrumentalizing and testing transpiled JS'); npmts_promisechain_1.npmtsOra.text('Instrumentalizing and testing transpiled JS');
npmts_promisechain_1.npmtsOra.end(); // end npmtsOra for tests. npmts_promisechain_1.npmtsOra.end(); // end npmtsOra for tests.
var done = plugins.Q.defer(); let done = plugins.q.defer();
plugins.gulp.src([plugins.path.join(paths.cwd, 'dist/*.js')]) plugins.gulp.src([plugins.path.join(paths.cwd, 'dist/*.js')])
.pipe(plugins.g.sourcemaps.init()) .pipe(plugins.g.sourcemaps.init())
.pipe(plugins.g.babel({ .pipe(plugins.g.babel({
@ -41,19 +41,19 @@ var mocha = function (configArg) {
}); });
return done.promise; return done.promise;
}; };
var coverage = function (configArg) { let coverage = function (configArg) {
var done = plugins.Q.defer(); let done = plugins.q.defer();
plugins.smartcov.get.percentage(plugins.path.join(paths.coverageDir, 'lcov.info'), 2) plugins.smartcov.get.percentage(plugins.path.join(paths.coverageDir, 'lcov.info'), 2)
.then(function (percentageArg) { .then(function (percentageArg) {
if (percentageArg >= configArg.coverageTreshold) { if (percentageArg >= configArg.coverageTreshold) {
plugins.beautylog.ok(percentageArg.toString() + "% " plugins.beautylog.ok(`${percentageArg.toString()}% `
+ "coverage exceeds your treshold of " + `coverage exceeds your treshold of `
+ (configArg.coverageTreshold.toString() + "%")); + `${configArg.coverageTreshold.toString()}%`);
} }
else { else {
plugins.beautylog.warn(percentageArg.toString() + "% " plugins.beautylog.warn(`${percentageArg.toString()}% `
+ "coverage fails your treshold of " + `coverage fails your treshold of `
+ (configArg.coverageTreshold.toString() + "%")); + `${configArg.coverageTreshold.toString()}%`);
plugins.beautylog.error('exiting due to coverage failure'); plugins.beautylog.error('exiting due to coverage failure');
process.exit(1); process.exit(1);
} }
@ -62,8 +62,8 @@ var coverage = function (configArg) {
return done.promise; return done.promise;
}; };
exports.run = function (configArg) { exports.run = function (configArg) {
var done = plugins.Q.defer(); let done = plugins.q.defer();
var config = configArg; let config = configArg;
if (config.test === true) { if (config.test === true) {
npmts_promisechain_1.npmtsOra.text('now starting tests'); npmts_promisechain_1.npmtsOra.text('now starting tests');
plugins.beautylog.log('-------------------------------------------------------\n' + plugins.beautylog.log('-------------------------------------------------------\n' +
@ -71,7 +71,7 @@ exports.run = function (configArg) {
'--------------------------------------------------------------'); '--------------------------------------------------------------');
mocha(config) mocha(config)
.then(coverage) .then(coverage)
.then(function () { .then(() => {
done.resolve(config); done.resolve(config);
}); });
} }

View File

@ -1,4 +1,4 @@
/// <reference types="q" /> /// <reference types="q" />
import 'typings-global'; import 'typings-global';
import plugins = require('./npmts.plugins'); import plugins = require('./npmts.plugins');
export declare let run: (configArg: any) => plugins.Q.Promise<{}>; export declare let run: (configArg: any) => plugins.q.Promise<{}>;

16
dist/npmts.typedoc.js vendored
View File

@ -1,11 +1,11 @@
"use strict"; "use strict";
require("typings-global"); require("typings-global");
var plugins = require("./npmts.plugins"); const plugins = require("./npmts.plugins");
var paths = require("./npmts.paths"); const paths = require("./npmts.paths");
var npmts_promisechain_1 = require("./npmts.promisechain"); const npmts_promisechain_1 = require("./npmts.promisechain");
var npmts_check_1 = require("./npmts.check"); const npmts_check_1 = require("./npmts.check");
var genTypeDoc = function (configArg) { let genTypeDoc = function (configArg) {
var done = plugins.Q.defer(); let done = plugins.q.defer();
npmts_promisechain_1.npmtsOra.text('now generating ' + 'TypeDoc documentation'.yellow); npmts_promisechain_1.npmtsOra.text('now generating ' + 'TypeDoc documentation'.yellow);
plugins.beautylog.log('TypeDoc Output:'); plugins.beautylog.log('TypeDoc Output:');
plugins.gulp.src(plugins.path.join(paths.tsDir, '**/*.ts')) plugins.gulp.src(plugins.path.join(paths.tsDir, '**/*.ts'))
@ -28,10 +28,10 @@ var genTypeDoc = function (configArg) {
return done.promise; return done.promise;
}; };
exports.run = function (configArg) { exports.run = function (configArg) {
var done = plugins.Q.defer(); let done = plugins.q.defer();
if (configArg.docs) { if (configArg.docs) {
genTypeDoc(configArg) genTypeDoc(configArg)
.then(function () { .then(() => {
done.resolve(configArg); done.resolve(configArg);
}); });
} }

3
dist/npmts.watch.d.ts vendored Normal file
View File

@ -0,0 +1,3 @@
/// <reference types="q" />
import * as plugins from './npmts.plugins';
export declare let run: (configArg: any) => plugins.q.Promise<{}>;

26
dist/npmts.watch.js vendored Normal file
View File

@ -0,0 +1,26 @@
"use strict";
const plugins = require("./npmts.plugins");
const promisechain = require("./npmts.promisechain");
let npmtsSmartchok = null;
exports.run = (configArg) => {
let done = plugins.q.defer();
if (configArg.watch && npmtsSmartchok === null) {
let pathsToWatch = [];
for (let key in configArg.ts) {
pathsToWatch.push(key);
}
npmtsSmartchok = new plugins.smartchok.Smartchok(pathsToWatch);
npmtsSmartchok.getObservableFor('change').then((changeObservableArg) => {
plugins.beautylog.info('now watching...');
changeObservableArg.subscribe(() => {
promisechain.run(configArg);
});
});
npmtsSmartchok.start();
done.resolve(configArg);
}
else {
done.resolve(configArg);
}
return done.promise;
};

View File

@ -7,8 +7,10 @@
"npmts": "dist/cli.js" "npmts": "dist/cli.js"
}, },
"scripts": { "scripts": {
"test": "(npm run compile && npm run setupCheck && npm run check && npm run checkVersion && npm run checkNoTest && npm run checkNoDocs)", "test": "(npm run compile && npm run prepareTest && npm run setupCheck && npm run check && npm run checkVersion && npm run checkNoTest && npm run checkNoDocs)",
"compile": "(rm -rf test/ && rm -r dist/ && mkdir dist/ && tsc && cp assets/cli.js dist/ )", "testShort": "(npm run compile && npm run check)",
"prepareTest": "(rm -rf test/)",
"compile": "(rm -r dist/ && tsc && cp assets/cli.js dist/ )",
"setupCheck": "(git clone https://gitlab.com/sandboxzone/sandbox-npmts.git test/)", "setupCheck": "(git clone https://gitlab.com/sandboxzone/sandbox-npmts.git test/)",
"typedoc": "(typedoc --out ./pages/api --target ES6 ./ts/)", "typedoc": "(typedoc --out ./pages/api --target ES6 ./ts/)",
"npmpage": "(npmpage)", "npmpage": "(npmpage)",
@ -32,14 +34,14 @@
}, },
"homepage": "https://gitlab.com/pushrocks/npmts#readme", "homepage": "https://gitlab.com/pushrocks/npmts#readme",
"dependencies": { "dependencies": {
"@types/gulp": "^3.8.31", "@types/gulp": "^3.8.32",
"@types/minimatch": "^2.0.28", "@types/minimatch": "^2.0.29",
"@types/q": "^0.x.x", "@types/q": "^0.x.x",
"@types/shelljs": "^0.3.30", "@types/shelljs": "^0.3.31",
"babel-preset-es2015": "^6.14.0", "babel-preset-es2015": "^6.14.0",
"beautylog": "5.0.23", "beautylog": "5.0.23",
"depcheck": "^0.6.4", "depcheck": "^0.6.4",
"early": "^2.0.28", "early": "^2.0.35",
"gulp": "3.9.1", "gulp": "3.9.1",
"gulp-babel": "^6.1.2", "gulp-babel": "^6.1.2",
"gulp-function": "^1.3.6", "gulp-function": "^1.3.6",
@ -48,15 +50,16 @@
"gulp-mocha": "^3.0.1", "gulp-mocha": "^3.0.1",
"gulp-sourcemaps": "^1.6.0", "gulp-sourcemaps": "^1.6.0",
"gulp-typedoc": "^2.0.0", "gulp-typedoc": "^2.0.0",
"lodash": "^4.15.0", "lodash": "^4.16.1",
"npmextra": "^1.0.11", "npmextra": "^1.0.12",
"projectinfo": "1.0.3", "projectinfo": "1.0.3",
"q": "^1.4.1", "q": "^1.4.1",
"shelljs": "^0.7.4", "shelljs": "^0.7.4",
"smartchok": "^1.0.2",
"smartcli": "1.0.9", "smartcli": "1.0.9",
"smartcov": "1.0.0", "smartcov": "1.0.0",
"smartenv": "1.2.5", "smartenv": "1.2.5",
"smartfile": "4.0.18", "smartfile": "4.0.20",
"smartpath": "3.2.2", "smartpath": "3.2.2",
"smartstring": "^2.0.17", "smartstring": "^2.0.17",
"source-map-support": "^0.4.2", "source-map-support": "^0.4.2",

View File

@ -7,7 +7,7 @@ import * as early from 'early'
early.start('NPMTS') early.start('NPMTS')
import * as plugins from './npmts.plugins' import * as plugins from './npmts.plugins'
import * as paths from './npmts.paths' import * as paths from './npmts.paths'
import {promisechain} from './npmts.promisechain' import * as promisechain from './npmts.promisechain'
early.stop() early.stop()
.then(() => { .then(() => {
let npmtsProjectInfo = new plugins.projectinfo.ProjectinfoNpm(paths.npmtsPackageRoot) let npmtsProjectInfo = new plugins.projectinfo.ProjectinfoNpm(paths.npmtsPackageRoot)
@ -16,11 +16,7 @@ early.stop()
.then((argvArg) => { .then((argvArg) => {
plugins.beautylog.figletSync('NPMTS') plugins.beautylog.figletSync('NPMTS')
plugins.beautylog.info('npmts version: ' + npmtsProjectInfo.version) plugins.beautylog.info('npmts version: ' + npmtsProjectInfo.version)
try { promisechain.run(argvArg).catch((err) => { console.log(err) })
promisechain(argvArg)
} catch (err) {
console.log(err)
}
}) })
npmtsCli.addVersion(npmtsProjectInfo.version) npmtsCli.addVersion(npmtsProjectInfo.version)

View File

@ -4,7 +4,7 @@ import paths = require('./npmts.paths')
import {npmtsOra} from './npmts.promisechain' import {npmtsOra} from './npmts.promisechain'
export var run = function(configArg){ export var run = function(configArg){
let done = plugins.Q.defer() let done = plugins.q.defer()
let config = configArg let config = configArg
npmtsOra.text('now looking at ' + 'required assets'.yellow) npmtsOra.text('now looking at ' + 'required assets'.yellow)
if (config.cli === true) { if (config.cli === true) {

View File

@ -7,7 +7,8 @@ import {ProjectinfoNpm} from 'projectinfo'
export let projectInfo: ProjectinfoNpm export let projectInfo: ProjectinfoNpm
let checkProjectTypings = (configArg) => { let checkProjectTypings = (configArg) => {
let done = plugins.Q.defer() let done = plugins.q.defer()
npmtsOra.text('Check Module: Check Project Typings...')
projectInfo = new ProjectinfoNpm(paths.cwd) projectInfo = new ProjectinfoNpm(paths.cwd)
if (typeof projectInfo.packageJson.typings === 'undefined') { if (typeof projectInfo.packageJson.typings === 'undefined') {
plugins.beautylog.error(`please add typings field to package.json`) plugins.beautylog.error(`please add typings field to package.json`)
@ -33,7 +34,8 @@ const depcheckOptions = {
} }
let checkDependencies = (configArg) => { let checkDependencies = (configArg) => {
let done = plugins.Q.defer() let done = plugins.q.defer()
npmtsOra.text('Check Module: Check Dependencies...')
let depcheckOptionsMerged = plugins.lodash.merge(depcheckOptions, { let depcheckOptionsMerged = plugins.lodash.merge(depcheckOptions, {
ignoreDirs: [ // folder with these names will be ignored ignoreDirs: [ // folder with these names will be ignored
'test', 'test',
@ -47,28 +49,29 @@ let checkDependencies = (configArg) => {
}) })
plugins.depcheck(paths.cwd, depcheckOptionsMerged, (unused) => { plugins.depcheck(paths.cwd, depcheckOptionsMerged, (unused) => {
for (let item of unused.dependencies) { for (let item of unused.dependencies) {
plugins.beautylog.warn(`Watch out: unused dependency ${item.red}`) plugins.beautylog.warn(`Watch out: unused dependency "${item}"`)
}; }
for (let item of unused.missing) { for (let item in unused.missing) {
plugins.beautylog.error(`unused devDependency ${item.red}`) plugins.beautylog.error(`unused devDependency "${item}"`)
}; }
if (unused.missing.length > 0) { if (unused.missing.length > 0) {
plugins.beautylog.info('exiting due to missing dependencies in package.json') plugins.beautylog.info('exiting due to missing dependencies in package.json')
process.exit(1) process.exit(1)
} }
for (let item of unused.invalidFiles) { for (let item in unused.invalidFiles) {
plugins.beautylog.warn(`Watch out: could not parse file ${item.red}`) plugins.beautylog.warn(`Watch out: could not parse file ${item.red}`)
}; };
for (let item of unused.invalidDirs) { for (let item in unused.invalidDirs) {
plugins.beautylog.warn(`Watch out: could not parse directory ${item.red}`) plugins.beautylog.warn(`Watch out: could not parse directory ${item.red}`)
}; }
done.resolve(configArg) done.resolve(configArg)
}) })
return done.promise return done.promise
} }
let checkDevDependencies = (configArg) => { let checkDevDependencies = (configArg) => {
let done = plugins.Q.defer() let done = plugins.q.defer()
npmtsOra.text('Check Module: Check devDependencies...')
let depcheckOptionsMerged = plugins.lodash.merge(depcheckOptions, { let depcheckOptionsMerged = plugins.lodash.merge(depcheckOptions, {
ignoreDirs: [ // folder with these names will be ignored ignoreDirs: [ // folder with these names will be ignored
'ts', 'ts',
@ -83,18 +86,18 @@ let checkDevDependencies = (configArg) => {
plugins.depcheck(paths.cwd, depcheckOptionsMerged, (unused) => { plugins.depcheck(paths.cwd, depcheckOptionsMerged, (unused) => {
for (let item of unused.devDependencies) { for (let item of unused.devDependencies) {
plugins.beautylog.log(`unused devDependency ${item.red}`) plugins.beautylog.log(`unused devDependency ${item.red}`)
}; }
for (let item of unused.missing) { for (let item in unused.missing) {
plugins.beautylog.error(`unused devDependency ${item.red}`) plugins.beautylog.error(`unused devDependency ${item.red}`)
}; }
if (unused.missing.length > 0) { if (unused.missing.length > 0) {
plugins.beautylog.info('exiting due to missing dependencies in package.json') plugins.beautylog.info('exiting due to missing dependencies in package.json')
process.exit(1) process.exit(1)
} }
for (let item of unused.invalidFiles) { for (let item in unused.invalidFiles) {
plugins.beautylog.warn(`Watch out: could not parse file ${item.red}`) plugins.beautylog.warn(`Watch out: could not parse file ${item.red}`)
} }
for (let item of unused.invalidDirs) { for (let item in unused.invalidDirs) {
plugins.beautylog.warn(`Watch out: could not parse directory ${item.red}`) plugins.beautylog.warn(`Watch out: could not parse directory ${item.red}`)
} }
done.resolve(configArg) done.resolve(configArg)
@ -103,18 +106,20 @@ let checkDevDependencies = (configArg) => {
} }
let checkNodeVersion = (configArg) => { let checkNodeVersion = (configArg) => {
let done = plugins.Q.defer() let done = plugins.q.defer()
npmtsOra.text('checking node version')
done.resolve(configArg) done.resolve(configArg)
return done.promise return done.promise
} }
export let run = (configArg) => { export let run = (configArg) => {
let done = plugins.Q.defer() let done = plugins.q.defer()
npmtsOra.text('running project checks...') npmtsOra.text('Check Module: ...')
checkProjectTypings(configArg) checkProjectTypings(configArg)
.then(checkDependencies) .then(checkDependencies)
.then(checkDevDependencies) .then(checkDevDependencies)
.then(checkNodeVersion) .then(checkNodeVersion)
.then(done.resolve) .then(done.resolve)
.catch((err) => { console.log(err) })
return done.promise return done.promise
} }

View File

@ -15,7 +15,7 @@ let removePages = function(){
export let run = function(configArg){ export let run = function(configArg){
npmtsOra.text('cleaning up from previous builds...') npmtsOra.text('cleaning up from previous builds...')
let done = plugins.Q.defer() let done = plugins.q.defer()
removeDist() removeDist()
.then(removePages) .then(removePages)
.then(function(){ .then(function(){

View File

@ -4,7 +4,7 @@ import paths = require('./npmts.paths')
import {npmtsOra} from './npmts.promisechain' import {npmtsOra} from './npmts.promisechain'
export let run = function (configArg) { export let run = function (configArg) {
let done = plugins.Q.defer() let done = plugins.q.defer()
let config = configArg let config = configArg
npmtsOra.text('now compiling ' + 'TypeScript'.yellow) npmtsOra.text('now compiling ' + 'TypeScript'.yellow)
plugins.tsn.compileGlobStringObject(config.ts,config.tsOptions,paths.cwd) plugins.tsn.compileGlobStringObject(config.ts,config.tsOptions,paths.cwd)

View File

@ -13,12 +13,13 @@ export interface INpmtsConfig {
test: boolean, test: boolean,
testTs: any, testTs: any,
ts: any, ts: any,
tsOptions: any tsOptions: any,
watch: boolean
}; };
export var run = function (argvArg) { export var run = function (argvArg) {
let done = plugins.Q.defer() let done = plugins.q.defer()
let defaultConfig: INpmtsConfig = { let defaultConfig: INpmtsConfig = {
argv: undefined, argv: undefined,
coverageTreshold: 70, coverageTreshold: 70,
@ -27,7 +28,8 @@ export var run = function (argvArg) {
test: true, test: true,
testTs: {}, testTs: {},
ts: {}, ts: {},
tsOptions: {} tsOptions: {},
watch: false
} }
// mix with configfile // mix with configfile
@ -70,6 +72,9 @@ export var run = function (argvArg) {
if (config.argv.nodocs) { if (config.argv.nodocs) {
config.docs = false config.docs = false
}; };
if (config.argv.watch) {
config.watch = true
};
plugins.beautylog.ok('build options are ready!') plugins.beautylog.ok('build options are ready!')
done.resolve(config) done.resolve(config)

View File

@ -15,8 +15,9 @@ export import lodash = require('lodash')
export import npmextra = require('npmextra') export import npmextra = require('npmextra')
export import projectinfo = require('projectinfo') export import projectinfo = require('projectinfo')
export import path = require('path') export import path = require('path')
export import Q = require('q') export import q = require('q')
export import shelljs = require('shelljs') export import shelljs = require('shelljs')
export import smartchok = require('smartchok')
export import smartcli = require('smartcli') export import smartcli = require('smartcli')
export import smartcov = require('smartcov') export import smartcov = require('smartcov')
export import smartenv = require('smartenv') export import smartenv = require('smartenv')

View File

@ -4,16 +4,17 @@ import {Ora} from 'beautylog'
export let npmtsOra = new Ora('setting up TaskChain','cyan') export let npmtsOra = new Ora('setting up TaskChain','cyan')
import NpmtsAssets = require('./npmts.assets') import * as NpmtsAssets from './npmts.assets'
import NpmtsCheck = require('./npmts.check') import * as NpmtsCheck from './npmts.check'
import NpmtsClean = require('./npmts.clean') import * as NpmtsClean from './npmts.clean'
import NpmtsCompile = require('./npmts.compile') import * as NpmtsCompile from './npmts.compile'
import NpmtsTypeDoc = require('./npmts.typedoc') import * as NpmtsTypeDoc from './npmts.typedoc'
import NpmtsOptions = require('./npmts.options') import * as NpmtsOptions from './npmts.options'
import NpmtsTests = require('./npmts.tests') import * as NpmtsTests from './npmts.tests'
import * as NpmtsWatch from './npmts.watch'
export let promisechain = function(argvArg){ export let run = function(argvArg){
let done = plugins.Q.defer() let done = plugins.q.defer()
npmtsOra.start() npmtsOra.start()
NpmtsOptions.run(argvArg) NpmtsOptions.run(argvArg)
.then(NpmtsClean.run) .then(NpmtsClean.run)
@ -22,6 +23,7 @@ export let promisechain = function(argvArg){
.then(NpmtsAssets.run) .then(NpmtsAssets.run)
.then(NpmtsTypeDoc.run) .then(NpmtsTypeDoc.run)
.then(NpmtsTests.run) .then(NpmtsTests.run)
.then(NpmtsWatch.run)
.then(function(configArg){ .then(function(configArg){
let shipString = '' + let shipString = '' +
'\n' + '\n' +
@ -43,7 +45,7 @@ export let promisechain = function(argvArg){
} else { } else {
plugins.beautylog.success('Done!') plugins.beautylog.success('Done!')
} }
done.resolve() done.resolve(configArg)
}) })
return done.promise return done.promise
} }

View File

@ -10,7 +10,7 @@ import { npmtsOra } from './npmts.promisechain'
let mocha = function (configArg) { let mocha = function (configArg) {
npmtsOra.text('Instrumentalizing and testing transpiled JS') npmtsOra.text('Instrumentalizing and testing transpiled JS')
npmtsOra.end() // end npmtsOra for tests. npmtsOra.end() // end npmtsOra for tests.
let done = plugins.Q.defer() let done = plugins.q.defer()
plugins.gulp.src([plugins.path.join(paths.cwd, 'dist/*.js')]) plugins.gulp.src([plugins.path.join(paths.cwd, 'dist/*.js')])
.pipe(plugins.g.sourcemaps.init()) .pipe(plugins.g.sourcemaps.init())
.pipe(plugins.g.babel({ .pipe(plugins.g.babel({
@ -47,7 +47,7 @@ let mocha = function (configArg) {
} }
let coverage = function (configArg) { let coverage = function (configArg) {
let done = plugins.Q.defer() let done = plugins.q.defer()
plugins.smartcov.get.percentage(plugins.path.join(paths.coverageDir, 'lcov.info'), 2) plugins.smartcov.get.percentage(plugins.path.join(paths.coverageDir, 'lcov.info'), 2)
.then(function (percentageArg) { .then(function (percentageArg) {
if (percentageArg >= configArg.coverageTreshold) { if (percentageArg >= configArg.coverageTreshold) {
@ -71,7 +71,7 @@ let coverage = function (configArg) {
} }
export let run = function (configArg) { export let run = function (configArg) {
let done = plugins.Q.defer() let done = plugins.q.defer()
let config = configArg let config = configArg
if (config.test === true) { if (config.test === true) {
npmtsOra.text('now starting tests') npmtsOra.text('now starting tests')

View File

@ -6,7 +6,7 @@ import { npmtsOra } from './npmts.promisechain'
import { projectInfo } from './npmts.check' import { projectInfo } from './npmts.check'
let genTypeDoc = function (configArg) { let genTypeDoc = function (configArg) {
let done = plugins.Q.defer() let done = plugins.q.defer()
npmtsOra.text('now generating ' + 'TypeDoc documentation'.yellow) npmtsOra.text('now generating ' + 'TypeDoc documentation'.yellow)
plugins.beautylog.log('TypeDoc Output:') plugins.beautylog.log('TypeDoc Output:')
plugins.gulp.src(plugins.path.join(paths.tsDir, '**/*.ts')) plugins.gulp.src(plugins.path.join(paths.tsDir, '**/*.ts'))
@ -32,7 +32,7 @@ let genTypeDoc = function (configArg) {
} }
export let run = function (configArg) { export let run = function (configArg) {
let done = plugins.Q.defer() let done = plugins.q.defer()
if (configArg.docs) { if (configArg.docs) {
genTypeDoc(configArg) genTypeDoc(configArg)
.then(() => { .then(() => {

25
ts/npmts.watch.ts Normal file
View File

@ -0,0 +1,25 @@
import * as plugins from './npmts.plugins'
import * as promisechain from './npmts.promisechain'
let npmtsSmartchok: plugins.smartchok.Smartchok = null
export let run = (configArg) => {
let done = plugins.q.defer()
if (configArg.watch && npmtsSmartchok === null) {
let pathsToWatch: string[] = []
for (let key in configArg.ts) {
pathsToWatch.push(key)
}
npmtsSmartchok = new plugins.smartchok.Smartchok(pathsToWatch)
npmtsSmartchok.getObservableFor('change').then((changeObservableArg) => {
plugins.beautylog.info('now watching...')
changeObservableArg.subscribe(() => {
promisechain.run(configArg)
})
})
npmtsSmartchok.start()
done.resolve(configArg)
} else {
done.resolve(configArg)
}
return done.promise
}

View File

@ -2,7 +2,12 @@
"compilerOptions": { "compilerOptions": {
"declaration": true, "declaration": true,
"module": "commonjs", "module": "commonjs",
"target": "ES5", "target": "ES6",
"outDir": "./dist/" "outDir": "./dist/"
} },
"exclude": [
"./node_modules",
"./test",
"./dist"
]
} }