TryGhost / Ghost-CLI / 745

pending completion

Build # 745

Build Type

push

travis-ci

Committed by

acburdine

Commit Message

fix(yarn): trim newline from end of yarn output

refs #313
- trims newline so verbose output is nicer

Run Details

138 of 322 branches covered (42.86%)

1 of 1 new or added line in 1 file covered. (100.0%)

361 of 642 relevant lines covered (56.23%)

1.8 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

59.09

/lib/utils/yarn.js

'use strict';
const assign = require('lodash/assign');
const execa = require('execa');
const Observable = require('rxjs').Observable;

const errors = require('../errors');

/**
 * Runs a yarn command. Can return an Observer which allows
 * listr to output the current status of yarn
 */
module.exports = function yarn(yarnArgs, options) {
    options = options || {};

    let observe = options.observe || false;
    delete options.observe;

    yarnArgs = yarnArgs || [];

    let execaOpts = assign({}, options, {
        preferLocal: true,
        localDir: __dirname
    });

    let cp = execa('yarn', yarnArgs, execaOpts);

    if (!observe) {
        return cp.catch((error) => {
            // execa augments the error object with
            // some other properties, so we just pass
            // the entire error object in as options to
            // the ProcessError
            return Promise.reject(new errors.ProcessError(error));
        });
    }

    return new Observable((observer) => {
        cp.stdout.setEncoding('utf8');

        cp.stdout.on('data', (data) => {
            observer.next(data.replace(/\n$/, ''));
        });

        cp.then(() => {
            observer.complete();
        }).catch((error) => {
            observer.error(error);
        });
    }).catch((error) => {
        // execa augments the error object with
        // some other properties, so we just pass
        // the entire error object in as options to
        // the ProcessError
        return Promise.reject(new errors.ProcessError(error));
    });
};

1	'use strict';
2	const assign = require('lodash/assign');	5✔
3	const execa = require('execa');	5✔
4	const Observable = require('rxjs').Observable;	5✔
5
6	const errors = require('../errors');	5✔
7
8	/**
9	* Runs a yarn command. Can return an Observer which allows
10	* listr to output the current status of yarn
11	*/
12	module.exports = function yarn(yarnArgs, options) {	5✔
13	options = options \|\| {};	4✔
14
15	let observe = options.observe \|\| false;	4✔
16	delete options.observe;	4✔
17
18	yarnArgs = yarnArgs \|\| [];	4✔
19
20	let execaOpts = assign({}, options, {	4✔
21	preferLocal: true,
22	localDir: __dirname
23	});
24
25	let cp = execa('yarn', yarnArgs, execaOpts);	4✔
26
27	if (!observe) {	4!
28	return cp.catch((error) => {	4✔
29	// execa augments the error object with
30	// some other properties, so we just pass
31	// the entire error object in as options to
32	// the ProcessError
33	return Promise.reject(new errors.ProcessError(error));	×
34	});
35	}
36
37	return new Observable((observer) => {	×
38	cp.stdout.setEncoding('utf8');	×
39
40	cp.stdout.on('data', (data) => {	×
41	observer.next(data.replace(/\n$/, ''));	×
42	});
43
44	cp.then(() => {	×
45	observer.complete();	×
46	}).catch((error) => {
47	observer.error(error);	×
48	});
49	}).catch((error) => {
50	// execa augments the error object with
51	// some other properties, so we just pass
52	// the entire error object in as options to
53	// the ProcessError
54	return Promise.reject(new errors.ProcessError(error));	×
55	});
56	};

TryGhost / Ghost-CLI / 745

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous