minimatch 0.2.14 → 0.3.0

package/README.md

@@ -157,8 +157,8 @@ Perform a case-insensitive match.
 ### nonull
 
 When a match is not found by `minimatch.match`, return a list containing
-the pattern itself.  When set, an empty list is returned if there are
-no matches.
+the pattern itself if this option is set.  When not set, an empty list
+is returned if there are no matches.
 
 ### matchBase
 

package/minimatch.js

@@ -813,11 +813,12 @@ function makeRe () {
 }
 
 minimatch.match = function (list, pattern, options) {
+  options = options || {}
   var mm = new Minimatch(pattern, options)
   list = list.filter(function (f) {
     return mm.match(f)
   })
-  if (options.nonull && !list.length) {
+  if (mm.options.nonull && !list.length) {
     list.push(pattern)
   }
   return list
@@ -853,12 +854,17 @@ function match (f, partial) {
   var set = this.set
   this.debug(this.pattern, "set", set)
 
-  var splitFile = path.basename(f.join("/")).split("/")
+  // Find the basename of the path by looking for the last non-empty segment
+  var filename;
+  for (var i = f.length - 1; i >= 0; i--) {
+    filename = f[i]
+    if (filename) break
+  }
 
   for (var i = 0, l = set.length; i < l; i ++) {
     var pattern = set[i], file = f
     if (options.matchBase && pattern.length === 1) {
-      file = splitFile
+      file = [filename]
     }
     var hit = this.matchOne(file, pattern, partial)
     if (hit) {
@@ -975,7 +981,7 @@ Minimatch.prototype.matchOne = function (file, pattern, partial) {
       }
       // no match was found.
       // However, in partial mode, we can't say this is necessarily over.
-      // If there's more *pattern* left, then 
+      // If there's more *pattern* left, then
       if (partial) {
         // ran out of file
         this.debug("\n>>> no match, partial?", file, fr, pattern, pr)

package/package.json

@@ -2,7 +2,7 @@
   "author": "Isaac Z. Schlueter <i@izs.me> (http://blog.izs.me)",
   "name": "minimatch",
   "description": "a glob matcher in javascript",
-  "version": "0.2.14",
+  "version": "0.3.0",
   "repository": {
     "type": "git",
     "url": "git://github.com/isaacs/minimatch.git"

package/test/defaults.js

@@ -237,7 +237,7 @@ tap.test("basic tests", function (t) {
 
       var pattern = c[0]
         , expect = c[1].sort(alpha)
-        , options = c[2] || {}
+        , options = c[2]
         , f = c[3] || files
         , tapOpts = c[4] || {}