Skip to content

Commit

Permalink
Merge pull request #2 from Filirom1/master
Browse files Browse the repository at this point in the history
Use with Glob instead of Miniglob
  • Loading branch information
mklabs committed Jan 18, 2012
2 parents 2ec0dd6 + 6d4b61d commit e940f04
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions README.md
@@ -1,6 +1,6 @@
# node-fileset

Exposes a basic wrapper on top of [miniglob](https://github.com/isaacs/miniglob) / [minimatch](https://github.com/isaacs/minimatch) combo both written by @isaacs. miniglob is now used instead of node-glob to replace the C++ bindings and make it usable in node 0.6.x and windows platforms.
Exposes a basic wrapper on top of [Glob](https://github.com/isaacs/node-glob) / [minimatch](https://github.com/isaacs/minimatch) combo both written by @isaacs. Glob now use javascript instead of C++ bindings and make it usable in node 0.6.x and windows platforms.

[![Build Status](https://secure.travis-ci.org/mklabs/node-fileset.png)](http://travis-ci.org/mklabs/node-fileset)

Expand Down Expand Up @@ -59,4 +59,4 @@ just run `npm test`

mainly as a build tool with cake files, to provide me an easy way to get a list of files by either using glob or path patterns, optionnaly allowing exclude patterns to filter out the results.

All the magic is happening in [miniglob](https://github.com/isaacs/miniglob) and [minimatch](https://github.com/isaacs/minimatch), check them out !
All the magic is happening in [Glob](https://github.com/isaacs/node-glob) and [minimatch](https://github.com/isaacs/minimatch), check them out !
6 changes: 3 additions & 3 deletions lib/fileset.js
Expand Up @@ -3,7 +3,7 @@

var util = require('util'),
minimatch = require('minimatch'),
Miniglob = require('miniglob').Miniglob,
Glob = require('glob').Glob,
EventEmitter = require('events').EventEmitter;

module.exports = fileset;
Expand Down Expand Up @@ -52,14 +52,14 @@ fileset.Fileset = function Fileset(pattern, options, cb) {
if (typeof options === 'function') cb = options, options = {};
if (!options) options = {};

Miniglob.call(this, pattern, options);
Glob.call(this, pattern, options);

if(typeof cb === 'function') {
this.on('error', cb);
this.on('end', function(matches) { cb(null, matches); });
}
};

util.inherits(fileset.Fileset, Miniglob);
util.inherits(fileset.Fileset, Glob);


4 changes: 2 additions & 2 deletions package.json
Expand Up @@ -16,7 +16,7 @@
"node": "*"
},
"dependencies": {
"miniglob": "https://nodeload.github.com/isaacs/miniglob/tarball/master",
"minimatch": "https://nodeload.github.com/mklabs/minimatch/tarball/windows-path-prefixing"
"minimatch": "0.1.x",
"glob": "3.0.x"
}
}

0 comments on commit e940f04

Please sign in to comment.