Skip to content

Commit

Permalink
Fix the release maker, when there are no previous releases
Browse files Browse the repository at this point in the history
  • Loading branch information
alexcanessa committed Jan 26, 2016
1 parent 3f6ebdb commit f25dd22
Showing 1 changed file with 13 additions and 12 deletions.
25 changes: 13 additions & 12 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ function makeRelease(gren, releaseOptions) {
responseText.message + '\n'
+ responseText.errors[0].code
);
reject();
reject(false);
} else {
console.log(release.tag_name + ' successfully created!');
resolve();
resolve(true);
}
});
});
Expand Down Expand Up @@ -69,7 +69,7 @@ function prepareRelease(gren, tagName, commitMessages) {
var body = commitMessages
.slice(0, -1)
.filter(function (message) {
return !message.match(/^merge/i) && !message.match(/^[x]/);
return !message.match(/^merge/i);
})
.map(createBody)
.join('\n');
Expand Down Expand Up @@ -146,8 +146,8 @@ function getLastTags(gren, releaseTagName) {
if(err) {
reject(err);
} else {
var filteredTags = tags.filter(function (tag, index) {
return index === 0 || tag.name === releaseTagName;
var filteredTags = tags.filter(function(tag, index) {
return index === 0 || (releaseTagName ? tag.name === releaseTagName : index === tags.length-1 );
});

resolve(filteredTags);
Expand All @@ -166,10 +166,14 @@ function getLastTags(gren, releaseTagName) {
function getLatestRelease(gren) {
return new Promise(function (resolve, reject) {
gren.repo.getLatestRelease(function (err, release) {
if(err) {
if(err && err.request.status !== 404) {
reject(err);
} else {
resolve(release.tag_name);
if(err && err.request.status === 404) {
resolve(false);
} else {
resolve(release.tag_name);
}
}
});
});
Expand Down Expand Up @@ -237,11 +241,8 @@ GithubReleaseNotes.prototype.release = function() {
.then(function (commitMessages) {
return prepareRelease(that, tagName, commitMessages);
})
.then(function () {
return true;
},
function() {
return false;
.then(function (success) {
return success;
})
.catch(function (error) {
console.error(error);
Expand Down

0 comments on commit f25dd22

Please sign in to comment.