fix(core): update

This commit is contained in:
2018-10-28 19:28:08 +01:00
parent 9c7f351998
commit 4b8bb062c7
6 changed files with 43 additions and 22 deletions

View File

@ -1,5 +1,11 @@
import * as plugins from './tswatch.plugins';
export interface ITsWatchConstructorOptions {
filePathToWatch: string;
commandToExecute: string;
timeout?: number;
}
/**
* handles the management of watching for foes
*/
@ -9,15 +15,10 @@ export class TsWatch {
});
private currentExecution: plugins.smartshell.IExecResultStreaming;
private watcher = plugins.fileWatcher();
private filePathToWatch: string;
private commandToExecute: string;
private options: ITsWatchConstructorOptions;
constructor(optionsArg: {
filePathToWatch: string,
commandToExecute: string
}) {
this.filePathToWatch = optionsArg.filePathToWatch;
this.commandToExecute = optionsArg.commandToExecute;
constructor(optionsArg: ITsWatchConstructorOptions) {
this.options = optionsArg;
}
/**
@ -25,8 +26,8 @@ export class TsWatch {
*/
public async start() {
this.setupCleanup();
console.log(`Looking at ${this.filePathToWatch} for changes`);
this.watcher.add(this.filePathToWatch); // __dirname refers to the directory of this very file
console.log(`Looking at ${this.options.filePathToWatch} for changes`);
this.watcher.add(this.options.filePathToWatch); // __dirname refers to the directory of this very file
this.watcher.on('change', async (file, stat) => {
console.log('Noticed change!');
if (!stat) {
@ -41,14 +42,14 @@ export class TsWatch {
if (this.currentExecution) {
process.kill(-this.currentExecution.childProcess.pid);
}
this.currentExecution = await this.smartshellInstance.execStreaming(this.commandToExecute);
this.currentExecution = await this.smartshellInstance.execStreaming(this.options.commandToExecute);
this.currentExecution = null;
}
/**
* this method sets up a clean exit strategy
*/
private setupCleanup() {
private async setupCleanup() {
const cleanup = () => {
if (this.currentExecution) {
process.kill(-this.currentExecution.childProcess.pid);
@ -66,5 +67,14 @@ export class TsWatch {
cleanup();
process.exit(0);
});
// handle timeout
if (this.options.timeout) {
plugins.smartdelay.delayFor(this.options.timeout).then(() => {
console.log(`timed out afer ${this.options.timeout} milliseconds! exiting!`);
cleanup();
process.exit(0);
});
}
}
}

View File

@ -8,7 +8,15 @@ const tswatchCli = new plugins.smartcli.Smartcli();
tswatchCli.addCommand('test').subscribe(argvArg => {
const tsWatch = new TsWatch({
filePathToWatch: paths.cwd,
commandToExecute: 'npm run test2'
commandToExecute: 'npm run test2',
timeout: (() => {
if (argvArg.timeout) {
console.log(`timeing out after ${argvArg.timeout}`);
return argvArg.timeout;
} else {
return null;
}
})()
});
tsWatch.start();
});

View File

@ -3,9 +3,10 @@ export { path };
// @pushrocks scope
import * as smartcli from '@pushrocks/smartcli';
import * as smartdelay from '@pushrocks/smartdelay';
import * as smartshell from '@pushrocks/smartshell';
export { smartshell, smartcli };
export { smartdelay, smartshell, smartcli };
// Third Pary
import * as fileWatcher from 'filewatcher';