be consistent about target vs entry

Author: daaku

index.js

@@ -43,62 +43,62 @@ Walker.prototype.filterDir = function(fn) {
 /**
  * Process a file or directory.
  */
-Walker.prototype.go = function(target) {
+Walker.prototype.go = function(entry) {
   var that = this
   this._pending++
 
-  fs.lstat(target, function(er, stat) {
+  fs.lstat(entry, function(er, stat) {
     if (er) {
-      that.emit('error', er, target, stat)
+      that.emit('error', er, entry, stat)
       that.doneOne()
       return
     }
 
     if (stat.isDirectory()) {
-      if (!that._filterDir(target, stat)) {
+      if (!that._filterDir(entry, stat)) {
         that.doneOne()
       } else {
-        fs.readdir(target, function(er, files) {
+        fs.readdir(entry, function(er, files) {
           if (er) {
-            that.emit('error', er, target, stat)
+            that.emit('error', er, entry, stat)
             that.doneOne()
             return
           }
 
-          that.emit('entry', target, stat)
-          that.emit('dir', target, stat)
+          that.emit('entry', entry, stat)
+          that.emit('dir', entry, stat)
           files.forEach(function(part) {
-            that.go(path.join(target, part))
+            that.go(path.join(entry, part))
           })
           that.doneOne()
         })
       }
     } else if (stat.isSymbolicLink()) {
-      that.emit('entry', target, stat)
-      that.emit('symlink', target, stat)
+      that.emit('entry', entry, stat)
+      that.emit('symlink', entry, stat)
       that.doneOne()
     } else if (stat.isBlockDevice()) {
-      that.emit('entry', target, stat)
-      that.emit('blockDevice', target, stat)
+      that.emit('entry', entry, stat)
+      that.emit('blockDevice', entry, stat)
       that.doneOne()
     } else if (stat.isCharacterDevice()) {
-      that.emit('entry', target, stat)
-      that.emit('characterDevice', target, stat)
+      that.emit('entry', entry, stat)
+      that.emit('characterDevice', entry, stat)
       that.doneOne()
     } else if (stat.isFIFO()) {
-      that.emit('entry', target, stat)
-      that.emit('fifo', target, stat)
+      that.emit('entry', entry, stat)
+      that.emit('fifo', entry, stat)
       that.doneOne()
     } else if (stat.isSocket()) {
-      that.emit('entry', target, stat)
-      that.emit('socket', target, stat)
+      that.emit('entry', entry, stat)
+      that.emit('socket', entry, stat)
       that.doneOne()
     } else if (stat.isFile()) {
-      that.emit('entry', target, stat)
-      that.emit('file', target, stat)
+      that.emit('entry', entry, stat)
+      that.emit('file', entry, stat)
       that.doneOne()
     } else {
-      that.emit('error', UnknownFileTypeError(), target, stat)
+      that.emit('error', UnknownFileTypeError(), entry, stat)
       that.doneOne()
     }
   })

package.json

@@ -1,7 +1,7 @@
 {
   "name": "walker",
   "description": "A simple directory tree walker.",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "author": "Naitik Shah <n@daaku.org>",
   "keywords": ["utils", "fs", "filesystem"],
   "main": "index",

readme.md

@@ -37,8 +37,8 @@ directory trees. This shows the entire API; everything is optional:
       .on('characterDevice', function(characterDevice, stat) {
         console.log('Got characterDevice: ' + characterDevice)
       })
-      .on('error', function(er, target, stat) {
-        console.log('Got error ' + er + ' on target ' + target)
+      .on('error', function(er, entry, stat) {
+        console.log('Got error ' + er + ' on entry ' + entry)
       })
       .on('end', function() {
         console.log('All files traversed.')

test/walker.js

@@ -34,7 +34,7 @@ exports['simple walk'] = function(beforeExit) {
         file, 'Unexpected file.')
       n--
     })
-    .on('error', function(er, target, stat) {
+    .on('error', function(er, entry, stat) {
       assert.ifError(er)
     })
     .on('end', function() {
@@ -65,7 +65,7 @@ exports['simple walk, exclude sub-directory tree'] = function(beforeExit) {
         file, 'Unexpected file.')
       n--
     })
-    .on('error', function(er, target, stat) {
+    .on('error', function(er, entry, stat) {
       assert.ifError(er)
     })
     .on('end', function() {
@@ -93,8 +93,8 @@ exports['error walk'] = function(beforeExit) {
         file, 'Unexpected file.')
       n--
     })
-    .on('error', function(er, target, stat) {
-      assert.equal(ERROR_WALK + '/d', target, 'Expect specific error.')
+    .on('error', function(er, entry, stat) {
+      assert.equal(ERROR_WALK + '/d', entry, 'Expect specific error.')
       n--
     })
     .on('end', function() {
@@ -116,8 +116,8 @@ exports['bad start'] = function(beforeExit) {
     .on('file', function(file) {
       n--
     })
-    .on('error', function(er, target, stat) {
-      assert.equal(BAD_START_WALK, target, 'Expect specific error.')
+    .on('error', function(er, entry, stat) {
+      assert.equal(BAD_START_WALK, entry, 'Expect specific error.')
       n--
     })
     .on('end', function() {
@@ -163,7 +163,7 @@ exports['symlink test'] = function(beforeExit) {
       )
       n--
     })
-    .on('error', function(er, target, stat) {
+    .on('error', function(er, entry, stat) {
       assert.ifError(er)
     })
     .on('end', function() {