yargs 4.8.0-candidate2 → 4.8.1

package/CHANGELOG.md

@@ -2,6 +2,42 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+<a name="4.8.1"></a>
+## [4.8.1](https://github.com/yargs/yargs/compare/v4.8.0...v4.8.1) (2016-07-16)
+
+
+### Bug Fixes
+
+* **commandDir:** make dir relative to caller instead of require.main.filename ([#548](https://github.com/yargs/yargs/issues/548)) ([3c2e479](https://github.com/yargs/yargs/commit/3c2e479))
+* add config lookup for .implies() ([#556](https://github.com/yargs/yargs/issues/556)) ([8d7585c](https://github.com/yargs/yargs/commit/8d7585c))
+* cache pkg lookups by path to avoid returning the wrong one ([#552](https://github.com/yargs/yargs/issues/552)) ([fea7e0b](https://github.com/yargs/yargs/commit/fea7e0b))
+* positional arguments were not being handled appropriately by parse() ([#559](https://github.com/yargs/yargs/issues/559)) ([063a866](https://github.com/yargs/yargs/commit/063a866))
+* pull in [@nexdrew](https://github.com/nexdrew)'s fixes to yargs-parser ([#560](https://github.com/yargs/yargs/issues/560)) ([c77c080](https://github.com/yargs/yargs/commit/c77c080)), closes [#560](https://github.com/yargs/yargs/issues/560)
+
+
+
+<a name="4.8.0"></a>
+# [4.8.0](https://github.com/yargs/yargs/compare/v4.7.1...v4.8.0) (2016-07-09)
+
+
+### Bug Fixes
+
+* drop unused camelcase dependency fixes [#516](https://github.com/yargs/yargs/issues/516) ([#525](https://github.com/yargs/yargs/issues/525)) ([365fb9a](https://github.com/yargs/yargs/commit/365fb9a)), closes [#516](https://github.com/yargs/yargs/issues/516) [#525](https://github.com/yargs/yargs/issues/525)
+* fake a tty in tests, so that we can use the new set-blocking ([#512](https://github.com/yargs/yargs/issues/512)) ([a54c742](https://github.com/yargs/yargs/commit/a54c742))
+* ignore invalid package.json during read-pkg-up ([#546](https://github.com/yargs/yargs/issues/546)) ([e058c87](https://github.com/yargs/yargs/commit/e058c87))
+* keep both zh and zh_CN until yargs[@5](https://github.com/5).x ([0f8faa7](https://github.com/yargs/yargs/commit/0f8faa7))
+* lazy-load package.json and cache. get rid of pkg-conf dependency. ([#544](https://github.com/yargs/yargs/issues/544)) ([2609b2e](https://github.com/yargs/yargs/commit/2609b2e))
+* we now respect the order of _ when applying commands ([#537](https://github.com/yargs/yargs/issues/537)) ([ed86b78](https://github.com/yargs/yargs/commit/ed86b78))
+
+
+### Features
+
+* add .commandDir(dir) to API to apply all command modules from a relative directory ([#494](https://github.com/yargs/yargs/issues/494)) ([b299dff](https://github.com/yargs/yargs/commit/b299dff))
+* **command:** derive missing command string from module filename ([#527](https://github.com/yargs/yargs/issues/527)) ([20d4b8a](https://github.com/yargs/yargs/commit/20d4b8a))
+* builder is now optional for a command module ([#545](https://github.com/yargs/yargs/issues/545)) ([8d6ad6e](https://github.com/yargs/yargs/commit/8d6ad6e))
+
+
+
 <a name="4.7.1"></a>
 ## [4.7.1](https://github.com/yargs/yargs/compare/v4.7.0...v4.7.1) (2016-05-15)
 

package/README.md

@@ -1666,8 +1666,8 @@ This module is loosely inspired by Perl's
 [coveralls-image]: https://img.shields.io/coveralls/yargs/yargs.svg
 [npm-url]: https://www.npmjs.com/package/yargs
 [npm-image]: https://img.shields.io/npm/v/yargs.svg
-[windows-url]: https://ci.appveyor.com/project/bcoe/yargs
-[windows-image]: https://img.shields.io/appveyor/ci/bcoe/yargs/master.svg?label=Windows%20Tests
+[windows-url]: https://ci.appveyor.com/project/bcoe/yargs-ljwvf
+[windows-image]: https://img.shields.io/appveyor/ci/bcoe/yargs-ljwvf/master.svg?label=Windows%20Tests
 [standard-image]: https://img.shields.io/badge/code%20style-standard-brightgreen.svg
 [standard-url]: http://standardjs.com/
 [standard-version-image]: https://img.shields.io/badge/release-standard%20version-brightgreen.svg

package/lib/command.js

@@ -11,14 +11,9 @@ module.exports = function (yargs, usage, validation) {
 
   var handlers = {}
   self.addHandler = function (cmd, description, builder, handler) {
-    // allow modules that define (a) all properties or (b) only command and description
     if (typeof cmd === 'object') {
       const commandString = typeof cmd.command === 'string' ? cmd.command : moduleName(cmd)
-      if (cmd.builder && typeof cmd.handler === 'function') {
-        self.addHandler(commandString, extractDesc(cmd), cmd.builder, cmd.handler)
-      } else {
-        self.addHandler(commandString, extractDesc(cmd))
-      }
+      self.addHandler(commandString, extractDesc(cmd), cmd.builder, cmd.handler)
       return
     }
 
@@ -39,16 +34,16 @@ module.exports = function (yargs, usage, validation) {
     handlers[parsedCommand.cmd] = {
       original: cmd,
       handler: handler,
+      // TODO: default to a noop builder in
+      // yargs@5.x
       builder: builder,
       demanded: parsedCommand.demanded,
       optional: parsedCommand.optional
     }
   }
 
-  self.addDirectory = function (dir, context, req, mainFilename, opts) {
+  self.addDirectory = function (dir, context, req, callerFile, opts) {
     opts = opts || {}
-    // dir should be relative to the command module
-    dir = path.join(context.dirs[context.commands.join('|')] || '', dir)
     // disable recursion to support nested directories of subcommands
     if (typeof opts.recurse !== 'boolean') opts.recurse = false
     // exclude 'json', 'coffee' from require-directory defaults
@@ -65,14 +60,11 @@ module.exports = function (yargs, usage, validation) {
         if (~context.files.indexOf(joined)) return visited
         // keep track of visited files in context.files
         context.files.push(joined)
-        // map "command path" to the directory path it came from
-        // so that dir can be relative in the API
-        context.dirs[context.commands.concat(parseCommand(visited.command || commandFromFilename(filename)).cmd).join('|')] = dir
         self.addHandler(visited)
       }
       return visited
     }
-    requireDirectory({ require: req, filename: mainFilename }, dir, opts)
+    requireDirectory({ require: req, filename: callerFile }, dir, opts)
   }
 
   // lookup module object from require()d command and derive name

package/lib/validation.js

@@ -219,6 +219,12 @@ module.exports = function (yargs, usage, y18n) {
     const implyFail = []
 
     Object.keys(implied).forEach(function (key) {
+      var booleanNegation
+      if (yargs.getOptions().configuration['boolean-negation'] === false) {
+        booleanNegation = false
+      } else {
+        booleanNegation = true
+      }
       var num
       const origKey = key
       var value = implied[key]
@@ -230,7 +236,7 @@ module.exports = function (yargs, usage, y18n) {
       if (typeof key === 'number') {
         // check length of argv._
         key = argv._.length >= key
-      } else if (key.match(/^--no-.+/)) {
+      } else if (key.match(/^--no-.+/) && booleanNegation) {
         // check if key doesn't exist
         key = key.match(/^--no-(.+)/)[1]
         key = !argv[key]
@@ -244,7 +250,7 @@ module.exports = function (yargs, usage, y18n) {
 
       if (typeof value === 'number') {
         value = argv._.length >= value
-      } else if (value.match(/^--no-.+/)) {
+      } else if (value.match(/^--no-.+/) && booleanNegation) {
         value = value.match(/^--no-(.+)/)[1]
         value = !argv[value]
       } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yargs",
-  "version": "4.8.0-candidate2",
+  "version": "4.8.1",
   "description": "yargs the modern, pirate-themed, successor to optimist.",
   "main": "./index.js",
   "files": [
@@ -14,6 +14,7 @@
   "dependencies": {
     "cliui": "^3.2.0",
     "decamelize": "^1.1.1",
+    "get-caller-file": "^1.0.1",
     "lodash.assign": "^4.0.3",
     "os-locale": "^1.4.0",
     "read-pkg-up": "^1.0.1",
@@ -24,14 +25,14 @@
     "which-module": "^1.0.0",
     "window-size": "^0.2.0",
     "y18n": "^3.2.1",
-    "yargs-parser": "^2.4.0"
+    "yargs-parser": "^2.4.1"
   },
   "devDependencies": {
     "chai": "^3.4.1",
     "chalk": "^1.1.3",
-    "coveralls": "^2.11.9",
+    "coveralls": "^2.11.11",
     "cpr": "^1.0.0",
-    "cross-spawn-async": "^2.2.1",
+    "cross-spawn": "^4.0.0",
     "es6-promise": "^3.0.2",
     "hashish": "0.0.4",
     "mocha": "^2.5.2",

package/yargs.js

@@ -49,7 +49,7 @@ function Yargs (processArgs, cwd, parentRequire) {
 
   // use context object to keep track of resets, subcommand execution, etc
   // submodules should modify and check the state of context as necessary
-  const context = { resets: -1, commands: [], dirs: {}, files: [] }
+  const context = { resets: -1, commands: [], files: [] }
   self.getContext = function () {
     return context
   }
@@ -207,7 +207,7 @@ function Yargs (processArgs, cwd, parentRequire) {
 
   self.commandDir = function (dir, opts) {
     const req = parentRequire || require
-    command.addDirectory(dir, self.getContext(), req, requireMainFilename(req), opts)
+    command.addDirectory(dir, self.getContext(), req, require('get-caller-file')(), opts)
     return self
   }
 
@@ -355,20 +355,25 @@ function Yargs (processArgs, cwd, parentRequire) {
     return self
   }
 
-  var pkg = null
+  var pkgs = {}
   function pkgUp (path) {
-    if (pkg && !path) return pkg
+    var npath = path || '*'
+    if (pkgs[npath]) return pkgs[npath]
     const readPkgUp = require('read-pkg-up')
 
-    var obj = readPkgUp.sync({
-      cwd: path || requireMainFilename(parentRequire || require)
-    })
+    var obj = {}
+    try {
+      obj = readPkgUp.sync({
+        cwd: path || requireMainFilename(parentRequire || require)
+      })
+    } catch (noop) {}
 
-    if (obj.pkg) pkg = obj.pkg
-    return pkg || {}
+    pkgs[npath] = obj.pkg || {}
+    return pkgs[npath]
   }
 
   self.parse = function (args, shortCircuit) {
+    if (!shortCircuit) processArgs = args
     return parseArgs(args, shortCircuit)
   }
 
@@ -632,7 +637,7 @@ function Yargs (processArgs, cwd, parentRequire) {
 
   function parseArgs (args, shortCircuit) {
     options.__ = y18n.__
-    options.configuration = pkgUp()['yargs'] || {}
+    options.configuration = pkgUp(cwd)['yargs'] || {}
     const parsed = Parser.detailed(args, options)
     const argv = parsed.argv
     var aliases = parsed.aliases