Skip to content

{branch: false} option didn't work #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
romanostolosh-devpronet wants to merge 3 commits into
base: master
Choose a base branch
from
Open

{branch: false} option didn't work #2

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dabf5fb
Bugfix: Enabling the 'branch: false' option to watch for all branche
romanostolosh-devpronet May 27, 2013
37b8f4d
Add verification if the body has been parsed already
romanostolosh-devpronet Jun 25, 2014
d8663d2
Merge branch 'master' of https://github.com/romanostolosh-devpronet/u…
romanostolosh-devpronet Jun 25, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 23 additions & 11 deletions up-hook.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

/**
* Module dependencies.
*/
Expand Down Expand Up @@ -59,28 +58,41 @@ function uphook (url, opts, fn) {
}

var opts = opts || {}
, branch = opts.branch || 'master'
, branch = (branch = opts.branch) != null ? branch : opts.branch = 'master'
, cmd = opts.cmd || 'git pull'

return function (req, res, next) {
if (url == req.url && 'POST' == req.method) {
var server = this
, payload
, ref


// get payload
bodyParser(req, res, function (err) {
if (err) return next(err);

debug('got github payload "%s"', req.body.payload);

try {
payload = JSON.parse(req.body.payload);
} catch (e) {
next(new Error('GitHub payload error'));

// get payload
// look if body was already parsed
if (req.body && req.body.payload) {
if (typeof req.body.payload == 'string') {
try {
payload = JSON.parse(req.body.payload);
ref = payload.ref;
} catch (e) {
next(new Error('GitHub payload error'));
}
};

if (typeof req.body.payload == 'object') {
payload = req.body.payload;
ref = req.body.payload.ref;
}
}

if (!branch || ('refs/heads/' + branch == payload.ref)) {
debug('got commit to ref "%s" - reloading', payload.ref);
if (!branch || ('refs/heads/' + branch == ref)) {
debug('got commit to ref "%s" - reloading', ref);

if (cmd) {
exec(cmd, { cwd: opts.cwd }, function (err) {
Expand All @@ -96,7 +108,7 @@ function uphook (url, opts, fn) {
fn && fn(null);
}
} else {
debug('ignoring commit to ref "%s"', payload.ref);
debug('ignoring commit to ref "%s"', ref);
}

// respond
Expand Down