Merge pull request #25 from QubitProducts/ungen

Use promises instead of generators

lib/cached.js

@@ -8,7 +8,7 @@ module.exports = function cached (namespace, producer, timeout) {
   CACHE[namespace] = {}
   var cache = CACHE[namespace]
 
-  return co(function * () {
+  return function () {
     var args = Array.prototype.slice.call(arguments)
     var key = args.join(SEPARATOR)
 
@@ -46,5 +46,5 @@ module.exports = function cached (namespace, producer, timeout) {
     }
 
     return cloneDeep(cache[key].val) || cache[key].fetch
-  })
+  }
 }

lib/getCurrent.js

@@ -1,6 +1,7 @@
 var co = require('creed').coroutine
 
-module.exports = co(function * getCurrent (s3, branch) {
-  var current = yield s3.tryReadingFile(`/${branch}/current`)
-  return current ? current.Body.toString() : null
-})
+module.exports = function getCurrent (s3, branch) {
+  return s3.tryReadingFile(`/${branch}/current`).then(function (current) {
+    return current ? current.Body.toString() : null
+  })
+}

lib/s3.js

@@ -12,15 +12,13 @@ S3FS.prototype.readdir = function () {
 
 // extend S3FS with a function that attempts reading the file, but
 // handles not found case without throwing
-S3FS.prototype.tryReadingFile = co(function * tryReadFile (path) {
-  try {
-    return yield this.readFile(path)
-  } catch (err) {
+S3FS.prototype.tryReadingFile = function tryReadFile (path) {
+  return this.readFile(path).catch(function (err) {
     if (err.code !== 'NoSuchKey') {
       throw err
     }
-  }
-})
+  })
+}
 
 module.exports = function (bapConfig) {
   return new S3FS(bapConfig.bucket, {