Standardize error-handling logic

Author: Joshua Grosso

src/commands/checkout.js

@@ -55,10 +55,9 @@ const generateCheckoutStats = (raw) => {
 };
 
 function checkout(repo) {
-  const response = generateResponse();
-
   return core.checkout('', { cwd: repo.workdir() })
     .then(({ stdout, stderr }) => {
+      const response = generateResponse();
       response.raw = stdout;
 
       if (stderr) {

src/commands/clone.js

@@ -70,13 +70,12 @@ function clone(url, cwd, options) {
   } = (options || {});
   const args = branch ? `-b ${branch}` : '';
 
-  const response = generateResponse();
   return core.clone(`${url} ${args}`, { cwd, env }, callback)
-    .then(({ stdout }) => {
-      response.raw = stdout;
-      response.clone = generateCloneStats(stdout);
-      return response;
-    }, errorCatchHandler(response));
+    .then(({ stdout }) => ({
+      ...generateResponse(),
+      raw: stdout,
+      clone: generateCloneStats(stdout)
+    }), errorCatchHandler);
 }
 
 export default clone;

src/commands/fetch.js

@@ -59,8 +59,6 @@ const generateFetchStats = (raw) => {
 };
 
 function fetch(repo, options) {
-  const response = generateResponse();
-
   const args = [];
   const {
     remoteName,
@@ -78,11 +76,11 @@ function fetch(repo, options) {
 
   const argsString = R.join(' ', args);
   return core.fetch(argsString, { cwd: repo.workdir(), shell: true }, callback)
-    .then(({ stdout }) => {
-      response.raw = stdout;
-      response.fetch = generateFetchStats(stdout);
-      return response;
-    }, errorCatchHandler(response));
+    .then(({ stdout }) => ({
+      ...generateResponse(),
+      fetch: generateFetchStats(stdout),
+      raw: stdout
+    }), errorCatchHandler);
 }
 
 export default fetch;

src/commands/ls.js

@@ -47,17 +47,18 @@ const buildArgs = (options) => {
 };
 
 const ls = (repo, options) => {
-  const response = generateResponse();
   const args = buildArgs(options);
 
   return core.ls(args, { cwd: repo.workdir() })
     .then(({ stdout, stderr }) => {
+      const response = generateResponse();
       response.raw = stdout;
 
-      if (stderr.length > 0) {
+      if (stderr) {
+        response.errno = BAD_CORE_RESPONSE;
         response.stderr = stderr;
         response.success = false;
-        response.errno = BAD_CORE_RESPONSE;
+        return response;
       }
 
       response.files = extractFileNames(stdout);

src/commands/pointer.js

@@ -13,16 +13,16 @@ const pointer = (repo, filePath, pointerPath) => {
     args += `--file=${pointerPath} `;
   }
 
-  const response = generateResponse();
 
   return core.pointer(args, { cwd: repo.workdir() })
     .then(({ stdout, stderr }) => {
+      const response = generateResponse();
       response.raw = stdout;
 
       if (stderr) {
-        response.success = false;
         response.errno = BAD_CORE_RESPONSE;
         response.stderr = stderr;
+        response.success = false;
         return response;
       }
 

src/commands/prune.js

@@ -2,22 +2,19 @@ import { core } from './lfsCommands';
 import generateResponse from '../utils/generateResponse';
 import { BAD_CORE_RESPONSE } from '../constants';
 
-const prune = (repo, args) => {
-  const response = generateResponse();
-
-  return core.prune(args, { cwd: repo.workdir() })
+const prune = (repo, args) =>
+  core.prune(args, { cwd: repo.workdir() })
     .then(({ stdout, stderr }) => {
+      const response = generateResponse();
       response.raw = stdout;
 
       if (stderr) {
         response.errno = BAD_CORE_RESPONSE;
         response.stderr = stderr;
         response.success = false;
-        return response;
       }
 
       return response;
     });
-};
 
 export default prune;

src/commands/pull.js

@@ -59,8 +59,6 @@ const generatePullStats = (raw) => {
 };
 
 function pull(repo, options) {
-  const response = generateResponse();
-
   const args = [];
   const {
     remoteName,
@@ -77,11 +75,11 @@ function pull(repo, options) {
   const argsString = R.join(' ', args);
 
   return core.pull(argsString, { cwd: repo.workdir(), shell: true }, callback)
-    .then(({ stdout }) => {
-      response.raw = stdout;
-      response.pull = generatePullStats(stdout);
-      return response;
-    }, errorCatchHandler(response));
+    .then(({ stdout }) => ({
+      ...generateResponse(),
+      pull: generatePullStats(stdout),
+      raw: stdout
+    }), errorCatchHandler);
 }
 
 export default pull;

src/commands/push.js

@@ -62,8 +62,6 @@ const generatePushStats = (raw) => {
 };
 
 function push(repo, options) {
-  const response = generateResponse();
-
   const {
     remoteName,
     branchName,
@@ -96,11 +94,11 @@ function push(repo, options) {
 
   return getRemoteAndBranchPromise
     .then(() => core.push(`${remote} ${branch}`, { cwd: repo.path() }, callback))
-    .then(({ stdout }) => {
-      response.raw = stdout;
-      response.push = generatePushStats(stdout);
-      return response;
-    }, errorCatchHandler(response));
+    .then(({ stdout }) => ({
+      ...generateResponse(),
+      push: generatePushStats(stdout),
+      raw: stdout
+    }), errorCatchHandler);
 }
 
 export default push;

src/commands/track.js

@@ -22,16 +22,16 @@ const track = (repo, globs) => {
     R.filter(isString),
     R.map(g => `${ticks}${g}${ticks}`)
   )(globs);
-  const response = generateResponse();
 
   return core.track(R.join(' ', filteredGlobs), { cwd: repo.workdir() })
     .then(({ stdout, stderr }) => {
+      const response = generateResponse();
       response.raw = stdout;
 
       if (stderr) {
-        response.success = false;
         response.errno = BAD_CORE_RESPONSE;
         response.stderr = stderr;
+        response.success = false;
         return response;
       }
 

src/commands/untrack.js

@@ -22,16 +22,16 @@ const untrack = (repo, globs) => {
     R.filter(isString),
     R.map(g => `${ticks}${g}${ticks}`)
   )(globs);
-  const response = generateResponse();
 
   return core.untrack(R.join(' ', filteredGlobs), { cwd: repo.workdir() })
     .then(({ stdout, stderr }) => {
+      const response = generateResponse();
       response.raw = stdout;
 
       if (stderr) {
-        response.success = false;
         response.errno = BAD_CORE_RESPONSE;
         response.stderr = stderr;
+        response.success = false;
         return response;
       }