Use npm to install nodeunit and rimraf

mmalecki · mmalecki · commit db937576bde4 · 2011-12-20T17:27:33.000+01:00
Remove submodules, change paths when requiring these modules and fix
errors in `test/index.js`.
diff --git a/.gitmodules b/.gitmodules
@@ -1,9 +1,3 @@
-[submodule "vendor/nodeunit"]
-	path = vendor/nodeunit
-	url = git://github.com/caolan/nodeunit.git
-[submodule "vendor/rimraf"]
-	path = vendor/rimraf
-	url = git://github.com/isaacs/rimraf.git
 [submodule "vendor/libgit2"]
 	path = vendor/libgit2
 	url = git://github.com/libgit2/libgit2.git
diff --git a/package.json b/package.json
@@ -16,6 +16,10 @@
   "engines": {
     "node": "~0.6"
   },
+  "devDependencies": {
+    "nodeunit": "0.6.x",
+    "rimraf": "1.0.x"
+  },
   "scripts": {
     "preinstall": "./configure",
     "install": "make"
diff --git a/test/convenience-repo.js b/test/convenience-repo.js
@@ -1,5 +1,5 @@
 var git = require( "../" );
-var rimraf = require( "../vendor/rimraf");
+var rimraf = require("rimraf");
 var fs = require( "fs" );
 
 // Helper functions
diff --git a/test/index.js b/test/index.js
@@ -1,27 +1,26 @@
 
 try {
-  var reporter = require( '../vendor/nodeunit' ).reporters['default'];
+  var reporter = require('nodeunit').reporters['default'];
 }
 catch( e ) {
   var sys = require( 'util' );
   sys.puts( 'Cannot find nodeunit module.' );
-  sys.puts( 'You can download submodules for this project by doing:' );
+  sys.puts( 'You can install it by running:');
   sys.puts( '' );
-  sys.puts( '    git submodule update --init' );
+  sys.puts( '    npm install');
   sys.puts( '' );
   process.exit();
 }
 
 try {
-  var rimraf = require( '../vendor/rimraf' );
+  var rimraf = require('rimraf');
 }
 catch(e) {
   var sys = require( 'util' );
   sys.puts( 'Cannot find rimraf module.' );
-  sys.puts( 'You can download submodules for this project by doing:' );
+  sys.puts( 'You can install it by running:');
   sys.puts( '' );
-  sys.puts( '    git submodule init vendor/rimraf' );
-  sys.puts( '    git submodule update vendor/rimraf' );
+  sys.puts( '    npm install');
   sys.puts( '' );
   process.exit();
 }
diff --git a/test/raw-blob.js b/test/raw-blob.js
@@ -1,6 +1,6 @@
 var git = require( '../' ).raw
   , path = require( 'path' )
-  , rimraf = require( '../vendor/rimraf' );
+  , rimraf = require('rimraf');
 
 var testRepo = new git.Repo();
 
diff --git a/test/raw-commit.js b/test/raw-commit.js
@@ -1,5 +1,5 @@
 var git = require( '../' ).raw,
-    rimraf = require( '../vendor/rimraf' ) || require( 'rimraf' ),
+    rimraf = require( 'rimraf' ),
     path = require( 'path' );
 
 var testRepo = new git.Repo();
diff --git a/test/raw-error.js b/test/raw-error.js
@@ -1,5 +1,5 @@
 var git = require( '../' ).raw,
-    rimraf = require( '../vendor/rimraf' ) || require( 'rimraf' );
+    rimraf = require('rimraf');
 
 // Helper functions
 var helper = {
diff --git a/test/raw-object.js b/test/raw-object.js
@@ -1,5 +1,5 @@
 var git = require( '../' ).raw,
-    rimraf = require( '../vendor/rimraf' );
+    rimraf = require('rimraf');
 
 // Helper functions
 var helper = {
diff --git a/test/raw-oid.js b/test/raw-oid.js
@@ -1,5 +1,5 @@
 var git = require( '../' ).raw,
-    rimraf = require( '../vendor/rimraf' );
+    rimraf = require('rimraf');
 
 // Helper functions
 var helper = {
diff --git a/test/raw-reference.js b/test/raw-reference.js
@@ -1,5 +1,5 @@
 var git = require( '../' ).raw,
-    rimraf = require( '../vendor/rimraf' );
+    rimraf = require('rimraf');
 
 // Helper functions
 var helper = {
diff --git a/test/raw-repo.js b/test/raw-repo.js
@@ -1,5 +1,5 @@
 var git = require( '../' ).raw,
-    rimraf = require( '../vendor/rimraf' ) || require( 'rimraf' ),
+    rimraf = require('rimraf'),
     path = require( 'path' ),
     fs = require( 'fs' );
 
diff --git a/test/raw-revwalk.js b/test/raw-revwalk.js
@@ -1,5 +1,5 @@
 var git = require( '../' ).raw,
-    rimraf = require( '../vendor/rimraf' ) || require( 'rimraf' );
+    rimraf = require('rimraf');
 
 var testRepo = new git.Repo();
 
diff --git a/vendor/nodeunit b/vendor/nodeunit
diff --git a/vendor/rimraf b/vendor/rimraf
