Merge pull request #26 from QubitProducts/bugfix/gift-regex-fail

Ensures bugfix to gift is included in bapistrano when installing with yarn

lib/gitMeta.js

@@ -3,6 +3,7 @@ var path = require('path')
 var gift = require('gift-wrapper')
 var co = require('creed').coroutine
 var log = require('./log')
+var promisify = require('./promisify')
 
 var gitRoot = findGitRoot()
 
@@ -19,10 +20,10 @@ module.exports = co(function * (asBranch) {
   if (asBranch) {
     branch = asBranch
   } else {
-    branch = (yield repo.branch()).name
+    branch = (yield promisify(repo, 'branch')()).name
   }
 
-  var commit = (yield repo.current_commit()).id
+  var commit = (yield promisify(repo, 'current_commit')()).id
 
   return { branch, commit }
 })

lib/promisify.js

@@ -0,0 +1,10 @@
+module.exports = function promisify (obj, method) {
+  return function () {
+    return new Promise((resolve, reject) => {
+      obj[method]((err, val) => {
+        if (err) return reject(err)
+        resolve(val)
+      })
+    })
+  }
+}

package.json

@@ -10,7 +10,7 @@
     "cli-color": "^1.1.0",
     "commander": "^2.9.0",
     "creed": "^1.0.1",
-    "gift-wrapper": "^1.1.1",
+    "gift": "^0.10.1",
     "klaw": "^1.2.0",
     "lodash": "^4.15.0",
     "mime": "^1.3.4",