Merge branch 'master' into release

CHANGELOG.md

@@ -1,9 +1,19 @@
 
-## [Working Changes](https://github.com/sierrasoftworks/iridium)
+## [v5.9.2](https://github.com/sierrasoftworks/iridium/tree/v5.9.2)
+- [2438155](https://github.com/sierrasoftworks/iridium/commit/2438155) Version 5.9.2
+- [b2cb440](https://github.com/sierrasoftworks/iridium/commit/b2cb440) Fix for a strange set of behaviour with the last release
+- [b9c13fb](https://github.com/sierrasoftworks/iridium/commit/b9c13fb) Updated changelog generation
+- [f656174](https://github.com/sierrasoftworks/iridium/commit/f656174) Revert "Switch to Travis-CI container infrastucture"
+- [5261ea0](https://github.com/sierrasoftworks/iridium/commit/5261ea0) Revert "Updated travis config to use MongoDB precise (3.x)"
+- [cefc0f4](https://github.com/sierrasoftworks/iridium/commit/cefc0f4) (origin/master, origin/HEAD, infrastructure/travisci-containers) Updated travis config to use MongoDB precise (3.x)
+- [d11c8f3](https://github.com/sierrasoftworks/iridium/commit/d11c8f3) Switch to Travis-CI container infrastucture
+- [5a2dc37](https://github.com/sierrasoftworks/iridium/commit/5a2dc37) Updated CHANGELOG
+
+## [v5.9.1](https://github.com/sierrasoftworks/iridium/tree/v5.9.1)
 - [4efcdf1](https://github.com/sierrasoftworks/iridium/commit/4efcdf1) Version 5.9.1
 - [1e8bb04](https://github.com/sierrasoftworks/iridium/commit/1e8bb04) Added an extra Onmom test
 - [179516c](https://github.com/sierrasoftworks/iridium/commit/179516c) Added additional error information for instance updates
-- [465cc85](https://github.com/sierrasoftworks/iridium/commit/465cc85) (origin/master, origin/HEAD) Updated CHANGELOG
+- [465cc85](https://github.com/sierrasoftworks/iridium/commit/465cc85) Updated CHANGELOG
 
 ## [v5.9.0](https://github.com/sierrasoftworks/iridium/tree/v5.9.0)
 - [431bb0b](https://github.com/sierrasoftworks/iridium/commit/431bb0b) Version 5.9.0

build/changelog.js

@@ -3,26 +3,26 @@ var gulp = require('gulp'),
 	git = require('gulp-git'),
 	replace = require('gulp-replace'),
 	path = require('path');
-	
+
 var repo = require('../package.json').repository.url;
-	
+
 gulp.task('changelog', function(done) {
 	git.exec({ args: 'log --oneline --decorate' }, function(err, stdout) {
 		if(err) return done(err);
 		return done(null, gulp.src('CHANGELOG.md')
 			.pipe(replace(/.|\n/g, ''))
 			.pipe(replace(/$/, stdout))
 			.pipe(replace(/#(\d+)/, '[#$1](' + repo + '/issues/$1)'))
-			.pipe(replace(/([a-f0-9]{7}) \(HEAD[^)]*\) (.+)/g, function(_, sha, comment) {
-				return '\n## [Working Changes](' + repo + ')' +
-					'\n- [' + sha + '](' + repo + '/commit/' + sha + ') ' + comment;
-			}))
-			.pipe(replace(/([a-f0-9]{7}) \(tag: ([^\s),]*)[^)]*\) (.+)/g, function(_, sha, tag, comment) {
+			.pipe(replace(/([a-f0-9]{7}) \((?:HEAD, )?tag: ([^\s),]*)[^)]*\) (.+)/g, function(_, sha, tag, comment) {
 				var niceTag = tag;
 				if(tag.indexOf('v') !== 0) niceTag = 'v' + tag;
 				return '\n## [' + niceTag + '](' + repo + '/tree/' + tag + ')' +
 					'\n- [' + sha + '](' + repo + '/commit/' + sha + ') ' + comment;
 			}))
+			.pipe(replace(/([a-f0-9]{7}) \(HEAD[^)]*\) (.+)/g, function(_, sha, comment) {
+				return '\n## [Working Changes](' + repo + ')' +
+					'\n- [' + sha + '](' + repo + '/commit/' + sha + ') ' + comment;
+			}))
 			.pipe(replace(/([a-f0-9]{7}) (.+)/g, '- [$1](' + repo + '/commit/$1) $2'))
 			.pipe(gulp.dest('.')));
 	});

lib/Instance.ts

@@ -159,7 +159,7 @@ export default class Instance<TDocument extends { _id?: any }, TInstance> {
                     });
                 });
             }
-        }, err => {
+        }).catch(err => {
             err['original'] = this._original;
             err['modified'] = this._modified;
             return Bluebird.reject(err);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "iridium",
-  "version": "5.9.1",
+  "version": "5.9.2",
   "author": "Benjamin Pannell <[email protected]>",
   "description": "A custom lightweight ORM for MongoDB designed for power-users",
   "license": "MIT",