Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename joinedCommand variables to command #278

Merged
merged 1 commit into from Jun 10, 2019
Merged

Rename joinedCommand variables to command #278

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 10 additions & 10 deletions index.js
View file
Open in desktop
Expand Up @@ -138,20 +138,20 @@ function getStream(process, stream, {encoding, buffer, maxBuffer}) {
function makeError(result, options) {
const {stdout, stderr, signal} = result;
let {error} = result;
const {code, joinedCommand, timedOut, isCanceled, killed, parsed: {options: {timeout}}} = options;
const {code, command, timedOut, isCanceled, killed, parsed: {options: {timeout}}} = options;

const [exitCodeName, exitCode] = getCode(result, code);

const prefix = getErrorPrefix({timedOut, timeout, signal, exitCodeName, exitCode, isCanceled});
const message = `Command ${prefix}: ${joinedCommand}`;
const message = `Command ${prefix}: ${command}`;

if (error instanceof Error) {
error.message = `${message}\n${error.message}`;
} else {
error = new Error(message);
}

error.command = joinedCommand;
error.command = command;
delete error.code;
error.exitCode = exitCode;
error.exitCodeName = exitCodeName;
Expand Down Expand Up @@ -241,14 +241,14 @@ function shouldForceKill(signal, options, killResult) {
const execa = (file, args, options) => {
const parsed = handleArgs(file, args, options);
const {encoding, buffer, maxBuffer} = parsed.options;
const joinedCommand = joinCommand(file, args);
const command = joinCommand(file, args);

let spawned;
try {
spawned = childProcess.spawn(parsed.file, parsed.args, parsed.options);
} catch (error) {
return Promise.reject(makeError({error, stdout: '', stderr: '', all: ''}, {
joinedCommand,
command,
parsed,
timedOut: false,
isCanceled: false,
Expand Down Expand Up @@ -350,7 +350,7 @@ const execa = (file, args, options) => {
if (result.error || result.code !== 0 || result.signal !== null) {
const error = makeError(result, {
code: result.code,
joinedCommand,
command,
parsed,
timedOut,
isCanceled,
Expand All @@ -365,7 +365,7 @@ const execa = (file, args, options) => {
}

return {
command: joinedCommand,
command,
exitCode: 0,
exitCodeName: 'SUCCESS',
stdout: result.stdout,
Expand Down Expand Up @@ -409,7 +409,7 @@ module.exports = execa;

module.exports.sync = (file, args, options) => {
const parsed = handleArgs(file, args, options);
const joinedCommand = joinCommand(file, args);
const command = joinCommand(file, args);

if (isStream(parsed.options.input)) {
throw new TypeError('The `input` option cannot be a stream in sync mode');
Expand All @@ -422,7 +422,7 @@ module.exports.sync = (file, args, options) => {
if (result.error || result.status !== 0 || result.signal !== null) {
const error = makeError(result, {
code: result.status,
joinedCommand,
command,
parsed,
timedOut: result.error && result.error.errno === 'ETIMEDOUT',
isCanceled: false,
Expand All @@ -437,7 +437,7 @@ module.exports.sync = (file, args, options) => {
}

return {
command: joinedCommand,
command,
exitCode: 0,
exitCodeName: 'SUCCESS',
stdout: result.stdout,
Expand Down