Style fixes for latest ESLint rules

Signed-off-by: Kevin Locke <[email protected]>

Author: kevinoid

bin/git-branch-is.js

@@ -7,6 +7,7 @@
 'use strict';
 
 const Command = require('commander').Command;
+
 const gitBranchIs = require('..');
 const packageJson = require('../package.json');
 
@@ -110,28 +111,28 @@ function gitBranchIsCmd(args, callback) {
       if (!expectedBranchRegExp.test(currentBranch)) {
         callback(null, {
           code: 1,
-          stderr: command.quiet ? '' :
-            `Error: Current branch "${currentBranch}" does not match "${
+          stderr: command.quiet ? ''
+            : `Error: Current branch "${currentBranch}" does not match "${
               expectedBranch}".\n`
         });
         return;
       }
-    } else if (currentBranch !== expectedBranch &&
-        (!command.ignoreCase ||
-         currentBranch.toUpperCase() !== expectedBranch.toUpperCase())) {
+    } else if (currentBranch !== expectedBranch
+        && (!command.ignoreCase
+         || currentBranch.toUpperCase() !== expectedBranch.toUpperCase())) {
       callback(null, {
         code: 1,
-        stderr: command.quiet ? '' :
-          `Error: Current branch is "${currentBranch}", not "${
+        stderr: command.quiet ? ''
+          : `Error: Current branch is "${currentBranch}", not "${
             expectedBranch}".\n`
       });
       return;
     }
 
     callback(null, {
       code: 0,
-      stdout: !command.verbose ? '' :
-        `Current branch is "${currentBranch}".\n`
+      stdout: !command.verbose ? ''
+        : `Current branch is "${currentBranch}".\n`
     });
   });
   return undefined;
@@ -148,8 +149,8 @@ if (require.main === module) {
     if (errOrResult.stderr) { process.stderr.write(errOrResult.stderr); }
     if (err) { process.stderr.write(`${err.name}: ${err.message}\n`); }
 
-    const code = typeof errOrResult.code === 'number' ? errOrResult.code :
-      err ? 1 : 0;
+    const code = typeof errOrResult.code === 'number' ? errOrResult.code
+      : err ? 1 : 0;
     process.exit(code);
   });
 }

index.js

@@ -75,9 +75,9 @@ function gitBranchIs(branchNameOrTest, options, callback) {
 
     let result;
     try {
-      result = currentBranch === branchNameOrTest ||
-        (typeof branchNameOrTest === 'function' &&
-         branchNameOrTest(currentBranch));
+      result = currentBranch === branchNameOrTest
+        || (typeof branchNameOrTest === 'function'
+         && branchNameOrTest(currentBranch));
     } catch (errTest) {
       callback(errTest);
       return;
@@ -129,9 +129,9 @@ gitBranchIs.getBranch = function getBranch(options, callback) {
     combinedOpts[prop] = options[prop];
   });
 
-  const gitArgs = combinedOpts.gitArgs ?
-    Array.prototype.slice.call(combinedOpts.gitArgs, 0) :
-    [];
+  const gitArgs = combinedOpts.gitArgs
+    ? Array.prototype.slice.call(combinedOpts.gitArgs, 0)
+    : [];
   if (combinedOpts.gitDir) {
     gitArgs.unshift(`--git-dir=${combinedOpts.gitDir}`);
   }

test/git-branch-is-cmd.js

@@ -5,17 +5,18 @@
 
 'use strict';
 
-const gitBranchIsCmd = require('../bin/git-branch-is');
 
 const BBPromise = require('bluebird').Promise;
 // eslint-disable-next-line no-undef
 const PPromise = typeof Promise === 'function' ? Promise : BBPromise;
 const assert = require('assert');
-const assertMatch = require('../test-lib/assert-match');
-const constants = require('../test-lib/constants');
 const execFile = require('child_process').execFile;
 const path = require('path');
 
+const assertMatch = require('../test-lib/assert-match');
+const constants = require('../test-lib/constants');
+const gitBranchIsCmd = require('../bin/git-branch-is');
+
 /** Initial command arguments. */
 const ARGS = [process.argv[0], 'git-branch-is'];
 
@@ -106,8 +107,8 @@ describe('git-branch-is', () => {
   });
 
   it('exit 0 silently for matching i regex branch name', (done) => {
-    const args =
-      ARGS.concat('-i', '-r', `^${BRANCH_CURRENT.toUpperCase()}$`);
+    const args
+      = ARGS.concat('-i', '-r', `^${BRANCH_CURRENT.toUpperCase()}$`);
     gitBranchIsCmd(args, (err, result) => {
       assert.ifError(err);
       assert.strictEqual(result.code, 0);
@@ -370,8 +371,8 @@ describe('git-branch-is', () => {
         () => {
           gitBranchIsCmd(ARGS.concat(BRANCH_CURRENT));
         },
-        (err) => err instanceof TypeError &&
-                /\bcallback\b/.test(err.message)
+        (err) => err instanceof TypeError
+                && /\bcallback\b/.test(err.message)
       );
     });
   });

test/git-branch-is.js

@@ -11,9 +11,10 @@ const BBPromise = require('bluebird').Promise;
 // eslint-disable-next-line no-undef
 const PPromise = typeof Promise === 'function' ? Promise : BBPromise;
 const assert = require('assert');
+const path = require('path');
+
 const assertMatch = require('../test-lib/assert-match');
 const constants = require('../test-lib/constants');
-const path = require('path');
 
 // Local copy of shared constants
 const BRANCH_CURRENT = constants.BRANCH_CURRENT;

test/global-hooks.js

@@ -8,13 +8,14 @@
 const BBPromise = require('bluebird').Promise;
 // eslint-disable-next-line no-undef
 const PPromise = typeof Promise === 'function' ? Promise : BBPromise;
-const constants = require('../test-lib/constants');
 const fs = require('fs');
-const git = require('../test-lib/git');
 const path = require('path');
 const pify = require('pify');
 const rimraf = require('rimraf');
 
+const git = require('../test-lib/git');
+const constants = require('../test-lib/constants');
+
 const fsP = pify(fs, PPromise);
 const rimrafP = pify(rimraf, PPromise);