fixing issue with options handler where current directory default was…

… not working for edit and open
carsdotcom · Feb 28, 2017 · a4574a2 · a4574a2
1 parent 0863f65
commit a4574a2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/cli.js b/cli.js
@@ -11,21 +11,25 @@ module.exports = cli;
 
 function setSearchTerm(options) {
     let searchTerm;
-    let flags = _.pick(options, [
+    let defaultToCurrent = _.pick(options, [
         'open',
-        'edit',
+        'edit'
+    ]);
+    let defaultToWild = _.pick(options, [
         'completions',
         'clone-all',
         'force-latest'
     ]);
     if (options._ && options._[0]) {
         searchTerm = options._[0];
-    } else if (_.keys(flags).length) {
-        searchTerm = _.reduce(_.values(flags), (acc, value) => {
+    } else if (_.keys(defaultToCurrent).length) {
+        searchTerm = _.reduce(_.values(defaultToCurrent), (acc, value) => {
+            return _.isString(value) ? value : acc;
+        }, '^' + _.takeRight(process.cwd().split(path.sep), 3).join(path.sep) + '$');
+    } else if (_.keys(defaultToWild).length) {
+        searchTerm = _.reduce(_.values(defaultToWild), (acc, value) => {
             return _.isString(value) ? value : acc;
         }, '.*');
-    } else {
-        searchTerm = '^' + _.takeRight(process.cwd().split(path.sep), 3).join(path.sep) + '$';
     }
     return searchTerm;
 }

diff --git a/package.json b/package.json
@@ -56,7 +56,6 @@
   "pre-commit": [
     "lint",
     "test",
-    "check-coverage",
-    "generate-and-stage-changelog"
+    "check-coverage"
   ]
 }