@mishguru/flacutono
Advanced tools
Comparing version 6.0.3 to 6.1.0
@@ -1,2 +0,2 @@ | ||
'use strict'; | ||
"use strict"; | ||
@@ -6,9 +6,8 @@ Object.defineProperty(exports, "__esModule", { | ||
}); | ||
exports.default = void 0; | ||
var _ramda = require('ramda'); | ||
var _ramda = require("ramda"); | ||
var _Logger = require('./Logger'); | ||
var _Logger = _interopRequireDefault(require("./Logger")); | ||
var _Logger2 = _interopRequireDefault(_Logger); | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } | ||
@@ -24,5 +23,3 @@ | ||
this.logStatus = options.logStatus || this.logStatus; | ||
this.logger = new _Logger2.default(); | ||
this.logger = new _Logger.default(); | ||
this.interval = setInterval(() => { | ||
@@ -36,3 +33,2 @@ this.logStatus(this.getStatus()); | ||
const groupedJobs = groupJobsBySection(activeJobs); | ||
return Object.entries(groupedJobs).reduce((status, entry) => { | ||
@@ -49,3 +45,6 @@ const [section, jobs] = entry; | ||
if (Object.keys(status).length > 0) { | ||
console.dir(status, { depth: null, colors: true }); | ||
console.dir(status, { | ||
depth: null, | ||
colors: true | ||
}); | ||
} | ||
@@ -63,9 +62,9 @@ } | ||
}); | ||
job.listen(options.promise); | ||
return job; | ||
} | ||
} | ||
exports.default = Foreman; | ||
var _default = Foreman; | ||
exports.default = _default; |
@@ -1,11 +0,7 @@ | ||
'use strict'; | ||
"use strict"; | ||
var _ava = require('ava'); | ||
var _ava = _interopRequireDefault(require("ava")); | ||
var _ava2 = _interopRequireDefault(_ava); | ||
var _Foreman = _interopRequireDefault(require("../src/Foreman")); | ||
var _Foreman = require('../src/Foreman'); | ||
var _Foreman2 = _interopRequireDefault(_Foreman); | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } | ||
@@ -19,13 +15,10 @@ | ||
(0, _ava2.default)('constructor', t => { | ||
const foreman = new _Foreman2.default(); | ||
(0, _ava.default)('constructor', t => { | ||
const foreman = new _Foreman.default(); | ||
t.is(typeof foreman.logInterval, 'number'); | ||
t.is(typeof foreman.logStatus, 'function'); | ||
}); | ||
(0, _ava2.default)('getStatus', t => { | ||
(0, _ava.default)('getStatus', t => { | ||
t.plan(2); | ||
const foreman = new _Foreman2.default(); | ||
const foreman = new _Foreman.default(); | ||
const promise = delay(1000).then(() => { | ||
@@ -36,3 +29,2 @@ t.deepEqual(foreman.getStatus(), { | ||
}); | ||
foreman.monitor({ | ||
@@ -43,14 +35,10 @@ section: 'Tests', | ||
}); | ||
t.deepEqual(foreman.getStatus(), { | ||
Tests: ['Wait for 1s (0.0s)'] | ||
}); | ||
return promise; | ||
}); | ||
(0, _ava2.default)('logStatus', t => { | ||
(0, _ava.default)('logStatus', t => { | ||
t.plan(1); | ||
const foreman = new _Foreman2.default({ | ||
const foreman = new _Foreman.default({ | ||
logInterval: 500, | ||
@@ -63,5 +51,3 @@ logStatus: status => { | ||
}); | ||
const promise = delay(750); | ||
foreman.monitor({ | ||
@@ -72,4 +58,3 @@ section: 'Section', | ||
}); | ||
return promise; | ||
}); |
@@ -1,2 +0,2 @@ | ||
'use strict'; | ||
"use strict"; | ||
@@ -6,12 +6,11 @@ Object.defineProperty(exports, "__esModule", { | ||
}); | ||
var _Foreman = require('./Foreman'); | ||
Object.defineProperty(exports, 'default', { | ||
Object.defineProperty(exports, "default", { | ||
enumerable: true, | ||
get: function () { | ||
return _interopRequireDefault(_Foreman).default; | ||
return _Foreman.default; | ||
} | ||
}); | ||
var _Foreman = _interopRequireDefault(require("./Foreman")); | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } |
@@ -6,10 +6,14 @@ "use strict"; | ||
}); | ||
exports.default = void 0; | ||
class Job { | ||
constructor({ id, data, onComplete }) { | ||
constructor({ | ||
id, | ||
data, | ||
onComplete | ||
}) { | ||
this.id = id; | ||
this.data = data; | ||
this.startedAt = Date.now(); | ||
this.onComplete = onComplete; | ||
this.resolve = this.resolve.bind(this); | ||
@@ -29,10 +33,12 @@ this.reject = this.reject.bind(this); | ||
return promise.then(this.resolve, this.reject); | ||
} | ||
} // how long the process has been running for in seconds | ||
// how long the process has been running for in seconds | ||
age() { | ||
return ((Date.now() - this.startedAt) / 1000).toFixed(1); | ||
} | ||
} | ||
exports.default = Job; | ||
var _default = Job; | ||
exports.default = _default; |
@@ -1,24 +0,17 @@ | ||
'use strict'; | ||
"use strict"; | ||
var _ava = require('ava'); | ||
var _ava = _interopRequireDefault(require("ava")); | ||
var _ava2 = _interopRequireDefault(_ava); | ||
var _sinon = _interopRequireDefault(require("sinon")); | ||
var _sinon = require('sinon'); | ||
var _Job = _interopRequireDefault(require("./Job")); | ||
var _sinon2 = _interopRequireDefault(_sinon); | ||
var _Job = require('./Job'); | ||
var _Job2 = _interopRequireDefault(_Job); | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } | ||
(0, _ava2.default)('Job.complete', t => { | ||
const job = new _Job2.default({ | ||
(0, _ava.default)('Job.complete', t => { | ||
const job = new _Job.default({ | ||
id: 0, | ||
data: 'data', | ||
onComplete: _sinon2.default.spy() | ||
onComplete: _sinon.default.spy() | ||
}); | ||
t.is(job.id, 0); | ||
@@ -28,20 +21,13 @@ t.is(job.data, 'data'); | ||
t.true(job.startedAt > 0); | ||
job.resolve(); | ||
t.true(job.onComplete.calledOnce); | ||
}); | ||
(0, _ava2.default)('Job.listen - resolve', t => { | ||
(0, _ava.default)('Job.listen - resolve', t => { | ||
t.plan(1); | ||
const job = new _Job2.default({ | ||
onComplete: _sinon2.default.spy() | ||
const job = new _Job.default({ | ||
onComplete: _sinon.default.spy() | ||
}); | ||
const result = 'some data'; | ||
const promise = Promise.resolve(result); | ||
job.listen(promise); | ||
return promise.then(() => { | ||
@@ -51,15 +37,10 @@ t.true(job.onComplete.calledOnce); | ||
}); | ||
(0, _ava2.default)('Job.listen - reject', t => { | ||
(0, _ava.default)('Job.listen - reject', t => { | ||
t.plan(1); | ||
const job = new _Job2.default({ | ||
onComplete: _sinon2.default.spy() | ||
const job = new _Job.default({ | ||
onComplete: _sinon.default.spy() | ||
}); | ||
const error = new Error('This promise failed'); | ||
const promise = Promise.reject(error); | ||
job.listen(promise); | ||
return promise.catch(() => { | ||
@@ -66,0 +47,0 @@ t.true(job.onComplete.calledOnce); |
@@ -1,2 +0,2 @@ | ||
'use strict'; | ||
"use strict"; | ||
@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { | ||
}); | ||
exports.default = void 0; | ||
var _Job = require('./Job'); | ||
var _Job = _interopRequireDefault(require("./Job")); | ||
var _Job2 = _interopRequireDefault(_Job); | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } | ||
@@ -27,4 +26,7 @@ | ||
this._nextId += 1; | ||
const job = new _Job.default({ | ||
id, | ||
data | ||
}); | ||
const job = new _Job2.default({ id, data }); | ||
job.onComplete = () => { | ||
@@ -38,4 +40,6 @@ return this._activeJobs.delete(id); | ||
} | ||
} | ||
exports.default = Logger; | ||
var _default = Logger; | ||
exports.default = _default; |
{ | ||
"name": "@mishguru/flacutono", | ||
"version": "6.0.3", | ||
"version": "6.1.0", | ||
"description": "Server status monitor", | ||
@@ -10,3 +10,3 @@ "main": "dist/index.js", | ||
"devDependencies": { | ||
"@mishguru/package": "^1.1.2", | ||
"@mishguru/package": "^4.1.0", | ||
"sinon": "^2.1.0" | ||
@@ -21,28 +21,2 @@ }, | ||
}, | ||
"babel": { | ||
"presets": [ | ||
[ | ||
"env", | ||
{ | ||
"targets": { | ||
"node": "current" | ||
} | ||
} | ||
] | ||
], | ||
"plugins": [ | ||
[ | ||
"transform-object-rest-spread", | ||
{ | ||
"useBuiltIns": true | ||
} | ||
] | ||
] | ||
}, | ||
"ava": { | ||
"require": [ | ||
"babel-register" | ||
], | ||
"babel": "inherit" | ||
}, | ||
"dependencies": { | ||
@@ -49,0 +23,0 @@ "ramda": "^0.23.0" |
804896
16
215