Extract middleware into separate registerPipelineMiddleware function

kuychaco · kuychaco · commit 772b8dc5beee · 2017-10-24T18:18:47.000-07:00
diff --git a/lib/github-package.js b/lib/github-package.js
@@ -19,11 +19,9 @@ import Switchboard from './switchboard';
 import yardstick from './yardstick';
 import GitTimingsView from './views/git-timings-view';
 import ContextMenuInterceptor from './context-menu-interceptor';
-import {getActionPipelineManager} from './action-pipeline';
 import AsyncQueue from './async-queue';
 import WorkerManager from './worker-manager';
-import {GitError} from './git-shell-out-strategy';
-
+import registerPipelineMiddleware from './register-pipeline-middleware';
 
 const defaultState = {
 };
@@ -84,137 +82,7 @@ export default class GithubPackage {
 
     this.filePatchItems = [];
 
-    this.pipelineManager = getActionPipelineManager();
-    const pushPipeline = this.pipelineManager.getPipeline(this.pipelineManager.actionKeys.PUSH);
-    pushPipeline.addMiddleware('confirm-force-push', (next, repository, branchName, options) => {
-      if (options.force) {
-        const choice = this.props.confirm({
-          message: 'Are you sure you want to force push?',
-          detailedMessage: 'This operation could result in losing data on the remote.',
-          buttons: ['Force Push', 'Cancel Push'],
-        });
-        if (choice !== 0) { return null; } else { return next(); }
-      } else {
-        return next();
-      }
-    });
-    pushPipeline.addMiddleware('set-push-in-progress', async (next, repository, branchName, options) => {
-      repository.setOperationProgressState('push', true);
-      await next();
-      repository.setOperationProgressState('push', false);
-    });
-    pushPipeline.addMiddleware('failed-to-push-error', async (next, repository, branchName, options) => {
-      try {
-        const result = await next();
-        return result;
-      } catch (error) {
-        if (!(error instanceof GitError)) { throw error; }
-        if (/rejected[\s\S]*failed to push/.test(error.stdErr)) {
-          this.notificationManager.addError('Push rejected', {
-            description: 'The tip of your current branch is behind its remote counterpart.' +
-              ' Try pulling before pushing again. Or, to force push, hold `cmd` or `ctrl` while clicking.',
-            dismissable: true,
-          });
-        } else {
-          console.error(error);
-          this.notificationManager.addError('Unable to push', {
-            description: `<pre>${error.stdErr}</pre>`,
-            dismissable: true,
-          });
-        }
-        return error;
-      }
-    });
-
-    const pullPipeline = this.pipelineManager.getPipeline(this.pipelineManager.actionKeys.PULL);
-    pullPipeline.addMiddleware('set-pull-in-progress', async (next, repository, branchName) => {
-      repository.setOperationProgressState('pull', true);
-      await next();
-      repository.setOperationProgressState('pull', false);
-    });
-    pullPipeline.addMiddleware('failed-to-pull-error', async (next, repository, branchName) => {
-      try {
-        const result = await next();
-        return result;
-      } catch (error) {
-        if (!(error instanceof GitError)) { throw error; }
-        if (/error: Your local changes to the following files would be overwritten by merge/.test(error.stdErr)) {
-          const lines = error.stdErr.split('\n');
-          const files = lines.slice(3, lines.length - 3).map(l => `\`${l.trim()}\``).join('<br>');
-          this.notificationManager.addError('Pull aborted', {
-            description: 'Local changes to the following would be overwritten by merge:<br>' + files +
-              '<br>Please commit your changes or stash them before you merge.',
-            dismissable: true,
-          });
-        } else if (/Automatic merge failed; fix conflicts and then commit the result./.test(error.stdOut)) {
-          this.controller.gitTabTracker.ensureVisible();
-          this.notificationManager.addInfo('Merge conflicts', {
-            description: `Your local changes conflicted with changes made on the remote branch. Resolve the conflicts
-              with the Git panel and commit to continue.`,
-            dismissable: true,
-          });
-        } else {
-          console.error(error);
-          this.notificationManager.addError('Unable to pull', {
-            description: `<pre>${error.stdErr}</pre>`,
-            dismissable: true,
-          });
-        }
-        return error;
-      }
-    });
-
-    const fetchPipeline = this.pipelineManager.getPipeline(this.pipelineManager.actionKeys.FETCH);
-    fetchPipeline.addMiddleware('set-fetch-in-progress', async (next, repository) => {
-      repository.setOperationProgressState('fetch', true);
-      await next();
-      repository.setOperationProgressState('fetch', false);
-    });
-    fetchPipeline.addMiddleware('failed-to-fetch-error', async (next, repository) => {
-      try {
-        const result = await next();
-        return result;
-      } catch (error) {
-        if (!(error instanceof GitError)) { throw error; }
-        console.error(error);
-        this.notificationManager.addError('Unable to fetch', {
-          description: `<pre>${error.stdErr}</pre>`,
-          dismissable: true,
-        });
-        return error;
-      }
-    });
-
-    const checkoutPipeline = this.pipelineManager.getPipeline(this.pipelineManager.actionKeys.CHECKOUT);
-    checkoutPipeline.addMiddleware('set-checkout-in-progress', async (next, repository, branchName) => {
-      repository.setOperationProgressState('checkout', branchName);
-      await next();
-      repository.setOperationProgressState('checkout', false);
-    });
-    checkoutPipeline.addMiddleware('failed-to-checkout-error', async (next, repository, branchName, options) => {
-      try {
-        const result = await next();
-        return result;
-      } catch (error) {
-        if (!(error instanceof GitError)) { throw error; }
-        const message = options.createNew ? 'Cannot create branch' : 'Checkout aborted';
-        let description = `<pre>${error.stdErr}</pre>`;
-        if (error.stdErr.match(/local changes.*would be overwritten/)) {
-          const files = error.stdErr.split(/\r?\n/).filter(l => l.startsWith('\t'))
-            .map(l => `\`${l.trim()}\``).join('<br>');
-          description = 'Local changes to the following would be overwritten:<br>' + files +
-            '<br>Please commit your changes or stash them.';
-        } else if (error.stdErr.match(/branch.*already exists/)) {
-          description = `\`${branchName}\` already exists. Choose another branch name.`;
-        } else if (error.stdErr.match(/error: you need to resolve your current index first/)) {
-          description = 'You must first resolve merge conflicts.';
-        } else {
-          console.error(error);
-        }
-        this.notificationManager.addError(message, {description, dismissable: true});
-        return error;
-      }
-    });
+    registerPipelineMiddleware(this.controller, {confirm, notificationManager});
   }
 
   setupYardstick() {
diff --git a/lib/register-pipeline-middleware.js b/lib/register-pipeline-middleware.js
@@ -0,0 +1,136 @@
+import {getActionPipelineManager} from './action-pipeline';
+import {GitError} from './git-shell-out-strategy';
+
+export default function(controller, {confirm, notificationManager}) {
+  const pipelineManager = getActionPipelineManager();
+  const pushPipeline = pipelineManager.getPipeline(pipelineManager.actionKeys.PUSH);
+  pushPipeline.addMiddleware('confirm-force-push', (next, repository, branchName, options) => {
+    if (options.force) {
+      const choice = confirm({
+        message: 'Are you sure you want to force push?',
+        detailedMessage: 'This operation could result in losing data on the remote.',
+        buttons: ['Force Push', 'Cancel Push'],
+      });
+      if (choice !== 0) { return null; } else { return next(); }
+    } else {
+      return next();
+    }
+  });
+  pushPipeline.addMiddleware('set-push-in-progress', async (next, repository, branchName, options) => {
+    repository.setOperationProgressState('push', true);
+    await next();
+    repository.setOperationProgressState('push', false);
+  });
+  pushPipeline.addMiddleware('failed-to-push-error', async (next, repository, branchName, options) => {
+    try {
+      const result = await next();
+      return result;
+    } catch (error) {
+      if (!(error instanceof GitError)) { throw error; }
+      if (/rejected[\s\S]*failed to push/.test(error.stdErr)) {
+        notificationManager.addError('Push rejected', {
+          description: 'The tip of your current branch is behind its remote counterpart.' +
+            ' Try pulling before pushing again. Or, to force push, hold `cmd` or `ctrl` while clicking.',
+          dismissable: true,
+        });
+      } else {
+        console.error(error);
+        notificationManager.addError('Unable to push', {
+          description: `<pre>${error.stdErr}</pre>`,
+          dismissable: true,
+        });
+      }
+      return error;
+    }
+  });
+
+  const pullPipeline = pipelineManager.getPipeline(pipelineManager.actionKeys.PULL);
+  pullPipeline.addMiddleware('set-pull-in-progress', async (next, repository, branchName) => {
+    repository.setOperationProgressState('pull', true);
+    await next();
+    repository.setOperationProgressState('pull', false);
+  });
+  pullPipeline.addMiddleware('failed-to-pull-error', async (next, repository, branchName) => {
+    try {
+      const result = await next();
+      return result;
+    } catch (error) {
+      if (!(error instanceof GitError)) { throw error; }
+      if (/error: Your local changes to the following files would be overwritten by merge/.test(error.stdErr)) {
+        const lines = error.stdErr.split('\n');
+        const files = lines.slice(3, lines.length - 3).map(l => `\`${l.trim()}\``).join('<br>');
+        notificationManager.addError('Pull aborted', {
+          description: 'Local changes to the following would be overwritten by merge:<br>' + files +
+            '<br>Please commit your changes or stash them before you merge.',
+          dismissable: true,
+        });
+      } else if (/Automatic merge failed; fix conflicts and then commit the result./.test(error.stdOut)) {
+        controller.gitTabTracker.ensureVisible();
+        notificationManager.addInfo('Merge conflicts', {
+          description: `Your local changes conflicted with changes made on the remote branch. Resolve the conflicts
+            with the Git panel and commit to continue.`,
+          dismissable: true,
+        });
+      } else {
+        console.error(error);
+        notificationManager.addError('Unable to pull', {
+          description: `<pre>${error.stdErr}</pre>`,
+          dismissable: true,
+        });
+      }
+      return error;
+    }
+  });
+
+  const fetchPipeline = pipelineManager.getPipeline(pipelineManager.actionKeys.FETCH);
+  fetchPipeline.addMiddleware('set-fetch-in-progress', async (next, repository) => {
+    repository.setOperationProgressState('fetch', true);
+    await next();
+    repository.setOperationProgressState('fetch', false);
+  });
+  fetchPipeline.addMiddleware('failed-to-fetch-error', async (next, repository) => {
+    try {
+      const result = await next();
+      return result;
+    } catch (error) {
+      if (!(error instanceof GitError)) { throw error; }
+      console.error(error);
+      notificationManager.addError('Unable to fetch', {
+        description: `<pre>${error.stdErr}</pre>`,
+        dismissable: true,
+      });
+      return error;
+    }
+  });
+
+  const checkoutPipeline = pipelineManager.getPipeline(pipelineManager.actionKeys.CHECKOUT);
+  checkoutPipeline.addMiddleware('set-checkout-in-progress', async (next, repository, branchName) => {
+    repository.setOperationProgressState('checkout', branchName);
+    await next();
+    repository.setOperationProgressState('checkout', false);
+  });
+  checkoutPipeline.addMiddleware('failed-to-checkout-error', async (next, repository, branchName, options) => {
+    try {
+      const result = await next();
+      return result;
+    } catch (error) {
+      if (!(error instanceof GitError)) { throw error; }
+      const message = options.createNew ? 'Cannot create branch' : 'Checkout aborted';
+      let description = `<pre>${error.stdErr}</pre>`;
+      if (error.stdErr.match(/local changes.*would be overwritten/)) {
+        const files = error.stdErr.split(/\r?\n/).filter(l => l.startsWith('\t'))
+          .map(l => `\`${l.trim()}\``).join('<br>');
+        description = 'Local changes to the following would be overwritten:<br>' + files +
+          '<br>Please commit your changes or stash them.';
+      } else if (error.stdErr.match(/branch.*already exists/)) {
+        description = `\`${branchName}\` already exists. Choose another branch name.`;
+      } else if (error.stdErr.match(/error: you need to resolve your current index first/)) {
+        description = 'You must first resolve merge conflicts.';
+      } else {
+        console.error(error);
+      }
+      notificationManager.addError(message, {description, dismissable: true});
+      return error;
+    }
+  });
+}
