Style fixes for new ESLint rules

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

Author: kevinoid

bin/git-branch-is.js

@@ -6,7 +6,7 @@
 
 'use strict';
 
-const Command = require('commander').Command;
+const {Command} = require('commander');
 
 const gitBranchIs = require('..');
 const packageJson = require('../package.json');

index.js

@@ -5,7 +5,7 @@
 
 'use strict';
 
-const execFile = require('child_process').execFile;
+const {execFile} = require('child_process');
 
 /** Options for {@link gitBranchIs}.
  *

test-lib/git.js

@@ -5,28 +5,27 @@
 
 'use strict';
 
-const execFile = require('child_process').execFile;
+const {execFile} = require('child_process');
 const pify = require('pify');
 
 const execFileP = pify(execFile, {multiArgs: true});
 
 /**
  * Run git with given arguments and options.
+ * @param {...string} args Arguments to pass to git.  Last argument may be an
+ * options object.
  * @return {Promise} Promise with the process output or Error for non-0 exit.
  */
-function git(/* [args...], [options] */) {
+function git(...args) {
   // Default to redirecting stdin (to prevent unexpected prompts) and
   // including any output with test output
   const defaultStdio = ['ignore', process.stdout, process.stderr];
 
-  let args, options;
-  if (typeof arguments[arguments.length - 1] === 'object') {
-    args = Array.prototype.slice.call(arguments);
+  let options;
+  if (typeof args[args.length - 1] === 'object') {
     options = args.pop();
     options.stdio = options.stdio || defaultStdio;
   } else {
-    // Note:  execFile/spawn requires Array type for arguments
-    args = Array.prototype.slice.call(arguments);
     options = {
       stdio: defaultStdio
     };

test/git-branch-is-cmd.js

@@ -7,7 +7,7 @@
 
 
 const assert = require('assert');
-const execFile = require('child_process').execFile;
+const {execFile} = require('child_process');
 const path = require('path');
 
 const assertMatch = require('../test-lib/assert-match');
@@ -18,9 +18,7 @@ const gitBranchIsCmd = require('../bin/git-branch-is');
 const ARGS = [process.argv[0], 'git-branch-is'];
 
 // Local copy of shared constants
-const BRANCH_CURRENT = constants.BRANCH_CURRENT;
-const SUBDIR_NAME = constants.SUBDIR_NAME;
-const TEST_REPO_PATH = constants.TEST_REPO_PATH;
+const {BRANCH_CURRENT, SUBDIR_NAME, TEST_REPO_PATH} = constants;
 
 const BRANCH_CURRENT_RE = new RegExp(`\\b${constants.BRANCH_CURRENT}\\b`);
 

test/git-branch-is.js

@@ -14,11 +14,13 @@ const assertMatch = require('../test-lib/assert-match');
 const constants = require('../test-lib/constants');
 
 // Local copy of shared constants
-const BRANCH_CURRENT = constants.BRANCH_CURRENT;
-const BRANCH_NON_EXISTENT = constants.BRANCH_NON_EXISTENT;
-const BRANCH_SAME_COMMIT = constants.BRANCH_SAME_COMMIT;
-const SUBDIR_NAME = constants.SUBDIR_NAME;
-const TEST_REPO_PATH = constants.TEST_REPO_PATH;
+const {
+  BRANCH_CURRENT,
+  BRANCH_NON_EXISTENT,
+  BRANCH_SAME_COMMIT,
+  SUBDIR_NAME,
+  TEST_REPO_PATH
+} = constants;
 
 describe('gitBranchIs', () => {
   it('callback true for current branch name', (done) => {

test/global-hooks.js

@@ -17,10 +17,12 @@ const fsP = pify(fs);
 const rimrafP = pify(rimraf);
 
 // Local copy of shared constants
-const BRANCH_CURRENT = constants.BRANCH_CURRENT;
-const BRANCH_SAME_COMMIT = constants.BRANCH_SAME_COMMIT;
-const SUBDIR_NAME = constants.SUBDIR_NAME;
-const TEST_REPO_PATH = constants.TEST_REPO_PATH;
+const {
+  BRANCH_CURRENT,
+  BRANCH_SAME_COMMIT,
+  SUBDIR_NAME,
+  TEST_REPO_PATH
+} = constants;
 
 // Global variables
 let origCWD;