fix(gen-docs): require files without touching PATH

vojtajina · IgorMinar · commit 8978e066b5f7 · 2011-10-18T22:23:52.000-07:00
So that it works on latest revision of node...
New version of Node (v0.5.x) does not support require.paths.push().
diff --git a/docs/spec/domSpec.js b/docs/spec/domSpec.js
@@ -1,4 +1,4 @@
-var DOM = require('dom.js').DOM;
+var DOM = require('../src/dom.js').DOM;
 
 describe('dom', function() {
   var dom;
diff --git a/docs/spec/ngdocSpec.js b/docs/spec/ngdocSpec.js
@@ -1,5 +1,5 @@
-var ngdoc = require('ngdoc.js');
-var DOM = require('dom.js').DOM;
+var ngdoc = require('../src/ngdoc.js');
+var DOM = require('../src/dom.js').DOM;
 
 describe('ngdoc', function() {
   var Doc = ngdoc.Doc;
diff --git a/docs/spec/sitemapSpec.js b/docs/spec/sitemapSpec.js
@@ -1,5 +1,5 @@
-var SiteMap = require('SiteMap.js').SiteMap;
-var Doc = require('ngdoc.js').Doc;
+var SiteMap = require('../src/SiteMap.js').SiteMap;
+var Doc = require('../src/ngdoc.js').Doc;
 
 
 describe('sitemap', function() {
diff --git a/docs/spec/specs.js b/docs/spec/specs.js
@@ -1,8 +1,6 @@
 if (global.jasmine) return;
 
-require.paths.push(__dirname + "/../../lib");
-require.paths.push(__dirname + '/../src');
-var jasmine = require('jasmine-1.0.1');
+var jasmine = require('../../lib/jasmine-1.0.1');
 var sys = require('util');
 
 for(var key in jasmine) {
diff --git a/docs/spec/writerSpec.js b/docs/spec/writerSpec.js
@@ -1,4 +1,4 @@
-var writer = require('writer.js');
+var writer = require('../src/writer.js');
 describe('writer', function() {
   describe('toString', function() {
     var toString = writer.toString;
diff --git a/docs/src/gen-docs.js b/docs/src/gen-docs.js
@@ -1,10 +1,8 @@
-require.paths.push(__dirname);
-require.paths.push('lib');
-var reader = require('reader.js'),
-    ngdoc = require('ngdoc.js'),
-    writer = require('writer.js'),
-    SiteMap = require('SiteMap.js').SiteMap,
-    appCache = require('appCache.js').appCache,
+var reader = require('./reader.js'),
+    ngdoc = require('./ngdoc.js'),
+    writer = require('./writer.js'),
+    SiteMap = require('./SiteMap.js').SiteMap,
+    appCache = require('./appCache.js').appCache,
     Q = require('qq');
 
 process.on('uncaughtException', function(err) {
diff --git a/docs/src/ngdoc.js b/docs/src/ngdoc.js
@@ -2,9 +2,9 @@
  * All parsing/transformation code goes here. All code here should be sync to ease testing.
  */
 
-var Showdown = require('showdown').Showdown;
-var DOM = require('dom.js').DOM;
-var htmlEscape = require('dom.js').htmlEscape;
+var Showdown = require('../../lib/showdown').Showdown;
+var DOM = require('./dom.js').DOM;
+var htmlEscape = require('./dom.js').htmlEscape;
 var NEW_LINE = /\n\r?/;
 
 exports.trim = trim;
diff --git a/docs/src/reader.js b/docs/src/reader.js
@@ -5,8 +5,7 @@
 
 exports.collect = collect;
 
-require.paths.push(__dirname);
-var ngdoc = require('ngdoc.js'),
+var ngdoc = require('./ngdoc.js'),
     Q = require('qq'),
     qfs = require('q-fs');
 
diff --git a/docs/src/writer.js b/docs/src/writer.js
@@ -2,7 +2,6 @@
  * All writing related code here. This is so that we can separate the async code from sync code
  * for testability
  */
-require.paths.push(__dirname);
 var qfs = require('q-fs');
 var Q = require('qq');
 var OUTPUT_DIR = "build/docs/";
diff --git a/gen_docs.sh b/gen_docs.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 if [ ! -e gen_docs.disable ]; then
-  jasmine-node docs/spec -i docs/src -i lib --noColor && node docs/src/gen-docs.js
+  jasmine-node docs/spec --noColor && node docs/src/gen-docs.js
 fi

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-var DOM = require('dom.js').DOM;`
	`1`	`+var DOM = require('../src/dom.js').DOM;`
`2`	`2`
`3`	`3`	`describe('dom', function() {`
`4`	`4`	`var dom;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-var writer = require('writer.js');`
	`1`	`+var writer = require('../src/writer.js');`
`2`	`2`	`describe('writer', function() {`
`3`	`3`	`describe('toString', function() {`
`4`	`4`	`var toString = writer.toString;`