Skip to content
This repository has been archived by the owner on Oct 20, 2020. It is now read-only.

Commit

Permalink
Merge branch 'klarkc-hotfix-deploy'
Browse files Browse the repository at this point in the history
  • Loading branch information
klarkc committed Jan 28, 2016
2 parents 9405211 + 3419089 commit 687bb20
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 28 deletions.
2 changes: 1 addition & 1 deletion .openshift/action_hooks/pre_start
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ else
fi

# Build App
./node_modules/gulp/bin/gulp.js build
./node_modules/loader-builder/bin/builder views .
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
<a name="3.0.3"></a>
## [3.0.3](https://github.com/GuildWars2Brasil/nodeclube/compare/3.0.2...v3.0.3) (2016-01-28)


### Bug Fixes

* **deploy:** Usa loader-builder em vez de gulp no openshift ([04afcd4](https://github.com/GuildWars2Brasil/nodeclube/commit/04afcd4))



<a name="3.0.2"></a>
## [3.0.2](https://github.com/GuildWars2Brasil/nodeclube/compare/3.0.1...v3.0.2) (2016-01-28)

Expand Down
24 changes: 1 addition & 23 deletions gulpfile.js
Original file line number Diff line number Diff line change
@@ -1,25 +1,3 @@
'use strict';

var spawn = require('child_process').spawn;
var gulp = require('gulp');
var gutil = require('gulp-util');

// We only need build task on production enviroment
if(process.env.NODE_ENV !== 'production') {
require('gulp-load-tasks')();
} else {
gulp.task('default', ['build']);
}

gulp.task('build', function (done) {
var command = './node_modules/loader-builder/bin/builder',
params = ['views', '.'],
child = spawn(command, params);

gutil.log('Running', gutil.colors.cyan(command, params.join(' ')));

child.stdout.pipe(process.stdout);
child.stderr.pipe(process.stderr);

child.on('exit', done);
});
require('gulp-load-tasks')();
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nodeclube",
"version": "3.0.2",
"version": "3.0.3",
"private": false,
"main": "app.js",
"description": "A Node.js bbs using MongoDB",
Expand Down Expand Up @@ -53,15 +53,14 @@
"utility": "1.6.0",
"validator": "4.5.1",
"xmlbuilder": "4.2.1",
"xss": "0.2.10",
"gulp": "^3.9.0",
"gulp-util": "^3.0.7"
"xss": "0.2.10"
},
"devDependencies": {
"conventional-github-releaser": "^0.5.1",
"conventional-recommended-bump": "0.0.3",
"coveralls": "2.11.6",
"errorhandler": "1.4.3",
"gulp": "^3.9.0",
"gulp-bump": "^1.0.0",
"gulp-conventional-changelog": "^0.7.0",
"gulp-git": "^1.6.1",
Expand All @@ -70,6 +69,7 @@
"gulp-load-tasks": "^0.8.4",
"gulp-mocha": "^2.2.0",
"gulp-nodemon": "^2.0.6",
"gulp-util": "^3.0.7",
"istanbul": "0.4.2",
"loader-connect": "1.0.0",
"mm": "1.3.5",
Expand Down
17 changes: 17 additions & 0 deletions tasks/build.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
'use strict';

var spawn = require('child_process').spawn;
var gutil = require('gulp-util');

module.exports = function (done) {
var command = './node_modules/loader-builder/bin/builder',
params = ['views', '.'],
child = spawn(command, params);

gutil.log('Running', gutil.colors.cyan(command, params.join(' ')));

child.stdout.pipe(process.stdout);
child.stderr.pipe(process.stderr);

child.on('exit', done);
};

0 comments on commit 687bb20

Please sign in to comment.