Merge pull request #400 from chaijs/release-2.1.2

Release v2.1.2

Author: keithamus

History.md

@@ -1,3 +1,13 @@
+2.1.2 / 2015-03-15
+==================
+
+  * Merge pull request #396 from chaijs/add-keith-cirkel-contributing-md
+  * Add Keith Cirkel to CONTRIBUTING.md
+  * Merge pull request #395 from cjqed/386-assert-operator-no-eval
+  * No longer using eval on assert operator #386
+  * Merge pull request #389 from chaijs/update-git-summary
+  * Update `git summary` in README
+
 2.1.1 / 2015-03-04
 ==================
 

README.md

@@ -26,81 +26,81 @@ Chai offers a robust Plugin architecture for extending Chai's assertions and int
 
      project  : chai
      repo age : 3 years, 3 months
-     active   : 230 days
-     commits  : 872
+     active   : 232 days
+     commits  : 879
      files    : 59
      authors  :
-       554  Jake Luer           63.5%
-        79  Veselin Todorov     9.1%
+       555  Jake Luer           63.1%
+        79  Veselin Todorov     9.0%
         43  Domenic Denicola    4.9%
-        36  Keith Cirkel        4.1%
+        41  Keith Cirkel        4.7%
         14  Joshua Perry        1.6%
          8  Chris Polis         0.9%
          6  Ruben Verborgh      0.7%
          6  Ian Zamojc          0.7%
-         5  Jo Liss             0.6%
          5  leider              0.6%
+         5  George Kats         0.6%
          5  Scott Nonnenberg    0.6%
+         5  Jo Liss             0.6%
          5  Juliusz Gonera      0.6%
-         5  George Kats         0.6%
-         4  josher19            0.5%
-         4  John Firebaugh      0.5%
-         4  charlierudolph      0.5%
          4  Veselin             0.5%
-         4  Chris Jones         0.5%
          4  Nick Heiner         0.5%
-         4  Max Edmands         0.5%
          4  David da Silva      0.5%
-         3  Andrei Neculau      0.3%
-         3  Duncan Beevers      0.3%
+         4  Chris Jones         0.5%
+         4  josher19            0.5%
+         4  John Firebaugh      0.5%
+         4  Max Edmands         0.5%
+         4  charlierudolph      0.5%
          3  Ryunosuke SATO      0.3%
+         3  Jason Karns         0.3%
          3  Jeff Barczewski     0.3%
+         3  Andrei Neculau      0.3%
+         3  Duncan Beevers      0.3%
          3  Jake Rosoman        0.3%
-         3  Jason Karns         0.3%
          2  Teddy Cross         0.2%
          2  Bartvds             0.2%
          2  Edwin Shao          0.2%
          2  Gregg Lind          0.2%
-         2  Jakub Nešetřil      0.2%
-         2  Jérémie Astori      0.2%
          2  Roman Masek         0.2%
+         2  Jérémie Astori      0.2%
+         2  Jakub Nešetřil      0.2%
          2  eldritch fossicker  0.2%
-         1  Julien Wajsberg     0.1%
-         1  piecioshka          0.1%
+         1  Adam Hull           0.1%
+         1  toastynerd          0.1%
+         1  Anand Patil         0.1%
+         1  Benjamin Horsleben  0.1%
+         1  Brandon Payton      0.1%
+         1  Chasen Le Hara      0.1%
+         1  Chris Connelly      0.1%
+         1  Chris Thompson      0.1%
+         1  Christopher Hiller  0.1%
+         1  Chun-Yi             0.1%
+         1  DD                  0.1%
+         1  Danilo Vaz          0.1%
          1  Dido Arellano       0.1%
+         1  Doug Neiner         0.1%
+         1  Jeff Welch          0.1%
+         1  Jesse McCarthy      0.1%
+         1  Julien Wajsberg     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  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  Adam Hull           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  toastynerd          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  Jesse McCarthy      0.1%
-         1  Jeff Welch          0.1%
-         1  Doug Neiner         0.1%
-
+         1  piecioshka          0.1%
+         1  root                0.1%
+         1  shinnn              0.1%
 
 ## License
 

ReleaseNotes.md

@@ -1,5 +1,17 @@
 # Release Notes
 
