Merge branch 'master' into release

SierraSoftworks · Oct 7, 2015 · bc90974 · bc90974
2 parents 62a4ee1 + 00f135e
commit bc90974
Show file tree

Hide file tree

Showing 119 changed files with 417 additions and 468 deletions.
diff --git a/.settings/launch.json → .vscode/launch.json b/.settings/launch.json → .vscode/launch.json
diff --git a/.settings/tasks.json → .vscode/tasks.json b/.settings/tasks.json → .vscode/tasks.json
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,46 @@
 
+## [v6.0.0](https://github.com/sierrasoftworks/iridium/tree/v6.0.0)
+- [656c73d](https://github.com/sierrasoftworks/iridium/commit/656c73d) Version 6.0.0
+- [7e4c31f](https://github.com/sierrasoftworks/iridium/commit/7e4c31f) (origin/master, origin/HEAD) Updated CHANGELOG
+- [8fe5933](https://github.com/sierrasoftworks/iridium/commit/8fe5933) Updated documentation
+
+## [v6.0.0-alpha.2](https://github.com/sierrasoftworks/iridium/tree/v6.0.0-alpha.2)
+- [30c17cb](https://github.com/sierrasoftworks/iridium/commit/30c17cb) Version 6.0.0-alpha.2
+- [56bb772](https://github.com/sierrasoftworks/iridium/commit/56bb772) fix: Undefined reference to Skmatc in ModelHandlers
+- [44fc771](https://github.com/sierrasoftworks/iridium/commit/44fc771) test: Fix compilation of tests
+- [cfb92a9](https://github.com/sierrasoftworks/iridium/commit/cfb92a9) tweak: Updated typescript definition pointer in package.json
+- [92ae221](https://github.com/sierrasoftworks/iridium/commit/92ae221) refactor: Remove _references.d.ts file
+- [9d4f52b](https://github.com/sierrasoftworks/iridium/commit/9d4f52b) refactor: Update all skmatc references to use new dependency structure
+- [a020ffe](https://github.com/sierrasoftworks/iridium/commit/a020ffe) dep: Update skmatc to 1.1.4
+- [9370b18](https://github.com/sierrasoftworks/iridium/commit/9370b18) dep: Update skmatc to 1.1.3
+- [f35342b](https://github.com/sierrasoftworks/iridium/commit/f35342b) Updated documentation
+- [a19768c](https://github.com/sierrasoftworks/iridium/commit/a19768c) Updated CHANGELOG
+
+## [v6.0.0-alpha.1](https://github.com/sierrasoftworks/iridium/tree/v6.0.0-alpha.1)
+- [a8f4c01](https://github.com/sierrasoftworks/iridium/commit/a8f4c01) Version 6.0.0-alpha.1
+- [f7886b3](https://github.com/sierrasoftworks/iridium/commit/f7886b3) Version 6.0.0-alpha.1
+- [8ba693c](https://github.com/sierrasoftworks/iridium/commit/8ba693c) tweak: Gulp CI command includes build step
+- [bd728e1](https://github.com/sierrasoftworks/iridium/commit/bd728e1) tweak: Added multi option to update options
+- [3fe9ebc](https://github.com/sierrasoftworks/iridium/commit/3fe9ebc) build: Fix CI test command
+- [6b73bbe](https://github.com/sierrasoftworks/iridium/commit/6b73bbe) dist: Build latest version of Iridium
+- [14cc15e](https://github.com/sierrasoftworks/iridium/commit/14cc15e) fix: Remove hacky approach to dependency resolution
+- [6032286](https://github.com/sierrasoftworks/iridium/commit/6032286) feat: Add index.d.ts file for TypeScript 1.6
+- [aabb131](https://github.com/sierrasoftworks/iridium/commit/aabb131) refactor: Remove references file from all files
+- [ba6c01c](https://github.com/sierrasoftworks/iridium/commit/ba6c01c) dep: Updated dependencies to latest versions
+- [12b201b](https://github.com/sierrasoftworks/iridium/commit/12b201b) refactor: Fix definitelytyped reference for mongodb remove function
+- [b869541](https://github.com/sierrasoftworks/iridium/commit/b869541) test: Fix reference to _id for a number of instance tests
+- [aa34363](https://github.com/sierrasoftworks/iridium/commit/aa34363) build: Switch to tsconfig for all build tasks
+- [351deb3](https://github.com/sierrasoftworks/iridium/commit/351deb3) build: Set experimental decorators flag when building TS files
+- [78f5339](https://github.com/sierrasoftworks/iridium/commit/78f5339) env: Update to VSCode 0.8.0
+- [6d1278d](https://github.com/sierrasoftworks/iridium/commit/6d1278d) Updated documentation
+- [0ea880a](https://github.com/sierrasoftworks/iridium/commit/0ea880a) Updated CHANGELOG
+
 ## [v5.11.0](https://github.com/sierrasoftworks/iridium/tree/v5.11.0)
 - [bd475da](https://github.com/sierrasoftworks/iridium/commit/bd475da) Version 5.11.0
 - [ea2a7c8](https://github.com/sierrasoftworks/iridium/commit/ea2a7c8) Listed docs in README (Closes [#9](https://github.com/sierrasoftworks/iridium/issues/9))
 - [d806e89](https://github.com/sierrasoftworks/iridium/commit/d806e89) Updated documentation
 - [971a2b8](https://github.com/sierrasoftworks/iridium/commit/971a2b8) Added implementation and tests for core level connection hooks
-- [4b52136](https://github.com/sierrasoftworks/iridium/commit/4b52136) (origin/master, origin/HEAD) Updated documentation
+- [4b52136](https://github.com/sierrasoftworks/iridium/commit/4b52136) Updated documentation
 - [016263c](https://github.com/sierrasoftworks/iridium/commit/016263c) Updated CHANGELOG
 
 ## [v5.10.1](https://github.com/sierrasoftworks/iridium/tree/v5.10.1)

diff --git a/_references.d.ts b/_references.d.ts
diff --git a/build/build.js b/build/build.js
@@ -1,31 +1,33 @@
 var gulp       = require('gulp'),
 	typescript = require('gulp-typescript'),
 	sourcemaps = require('gulp-sourcemaps');
-	
+
 var paths = require('./paths');
-
-var tsProject = {
-	module: 'commonjs',
-	target: 'es5',
+
+var tsProjectLib = typescript.createProject('tsconfig.json', {
 	typescript: require('typescript')
-};
+});
+
+var tsProjectTest = typescript.createProject('test/tsconfig.json', {
+	typescript: require('typescript')
+});
 
 gulp.task('build', ['build-lib', 'build-tests']);
 
-function build(files) {
+function build(files, project) {
 	var tsResult = gulp.src(files, { base: paths.projectRoot })
 		.pipe(sourcemaps.init())
-		.pipe(typescript(tsProject));
-		
+		.pipe(typescript(project));
+
 	return tsResult.js
 		.pipe(sourcemaps.write('.'))
 		.pipe(gulp.dest(paths.distFolder));
 }
 
 gulp.task('build-lib', function () {
-	return build(paths.buildFiles);
+	return build(paths.buildFiles, tsProjectLib);
 });
 
 gulp.task('build-tests', function () {
-	return build(paths.testFiles);
+	return build(paths.testFiles, tsProjectTest);
 });
diff --git a/build/ci.js b/build/ci.js
@@ -7,7 +7,7 @@ var path = require('path');
 var paths = require('./paths');
 
 gulp.task('ci', function () {
-	return runSequence('postpublish','build', 'ci-test');
+	return runSequence('build', 'ci-test');
 });
 
 gulp.task('ci-test', function () {

diff --git a/build/paths.js b/build/paths.js
@@ -3,22 +3,23 @@ module.exports = {
 	distFolder: path.resolve(__dirname, '../dist'),
 	projectRoot: path.dirname(__dirname),
 	coverageFolder: path.resolve(__dirname, '../coverage'),
-	
-	buildFiles: ["lib/**/*.ts", "index.ts"],
-	testFiles: ["test/**/*.ts"],
+
+	buildFiles: ["typings/DefinitelyTyped/tsd.d.ts", "lib/**/*.ts", "index.ts"],
+	testFiles: ["typings/DefinitelyTyped/tsd.d.ts", "test/**/*.ts"],
 	cleanFiles: ["coverage", "dist"],
-	
+
 	builtTestFiles: 'dist/test/*.js',
 	builtFiles: ["dist/lib/**/*.js", "dist/index.js"],
 	testSupportFiles: ['dist/test/support/chai'],
-	
+
 	docSourceFiles: [
+		"typings/DefinitelyTyped/tsd.d.ts",
 		"lib/Core.ts",
 		"lib/Model.ts",
 		"lib/Instance.ts",
-		
+
 		"lib/Decorators.ts",
-		
+
 		"lib/Plugins.ts",
 		"lib/Schema.ts",
 		"lib/Cache.ts",
@@ -27,12 +28,12 @@ module.exports = {
 		"lib/Configuration.ts",
 		"lib/Hooks.ts",
 		"lib/Transforms.ts",
-		
+
 		"lib/caches/MemoryCache.ts",
 		"lib/caches/NoOpCache.ts",
-		
+
 		"lib/cacheControllers/IDDirector.ts",
-		
+
 		"lib/utils/ObjectID.ts"
 	]
 };
diff --git a/build/publish.js b/build/publish.js
diff --git a/build/version.js b/build/version.js
@@ -45,7 +45,6 @@ gulp.task('version-push-tags', function (cb) {
 
 gulp.task('version', function (callback) {
     runSequence(
-        'postpublish',
         'doc',
         'version-bump',
         'version-commit',

diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/lib/Aggregate.js b/dist/lib/Aggregate.js
diff --git a/dist/lib/Aggregate.js.map b/dist/lib/Aggregate.js.map
diff --git a/dist/lib/Cache.js b/dist/lib/Cache.js
diff --git a/dist/lib/Cache.js.map b/dist/lib/Cache.js.map
diff --git a/dist/lib/CacheDirector.js b/dist/lib/CacheDirector.js
diff --git a/dist/lib/CacheDirector.js.map b/dist/lib/CacheDirector.js.map
diff --git a/dist/lib/Configuration.js b/dist/lib/Configuration.js
diff --git a/dist/lib/Configuration.js.map b/dist/lib/Configuration.js.map
diff --git a/dist/lib/Core.js b/dist/lib/Core.js