use changelog-parser

Author: ungoldman

CHANGELOG.md

@@ -1,7 +1,7 @@
 # gh-release changelog
 
-## Unreleased
-* improve version detection for `CHANGELOG.md` in `get-defaults`
+## 1.1.1 - 2015-03-02
+* use `changelog-parser` for more reliable changelog parsing
 
 ## 1.1.0 - 2015-03-01
 * target node `0.12` and `iojs` on travis

lib/get-defaults.js

@@ -1,33 +1,37 @@
-var fs = require('fs')
 var path = require('path')
+var changelogParser = require('changelog-parser')
 var exec = require('shelljs').exec
-var semver = /\[?v?([\w\d\.-]+\.[\w\d\.-]+[a-zA-Z0-9])\]?/
 
 module.exports = function getDefaults (callback) {
   var pkg = require(path.resolve(process.cwd(), 'package.json'))
   var commit = getTargetCommitish()
   var repoPath = pkg.repository.url.split('github.com/')[1].split('/')
   var owner = repoPath[0]
   var repo = repoPath[1].split('.git')[0]
-  var log = getChangelog()
-
-  if (log.version !== pkg.version) {
-    var err = 'CHANGELOG.md out of sync with package.json '
-    err += '(' + log.version + ' !== ' + pkg.version + ')'
-    return callback(new Error(err))
-  }
-
-  var version = pkg.version ? 'v' + pkg.version : null
+  var logPath = path.resolve(process.cwd(), 'CHANGELOG.md')
 
-  callback(null, {
-    tag_name: version,
-    target_commitish: commit,
-    name: version,
-    body: log.body,
-    owner: owner,
-    repo: repo,
-    draft: false,
-    prerelease: false
+  changelogParser(logPath, function (err, result) {
+    if (err) return callback(err)
+    var log = result.versions[0]
+
+    if (log.version !== pkg.version) {
+      var errStr = 'CHANGELOG.md out of sync with package.json '
+      errStr += '(' + log.version + ' !== ' + pkg.version + ')'
+      return callback(new Error(errStr))
+    }
+
+    var version = pkg.version ? 'v' + pkg.version : null
+
+    callback(null, {
+      tag_name: version,
+      target_commitish: commit,
+      name: version,
+      body: log.body,
+      owner: owner,
+      repo: repo,
+      draft: false,
+      prerelease: false
+    })
   })
 }
 
@@ -36,17 +40,3 @@ function getTargetCommitish () {
   if (commit.indexOf('fatal') === -1) return commit
   return 'master'
 }
-
-function getChangelog () {
-  var log = {}
-  var logPath = path.resolve(process.cwd(), 'CHANGELOG.md')
-
-  log.src = fs.readFileSync(logPath, { encoding: 'utf-8' })
-  log.version = log.src.split('## ')[1].split('\n')[0].split(' ')[0]
-  log.body = log.src.split('## ')[1].split('\n').slice(1).join('\n')
-
-  var isSemver = semver.exec(log.version)
-  if (isSemver) log.version = isSemver[1]
-
-  return log
-}

package.json

@@ -1,7 +1,7 @@
 {
   "name": "gh-release",
   "description": "Create a release for a node package on github.",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "author": "Nate Goldman <[email protected]>",
   "bin": {
     "gh-release": "./bin/cli.js"
@@ -15,6 +15,7 @@
     "Paul C Pederson <[email protected]>"
   ],
   "dependencies": {
+    "changelog-parser": "^1.0.1",
     "ghauth": "^2.0.0",
     "github": "^0.2.3",
     "inquirer": "^0.8.0",