Skip to content

Commit

Permalink
Merge branch 'master' into release
Browse files Browse the repository at this point in the history
Conflicts:
	doc
  • Loading branch information
notheotherben committed Aug 31, 2015
2 parents b5ccea3 + 4b52136 commit 42940bb
Show file tree
Hide file tree
Showing 77 changed files with 1,032 additions and 380 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@ node_modules/
coverage/
typings/DefinitelyTyped/**/*.d.ts
.tscache
dist/test/
dist/test/
doc
4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[submodule "doc"]
path = doc
url = git://github.com/SierraSoftworks/Iridium.git
branch = gh-pages
3 changes: 2 additions & 1 deletion .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,5 @@ Gruntfile.js
.jshintrc
.gitattributes
.gitignore
typings/DefinitelyTyped
typings/DefinitelyTyped
doc/
35 changes: 30 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,32 @@
## [v5.10.1](https://github.com/sierrasoftworks/iridium/tree/v5.10.1)
- [ad98906](https://github.com/sierrasoftworks/iridium/commit/ad98906) Version 5.10.1
- [b18beb5](https://github.com/sierrasoftworks/iridium/commit/b18beb5) (origin/master) Merge pull request [#17](https://github.com/sierrasoftworks/iridium/issues/17) from SierraSoftworks/feature/nicedocs
- [9ece18a](https://github.com/sierrasoftworks/iridium/commit/9ece18a) (origin/feature/nicedocs, feature/nicedocs) Updated docs
- [39524f7](https://github.com/sierrasoftworks/iridium/commit/39524f7) Fixed a number of broken test fixtures
- [89725a4](https://github.com/sierrasoftworks/iridium/commit/89725a4) Fix a little issue with CI tests
- [7b29f33](https://github.com/sierrasoftworks/iridium/commit/7b29f33) Changed the submodule URL for docs
- [7c9cf0d](https://github.com/sierrasoftworks/iridium/commit/7c9cf0d) Updated documentation
- [f02e177](https://github.com/sierrasoftworks/iridium/commit/f02e177) Updated documentation
- [db7c92c](https://github.com/sierrasoftworks/iridium/commit/db7c92c) Refactored doc gulp script
- [d37c855](https://github.com/sierrasoftworks/iridium/commit/d37c855) Updated documentation
- [47213a9](https://github.com/sierrasoftworks/iridium/commit/47213a9) Updated doc script to push changes to gh-pages branch
- [3dcd9c8](https://github.com/sierrasoftworks/iridium/commit/3dcd9c8) Updated script to only commit doc changes if there are changes to be committed
- [711c490](https://github.com/sierrasoftworks/iridium/commit/711c490) Added gulp script to automatically update documentation
- [006da28](https://github.com/sierrasoftworks/iridium/commit/006da28) Made the doc directory a git submodule for the gh-pages branch
- [c60b030](https://github.com/sierrasoftworks/iridium/commit/c60b030) Exclude documentation website from NPM module
- [5d05863](https://github.com/sierrasoftworks/iridium/commit/5d05863) Restructuring and a massive amount of extra documentation for TypeDoc
- [d92fce4](https://github.com/sierrasoftworks/iridium/commit/d92fce4) Ensure that documentation is generated correctly
- [d339af9](https://github.com/sierrasoftworks/iridium/commit/d339af9) Merge remote-tracking branch 'origin/master' into feature/nicedocs
- [138e448](https://github.com/sierrasoftworks/iridium/commit/138e448) Removed legacy documentation
- [ea6d099](https://github.com/sierrasoftworks/iridium/commit/ea6d099) Added TypeDoc documentation compilation step
- [54ad856](https://github.com/sierrasoftworks/iridium/commit/54ad856) Updated a variety of files to better support TypeDoc
- [c559581](https://github.com/sierrasoftworks/iridium/commit/c559581) Added TypeDoc dependency
- [99cc6cd](https://github.com/sierrasoftworks/iridium/commit/99cc6cd) Updated CHANGELOG

## [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))
- [09bfb53](https://github.com/sierrasoftworks/iridium/commit/09bfb53) Make use of arrow functions in Core (Closes #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
Expand All @@ -12,7 +37,7 @@
- [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)
- [cefc0f4](https://github.com/sierrasoftworks/iridium/commit/cefc0f4) 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

Expand Down Expand Up @@ -317,7 +342,7 @@
- [40fab25](https://github.com/sierrasoftworks/iridium/commit/40fab25) Log all the things for Travis
- [50523ce](https://github.com/sierrasoftworks/iridium/commit/50523ce) Come on Travis, we believe in you
- [858b766](https://github.com/sierrasoftworks/iridium/commit/858b766) Return nModified from update() on MongoDB 2.4
- [caf864a](https://github.com/sierrasoftworks/iridium/commit/caf864a) (sierrasoftworks/master) Make some test failures output more useful informatio
- [caf864a](https://github.com/sierrasoftworks/iridium/commit/caf864a) Make some test failures output more useful informatio
- [86b494f](https://github.com/sierrasoftworks/iridium/commit/86b494f) Travis is still broken, more logging and possible fixes
- [2448a4f](https://github.com/sierrasoftworks/iridium/commit/2448a4f) Support MongoDB 2.4 responses in update()
- [81144a2](https://github.com/sierrasoftworks/iridium/commit/81144a2) Added some logging to find out why Travis is failing tes
Expand All @@ -337,7 +362,7 @@
- [0147aea](https://github.com/sierrasoftworks/iridium/commit/0147aea) Updated project file
- [f9e57cb](https://github.com/sierrasoftworks/iridium/commit/f9e57cb) Show badges for the master branch
- [fdb0746](https://github.com/sierrasoftworks/iridium/commit/fdb0746) Merge pull request #7 from SierraSoftworks/typescript
- [cab9a81](https://github.com/sierrasoftworks/iridium/commit/cab9a81) Renamed Promise to Bluebird to avoid confusion and possible conflicts
- [cab9a81](https://github.com/sierrasoftworks/iridium/commit/cab9a81) (sierrasoftworks/typescript) Renamed Promise to Bluebird to avoid confusion and possible conflicts
- [a029c1e](https://github.com/sierrasoftworks/iridium/commit/a029c1e) Removed unused variable in Omnom
- [b4fb151](https://github.com/sierrasoftworks/iridium/commit/b4fb151) Removed unnecessary semicolons in module index
- [45ec39d](https://github.com/sierrasoftworks/iridium/commit/45ec39d) Updated .jshintrc file
Expand All @@ -347,7 +372,7 @@
- [aad75e8](https://github.com/sierrasoftworks/iridium/commit/aad75e8) Separated Model into a number of smaller files to make it more manageable
- [fb6f69a](https://github.com/sierrasoftworks/iridium/commit/fb6f69a) Added some fringe case tests for Omnom
- [2e48949](https://github.com/sierrasoftworks/iridium/commit/2e48949) Fixed Travis code climate configuration
- [c91116d](https://github.com/sierrasoftworks/iridium/commit/c91116d) (sierrasoftworks/typescript) Added more badges to the README
- [c91116d](https://github.com/sierrasoftworks/iridium/commit/c91116d) Added more badges to the README
- [65ffea9](https://github.com/sierrasoftworks/iridium/commit/65ffea9) Updated code coverage submissions for CodeClimate
- [8949641](https://github.com/sierrasoftworks/iridium/commit/8949641) Added coveralls coverage badge to README
- [5e229b9](https://github.com/sierrasoftworks/iridium/commit/5e229b9) Updated the project file
Expand Down
2 changes: 1 addition & 1 deletion build/ci.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ var path = require('path');
var paths = require('./paths');

gulp.task('ci', function () {
return runSequence('build', 'ci-test');
return runSequence('postpublish','build', 'ci-test');
});

gulp.task('ci-test', function () {
Expand Down
64 changes: 64 additions & 0 deletions build/doc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
var gulp = require('gulp'),
git = require('gulp-git'),
typedoc = require('gulp-typedoc'),
path = require('path'),
runSequence = require('run-sequence'),
fs = require('fs');

var paths = require('./paths');

gulp.task('doc', function() {
return runSequence('doc-build', 'doc-publish');
});

gulp.task('doc-build', function() {
return runSequence('doc-checkout', 'doc-compile', ['doc-submodule', 'doc-attributes']);
});

gulp.task('doc-checkout', function(cb) {
return git.checkout('gh-pages', { cwd: 'doc', quiet: true }, cb);
});

gulp.task('doc-submodule', function(cb) {
fs.writeFile('doc/.git', 'gitdir: ../.git/modules/doc', cb);
});

gulp.task('doc-attributes', function(cb) {
fs.writeFile('doc/.gitattributes', '* text=auto', cb);
});

gulp.task('doc-publish', function(cb) {
git.exec({ args: 'diff-files --quiet', quiet: true, cwd: 'doc' }, function(err, stdout) {
if(err && err.code === 1) runSequence('doc-commit', 'doc-update-ref', 'doc-push', cb);
else cb();
});
});

gulp.task('doc-commit', function() {
return gulp.src('**', { cwd: 'doc' })
.pipe(git.commit('Updated documentation', { cwd: 'doc' }));
});

gulp.task('doc-update-ref', function() {
return gulp.src('.')
.pipe(git.commit('Updated documentation'));
});

gulp.task('doc-push', function(cb) {
git.push('origin', 'gh-pages', { cwd: 'doc' }, cb);
});

gulp.task('doc-compile', function() {
return gulp.src(paths.docSourceFiles).pipe(typedoc({
module: 'commonjs',
target: 'es5',
mode: 'file',
entryPoint: 'iridium',

out: './doc',

name: "Iridium",
plugin: ['decorator'],
ignoreCompilerErrors: false
}));
});
26 changes: 25 additions & 1 deletion build/paths.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,29 @@ module.exports = {

builtTestFiles: 'dist/test/*.js',
builtFiles: ["dist/lib/**/*.js", "dist/index.js"],
testSupportFiles: ['dist/test/support/chai']
testSupportFiles: ['dist/test/support/chai'],

docSourceFiles: [
"lib/Core.ts",
"lib/Model.ts",
"lib/Instance.ts",

"lib/Decorators.ts",

"lib/Plugins.ts",
"lib/Schema.ts",
"lib/Cache.ts",
"lib/CacheDirector.ts",
"lib/ModelOptions.ts",
"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"
]
};
1 change: 1 addition & 0 deletions build/version.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ gulp.task('version-push-tags', function (cb) {
gulp.task('version', function (callback) {
runSequence(
'postpublish',
'doc',
'version-bump',
'version-commit',
'version-tag',
Expand Down
22 changes: 8 additions & 14 deletions dist/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/index.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 12 additions & 5 deletions dist/lib/Core.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 42940bb

Please sign in to comment.