From 06c7f16ddb0f3a658960dc607b21a721c8a39fd0 Mon Sep 17 00:00:00 2001
From: Jimb Esser <jimb@yahoo-inc.com>
Date: Wed, 7 May 2014 13:28:20 -0700
Subject: [PATCH] Fix global defaults getting squashed in each call to dive,
 and using the global defaults instead of local options.

---
 dive.js      | 11 +++++++++--
 package.json |  7 +++----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/dive.js b/dive.js
index 9795617..9c94c28 100644
--- a/dive.js
+++ b/dive.js
@@ -1,6 +1,5 @@
 var fs = require('fs');
 var path = require('path');
-var append = require('append');
 
 // default options
 var defaultOpt = {
@@ -10,6 +9,14 @@ var defaultOpt = {
   directories: false
 };
 
+function defaults(defaults, obj) {
+  for (var prop in defaults)
+    if (defaults.hasOwnProperty(prop))
+      if (!obj.hasOwnProperty(prop))
+        obj[prop] = defaults[prop];
+  return obj;
+}
+
 // general function
 module.exports = function(dir, opt, action, complete) {
 
@@ -29,7 +36,7 @@ module.exports = function(dir, opt, action, complete) {
   if (typeof dir != 'string')
     dir = process.cwd();
 
-  opt = append(defaultOpt, opt);
+  opt = defaults(defaultOpt, opt);
 
   function dive(dir) {
     // Read the directory
diff --git a/package.json b/package.json
index 6e3d7f6..908c147 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,8 @@
   "contributors": [
     "Jasper Palfree (https://github.com/wellcaffeinated)",
     "Jan Mühlemann (https://github.com/jamuhl)",
-    "Axel Hecht <axel@pike.org> (http://blog.mozilla.com/axel/)"
+    "Axel Hecht <axel@pike.org> (http://blog.mozilla.com/axel/)",
+    "Jimb Esser (https://github.com/Jimbly)"
   ],
   "version": "0.3.0",
   "main": "dive.js",
@@ -25,9 +26,7 @@
   "engines": {
     "node": ">=0.4.0"
   },
-  "dependencies": {
-    "append": ">=0.1.1"
-  },
+  "dependencies": {},
   "devDependencies": {},
   "optionalDependencies": {}
 }