Skip to content

Commit

Permalink
Merge branch 'master' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
notheotherben committed Aug 31, 2015
2 parents 42940bb + 6d1278d commit 62a4ee1
Show file tree
Hide file tree
Showing 10 changed files with 230 additions and 43 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[submodule "doc"]
path = doc
url = git://github.com/SierraSoftworks/Iridium.git
url = https://github.com/SierraSoftworks/Iridium.git
branch = gh-pages
20 changes: 14 additions & 6 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
## [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
- [016263c](https://github.com/sierrasoftworks/iridium/commit/016263c) Updated CHANGELOG

## [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
- [b18beb5](https://github.com/sierrasoftworks/iridium/commit/b18beb5) Merge pull request #17 from SierraSoftworks/feature/nicedocs
- [9ece18a](https://github.com/sierrasoftworks/iridium/commit/9ece18a) 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
Expand Down Expand Up @@ -37,7 +45,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) 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

Expand Down Expand Up @@ -342,7 +350,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) Make some test failures output more useful informatio
- [caf864a](https://github.com/sierrasoftworks/iridium/commit/caf864a) (sierrasoftworks/master) 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 @@ -362,7 +370,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) (sierrasoftworks/typescript) Renamed Promise to Bluebird to avoid confusion and possible conflicts
- [cab9a81](https://github.com/sierrasoftworks/iridium/commit/cab9a81) 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 @@ -372,7 +380,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) Added more badges to the README
- [c91116d](https://github.com/sierrasoftworks/iridium/commit/c91116d) (sierrasoftworks/typescript) 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: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ methods returning promises for their results and sensible, type annotated result
on ES5 compliant approaches.
- **Fall into Success** with Iridium's carefully designed API - which is structured to help ensure your code remains maintainable
regardless of how large your project becomes.
- **Amazing Documentation** which covers the full Iridium API, and is always up to date thanks to the brilliant TypeDoc project,
can be found at [sierrasoftworks.github.io/Iridium](http://sierrasoftworks.github.io/Iridium).

## Requirements
Iridium is built on top of a number of very modern technologies, including TypeScript 1.5, JavaScript ES6 (though we do compile
Expand Down
34 changes: 18 additions & 16 deletions build/doc.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,59 +4,61 @@ var gulp = require('gulp'),
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-publish', function (cb) {
setTimeout(function () {
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();
});
}, 5000);
});

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
Expand Down
31 changes: 31 additions & 0 deletions dist/lib/Core.js

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

Loading

0 comments on commit 62a4ee1

Please sign in to comment.