+## 2.1.2 / 2015-03-15
+
+A minor bug fix. No new features.
+
+### Community Contributions
+
+#### Code Features & Fixes
+
+ * [#395](https://github.com/chaijs/chai/pull/395) Fix eval-related bugs with
+   assert.operator ([#386](https://github.com/chaijs/chai/pull/386)).
+   By [@cjqed](https://github.com/cjqed)
+
 ## 2.1.1 / 2015-03-04
 
 Two minor bugfixes. No new features.

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "chai",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "description": "BDD/TDD assertion library for node.js and the browser. Test framework agnostic.",
   "license": "MIT",
   "keywords": [

chai.js

@@ -56,11 +56,11 @@ require.helper.semVerSort = function(a, b) {
 
 /**
  * Find and require a module which name starts with the provided name.
- * If multiple modules exists, the highest semver is used. 
+ * If multiple modules exists, the highest semver is used.
  * This function can only be used for remote dependencies.
 
  * @param {String} name - module name: `user~repo`
- * @param {Boolean} returnPath - returns the canonical require path if true, 
+ * @param {Boolean} returnPath - returns the canonical require path if true,
  *                               otherwise it returns the epxorted module
  */
 require.latest = function (name, returnPath) {
@@ -83,7 +83,7 @@ require.latest = function (name, returnPath) {
           semVerCandidates.push({version: version, name: moduleName});
         } else {
           otherCandidates.push({version: version, name: moduleName});
-        } 
+        }
     }
   }
   if (semVerCandidates.concat(otherCandidates).length === 0) {
@@ -678,7 +678,7 @@ var used = []
  * Chai version
  */
 
-exports.version = '2.1.1';
+exports.version = '2.1.2';
 
 /*!
  * Assertion Error
@@ -1045,7 +1045,7 @@ module.exports = function (chai, _) {
    * ### .any
    *
    * Sets the `any` flag, (opposite of the `all` flag)
-   * later used in the `keys` assertion. 
+   * later used in the `keys` assertion.
    *
    *     expect(foo).to.have.any.keys('bar', 'baz');
    *
@@ -1062,7 +1062,7 @@ module.exports = function (chai, _) {
   /**
    * ### .all
    *
-   * Sets the `all` flag (opposite of the `any` flag) 
+   * Sets the `all` flag (opposite of the `any` flag)
    * later used by the `keys` assertion.
    *
    *     expect(foo).to.have.all.keys('bar', 'baz');
@@ -1929,23 +1929,23 @@ module.exports = function (chai, _) {
    * ### .keys(key1, [key2], [...])
    *
    * Asserts that the target contains any or all of the passed-in keys.
-   * Use in combination with `any`, `all`, `contains`, or `have` will affect 
+   * Use in combination with `any`, `all`, `contains`, or `have` will affect
    * what will pass.
-   * 
-   * When used in conjunction with `any`, at least one key that is passed 
-   * in must exist in the target object. This is regardless whether or not 
+   *
+   * When used in conjunction with `any`, at least one key that is passed
+   * in must exist in the target object. This is regardless whether or not
    * the `have` or `contain` qualifiers are used. Note, either `any` or `all`
    * should be used in the assertion. If neither are used, the assertion is
    * defaulted to `all`.
-   * 
-   * When both `all` and `contain` are used, the target object must have at 
+   *
+   * When both `all` and `contain` are used, the target object must have at
    * least all of the passed-in keys but may have more keys not listed.
-   * 
+   *
    * When both `all` and `have` are used, the target object must both contain
    * all of the passed-in keys AND the number of keys in the target object must
-   * match the number of keys passed in (in other words, a target object must 
+   * match the number of keys passed in (in other words, a target object must
    * have all and only all of the passed-in keys).
-   * 
+   *
    *     expect({ foo: 1, bar: 2 }).to.have.any.keys('foo', 'baz');
    *     expect({ foo: 1, bar: 2 }).to.have.any.keys('foo');
    *     expect({ foo: 1, bar: 2 }).to.contain.any.keys('bar', 'baz');
@@ -4286,7 +4286,7 @@ var getPathInfo = require('chai/lib/chai/utils/getPathInfo.js');
 module.exports = function(path, obj) {
   var info = getPathInfo(path, obj);
   return info.value;
-}; 
+};
 
 });
 
@@ -4432,7 +4432,7 @@ var type = require('chai/lib/chai/utils/type.js');
  *     hasProperty('str', obj);  // true
  *     hasProperty('constructor', obj);  // true
  *     hasProperty('bar', obj);  // false
- *     
+ *
  *     hasProperty('length', obj.str); // true
  *     hasProperty(1, obj.str);  // true
  *     hasProperty(5, obj.str);  // false

component.json

@@ -1,7 +1,7 @@
 {
     "name": "chai"
   , "repo": "chaijs/chai"
-  , "version": "2.1.1"
+  , "version": "2.1.2"
   , "description": "BDD/TDD assertion library for node.js and the browser. Test framework agnostic."
   , "license": "MIT"
   , "keywords": [

lib/chai.js

@@ -11,7 +11,7 @@ var used = []
  * Chai version
  */
 
-exports.version = '2.1.1';
+exports.version = '2.1.2';
 
 /*!
  * Assertion Error

package.json

@@ -17,7 +17,7 @@
     "Veselin Todorov <hi@vesln.com>",
     "John Firebaugh <john.firebaugh@gmail.com>"
   ],
-  "version": "2.1.1",
+  "version": "2.1.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/chaijs/chai"