Comparing version 0.1.2 to 0.1.3
@@ -20,3 +20,3 @@ const request = require('request'); | ||
function getLastedReleaseTime(token, repoPath, baseBranch="master") { | ||
function getLastedRelease(token, repoPath, baseBranch="master") { | ||
const repoUrl = `${GITHUB_REPO_API_ROOT}${repoPath}`; | ||
@@ -33,7 +33,6 @@ return new Promise((resolve, reject) => { | ||
})[0]; | ||
const lastedReleaseTime = lastedRelease ? new Date(lastedRelease.created_at) : new Date(1970,1,1); | ||
return resolve(lastedReleaseTime); | ||
return resolve(lastedRelease); | ||
case 404: | ||
console.log("No releases before"); | ||
return resolve(new Date(1970,1,1)); | ||
return resolve(null); | ||
default: | ||
@@ -48,4 +47,5 @@ console.log(error, body, response.statusCode); | ||
function getClosedPullRequestsAfter(token, repoPath, time, baseBranch="master", callback) { | ||
function getClosedPullRequestsAfter(token, repoPath, lastedRelease, baseBranch="master", callback) { | ||
const repoUrl = `${GITHUB_REPO_API_ROOT}${repoPath}`; | ||
const lastedReleaseTime = lastedRelease ? new Date(lastedRelease.created_at) : new Date(1970,1,1); | ||
callGithubAPI({ | ||
@@ -59,5 +59,5 @@ url: repoUrl + RECENT_CLOSED_PR_PATH, | ||
const pullRequests = JSON.parse(body) | ||
.filter(pullRequest => new Date(pullRequest.merged_at) > time) | ||
.filter(pullRequest => new Date(pullRequest.merged_at) > lastedReleaseTime) | ||
.filter(pullRequest => pullRequest.base.ref === baseBranch); | ||
callback(renderPullRequestsReport(pullRequests)); | ||
callback(renderPullRequestsReport(pullRequests, lastedRelease)); | ||
} | ||
@@ -68,6 +68,6 @@ } | ||
function renderPullRequestsReport(pullRequests) { | ||
function renderPullRequestsReport(pullRequests, lastedRelease) { | ||
let output = ''; | ||
if (pullRequests.length) { | ||
output += "New merged pull requests:"; | ||
output += `New merged pull requests after last release: [${lastedRelease.tag_name}](${lastedRelease.html_url})`; | ||
let index = 1; | ||
@@ -79,3 +79,3 @@ pullRequests.forEach(function(pullRequest) { | ||
} else { | ||
output += 'No new pull requests be merged.'; | ||
output += `No new pull requests be merged after last release: [${lastedRelease.tag_name}](${lastedRelease.html_url})`; | ||
} | ||
@@ -87,5 +87,5 @@ return output; | ||
module.exports = (token, repoPath, baseBranch, callback) => { | ||
getLastedReleaseTime(token, repoPath, baseBranch).then((lastedReleaseTime) => { | ||
getClosedPullRequestsAfter(token, repoPath, lastedReleaseTime, baseBranch, callback); | ||
getLastedRelease(token, repoPath, baseBranch).then((lastedRelease) => { | ||
getClosedPullRequestsAfter(token, repoPath, lastedRelease, baseBranch, callback); | ||
}); | ||
} |
{ | ||
"name": "legilimens", | ||
"version": "0.1.2", | ||
"version": "0.1.3", | ||
"repository": { | ||
@@ -5,0 +5,0 @@ "type": "git", |
7903