refactor project files into their own directories (src/ test/ lib/)

README.md

@@ -98,7 +98,7 @@ Installation
 - Make sure you have git installed.
 - ./update-mongo-c-driver.sh
 - node-waf configure build
-- node test_mongo.js
+- ./run-tests.sh
 
 BUGS
 ----

mongodb.js → lib/mongodb.js

@@ -1,6 +1,5 @@
-sys = require("sys");
-
-var mongo = require("./mongo");
+var sys   = require("sys"),
+    mongo = require("mongo");
 
 function Collection(mongo, db, name) {
     this.mongo = mongo;

run-tests.sh

@@ -1,4 +1,4 @@
 #!/bin/sh
 
-node test_bson.js
-node test_mongo.js
+node tests/test_bson.js
+node tests/test_mongo.js

test_bson.js → tests/test_bson.js

@@ -1,8 +1,11 @@
-process.mixin(GLOBAL, require('mjsunit'));
+require.paths.push("lib");
+
+var sys     = require("sys"),
+    mongo   = require("mongo"),
+    mongodb = require("mongodb");
 
-sys = require("sys");
-var mongo = require("./mongo");
-var mongodb = require("./mongodb");
+process.mixin(GLOBAL, require('mjsunit'));
+jjj = JSON.stringify;
 
 var bson = { encode: mongo.encode, decode: mongo.decode };
 

test_mongo.js → tests/test_mongo.js

@@ -5,7 +5,11 @@ process.mixin(GLOBAL, require('mjsunit'));
 var jjj = JSON.stringify;
 
 var sys = require("sys");
-var mongodb = require("./mongodb");
+
+require.paths.push("lib");
+
+var mongodb = require("mongodb");
+
 var oid_hex = "123456789012345678901234";
 
 var mongo = new mongodb.MongoDB();

wscript

@@ -1,6 +1,7 @@
 import Options
 from os import unlink, symlink, popen
 from os.path import exists, abspath
+from shutil import copy
 
 srcdir = '.'
 blddir = 'build'
@@ -25,7 +26,7 @@ def build(bld):
   mongo = bld.new_task_gen('cxx', 'shlib', 'node_addon')
   mongo.cxxflags = "-g"
   mongo.target = 'mongo'
-  mongo.source = "mongo.cc bson.cc"
+  mongo.source = "src/mongo.cc src/bson.cc"
   mongo.uselib = "MONGO BSON"
 
 def shutdown():
@@ -35,4 +36,4 @@ def shutdown():
     if exists('mongo.node'): unlink('mongo.node')
   else:
     if exists('build/default/mongo.node') and not exists('mongo.node'):
-      symlink('build/default/mongo.node', 'mongo.node')
+      copy('build/default/mongo.node', 'lib/mongo.node')