From db937576bde4d31726e92955cbc3d5baf2254fac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Ma=C5=82ecki?= Date: Tue, 20 Dec 2011 00:13:51 +0100 Subject: [PATCH 1/3] Use `npm` to install `nodeunit` and `rimraf` Remove submodules, change paths when requiring these modules and fix errors in `test/index.js`. --- .gitmodules | 6 ------ package.json | 4 ++++ test/convenience-repo.js | 2 +- test/index.js | 13 ++++++------- test/raw-blob.js | 2 +- test/raw-commit.js | 2 +- test/raw-error.js | 2 +- test/raw-object.js | 2 +- test/raw-oid.js | 2 +- test/raw-reference.js | 2 +- test/raw-repo.js | 2 +- test/raw-revwalk.js | 2 +- vendor/nodeunit | 1 - vendor/rimraf | 1 - 14 files changed, 19 insertions(+), 24 deletions(-) delete mode 160000 vendor/nodeunit delete mode 160000 vendor/rimraf diff --git a/.gitmodules b/.gitmodules index 007c6113b..f3a63f3f0 100644 --- 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 index ba067563d..22c628de3 100644 --- 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 index 782085adc..a7d44e2ff 100644 --- 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 index 7712e11f6..0b86fd259 100644 --- 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 index dd927bf9d..eab916974 100644 --- 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 index 60a3e1d9d..e1a3c23a6 100644 --- 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 index ff57bec5c..6e6af594c 100644 --- 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 index 5427334c6..1d0b045ff 100644 --- 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 index 9e7074981..7cd7fac0b 100644 --- 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 index 14a7f203c..08b003979 100644 --- 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 index 9e6460f44..20fc927d3 100644 --- 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 index 702d7e4ba..4e7ef0f3b 100644 --- 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 deleted file mode 160000 index 1f2038189..000000000 --- a/vendor/nodeunit +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1f203818990be48e327c95f067301a6b713eb812 diff --git a/vendor/rimraf b/vendor/rimraf deleted file mode 160000 index 7e9818fcc..000000000 --- a/vendor/rimraf +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7e9818fcc9eb7a967731d8e84b062375c5221621 From 9b837768c7421d0af1ec63954a2ede37194269ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Ma=C5=82ecki?= Date: Tue, 20 Dec 2011 00:23:31 +0100 Subject: [PATCH 2/3] Use `npm test` for running tests --- Makefile | 3 --- package.json | 3 ++- test/index.js | 58 --------------------------------------------------- 3 files changed, 2 insertions(+), 62 deletions(-) delete mode 100644 test/index.js diff --git a/Makefile b/Makefile index 4207da976..048feaeaa 100644 --- a/Makefile +++ b/Makefile @@ -41,9 +41,6 @@ clean: @@rm -rf $(BASE)/build/ @@rm -rf $(BASE)/vendor/libgit2/build/ -test: - @@$(NODE_JS) $(BASE)/test/index.js test - lint: @@$(NODE_JS) $(BASE)/util/hint-check.js diff --git a/package.json b/package.json index 22c628de3..aab2939ee 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,7 @@ }, "scripts": { "preinstall": "./configure", - "install": "make" + "install": "make", + "test": "cd test && nodeunit *.js" } } diff --git a/test/index.js b/test/index.js deleted file mode 100644 index 0b86fd259..000000000 --- a/test/index.js +++ /dev/null @@ -1,58 +0,0 @@ - -try { - var reporter = require('nodeunit').reporters['default']; -} -catch( e ) { - var sys = require( 'util' ); - sys.puts( 'Cannot find nodeunit module.' ); - sys.puts( 'You can install it by running:'); - sys.puts( '' ); - sys.puts( ' npm install'); - sys.puts( '' ); - process.exit(); -} - -try { - var rimraf = require('rimraf'); -} -catch(e) { - var sys = require( 'util' ); - sys.puts( 'Cannot find rimraf module.' ); - sys.puts( 'You can install it by running:'); - sys.puts( '' ); - sys.puts( ' npm install'); - sys.puts( '' ); - process.exit(); -} - -process.chdir( './test' ); -reporter.run( - [ - // Raw API - 'raw-blob.js' - , 'raw-commit.js' - , 'raw-error.js' - , 'raw-object.js' - , 'raw-oid.js' - , 'raw-reference.js' - , 'raw-repo.js' - , 'raw-revwalk.js' - // Sig - // Tree - // Tree Entry - // Util - - // Convenience API - , 'convenience-repo.js' - // Blob - // Commit - // Error - // Obj - // Oid - // Ref - // RevWalk - // Sig - // Tree - // TreeEntry - ] -); From 9e53319831898ca7fe4f523021f8acc2979898d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Ma=C5=82ecki?= Date: Tue, 20 Dec 2011 00:24:20 +0100 Subject: [PATCH 3/3] Add `node_modules` to `.gitignore` --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index c85f3e820..da0fdf8dd 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ build doc !doc/Theme.css example/stress/test +node_modules