Skip to content

Commit 14de47d

Browse files
committed
Merge pull request #19 from paulcpederson/git-urls
Two bug fixes
2 parents 02955e3 + 63c1088 commit 14de47d

File tree

2 files changed

+19
-5
lines changed

2 files changed

+19
-5
lines changed

index.js

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,27 @@ function ghRelease (options, auth, callback) {
5656
process.exit(0)
5757
}
5858

59-
client.releases.createRelease(releaseOptions, function (err, res) {
59+
var checkCommitForm = {
60+
user: releaseOptions.owner,
61+
repo: releaseOptions.repo,
62+
sha: releaseOptions.target_commitish
63+
}
64+
65+
client.repos.getCommit(checkCommitForm, function (err, res) {
6066
if (err) {
61-
console.error(err)
67+
console.log('Couldn\'t find the target commit on GitHub.')
68+
console.log('Make sure you\'ve pushed everything up to ' + releaseOptions.owner + '/' + releaseOptions.repo + ' and try again')
69+
console.log('Target commit: ' + releaseOptions.target_commitish)
6270
process.exit(1)
71+
} else {
72+
client.releases.createRelease(releaseOptions, function (err, res) {
73+
if (err) {
74+
console.error(err)
75+
process.exit(1)
76+
}
77+
callback(null, res)
78+
})
6379
}
64-
65-
callback(null, res)
6680
})
6781
})
6882
})

lib/get-defaults.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ var exec = require('shelljs').exec
55
module.exports = function getDefaults (workPath, callback) {
66
var pkg = require(path.resolve(workPath, 'package.json'))
77
var commit = getTargetCommitish()
8-
var repoPath = pkg.repository.url.split('github.com/')[1].split('/')
8+
var repoPath = pkg.repository.url.split('github.com')[1].slice(1).split('/')
99
var owner = repoPath[0]
1010
var repo = repoPath[1].split('.git')[0]
1111
var logPath = path.resolve(workPath, 'CHANGELOG.md')

0 commit comments

Comments
 (0)