From 8e2ca7fec33822a9ea15975ac601db368b3a39d5 Mon Sep 17 00:00:00 2001
From: Sami Samhuri <sami.samhuri@gmail.com>
Date: Sun, 5 Jun 2011 18:06:27 -0700
Subject: [PATCH] move fs extensions into a subdir

---
 lib/{ => fs}/file-follower.js | 4 ++--
 lib/{file.js => fs/index.js}  | 9 ++++-----
 lib/{ => fs}/line-emitter.js  | 0
 3 files changed, 6 insertions(+), 7 deletions(-)
 rename lib/{ => fs}/file-follower.js (96%)
 rename lib/{file.js => fs/index.js} (93%)
 rename lib/{ => fs}/line-emitter.js (100%)

diff --git a/lib/file-follower.js b/lib/fs/file-follower.js
similarity index 96%
rename from lib/file-follower.js
rename to lib/fs/file-follower.js
index 876590d..0baa00a 100644
--- a/lib/file-follower.js
+++ b/lib/fs/file-follower.js
@@ -4,7 +4,7 @@
 var fs = require('fs')
   , util = require('util')
   , EventEmitter = require('events').EventEmitter
-  , FileExt = require('./file')
+  , batteries = require('./')
   ;
 
 module.exports = FileFollower;
@@ -17,7 +17,7 @@ function FileFollower(file, options) {
   this.currSize = fs.statSync(file).size;
   this.prevSize = this.currSize;
   this.interval = options.interval || 1000;
-  FileExt.eachLine(file,
+  batteries.fs.eachLine(file,
     { line: function(line) {
         self.emit('line', line);
       }
diff --git a/lib/file.js b/lib/fs/index.js
similarity index 93%
rename from lib/file.js
rename to lib/fs/index.js
index fa3a739..72582ff 100644
--- a/lib/file.js
+++ b/lib/fs/index.js
@@ -2,10 +2,9 @@
 // Copyright 2010 - 2011 Sami Samhuri <sami@samhuri.net>
 
 var fs = require('fs')
-  , ArrayExt = require('./array')
+  , batteries = require('../')
   , FileFollower = require('./file-follower')
   , LineEmitter = require('./line-emitter')
-  , ObjectExt = require('./object')
   , constants = require('constants')
   , FileExt
   ;
@@ -36,10 +35,10 @@ Object.keys(Object.getPrototypeOf(s)).forEach(function(k) {
 });
 
 exports.extendNative = function() {
-  ObjectExt.extend(fs, FileExt);
+  batteries.object.extend(fs, FileExt);
 };
 
-ObjectExt.extend(exports, FileExt);
+batteries.object.extend(exports, FileExt);
 
 function eachLine(f, optionsOrLineFn, endFn) {
   var lineFn, hasLineFn, hasEndFn;
@@ -81,7 +80,7 @@ function grep(regex, f, callback) {
   var results = [];
   eachLine(f,
     { line: function(line) { if (line.match(regex)) results.push(line); }
-    , end: callback(results)
+    , end: function() { callback(results); }
     });
 }
 
diff --git a/lib/line-emitter.js b/lib/fs/line-emitter.js
similarity index 100%
rename from lib/line-emitter.js
rename to lib/fs/line-emitter.js