[refactor] Remove any remaining references to require.paths

winstonjs · Jul 20, 2011 · 90190c1 · 90190c1
1 parent 6169c96
commit 90190c1
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 30 deletions.
diff --git a/examples/webhook-post.js b/examples/webhook-post.js
@@ -1,4 +1,4 @@
-var winston = require('winston');
+var winston = require('../lib/winston');
 
 //
 // Create a new winston logger instance with two tranports: Console, and Webhook

diff --git a/lib/winston.js b/lib/winston.js
@@ -24,7 +24,7 @@ winston.clone          = internal.clone;
 winston.longestElement = internal.longestElement;
 winston.config         = require('./winston/config');
 winston.addColors      = winston.config.addColors; 
-winston.Logger         = require('winston/logger').Logger;
+winston.Logger         = require('./winston/logger').Logger;
 
 //
 // We create and expose a 'defaultLogger' so that the programmer may do the

diff --git a/lib/winston/logger.js b/lib/winston/logger.js
@@ -278,6 +278,13 @@ Logger.prototype.cli = function () {
   return this;
 };
 
+//
+// ### @private function _onError (transport, err)
+// #### @transport {Object} Transport on which the error occured
+// #### @err {Error} Error that occurred on the transport
+// Bubbles the error, `err`, that occured on the specified `transport`
+// up from this instance if `emitErrs` has been set.
+//
 Logger.prototype._onError = function (transport, err) {
   if (self.emitErrs) {
     self.emit('error', err, transport);

diff --git a/package.json b/package.json
@@ -13,7 +13,6 @@
   },
   "keywords": ["logging", "sysadmin", "tools"],
   "dependencies": {
-    "async": "0.1.x",
     "colors": "0.x.x",
     "eyes": "0.1.x",
     "loggly": "0.3.x",

diff --git a/test/cli-test.js b/test/cli-test.js
@@ -6,12 +6,10 @@
  *
  */
 
-require.paths.unshift(require('path').join(__dirname, '..', 'lib'));
-
 var path = require('path'),
     vows = require('vows'),
     assert = require('assert'),
-    winston = require('winston'),
+    winston = require('../lib/winston'),
     helpers = require('./helpers');
 
 vows.describe('winston/logger/cli').addBatch({

diff --git a/test/console-test.js b/test/console-test.js
@@ -6,12 +6,10 @@
  *
  */
 
-require.paths.unshift(require('path').join(__dirname, '..', 'lib'));
-
 var path = require('path'),
     vows = require('vows'),
     assert = require('assert'),
-    winston = require('winston'),
+    winston = require('../lib/winston'),
     helpers = require('./helpers');
 
 var npmTransport = new (winston.transports.Console)(),

diff --git a/test/file-maxsize-test.js b/test/file-maxsize-test.js
@@ -6,14 +6,12 @@
  *
  */
 
-require.paths.unshift(require('path').join(__dirname, '..', 'lib'));
-
 var assert = require('assert'),
     exec = require('child_process').exec,
     fs = require('fs'),
     path = require('path'),
     vows = require('vows'),
-    winston = require('winston'),
+    winston = require('../lib/winston'),
     helpers = require('./helpers');
 
 var maxsizeTransport = new winston.transports.File({

diff --git a/test/file-test.js b/test/file-test.js
@@ -6,13 +6,11 @@
  *
  */
 
-require.paths.unshift(require('path').join(__dirname, '..', 'lib'));
-
 var path = require('path'),
     vows = require('vows'),
     fs = require('fs'),
     assert = require('assert'),
-    winston = require('winston'),
+    winston = require('../lib/winston'),
     helpers = require('./helpers');
 
 var stream = fs.createWriteStream(path.join(__dirname, 'fixtures', 'testfile.log')),

diff --git a/test/helpers.js b/test/helpers.js
@@ -6,14 +6,12 @@
  *
  */
 
-require.paths.unshift(require('path').join(__dirname, '..', 'lib'));
-
 var fs = require('fs'),
     util = require('util'),
     path = require('path'),
     vows = require('vows'),
     assert = require('assert'),
-    winston = require('winston'),
+    winston = require('../lib/winston'),
     loggly = require('loggly')
 
 var helpers = exports;

diff --git a/test/logger-test.js b/test/logger-test.js
@@ -6,12 +6,10 @@
  *
  */
 
-require.paths.unshift(require('path').join(__dirname, '..', 'lib'));
-
 var path = require('path'),
     vows = require('vows'),
     assert = require('assert'),
-    winston = require('winston'),
+    winston = require('../lib/winston'),
     helpers = require('./helpers');
 
 vows.describe('winton/logger').addBatch({

diff --git a/test/loggly-test.js b/test/loggly-test.js
@@ -6,12 +6,10 @@
  *
  */
 
-require.paths.unshift(require('path').join(__dirname, '..', 'lib'));
-
 var path = require('path'),
     vows = require('vows'),
     assert = require('assert'),
-    winston = require('winston'),
+    winston = require('../lib/winston'),
     helpers = require('./helpers');
 
 var config = helpers.loadConfig(),

diff --git a/test/webhook-test.js b/test/webhook-test.js
@@ -6,14 +6,12 @@
  *
  */
 
-require.paths.unshift(require('path').join(__dirname, '..', 'lib'));
-
 var path = require('path'),
     vows = require('vows'),
     fs = require('fs'),
     http = require('http'),
     assert = require('assert'),
-    winston = require('winston'),
+    winston = require('../lib/winston'),
     helpers = require('./helpers');
 
 var webhookTransport = new (winston.transports.Webhook)({ 

diff --git a/test/winston-test.js b/test/winston-test.js
@@ -6,14 +6,12 @@
  *
  */
 
-require.paths.unshift(require('path').join(__dirname, '..', 'lib'));
-
 var fs = require('fs'),
     path = require('path'),
     vows = require('vows'),
     http = require('http'),
     assert = require('assert'),
-    winston = require('winston'),
+    winston = require('../lib/winston'),
     helpers = require('./helpers');
 
 vows.describe('winston').addBatch({