ExternalVendorCode/balena-cli
1
0
Fork 0
mirror of https://github.com/balena-io/balena-cli.git synced 2024-12-19 05:37:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2295 from balena-io/simplify-run-spinner

Browse Source 
Simplify runSpinner api
This commit is contained in:
bulldozer-balena[bot] 2021-07-20 15:55:11 +00:00 committed by GitHub
commit c325f1158e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
lib/utils/compose_ts.ts
View File

@ -36,7 +36,6 @@ import {
ComposeCliFlags,
ComposeOpts,
ComposeProject,
Release,
TaggedImage,
TarDirectoryOptions,
} from './compose-types';
@ -1310,20 +1309,13 @@ export async function deployProject(
const prefix = getChalk().cyan('[Info]') + ' ';
const spinner = createSpinner();
let runloop = runSpinner(tty, spinner, `${prefix}Creating release...`);
let $release: Release;
try {
$release = await createRelease(
apiEndpoint,
auth,
userId,
appId,
composition,
);
} finally {
runloop.end();
}
const $release = await runSpinner(
tty,
spinner,
`${prefix}Creating release...`,
() => createRelease(apiEndpoint, auth, userId, appId, composition),
);
const { client: pineClient, release, serviceImages } = $release;
try {
@ -1355,15 +1347,12 @@ export async function deployProject(
);
}
} finally {
runloop = runSpinner(tty, spinner, `${prefix}Saving release...`);
release.end_timestamp = new Date();
if (release.id != null) {
try {
await runSpinner(tty, spinner, `${prefix}Saving release...`, async () => {
release.end_timestamp = new Date();
if (release.id != null) {
await releaseMod.updateRelease(pineClient, release.id, release);
} finally {
runloop.end();
}
}
});
}
return release;
}
@ -1374,21 +1363,26 @@ export function createSpinner() {
return () => chars[index++ % chars.length];
}
function runSpinner(
async function runSpinner<T>(
tty: ReturnType<typeof import('./tty')>,
spinner: () => string,
msg: string,
) {
fn: () => Promise<T>,
): Promise<T> {
const runloop = createRunLoop(function () {
tty.clearLine();
tty.writeLine(`${msg} ${spinner()}`);
return tty.cursorUp();
tty.cursorUp();
});
runloop.onEnd = function () {
tty.clearLine();
return tty.writeLine(msg);
tty.writeLine(msg);
};
return runloop;
try {
return await fn();
} finally {
runloop.end();
}
}
export function createRunLoop(tick: (...args: any[]) => void) {