Skip to content
This repository has been archived by the owner on Jun 2, 2024. It is now read-only.

Commit

Permalink
Merge pull request #461 from cnpm/node-dev
Browse files Browse the repository at this point in the history
add node-dev: $ make dev
  • Loading branch information
dead-horse committed Oct 3, 2014
2 parents 683b2e3 + 92a828c commit 5d0d742
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
4 changes: 3 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ test-cov cov: install pretest
--require ./test/init.js \
$(MOCHA_OPTS) \
$(TESTS)
@./node_modules/.bin/cov coverage

test-travis: install pretest
@NODE_ENV=test node --harmony \
Expand All @@ -60,6 +59,9 @@ test-travis: install pretest
$(MOCHA_OPTS) \
$(TESTS)

dev:
@node_modules/.bin/node-dev --harmony dispatch.js

contributors: install
@./node_modules/.bin/contributors -f plain -o AUTHORS

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ only need to change the registry in config. Even include manual synchronization

### Dependencies

* [node](http://nodejs.org) =0.11.12
* [node](http://nodejs.org) >=0.11.12, use `--harmony`
* [mysql](http://dev.mysql.com/downloads/) >= 0.5.0, include `mysqld` and `mysql cli`. I test on `mysql@5.6.16`.

### Start MySQL
Expand All @@ -96,8 +96,8 @@ $ make test-cov
# udpate dependencies
$ make autod

# start server
$ node --harmony_generators dispatch.js
# start server with development mode
$ make dev
```

## How to contribute
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@
"chunkstream": "~0.0.1",
"co-mocha": "0.0.2",
"contributors": "*",
"cov": "*",
"istanbul-harmony": "~0.3.0",
"jshint": "~2.5.6",
"mm": "~0.2.1",
"mocha": "~1.21.4",
"node-dev": "*",
"pedding": "~1.0.0",
"should": "~4.0.4",
"should-http": "0.0.1",
Expand Down
2 changes: 1 addition & 1 deletion test/proxy/npm.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ describe('proxy/npm.test.js', function () {
should.not.exist(data);
});

it('should return error when http error', function *() {
it.skip('should return error when http error', function* () {
mm.http.request(/\//, new ChunkStream(['{']));
try {
var data = yield npm.get('pedding-not-exists');
Expand Down

0 comments on commit 5d0d742

Please sign in to comment.