diff --git a/.gitignore b/.gitignore index c676de0..417e97f 100644 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,7 @@ node_modules npm-debug.log coverage +/chai.js test/auth/* !test/auth/.gitkeep diff --git a/History.md b/History.md index fbb6dce..ae4d323 100644 --- a/History.md +++ b/History.md @@ -1,3 +1,10 @@ +### Note + +As of 3.0.0, the History.md file has been deprecated. [Please refer to the full +commit logs available on GitHub](https://github.com/chaijs/chai/commits/master). + +--- + 2.3.0 / 2015-04-26 ================== diff --git a/Makefile b/Makefile index e8ce5d7..40a2367 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,31 @@ all: chai.js chai.js: node_modules lib/* @printf "==> [Browser :: build]\n" - @./node_modules/.bin/browserify --bare --outfile chai.js --standalone chai --entry index.js + @./node_modules/.bin/browserify \ + --bare \ + --outfile chai.js \ + --standalone chai \ + --entry index.js + +# +# Release Task +# + +define release + ./node_modules/.bin/bump -y --$(1) *.json lib/chai.js + make chai.js + git add --force chai.js package.json + npm ls --depth=-1 --long . --loglevel silent | head -1 | git commit -F- +endef + +release-patch: + @$(call release,patch) + +release-minor: + @$(call release,minor) + +release-major: + @$(call release,major) # # Node Module @@ -79,3 +103,4 @@ clean-cov: .PHONY: all .PHONY: test test-all test-node test-phantom test-sauce test-cov .PHONY: clean clean-node clean-browser clean-cov +.PHONY: release-patch release-minor release-major diff --git a/README.md b/README.md index 8a12c40..af38635 100644 --- a/README.md +++ b/README.md @@ -28,89 +28,22 @@ Chai offers a robust Plugin architecture for extending Chai's assertions and int - [chaijs / assertion-error](https://github.com/chaijs/assertion-error): Custom `Error` constructor thrown upon an assertion failing. - [chaijs / deep-eql](https://github.com/chaijs/deep-eql): Improved deep equality testing for Node.js and the browser. +- [chaijs / type-detect](https://github.com/chaijs/type-detect): Improved typeof detection for node.js and the browser. ### Contributors - project : chai - repo age : 3 years, 5 months - active : 244 days - commits : 900 - files : 59 - authors : - 555 Jake Luer 61.7% - 79 Veselin Todorov 8.8% - 52 Keith Cirkel 5.8% - 43 Domenic Denicola 4.8% - 14 Joshua Perry 1.6% - 8 Chris Polis 0.9% - 6 Ruben Verborgh 0.7% - 6 Ian Zamojc 0.7% - 5 George Kats 0.6% - 5 leider 0.6% - 5 Scott Nonnenberg 0.6% - 5 Juliusz Gonera 0.6% - 5 Jo Liss 0.6% - 4 Jérémie Astori 0.4% - 4 John Firebaugh 0.4% - 4 charlierudolph 0.4% - 4 Veselin 0.4% - 4 Chris Jones 0.4% - 4 Nick Heiner 0.4% - 4 Max Edmands 0.4% - 4 David da Silva 0.4% - 4 Kaito Udagawa 0.4% - 4 josher19 0.4% - 3 Jordan Harband 0.3% - 3 Ryunosuke SATO 0.3% - 3 Jake Rosoman 0.3% - 3 Duncan Beevers 0.3% - 3 Jason Karns 0.3% - 3 Jeff Barczewski 0.3% - 3 Andrei Neculau 0.3% - 2 eldritch fossicker 0.2% - 2 Bartvds 0.2% - 2 Edwin Shao 0.2% - 2 Gregg Lind 0.2% - 2 Jakub Nešetřil 0.2% - 2 Roman Masek 0.2% - 2 Teddy Cross 0.2% - 1 Jesse McCarthy 0.1% - 1 Doug Neiner 0.1% - 1 Dido Arellano 0.1% - 1 Kilian Ciuffolo 0.1% - 1 Luís Cardoso 0.1% - 1 Martin Middel 0.1% - 1 Mathias Schreck 0.1% - 1 Danilo Vaz 0.1% - 1 Michael Lange 0.1% - 1 Mitchell Johnson 0.1% - 1 DD 0.1% - 1 Niklas Närhinen 0.1% - 1 Paul Miller 0.1% - 1 Refael Ackermann 0.1% - 1 shinnn 0.1% - 1 Chun-Yi 0.1% - 1 Christopher Hiller 0.1% - 1 Sasha Koss 0.1% - 1 Chris Thompson 0.1% - 1 toastynerd 0.1% - 1 Chris Connelly 0.1% - 1 Chasen Le Hara 0.1% - 1 Victor Costan 0.1% - 1 Vinay Pulim 0.1% - 1 Virginie BARDALES 0.1% - 1 Vlad GURDIGA 0.1% - 1 Brandon Payton 0.1% - 1 Adam Hull 0.1% - 1 ericdouglas 0.1% - 1 Benjamin Horsleben 0.1% - 1 laconbass 0.1% - 1 Anand Patil 0.1% - 1 mohayonao 0.1% - 1 piecioshka 0.1% - 1 root 0.1% - 1 Julien Wajsberg 0.1% - 1 Jeff Welch 0.1% +Please see the full +[Contributors Graph](https://github.com/chaijs/chai/graphs/contributors) for our +list of contributors. + +### Core Contributors + +Feel free to reach out to any of the core-contributors with you questions or +concerns. We will do our best to respond in a timely manner. + +[![Jake Luer](https://avatars3.githubusercontent.com/u/58988?v=3&s=50)](https://github.com/logicalparadox) +[![Veselin Todorov](https://avatars3.githubusercontent.com/u/330048?v=3&s=50)](https://github.com/vesln) +[![Keith Cirkel](https://avatars3.githubusercontent.com/u/118266?v=3&s=50)](https://github.com/keithamus) ## License diff --git a/ReleaseNotes.md b/ReleaseNotes.md index 28f2c88..2a80d5c 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -1,5 +1,12 @@ # Release Notes +## Note + +As of 3.0.0, the ReleaseNotes.md file has been deprecated. [Please refer to the release notes available on Github](https://github.com/chaijs/chai/releases). Or +[the release notes on the chaijs.com website](https://chaijs.com/releases). + +--- + ## 2.3.0 / 2015-04-26 Added `ownPropertyDescriptor` assertion: diff --git a/package.json b/package.json index bd8f8fb..37aa3f5 100644 --- a/package.json +++ b/package.json @@ -33,18 +33,19 @@ "node": ">= 0.4.0" }, "dependencies": { - "assertion-error": "1.0.1", - "deep-eql": "0.1.3", - "type-detect": "1.0.0" + "assertion-error": "^1.0.1", + "deep-eql": "^0.1.3", + "type-detect": "^1.0.0" }, "devDependencies": { - "browserify": "10.2.1", - "karma": "0.12.x", - "karma-mocha": "*", - "karma-sauce-launcher": "0.2.x", - "karma-phantomjs-launcher": "0.1.1", - "karma-firefox-launcher": "^0.1.4", - "mocha": "1.21.x", - "istanbul": "0.2.x" + "browserify": "^10.2.1", + "bump-cli": "^1.1.3", + "karma": "^0.12.0", + "karma-mocha": "^0.1.10", + "karma-sauce-launcher": "^0.2.11", + "karma-phantomjs-launcher": "^0.2.0", + "karma-firefox-launcher": "^0.1.6", + "mocha": "^2.2.5", + "istanbul": "^0.3.14" } }