Show a correct [Info] tag with the deploying progress bar

This commit is contained in:
Tim Perry 2017-06-28 18:57:49 +02:00
parent ce5685551d
commit e2a165ce80
4 changed files with 13 additions and 7 deletions

View File

@ -51,10 +51,10 @@ parseInput = Promise.method(function(params, options) {
return [appName, options.build, source, image];
});
showPushProgress = function() {
showPushProgress = function(message) {
var progressBar, visuals;
visuals = require('resin-cli-visuals');
progressBar = new visuals.Progress('Deploying');
progressBar = new visuals.Progress(message);
progressBar.update({
percentage: 0
});
@ -70,11 +70,12 @@ getBundleInfo = function(options) {
};
performUpload = function(imageStream, token, username, url, appName, logger) {
var progressBar, progressStream, request, streamWithProgress, uploadRequest, zlib;
var progressBar, progressMessage, progressStream, request, streamWithProgress, uploadRequest, zlib;
request = require('request');
progressStream = require('progress-stream');
zlib = require('zlib');
progressBar = showPushProgress();
progressMessage = logger.formatMessage('info', 'Deploying').slice(0, -1);
progressBar = showPushProgress(progressMessage);
streamWithProgress = imageStream.pipe(progressStream({
time: 500,
length: imageStream.length

View File

@ -33,6 +33,7 @@ module.exports = Logger = (function() {
}
}
});
this.formatMessage = logger.formatWithPrefix.bind(logger);
}
Logger.prototype.logInfo = function(msg) {

View File

@ -31,9 +31,9 @@ parseInput = Promise.method (params, options) ->
return [appName, options.build, source, image]
showPushProgress = ->
showPushProgress = (message) ->
visuals = require('resin-cli-visuals')
progressBar = new visuals.Progress('Deploying')
progressBar = new visuals.Progress(message)
progressBar.update({ percentage: 0 })
return progressBar
@ -49,7 +49,9 @@ performUpload = (imageStream, token, username, url, appName, logger) ->
progressStream = require('progress-stream')
zlib = require('zlib')
progressBar = showPushProgress()
# Need to strip off the newline
progressMessage = logger.formatMessage('info', 'Deploying').slice(0, -1)
progressBar = showPushProgress(progressMessage)
streamWithProgress = imageStream.pipe progressStream
time: 500,
length: imageStream.length

View File

@ -28,6 +28,8 @@ module.exports = class Logger
else
stream.pipe(process.stdout) if process.env.DEBUG?
@formatMessage = logger.formatWithPrefix.bind(logger)
logInfo: (msg) ->
@streams.info.write(msg + eol)