remove require.paths dependency

Author: cloudhead

bin/vows

@@ -34,12 +34,10 @@ var inspect = require('eyes').inspector({
     styles: { string: 'grey', regexp: 'grey' }
 });
 
-require.paths.unshift(path.join(__dirname, '..', 'lib'));
-
-var vows = require('vows');
-var cutils = require('vows/console');
-var stylize = require('vows/console').stylize;
-var _reporter = require('vows/reporters/dot-matrix'), reporter = {
+var vows = require('../lib/vows');
+var cutils = require('../lib/vows/console');
+var stylize = require('../lib/vows/console').stylize;
+var _reporter = require('../lib/vows/reporters/dot-matrix'), reporter = {
     name: _reporter.name,
 };
 var _coverage;
@@ -105,28 +103,28 @@ while (arg = argv.shift()) {
         } else {
             switch (arg) {
                 case 'json':
-                    _reporter = require('vows/reporters/json');
+                    _reporter = require('../lib/vows/reporters/json');
                     break;
                 case 'spec':
-                    _reporter = require('vows/reporters/spec');
+                    _reporter = require('../lib/vows/reporters/spec');
                     break;
                 case 'dot-matrix':
-                    _reporter = require('vows/reporters/dot-matrix');
+                    _reporter = require('../lib/vows/reporters/dot-matrix');
                     break;
                 case 'silent':
                 case 's':
-                    _reporter = require('vows/reporters/silent');
+                    _reporter = require('../lib/vows/reporters/silent');
                     break;
                 case 'xunit':
-                    _reporter = require('vows/reporters/xunit');
+                    _reporter = require('../lib/vows/reporters/xunit');
                     break;
                 case 'cover-plain':
                     options.coverage = true;
-                    _coverage = require('vows/coverage/report-plain');
+                    _coverage = require('../lib/vows/coverage/report-plain');
                     break;
                 case 'cover-html':
                     options.coverage = true;
-                    _coverage = require('vows/coverage/report-html');
+                    _coverage = require('../lib/vows/coverage/report-html');
                     break;
                 case 'verbose':
                 case 'v':
@@ -156,7 +154,7 @@ while (arg = argv.shift()) {
 }
 
 if (options.watch) {
-    options.reporter = reporter = require('vows/reporters/watch');
+    options.reporter = reporter = require('../lib/vows/reporters/watch');
 }
 
 msg('bin', 'argv', args);

lib/assert/error.js

@@ -1,5 +1,5 @@
-var stylize = require('vows/console').stylize;
-var inspect = require('vows/console').inspect;
+var stylize = require('../vows/console').stylize;
+var inspect = require('../vows/console').inspect;
 
 require('assert').AssertionError.prototype.toString = function () {
     var that = this,

lib/assert/macros.js

@@ -1,5 +1,5 @@
 var assert = require('assert'),
-    utils = require('assert/utils');
+    utils = require('./utils');
 
 var messages = {
     'equal'       : "expected {expected},\n\tgot\t {actual} ({operator})",

lib/vows.js

@@ -20,12 +20,10 @@ var sys = require('sys'),
     events = require('events'),
     vows = exports;
 
-require.paths.unshift(__dirname);
-
 // Options
 vows.options = {
     Emitter: events.EventEmitter,
-    reporter: require('vows/reporters/dot-matrix'),
+    reporter: require('./vows/reporters/dot-matrix'),
     matcher: /.*/,
     error: true // Handle "error" event
 };
@@ -34,12 +32,12 @@ vows.__defineGetter__('reporter', function () {
     return vows.options.reporter;
 });
 
-var stylize = require('vows/console').stylize;
-var console = require('vows/console');
+var stylize = require('./vows/console').stylize;
+var console = require('./vows/console');
 
-vows.inspect = require('vows/console').inspect;
-vows.prepare = require('vows/extras').prepare;
-vows.tryEnd = require('vows/suite').tryEnd;
+vows.inspect = require('./vows/console').inspect;
+vows.prepare = require('./vows/extras').prepare;
+vows.tryEnd  = require('./vows/suite').tryEnd;
 
 //
 // Assertion Macros & Extensions
@@ -50,7 +48,7 @@ require('./assert/macros');
 //
 // Suite constructor
 //
-var Suite = require('vows/suite').Suite;
+var Suite = require('./vows/suite').Suite;
 
 //
 // This function gets added to events.EventEmitter.prototype, by default.

lib/vows/coverage/report-html.js

@@ -1,6 +1,6 @@
 var sys  = require('sys'),
     fs   = require('fs'),
-    file = require('vows/coverage/file');
+    file = require('./file');
 
 this.name = 'coverage-report-html';
 

lib/vows/reporters/dot-matrix.js

@@ -2,8 +2,8 @@
 var sys = require('sys');
 
 var options = {};
-var console = require('vows/console');
-var spec = require('vows/reporters/spec');
+var console = require('../../vows/console');
+var spec = require('./spec');
 var stylize = console.stylize,
     puts = console.puts(options);
 //

lib/vows/reporters/spec.js

@@ -1,7 +1,7 @@
 var sys = require('sys');
 
 var options = {};
-var console = require('vows/console');
+var console = require('../../vows/console');
 var stylize = console.stylize,
     puts = console.puts(options);
 //

lib/vows/reporters/watch.js

@@ -1,8 +1,8 @@
 var sys = require('sys');
 
 var options = {};
-var console = require('vows/console');
-var spec = require('vows/reporters/spec');
+var console = require('../../vows/console');
+var spec = require('../../vows/reporters/spec');
 var stylize = console.stylize,
     puts = console.puts(options);
 //

lib/vows/suite.js

@@ -1,15 +1,13 @@
 var events = require('events'),
     path = require('path');
 
-require.paths.unshift(path.join(__dirname, '..'));
-
-var vows = require('vows');
-var Context = require('vows/context').Context;
+var vows = require('../vows');
+var Context = require('../vows/context').Context;
 
 this.Suite = function (subject) {
     this.subject = subject;
     this.matcher = /.*/;
-    this.reporter = require('vows/reporters/dot-matrix');
+    this.reporter = require('./reporters/dot-matrix');
     this.batches = [];
     this.options = { error: true };
     this.reset();

test/assert-test.js

@@ -1,4 +1,4 @@
-var vows = require('vows');
+var vows = require('../lib/vows');
 var assert = require('assert');
 
 vows.describe('vows/assert').addBatch({

test/vows-test.js

@@ -1,12 +1,8 @@
-var path = require('path');
-
-require.paths.unshift(path.join(__dirname, '..', 'lib'));
-
-var events = require('events'),
+var path   = require('path'),
+    events = require('events'),
     assert = require('assert'),
-    fs     = require('fs');
-
-var vows = require('vows');
+    fs     = require('fs'),
+    vows   = require('../lib/vows');
 
 var api = vows.prepare({
     get: function (id, callback) {