Merge remote-tracking branch 'origin/master' into feature/nicedocs

Conflicts:
	lib/Core.ts
	lib/Model.ts

CHANGELOG.md

@@ -1,10 +1,44 @@
 
-## [Working Changes](https://github.com/sierrasoftworks/iridium)
+## [v5.10.0](https://github.com/sierrasoftworks/iridium/tree/v5.10.0)
+- [375494a](https://github.com/sierrasoftworks/iridium/commit/375494a) Version 5.10.0
+- [09bfb53](https://github.com/sierrasoftworks/iridium/commit/09bfb53) (origin/master, origin/HEAD) Make use of arrow functions in Core (Closes [#16](https://github.com/sierrasoftworks/iridium/issues/16))
+- [d565312](https://github.com/sierrasoftworks/iridium/commit/d565312) Include compiled fix from 5.9.2
+- [f7f9db1](https://github.com/sierrasoftworks/iridium/commit/f7f9db1) Make core.connect async-safe (Fixes #15)
+- [0697117](https://github.com/sierrasoftworks/iridium/commit/0697117) Updated CHANGELOG
+
+## [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) (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) 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
+- [5f326fd](https://github.com/sierrasoftworks/iridium/commit/5f326fd) Clean up the references.d.ts file before bumping the version
+- [445ebb6](https://github.com/sierrasoftworks/iridium/commit/445ebb6) Added support and tests for the MongoDB aggregate operation
+- [f5926ce](https://github.com/sierrasoftworks/iridium/commit/f5926ce) Updated CHANGELOG
+
+## [v5.8.0](https://github.com/sierrasoftworks/iridium/tree/v5.8.0)
+- [ab6904e](https://github.com/sierrasoftworks/iridium/commit/ab6904e) Version 5.8.0
+- [625397d](https://github.com/sierrasoftworks/iridium/commit/625397d) Added support and tests for a toObjectID helper method
+- [4ebd33d](https://github.com/sierrasoftworks/iridium/commit/4ebd33d) Updated CHANGELOG
+
+## [v5.7.5](https://github.com/sierrasoftworks/iridium/tree/v5.7.5)
 - [b5cb543](https://github.com/sierrasoftworks/iridium/commit/b5cb543) Version 5.7.5
 - [ff0e292](https://github.com/sierrasoftworks/iridium/commit/ff0e292) Show release branch badges
 - [fe2e60a](https://github.com/sierrasoftworks/iridium/commit/fe2e60a) Fixed behaviour of Omnom when unsetting properties
 - [228f7ce](https://github.com/sierrasoftworks/iridium/commit/228f7ce) Added Omnom tests for $unset
-- [2e27c23](https://github.com/sierrasoftworks/iridium/commit/2e27c23) (origin/master, origin/HEAD) Added a contribution information file
+- [2e27c23](https://github.com/sierrasoftworks/iridium/commit/2e27c23) Added a contribution information file
 - [e360587](https://github.com/sierrasoftworks/iridium/commit/e360587) Updated CHANGELOG
 
 ## [v5.7.4](https://github.com/sierrasoftworks/iridium/tree/v5.7.4)
@@ -47,7 +81,7 @@
 ## [v5.5.5](https://github.com/sierrasoftworks/iridium/tree/5.5.5)
 - [0a71f20](https://github.com/sierrasoftworks/iridium/commit/0a71f20) Version 5.5.5
 - [6de8a3f](https://github.com/sierrasoftworks/iridium/commit/6de8a3f) Merge branch 'master' into release
-- [a98752e](https://github.com/sierrasoftworks/iridium/commit/a98752e) Automatically prep _references.d.ts during publish (Fixes [#11](https://github.com/sierrasoftworks/iridium/issues/11))
+- [a98752e](https://github.com/sierrasoftworks/iridium/commit/a98752e) Automatically prep _references.d.ts during publish (Fixes #11)
 
 ## [v5.6.0](https://github.com/sierrasoftworks/iridium/tree/5.6.0)
 - [95dec95](https://github.com/sierrasoftworks/iridium/commit/95dec95) Version 5.6.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('.')));
 	});

build/version.js

@@ -14,11 +14,11 @@ function getPackageJsonVersion() {
 
 gulp.task('version-bump', function () {
     var args = minimist(process.argv);
-    
+
     var options = {};
     if (semver.valid(args.version)) options.version = args.version;
     else options.type = args.version;
-    
+
     return gulp.src(['./package.json'])
         .pipe(bump(options).on('error', gutil.log))
         .pipe(gulp.dest('./'));
@@ -45,6 +45,7 @@ gulp.task('version-push-tags', function (cb) {
 
 gulp.task('version', function (callback) {
     runSequence(
+        'postpublish',
         'version-bump',
         'version-commit',
         'version-tag',