minimatch 0.0.4 → 0.0.5

package/.travis.yml

@@ -0,0 +1,4 @@
+language: node_js
+node_js:
+  - 0.4
+  - 0.6

package/README.md

@@ -1,3 +1,10 @@
+# minimatch
+
+A minimal matching utility.
+
+[![Build Status](https://secure.travis-ci.org/isaacs/minimatch.png)](http://travis-ci.org/isaacs/minimatch)
+
+
 This is the matching library used internally by npm.
 
 Eventually, it will replace the C binding in node-glob.

package/blerg.js

@@ -0,0 +1,62 @@
+
+// Turn something like {a,b{c,d},}x{e,f} into
+// ["axe", "axf", "bcxe", "bcxf", "bdxe", "bdxf", "xe", "xf"]
+// Only {,} groups are expanded.  While in many cases {x,y} is
+// functionally equivalent to @(x|y), for the purpose of globbing
+// files, only {x,y} gets expanded as multiple patterns.
+minimatch.patternSet = patternSet
+function patternSet (pattern) {
+  if (!pattern.match(/{/) || !pattern.match(/}/)) {
+    // shortcut - no sets.
+    return [pattern]
+  }
+
+  // a{b,c{d,e},{f,g}h}x{y,z}
+  //
+  // t=[before set, set, after set]
+  // t=["a", ["b", "c{d,e}", "{f,g}h"], "x{y,z}"]
+
+  // start walking, and note the position of the first {
+  // and the corresponding }
+  var p = pattern.indexOf("{")
+    , l = pattern.length
+    , d = 0
+    , escaping = false
+    , inClass = false
+  while (++ p < l) {
+    switch (pattern.charAt(p)) {
+      case "{":
+        d ++
+        continue
+      case "}":
+        
+
+
+  // t[2] = patternSet(t[2])
+  // t = [t[0]].concat([t[1].map(patternSet)]).concat([t[2]])
+  //
+  // t=["a",[["b"],[["cd","ce"]],[["fh","gh"]]],["xy","xz"]]
+  //
+  // // first turn into
+  // // [["ab"], ["acd", "ace"], ["afh", "agh"]]
+  // return t[1].map(function (p) {
+  //   return p.map(function (p) {
+  //     return t[0] + p
+  //   })
+  // })
+  // // flatten into ["ab", "acd", "ace", "afh", "agh"]
+  // .reduce(function (l, r) {
+  //   return l.concat(r)
+  // }, [])
+  // // tack all the endings onto each one
+  // .map(function (p) {
+  //   return t[2].map(function (e) {
+  //     return p + e
+  //   })
+  // })
+  // // flatten again
+  // .reduce(function (l, r) {
+  //   return l.concat(r)
+  // }, [])
+}
+

package/minimatch.js

@@ -17,6 +17,7 @@ minimatch.filter = function (pattern, options) {
 minimatch.match = function (list, pattern, options) {
   if (!options) options = {}
   var ret = list.filter(minimatch.filter(pattern, options))
+  if (options.debug) console.error("\nmatch: %s %j %j", pattern, list, ret)
 
   // set the null flag to allow empty match sets
   // Note that minimatch itself, and filter(), do not
@@ -47,7 +48,7 @@ function minimatch (p, pattern, options) {
   if (pattern.trim().charAt(0) === "#") return false
 
   // check the cache
-  var re = cache.get(pattern)
+  var re = cache.get(pattern + "\n" + JSON.stringify(options))
   if (!re && re !== false) {
     cache.set(pattern, re = minimatch.makeRe(pattern, options))
   }
@@ -93,18 +94,45 @@ minimatch.makeRe = makeRe
 function makeRe (pattern, options) {
   options = options || {}
 
+  function clearStateChar () {
+    if (stateChar) {
+      // we had some state-tracking character
+      // that wasn't consumed by this pass.
+      switch (stateChar) {
+        case "*":
+          re += oneStar
+          break
+        case "?":
+          re += "."
+          break
+        default:
+          re += "\\"+stateChar
+          break
+      }
+      stateChar = false
+    }
+  }
+
   var braceDepth = 0
     , re = ""
     , escaping = false
-    , oneStar = "[^\\/]*?"
-    , twoStar = ".*?"
+    , oneStar = options.dot ? "[^\\/]*?"
+      : "(?:(?!(?:\\\/|^)\\.)[^\\/])*?"
+    , twoStar = options.dot ? ".*?"
+      // not a ^ or / followed by a dot,
+      // followed by anything, any number of times.
+      : "(?:(?!(?:\\\/|^)\\.).)*?"
     , reSpecials = "().*{}+?[]^$/\\"
     , patternListStack = []
     , stateChar
     , negate = false
     , negating = false
     , inClass = false
-    , reClassStart = []
+    , reClassStart = -1
+    , classStart = -1
+    , classStartPattern = options.dot ? ""
+      : "(?:(?!(?:\\\/|^)\\.)"
+    , classEndPattern = options.dot ? "" : ")"
 
   for ( var i = 0, len = pattern.length, c
       ; (i < len) && (c = pattern.charAt(i))
@@ -129,6 +157,7 @@ function makeRe (pattern, options) {
         }
         continue
 
+      // the various stateChar values
       case "!":
         if (i === 0 || negating) {
           negate = !negate
@@ -213,21 +242,8 @@ function makeRe (pattern, options) {
 
       // these are mostly the same in regexp and glob :)
       case "[":
-        if (stateChar) {
-          // some state-tracking char was before the [
-          switch (stateChar) {
-            case "*":
-              re += oneStar
-              break
-            case "?":
-              re += "."
-              break
-            default:
-              re += "\\"+stateChar
-              break
-          }
-          stateChar = false
-        }
+        // swallow any state-tracking char before the [
+        clearStateChar()
 
         if (escaping || inClass) {
           re += "\\" + c
@@ -236,6 +252,7 @@ function makeRe (pattern, options) {
           inClass = true
           classStart = i
           reClassStart = re.length
+          re += classStartPattern
           re += c
         }
         continue
@@ -252,7 +269,7 @@ function makeRe (pattern, options) {
           escaping = false
         } else {
           inClass = false
-          re += c
+          re += c + classEndPattern
         }
         continue
 
@@ -271,6 +288,8 @@ function makeRe (pattern, options) {
           re += "\\}"
           escaping = false
         } else {
+          // swallow any state char that wasn't consumed
+          clearStateChar()
           re += ")"
           braceDepth --
         }
@@ -281,27 +300,15 @@ function makeRe (pattern, options) {
           re += ","
           escaping = false
         } else {
+          // swallow any state char that wasn't consumed
+          clearStateChar()
           re += "|"
         }
         continue
 
       default:
-        if (stateChar) {
-          // we had some state-tracking character
-          // that wasn't consumed by this pass.
-          switch (stateChar) {
-            case "*":
-              re += oneStar
-              break
-            case "?":
-              re += "."
-              break
-            default:
-              re += "\\"+stateChar
-              break
-          }
-          stateChar = false
-        }
+        // swallow any state char that wasn't consumed
+        clearStateChar()
 
         if (escaping) {
           // no need
@@ -321,20 +328,7 @@ function makeRe (pattern, options) {
 
   // handle trailing things that only matter at the very end.
   if (stateChar) {
-    // we had some state-tracking character
-    // that wasn't consumed by this pass.
-    switch (stateChar) {
-      case "*":
-        re += oneStar
-        break
-      case "?":
-        re += "."
-        break
-      default:
-        re += "\\"+stateChar
-        break
-    }
-    stateChar = false
+    clearStateChar()
   } else if (escaping) {
     re += "\\\\"
   }
@@ -345,7 +339,7 @@ function makeRe (pattern, options) {
     // this is a huge pita.  We now have to re-walk
     // the contents of the would-be class to re-translate
     // any characters that were passed through as-is
-    var cs = re.substr(reClassStart + 1)
+    var cs = re.substr(reClassStart + classStartPattern.length + 1)
       , csOpts = Object.create(options)
     csOpts.partial = true
 
@@ -355,11 +349,6 @@ function makeRe (pattern, options) {
 
   if (options.partial) return re
 
-  // don't match "." files unless pattern starts with "."
-  if (!options.dot && pattern.charAt(0) !== ".") {
-    re = "(?!\\.)" + re
-  }
-
   // must match entire pattern
   // ending in a * or ** will make it less strict.
   re = "^" + re + "$"
@@ -381,19 +370,3 @@ function makeRe (pattern, options) {
     return false
   }
 }
-
-if (require.main === module) {
-  // more tests in test/*.js
-  var tests = ["{a,b{c,d}}"
-              ,"a.*$?"
-              ,"\\{a,b{c,d}}"
-              ,"a/{c/,}d/{e/,f/{g,h,i}/}k"
-              ,"!*.bak"
-              ,"!!*.bak"
-              ,"!!!*.bak"
-              ,"\\a\\b\\c\\d"
-              ]
-  tests.forEach(function (t) {
-    console.log([t,makeRe(t)])
-  })
-}

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.0.4",
+  "version": "0.0.5",
   "repository": {
     "type": "git",
     "url": "git://github.com/isaacs/minimatch.git"
@@ -14,9 +14,6 @@
   "engines": {
     "node": "*"
   },
-  "bundleDependencies": [
-    "lru-cache"
-  ],
   "dependencies": {
     "lru-cache": "~1.0.2"
   },

package/t.js

@@ -0,0 +1,4 @@
+console.error(Object.keys(global).length)
+var m = require("./")
+console.log(m.makeRe("**"))
+console.error(Object.keys(global).length)

package/test/basic.js

@@ -1,6 +1,7 @@
 // http://www.bashcookbook.com/bashinfo/source/bash-1.14.7/tests/glob-test
 
 var tap = require("tap")
+  , globalBefore = Object.keys(global)
   , mm = require("../")
   , files = [ "a", "b", "c", "d", "abc"
             , "abd", "abe", "bb", "bcd"
@@ -10,6 +11,8 @@ var tap = require("tap")
                         , ".x", ".y" ])
 
 tap.test("basic tests", function (t) {
+  var start = Date.now()
+
   // [ pattern, [matches], MM opts, files, TAP opts]
   ; [ "http://www.bashcookbook.com/bashinfo" +
       "/source/bash-1.14.7/tests/glob-test"
@@ -32,13 +35,13 @@ tap.test("basic tests", function (t) {
     , ["\\.\\./*/", ["\\.\\./*/"]]
     , ["s/\\..*//", ["s/\\..*//"]]
 
-    // legendary larry crashes bashes
+    , "legendary larry crashes bashes"
     , ["/^root:/{s/^[^:]*:[^:]*:\([^:]*\).*$/\\1/"
       , ["/^root:/{s/^[^:]*:[^:]*:\([^:]*\).*$/\\1/"]]
     , ["/^root:/{s/^[^:]*:[^:]*:\([^:]*\).*$/\1/"
       , ["/^root:/{s/^[^:]*:[^:]*:\([^:]*\).*$/\1/"]]
 
-    // character classes
+    , "character classes"
     , ["[a-c]b*", ["abc", "abd", "abe", "bb", "cb"]]
     , ["[a-y]*[^c]", ["abd", "abe", "bb", "bcd",
        "bdir/", "ca", "cb", "dd", "de"]]
@@ -87,8 +90,8 @@ tap.test("basic tests", function (t) {
     , ["[[]", ["["], null, ["["]]
     , ["[", ["["], null, ["["]]
     , ["[*", ["[abc"], null, ["[abc"]]
-    , "a right bracket shall lose its special meaning and " +
-      "represent itself in a bracket expression if it occurs " +
+    , "a right bracket shall lose its special meaning and\n" +
+      "represent itself in a bracket expression if it occurs\n" +
       "first in the list.  -- POSIX.2 2.8.3.2"
     , ["[]]", ["]"], null, ["]"]]
     , ["[]-]", ["]"], null, ["]"]]
@@ -111,6 +114,21 @@ tap.test("basic tests", function (t) {
     , ["[ia]?[ck]", ["ABC", "IjK"], { nocase: true, null: true }
       , ["xYz", "ABC", "IjK"]]
 
+    // [ pattern, [matches], MM opts, files, TAP opts]
+    , "onestar/twostar"
+    , ["{/*,*}", [], {null: true}, ["/asdf/asdf/asdf"]]
+    , ["{/?,*}", ["/a", "bb"], {null: true}
+      , ["/a", "/b/b", "/a/b/c", "bb"]]
+
+    , "dots should not match unless requested"
+    , ["**", ["a/b"], {}, ["a/b", "a/.d", ".a/.d"]]
+
+    // this also tests that changing the options needs
+    // to change the cache key, even if the pattern is
+    // the same!
+    , ["**", ["a/b","a/.d",".a/.d"], { dot: true }
+      , [ ".a/.d", "a/.d", "a/b"]]
+
     ].forEach(function (c) {
       if (typeof c === "function") return c()
       if (typeof c === "string") return t.comment(c)
@@ -131,8 +149,16 @@ tap.test("basic tests", function (t) {
 
       t.equivalent( actual, expect
                   , JSON.stringify(pattern) + " " + JSON.stringify(expect)
-                  , c[4] )
+                  , tapOpts )
     })
+
+  t.comment("time=" + (Date.now() - start) + "ms")
+  t.end()
+})
+
+tap.test("global leak test", function (t) {
+  var globalAfter = Object.keys(global)
+  t.equivalent(globalAfter, globalBefore, "no new globals, please")
   t.end()
 })
 

package/.gitmodules

@@ -1,3 +0,0 @@
-[submodule "node_modules/lru-cache"]
-	path = node_modules/lru-cache
-	url = https://github.com/isaacs/node-lru-cache.git

package/node_modules/lru-cache/LICENSE

@@ -1,23 +0,0 @@
-Copyright 2009, 2010, 2011 Isaac Z. Schlueter.
-All rights reserved.
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.

package/node_modules/lru-cache/README.md

@@ -1,12 +0,0 @@
-# lru cache
-
-A cache object that deletes the least-recently-used items.
-
-Usage:
-
-    var LRU = require("lru-cache")
-      , cache = LRU(10) // max 10 items. default = Infinity
-    cache.set("key", "value")
-    cache.get("key") // "value"
-
-RTFS for more info.

package/node_modules/lru-cache/lib/lru-cache.js

@@ -1,151 +0,0 @@
-
-module.exports = LRUCache
-
-function hOP (obj, key) {
-  return Object.prototype.hasOwnProperty.call(obj, key)
-}
-
-function LRUCache (maxLength) {
-  if (!(this instanceof LRUCache)) {
-    return new LRUCache(maxLength)
-  }
-  var cache = {} // hash of items by key
-    , lruList = {} // list of items in order of use recency
-    , lru = 0 // least recently used
-    , mru = 0 // most recently used
-    , length = 0 // number of items in the list
-
-  // resize the cache when the maxLength changes.
-  Object.defineProperty(this, "maxLength",
-    { set : function (mL) {
-        if (!mL || !(typeof mL === "number") || mL <= 0 ) mL = Infinity
-        maxLength = mL
-        // if it gets above double maxLength, trim right away.
-        // otherwise, do it whenever it's convenient.
-        if (length > maxLength) trim()
-      }
-    , get : function () { return maxLength }
-    , enumerable : true
-    })
-  this.maxLength = maxLength
-  Object.defineProperty(this, "length",
-    { get : function () { return length }
-    , enumerable : true
-    })
-
-  this.set = function (key, value) {
-    if (hOP(cache, key)) {
-      this.get(key)
-      cache[key].value = value
-      return undefined
-    }
-    var hit = {key:key, value:value, lu:mru++}
-    lruList[hit.lu] = cache[key] = hit
-    length ++
-    if (length > maxLength) trim()
-  }
-  this.get = function (key) {
-    if (!hOP(cache, key)) return undefined
-    var hit = cache[key]
-    delete lruList[hit.lu]
-    if (hit.lu === lru) lruWalk()
-    hit.lu = mru ++
-    lruList[hit.lu] = hit
-    return hit.value
-  }
-  this.del = function (key) {
-    if (!hOP(cache, key)) return undefined
-    var hit = cache[key]
-    delete cache[key]
-    delete lruList[hit.lu]
-    if (hit.lu === lru) lruWalk()
-    length --
-  }
-  function lruWalk () {
-    // lru has been deleted, hop up to the next hit.
-    lru = Object.keys(lruList).shift()
-  }
-  function trim () {
-    if (length <= maxLength) return undefined
-    var prune = Object.keys(lruList).slice(0, length - maxLength)
-    for (var i = 0, l = (length - maxLength); i < l; i ++) {
-      delete cache[ lruList[prune[i]].key ]
-      delete lruList[prune[i]]
-    }
-    length = maxLength
-    lruWalk()
-  }
-}
-
-if (!process || !module || module !== process.mainModule) return undefined
-
-var l = LRUCache(3)
-  , assert = require("assert")
-
-l.set(1, 1)
-l.set(2, 1)
-l.set(3, 1)
-l.set(4, 1)
-l.set(5, 1)
-l.set(6, 1)
-
-assert.equal(l.get(1), undefined)
-assert.equal(l.get(2), undefined)
-assert.equal(l.get(3), undefined)
-assert.equal(l.get(4), 1)
-assert.equal(l.get(5), 1)
-assert.equal(l.get(6), 1)
-
-// now keep re-getting the 6 so it remains the most recently used.
-// in this case, we'll have 6, 7, 8, 9, 10, 11, so the ending length = 5
-l.set(7, 1)
-l.get(6)
-l.set(8, 1)
-l.get(6)
-l.set(9, 1)
-l.get(6)
-l.set(10, 1)
-l.get(6)
-l.set(11, 1)
-assert.equal(l.length, 3)
-assert.equal(l.get(4), undefined)
-assert.equal(l.get(5), undefined)
-assert.equal(l.get(6), 1)
-assert.equal(l.get(7), undefined)
-assert.equal(l.get(8), undefined)
-assert.equal(l.get(9), undefined)
-assert.equal(l.get(10), 1)
-assert.equal(l.get(11), 1)
-
-// test changing the maxLength, verify that the LRU items get dropped.
-l.maxLength = 100
-for (var i = 0; i < 100; i ++) l.set(i, i)
-assert.equal(l.length, 100)
-for (var i = 0; i < 100; i ++) {
-  assert.equal(l.get(i), i)
-}
-l.maxLength = 3
-assert.equal(l.length, 3)
-for (var i = 0; i < 97; i ++) {
-  assert.equal(l.get(i), undefined)
-}
-for (var i = 98; i < 100; i ++) {
-  assert.equal(l.get(i), i)
-}
-
-// now remove the maxLength restriction, and try again.
-l.maxLength = "hello"
-for (var i = 0; i < 100; i ++) l.set(i, i)
-assert.equal(l.length, 100)
-for (var i = 0; i < 100; i ++) {
-  assert.equal(l.get(i), i)
-}
-// should trigger an immediate resize
-l.maxLength = 3
-assert.equal(l.length, 3)
-for (var i = 0; i < 97; i ++) {
-  assert.equal(l.get(i), undefined)
-}
-for (var i = 98; i < 100; i ++) {
-  assert.equal(l.get(i), i)
-}

package/node_modules/lru-cache/package.json

@@ -1,13 +0,0 @@
-{ "name" : "lru-cache"
-, "description" : "A cache object that deletes the least-recently-used items."
-, "version" : "1.0.4"
-, "author" : "Isaac Z. Schlueter <i@izs.me>"
-, "scripts" : { "test" : "node lib/lru-cache.js" }
-, "main" : "lib/lru-cache"
-, "repository" : "git://github.com/isaacs/node-lru-cache.git"
-, "licenses" :
-  [ { "type" : "MIT"
-    , "url" : "http://github.com/isaacs/node-lru-cache/raw/master/LICENSE"
-    }
-  ]
-}