mirror of https://github.com/Seich/Beau.git
Moved the spinner initialization to the base class.
This commit is contained in:
parent
dbc7addb39
commit
d502f1dd01
|
|
@ -3,10 +3,16 @@ const fs = require('fs');
|
||||||
const path = require('path');
|
const path = require('path');
|
||||||
const dotenv = require('dotenv');
|
const dotenv = require('dotenv');
|
||||||
const { Command, flags } = require('@oclif/command');
|
const { Command, flags } = require('@oclif/command');
|
||||||
|
const { Spinner } = require('clui');
|
||||||
|
|
||||||
const Beau = require('../../src/beau');
|
const Beau = require('../../src/beau');
|
||||||
|
|
||||||
class Base extends Command {
|
class Base extends Command {
|
||||||
|
async init() {
|
||||||
|
const spinnerSprite = ['⣾', '⣽', '⣻', '⢿', '⡿', '⣟', '⣯', '⣷'];
|
||||||
|
this.spinner = new Spinner('', spinnerSprite);
|
||||||
|
}
|
||||||
|
|
||||||
openConfigFile(configFile) {
|
openConfigFile(configFile) {
|
||||||
if (!fs.existsSync(configFile)) {
|
if (!fs.existsSync(configFile)) {
|
||||||
this.error(`The config file, ${configFile} was not found.`);
|
this.error(`The config file, ${configFile} was not found.`);
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
const clc = require('cli-color');
|
const clc = require('cli-color');
|
||||||
const jsome = require('jsome');
|
const jsome = require('jsome');
|
||||||
const { Line, Spinner } = require('clui');
|
const { Line } = require('clui');
|
||||||
const { flags } = require('@oclif/command');
|
const { flags } = require('@oclif/command');
|
||||||
|
|
||||||
const Base = require('../base');
|
const Base = require('../base');
|
||||||
|
|
@ -47,12 +47,6 @@ class RequestCommand extends Base {
|
||||||
|
|
||||||
const Beau = this.loadConfig(config, params);
|
const Beau = this.loadConfig(config, params);
|
||||||
|
|
||||||
const spinnerSprite = ['⣾', '⣽', '⣻', '⢿', '⡿', '⣟', '⣯', '⣷'];
|
|
||||||
this.spinner = new Spinner(
|
|
||||||
clc.yellow(`Requesting: ${args.alias}`),
|
|
||||||
spinnerSprite
|
|
||||||
);
|
|
||||||
|
|
||||||
let spinnerEnabled = !noFormat && !asJson && !quiet;
|
let spinnerEnabled = !noFormat && !asJson && !quiet;
|
||||||
|
|
||||||
if (spinnerEnabled) {
|
if (spinnerEnabled) {
|
||||||
|
|
@ -78,7 +72,7 @@ class RequestCommand extends Base {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (asJson) {
|
if (asJson) {
|
||||||
return this.log(JSON.stringify(res.response));
|
return this.log(JSON.stringify(verbose ? res : res.response));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (noFormat) {
|
if (noFormat) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue