From 2ce6ee6e055e80222a640d5efd7001fef9000129 Mon Sep 17 00:00:00 2001
From: Andres Olave <andres.olave@thinkingbytes.net>
Date: Fri, 29 Jul 2016 10:20:23 +0300
Subject: [PATCH 1/8] Add Support for Db based persistence. A Store persists of
 file name, direction & time - each execution is persisted

---
 bin/migrate               |  29 ++++++--
 lib/adapters/filestore.js |  46 ++++++++++++
 lib/migrate.js            |   4 +-
 lib/migration.js          |   8 +-
 lib/set.js                | 151 +++++++++++++++++++++++++-------------
 test/basic.js             | 111 ++++++++++++++++------------
 test/issue-33.js          |   7 +-
 7 files changed, 246 insertions(+), 110 deletions(-)
 create mode 100644 lib/adapters/filestore.js

diff --git a/bin/migrate b/bin/migrate
index f77fd15..843235f 100755
--- a/bin/migrate
+++ b/bin/migrate
@@ -41,6 +41,9 @@ var usage = [
   , '     --state-file <path>     set path to state file (migrations/.migrate)'
   , '     --template-file <path>  set path to template file to use for new migrations'
   , '     --date-format <format>  set a date format to use for new migration filenames'
+  , '     --db-adapter <string>  select the db adapter to use: filestore (default) or mongo'
+  , '     --db-url <path>  url for the db adapter to use'
+  , '     --db-table <string>  table to use (migrations)'
   , '  Commands:'
   , ''
   , '     down   [name]    migrate down till given migration'
@@ -99,6 +102,12 @@ while (args.length) {
     case '--state-file':
       options.stateFile = required();
       break;
+    case '--db-adapter':
+      options.dbAdapter = required();
+    case '--db-url':
+      options.dbUrl = required();
+    case '--db-table':
+      options.dbTable = required();
     case '--template-file':
       template = fs.readFileSync(required());
       break;
@@ -192,17 +201,25 @@ function create(name) {
  */
 
 function performMigration(direction, migrationName) {
-  var state = options.stateFile || join('migrations', '.migrate');
-  var set = migrate.load(state, 'migrations');
+  var dbAdapterType = options.dbAdapter || 'filestore';
+  var dbAdapter = require('../lib/adapters/' + dbAdapterType);
+
+  var store;
+  if (dbAdapterType === 'filestore') {
+    var state = options.stateFile || join('migrations', '.migrate');
+    store = new dbAdapter(state);
+  } else {
+    var dbUrl = options.dbUrl;
+    var dbTable = options.dbTable || 'migrations';
+    store = new dbAdapter(dbUrl, dbTable);
+  }
+
+  var set = migrate.load(store, 'migrations');
 
   set.on('migration', function(migration, direction){
     log(direction, migration.title);
   });
 
-  var migrationPath = migrationName
-    ? join('migrations', migrationName)
-    : migrationName;
-
   set[direction](migrationName, function (err) {
     if (err) {
       log('error', err);
diff --git a/lib/adapters/filestore.js b/lib/adapters/filestore.js
new file mode 100644
index 0000000..f598782
--- /dev/null
+++ b/lib/adapters/filestore.js
@@ -0,0 +1,46 @@
+/**
+ * Created by arolave on 26/07/2016.
+ */
+var fs = require('fs');
+var readline = require('readline')
+
+module.exports = FileStore;
+
+function FileStore(path) {
+    this.path = path;
+}
+
+FileStore.prototype.load = function (callback) {
+    var stream = require('fs').createReadStream(this.path, {encoding: 'utf8'});
+    var lineReader = readline.createInterface({
+        input: stream
+    });
+
+    var arr = [];
+
+    lineReader.on('line', function (line) {
+        console.log(line);
+        try {
+            arr.push(JSON.parse(line));
+        } catch(err) {
+            callback(err);
+        }
+
+    });
+
+    lineReader.on('close', function (err) {
+        callback(err, arr);
+    });
+
+    stream.on('error', function (err) {
+        callback(err);
+    });
+};
+
+FileStore.prototype.save = function (migration, callback) {
+    fs.appendFile(this.path, JSON.stringify(migration) + '\n', 'utf8', callback);
+};
+
+FileStore.prototype.reset = function (callback) {
+    fs.unlink(this.path, callback)
+};
\ No newline at end of file
diff --git a/lib/migrate.js b/lib/migrate.js
index 04756e3..2c2b19e 100644
--- a/lib/migrate.js
+++ b/lib/migrate.js
@@ -35,9 +35,9 @@ function migrate(title, up, down) {
   }
 }
 
-exports.load = function (stateFile, migrationsDirectory) {
+exports.load = function (store, migrationsDirectory) {
 
-  var set = new Set(stateFile);
+  var set = new Set(store);
   var dir = path.resolve(migrationsDirectory);
 
   fs.readdirSync(dir).filter(function(file){
diff --git a/lib/migration.js b/lib/migration.js
index 361e828..a5e1661 100644
--- a/lib/migration.js
+++ b/lib/migration.js
@@ -15,4 +15,10 @@ function Migration(title, up, down) {
   this.title = title;
   this.up = up;
   this.down = down;
-}
\ No newline at end of file
+}
+
+Migration.prototype.run = function (operation, callback) {
+  this.operation = operation;
+  this.timestamp = new Date();
+  return this[operation](callback);
+};
\ No newline at end of file
diff --git a/lib/set.js b/lib/set.js
index 1bf3947..e2f4dbd 100644
--- a/lib/set.js
+++ b/lib/set.js
@@ -20,17 +20,16 @@ var EventEmitter = require('events').EventEmitter
 module.exports = Set;
 
 /**
- * Initialize a new migration `Set` with the given `path`
+ * Initialize a new migration `Set` with the given `store`
  * which is used to store data between migrations.
  *
- * @param {String} path
+ * @param {String} store
  * @api private
  */
 
-function Set(path) {
+function Set(store) {
   this.migrations = [];
-  this.path = path;
-  this.pos = 0;
+  this.store = store;
 };
 
 /**
@@ -58,10 +57,10 @@ Set.prototype.addMigration = function(title, up, down){
  * @api public
  */
 
-Set.prototype.save = function(fn){
-  var self = this
-    , json = JSON.stringify(this);
-  fs.writeFile(this.path, json, function(err){
+Set.prototype.save = function(migration, fn){
+  var self = this;
+
+  this.store.save(migration, function (err) {
     if (err) return fn(err);
 
     self.emit('save');
@@ -70,23 +69,50 @@ Set.prototype.save = function(fn){
 };
 
 /**
- * Load the migration data and call `fn(err, obj)`.
+ * Load all the migration data and call `fn(err, obj)`.
  *
  * @param {Function} fn
  * @return {Type}
  * @api public
  */
 
-Set.prototype.load = function(fn){
+Set.prototype.load = function(fn) {
   this.emit('load');
-  fs.readFile(this.path, 'utf8', function(err, json){
-    if (err) return fn(err);
-    try {
-      fn(null, JSON.parse(json));
-    } catch (err) {
-      fn(err);
-    }
+  var self = this;
+  this.store.load(function(err, allExecutedMigrations) {
+    self.allExecutedMigrations = allExecutedMigrations;
+    fn(err, allExecutedMigrations);
   });
+}
+
+/**
+ * Load the net migration state data and call `fn(err, obj)`.
+ * Net migration data means all the 'ups' minus the 'downs'
+ *
+ * @param {Function} fn
+ * @return {Type}
+ * @api public
+ */
+Set.prototype.loadNet = function (fn) {
+  var self = this;
+  this.load(function(err) {
+    if (err)
+      return fn(err);
+
+    var netMigrationsObj = self.allExecutedMigrations.reduce(
+      function (obj, m) {
+        if (obj[m.title] && m.operation == 'down') {
+          delete obj[m.title];
+        } else {
+          obj[m.title] = true;
+        }
+        return obj;
+      },
+      {}
+    );
+    self.appliedMigrationTitles = Object.keys(netMigrationsObj).sort();
+    fn(null, self.appliedMigrationTitles)
+  })
 };
 
 /**
@@ -125,29 +151,14 @@ Set.prototype.migrate = function(direction, migrationName, fn){
     migrationName = null;
   }
   var self = this;
-  this.load(function(err, obj){
+  this.loadNet(function(err){
     if (err) {
       if ('ENOENT' != err.code) return fn(err);
-    } else {
-      self.pos = obj.pos;
     }
     self._migrate(direction, migrationName, fn);
   });
 };
 
-/**
- * Get index of given migration in list of migrations
- *
- * @api private
- */
-
- function positionOfMigration(migrations, filename) {
-   for(var i=0; i < migrations.length; ++i) {
-     if (migrations[i].title == filename) return i;
-   }
-   return -1;
- }
-
 /**
  * Perform migration.
  *
@@ -156,39 +167,75 @@ Set.prototype.migrate = function(direction, migrationName, fn){
 
 Set.prototype._migrate = function(direction, migrationName, fn){
   var self = this
-    , migrations
-    , migrationPos;
+    , newMigrations;
+
+  //Consider using lodash for get*Migrations Function - much cleaner
+  function getUpMigrations(appliedTitles, allMigrations) {
+    if (!appliedTitles)
+      return allMigrations.slice(0); //clone
 
-  if (!migrationName) {
-    migrationPos = direction == 'up' ? this.migrations.length : 0;
-  } else if ((migrationPos = positionOfMigration(this.migrations, migrationName)) == -1) {
-    return fn(new Error("Could not find migration: " + migrationName));
+    return allMigrations.filter(function (m) {
+      return appliedTitles.indexOf(m.title) === -1;
+    }); // filter out applied migrations
   }
 
-  switch (direction) {
-    case 'up':
-      migrations = this.migrations.slice(this.pos, migrationPos+1);
-      break;
-    case 'down':
-      migrations = this.migrations.slice(migrationPos, this.pos).reverse();
-      break;
+  function getDownMigrations(appliedTitles, allMigrations) {
+    if (!allMigrations || !appliedTitles)
+      return [];
+
+    var migrationTitles = allMigrations.map(function (m) {
+      return m.title
+    });
+
+    return appliedTitles.reverse().reduce(function (buff, title) {
+        var i = migrationTitles.indexOf(title);
+        if (i >= 0)
+          buff.push(allMigrations[i]);
+        return buff;
+      },
+      []); // Select applied migrations, use reduce in case the files have been deleted
+  }
+
+  function takeUntil(arr, val, prop) {
+    var buff = [];
+    for(var i = 0, found = false; i<arr.length && !found; i++) {
+      buff.push(arr[i]);
+      found = (prop && arr[i][prop] === val) || arr[i] === val;
+    }
+    return buff;
   }
 
   function next(migration) {
     if (!migration) return fn(null);
 
     self.emit('migration', migration, direction);
-    migration[direction](function(err){
+    migration.run(direction, function(err){
       if (err) return fn(err);
 
-      self.pos += (direction === 'up' ? 1 : -1);
-      self.save(function (err) {
+      self.save(migration, function (err) {
         if (err) return fn(err);
 
-        next(migrations.shift())
+        next(newMigrations.shift())
       });
     });
   }
 
-  next(migrations.shift());
+  switch (direction) {
+    case 'up':
+      newMigrations = getUpMigrations(self.appliedMigrationTitles, self.migrations);
+      break;
+    case 'down':
+      newMigrations = getDownMigrations(self.appliedMigrationTitles, self.migrations);
+      break;
+  }
+  console.log('running ' + newMigrations.map(function(m) {return m.title;}).join(',') + ': ' + direction);
+
+  if (migrationName) {
+    var k = takeUntil(newMigrations, migrationName, 'title');
+    if (k.length === newMigrations.length)
+      return fn(new Error("Could not find migrationName " + migrationName));
+    newMigrations = k;
+  }
+
+  next(newMigrations.shift());
 };
diff --git a/test/basic.js b/test/basic.js
index d2a1e10..3a6a36a 100644
--- a/test/basic.js
+++ b/test/basic.js
@@ -1,8 +1,8 @@
 
-var fs = require('fs');
 var path = require('path');
 var assert = require('assert');
 
+var FileStore = require('../lib/adapters/filestore');
 var migrate = require('../');
 var db = require('./fixtures/db');
 
@@ -12,63 +12,76 @@ var STATE = path.join(BASE, '.migrate');
 describe('migrate', function () {
 
   var set;
+  var store;
 
-  function assertNoPets() {
+  function assertNumMigrations(num, cb) {
+    set.loadNet(function(err, migrations) {
+      assert.equal(migrations.length, num);
+      cb();
+    })
+  }
+
+  function assertNoPets(cb) {
     assert.equal(db.pets.length, 0);
-    assert.equal(set.pos, 0);
+    assertNumMigrations(0, cb)
   }
 
-  function assertPets() {
+  function assertPets(cb) {
     assert.equal(db.pets.length, 3);
     assert.equal(db.pets[0].name, 'tobi');
     assert.equal(db.pets[0].email, 'tobi@learnboost.com');
-    assert.equal(set.pos, 3);
+    assertNumMigrations(3, cb)
   }
 
-  function assertPetsWithDogs() {
+  function assertPetsWithDogs(cb) {
     assert.equal(db.pets.length, 5);
     assert.equal(db.pets[0].name, 'tobi');
     assert.equal(db.pets[0].email, 'tobi@learnboost.com');
     assert.equal(db.pets[4].name, 'suki');
+    cb()
   };
 
-  function assertFirstMigration() {
+  function assertFirstMigration(cb) {
     assert.equal(db.pets.length, 2);
     assert.equal(db.pets[0].name, 'tobi');
     assert.equal(db.pets[1].name, 'loki');
-    assert.equal(set.pos, 1);
+    assertNumMigrations(1, cb)
   }
 
-  function assertSecondMigration() {
+  function assertSecondMigration(cb) {
     assert.equal(db.pets.length, 3);
     assert.equal(db.pets[0].name, 'tobi');
     assert.equal(db.pets[1].name, 'loki');
     assert.equal(db.pets[2].name, 'jane');
-    assert.equal(set.pos, 2);
+    assertNumMigrations(2, cb)
   }
 
   beforeEach(function () {
-    set = migrate.load(STATE, BASE);
+    store = new FileStore(STATE);
+    set = migrate.load(store, BASE);
   });
 
   it('should handle basic migration', function (done) {
 
     set.up(function (err) {
       assert.ifError(err);
-      assertPets();
-      set.up(function (err) {
-        assert.ifError(err);
-        assertPets();
-        set.down(function (err) {
+      assertPets(function () {
+        set.up(function (err) {
           assert.ifError(err);
-          assertNoPets();
-          set.down(function (err) {
-            assert.ifError(err);
-            assertNoPets();
-            set.up(function (err) {
+          assertPets(function() {
+            set.down(function (err) {
               assert.ifError(err);
-              assertPets();
-              done();
+              assertNoPets(function() {
+                set.down(function (err) {
+                  assert.ifError(err);
+                  assertNoPets(function() {
+                    set.up(function (err) {
+                      assert.ifError(err);
+                      assertPets(done);
+                    });
+                  });
+                });
+              });
             });
           });
         });
@@ -91,15 +104,17 @@ describe('migrate', function () {
 
     set.up(function (err) {
       assert.ifError(err);
-      assertPetsWithDogs();
-      set.up(function (err) {
-        assert.ifError(err);
-        assertPetsWithDogs();
-        set.down(function (err) {
+      assertPetsWithDogs(function() {
+        set.up(function (err) {
           assert.ifError(err);
-          assertNoPets();
-          done();
+          assertPetsWithDogs(function() {
+            set.down(function (err) {
+              assert.ifError(err);
+              assertNoPets(done);
+            });
+          });
         });
+
       });
     });
 
@@ -152,8 +167,7 @@ describe('migrate', function () {
         assert.ifError(err);
         assert.equal(saved, 8);
         assert.deepEqual(migrations, expectedMigrations);
-        assertNoPets();
-        done();
+        assertNoPets(done);
       });
 
     });
@@ -161,35 +175,38 @@ describe('migrate', function () {
   });
 
   it('should migrate to named migration', function (done) {
-
-    assertNoPets();
     set.up('1-add-guy-ferrets.js', function (err) {
       assert.ifError(err);
-      assertFirstMigration();
-      set.up('2-add-girl-ferrets.js', function (err) {
-        assert.ifError(err);
-        assertSecondMigration();
-        set.down('2-add-girl-ferrets.js', function (err) {
+      assertFirstMigration(function() {
+        set.up('2-add-girl-ferrets.js', function (err) {
           assert.ifError(err);
-          assertFirstMigration();
-          set.up('2-add-girl-ferrets.js', function (err) {
-            assert.ifError(err);
-            assertSecondMigration();
+          assertSecondMigration(function() {
             set.down('2-add-girl-ferrets.js', function (err) {
               assert.ifError(err);
-              assert.equal(set.pos, 1);
-              done();
+              assertFirstMigration(function() {
+                set.up('2-add-girl-ferrets.js', function (err) {
+                  assert.ifError(err);
+                  assertSecondMigration(function() {
+                    set.down('2-add-girl-ferrets.js', function (err) {
+                      assert.ifError(err);
+                      assertNumMigrations(1, done)
+                    });
+                  });
+
+                });
+              });
+
             });
           });
         });
       });
-    });
 
+    });
   });
 
   afterEach(function (done) {
     db.nuke();
-    fs.unlink(STATE, done);
+    store.reset(done)
   });
 
 });
diff --git a/test/issue-33.js b/test/issue-33.js
index bf6b22d..14a6629 100644
--- a/test/issue-33.js
+++ b/test/issue-33.js
@@ -6,6 +6,7 @@ var assert = require('assert');
 var migrate = require('../');
 var db = require('./fixtures/db');
 
+var FileStore = require('../lib/adapters/filestore');
 var BASE = path.join(__dirname, 'fixtures', 'issue-33');
 var STATE = path.join(BASE, '.migrate');
 
@@ -15,9 +16,11 @@ var A2 = A1.concat(['3-down', '2-down', '1-down']);
 describe('issue #33', function () {
 
   var set;
+  var store;
 
   beforeEach(function () {
-    set = migrate.load(STATE, BASE);
+    store = new FileStore(STATE);
+    set = migrate.load(store, BASE);
   });
 
   it('should run migrations in the correct order', function (done) {
@@ -48,7 +51,7 @@ describe('issue #33', function () {
 
   afterEach(function (done) {
     db.nuke();
-    fs.unlink(STATE, done);
+    store.reset(done);
   });
 
 });

From 97202d9ba79407a021586d599c1fefae302bb8c0 Mon Sep 17 00:00:00 2001
From: Andres Olave <andres.olave@thinkingbytes.net>
Date: Sun, 31 Jul 2016 19:08:10 +0300
Subject: [PATCH 2/8] Split node-migrate & the filestore Reusable tests change
 migration script

---
 bin/migrate                                   | 127 ++++++-----
 lib/adapters/filestore.js                     |  46 ----
 package.json                                  |   3 +-
 test/basic.js                                 | 212 ------------------
 test/common/basic.js                          | 204 +++++++++++++++++
 .../fixtures/basic/1-add-guy-ferrets.js       |   0
 .../fixtures/basic/2-add-girl-ferrets.js      |   0
 .../fixtures/basic/3-add-emails.js            |   0
 test/{ => common}/fixtures/db.js              |   0
 .../fixtures/issue-33/1-migration.js          |   0
 .../fixtures/issue-33/2-migration.js          |   0
 .../fixtures/issue-33/3-migration.js          |   0
 test/common/issue-33.js                       |  53 +++++
 test/index.js                                 |  14 ++
 test/issue-33.js                              |  57 -----
 15 files changed, 345 insertions(+), 371 deletions(-)
 delete mode 100644 lib/adapters/filestore.js
 delete mode 100644 test/basic.js
 create mode 100644 test/common/basic.js
 rename test/{ => common}/fixtures/basic/1-add-guy-ferrets.js (100%)
 rename test/{ => common}/fixtures/basic/2-add-girl-ferrets.js (100%)
 rename test/{ => common}/fixtures/basic/3-add-emails.js (100%)
 rename test/{ => common}/fixtures/db.js (100%)
 rename test/{ => common}/fixtures/issue-33/1-migration.js (100%)
 rename test/{ => common}/fixtures/issue-33/2-migration.js (100%)
 rename test/{ => common}/fixtures/issue-33/3-migration.js (100%)
 create mode 100644 test/common/issue-33.js
 create mode 100644 test/index.js
 delete mode 100644 test/issue-33.js

diff --git a/bin/migrate b/bin/migrate
index 843235f..4930627 100755
--- a/bin/migrate
+++ b/bin/migrate
@@ -31,26 +31,71 @@ var cwd;
  * Usage information.
  */
 
-var usage = [
+var migrationCliHandlers = [
+  {
+    usageOptions: [
+      '     -c, --chdir <path>      change the working directory'
+      , '     --template-file <path>  set path to template file to use for new migrations'
+      , '     --date-format <format>  set a date format to use for new migration filenames'
+      , '     --store <string>  select the db adapter to use: file (default) or mongo'
+    ],
+    parseArg    : function (arg) {
+      switch (arg) {
+        case '-h':
+        case '--help':
+        case 'help':
+          console.log(usage);
+          process.exit();
+          return true;
+        case '-c':
+        case '--chdir':
+          process.chdir(cwd = required());
+          return true;
+        case '--store':
+          options.store = required();
+          return true;
+        case '--template-file':
+          template = fs.readFileSync(required());
+          return true;
+        case '--date-format':
+          options.dateFormat = required();
+          return true;
+      }
+    }
+  }
+];
+
+['file', 'mongo'].forEach(function(storeType) {
+  try {
+    var Store = require('node-migrate-' + storeType + 'store');
+    // validStoreTypes.push(storeType);
+    if (Store.cliHandler)
+      migrationCliHandlers.push(Store.cliHandler)
+  } catch(e) {
+    //ignore missing types
+  }
+});
+
+var usageArr = [
     ''
   , '  Usage: migrate [options] [command]'
   , ''
   , '  Options:'
-  , ''
-  , '     -c, --chdir <path>      change the working directory'
-  , '     --state-file <path>     set path to state file (migrations/.migrate)'
-  , '     --template-file <path>  set path to template file to use for new migrations'
-  , '     --date-format <format>  set a date format to use for new migration filenames'
-  , '     --db-adapter <string>  select the db adapter to use: filestore (default) or mongo'
-  , '     --db-url <path>  url for the db adapter to use'
-  , '     --db-table <string>  table to use (migrations)'
+  , ''];
+
+migrationCliHandlers.forEach(function (handler) {
+  usageArr = usageArr.concat(handler.usageOptions)
+});
+
+usageArr = usageArr.concat([
   , '  Commands:'
   , ''
   , '     down   [name]    migrate down till given migration'
   , '     up     [name]    migrate up till given migration (the default command)'
   , '     create [title]   create a new migration file with optional [title]'
   , ''
-].join('\n');
+]);
+var usage = usageArr.join('\n');
 
 /**
  * Migration template.
@@ -84,42 +129,22 @@ function abort(msg) {
 }
 
 // parse arguments
-
 var arg;
 while (args.length) {
   arg = args.shift();
-  switch (arg) {
-    case '-h':
-    case '--help':
-    case 'help':
-      console.log(usage);
-      process.exit();
-      break;
-    case '-c':
-    case '--chdir':
-      process.chdir(cwd = required());
-      break;
-    case '--state-file':
-      options.stateFile = required();
-      break;
-    case '--db-adapter':
-      options.dbAdapter = required();
-    case '--db-url':
-      options.dbUrl = required();
-    case '--db-table':
-      options.dbTable = required();
-    case '--template-file':
-      template = fs.readFileSync(required());
-      break;
-    case '--date-format':
-      options.dateFormat = required();
-      break;
-    default:
-      if (options.command) {
-        options.args.push(arg);
-      } else {
-        options.command = arg;
-      }
+  var optionKey;
+  for (var i = 0; i<migrationCliHandlers.length; i++) {
+    optionKey = migrationCliHandlers[i].parseArg(arg)
+    if (optionKey)
+      options[optionKey] = required();
+  }
+  if (!optionKey) {
+    // default case
+    if (options.command) {
+      options.args.push(arg);
+    } else {
+      options.command = arg;
+    }
   }
 }
 
@@ -201,18 +226,10 @@ function create(name) {
  */
 
 function performMigration(direction, migrationName) {
-  var dbAdapterType = options.dbAdapter || 'filestore';
-  var dbAdapter = require('../lib/adapters/' + dbAdapterType);
-
-  var store;
-  if (dbAdapterType === 'filestore') {
-    var state = options.stateFile || join('migrations', '.migrate');
-    store = new dbAdapter(state);
-  } else {
-    var dbUrl = options.dbUrl;
-    var dbTable = options.dbTable || 'migrations';
-    store = new dbAdapter(dbUrl, dbTable);
-  }
+  var storeType = options.store || 'file';
+  var Store = require('node-migrate-'  + storeType + 'store');
+
+  var store = new (Function.prototype.bind.apply(Store, [null].concat(options)));
 
   var set = migrate.load(store, 'migrations');
 
diff --git a/lib/adapters/filestore.js b/lib/adapters/filestore.js
deleted file mode 100644
index f598782..0000000
--- a/lib/adapters/filestore.js
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * Created by arolave on 26/07/2016.
- */
-var fs = require('fs');
-var readline = require('readline')
-
-module.exports = FileStore;
-
-function FileStore(path) {
-    this.path = path;
-}
-
-FileStore.prototype.load = function (callback) {
-    var stream = require('fs').createReadStream(this.path, {encoding: 'utf8'});
-    var lineReader = readline.createInterface({
-        input: stream
-    });
-
-    var arr = [];
-
-    lineReader.on('line', function (line) {
-        console.log(line);
-        try {
-            arr.push(JSON.parse(line));
-        } catch(err) {
-            callback(err);
-        }
-
-    });
-
-    lineReader.on('close', function (err) {
-        callback(err, arr);
-    });
-
-    stream.on('error', function (err) {
-        callback(err);
-    });
-};
-
-FileStore.prototype.save = function (migration, callback) {
-    fs.appendFile(this.path, JSON.stringify(migration) + '\n', 'utf8', callback);
-};
-
-FileStore.prototype.reset = function (callback) {
-    fs.unlink(this.path, callback)
-};
\ No newline at end of file
diff --git a/package.json b/package.json
index b98eb59..6408d4f 100644
--- a/package.json
+++ b/package.json
@@ -23,6 +23,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "dateformat": "^1.0.12"
+    "dateformat": "^1.0.12",
+    "node-migrate-filestore": "latest"
   }
 }
diff --git a/test/basic.js b/test/basic.js
deleted file mode 100644
index 3a6a36a..0000000
--- a/test/basic.js
+++ /dev/null
@@ -1,212 +0,0 @@
-
-var path = require('path');
-var assert = require('assert');
-
-var FileStore = require('../lib/adapters/filestore');
-var migrate = require('../');
-var db = require('./fixtures/db');
-
-var BASE = path.join(__dirname, 'fixtures', 'basic');
-var STATE = path.join(BASE, '.migrate');
-
-describe('migrate', function () {
-
-  var set;
-  var store;
-
-  function assertNumMigrations(num, cb) {
-    set.loadNet(function(err, migrations) {
-      assert.equal(migrations.length, num);
-      cb();
-    })
-  }
-
-  function assertNoPets(cb) {
-    assert.equal(db.pets.length, 0);
-    assertNumMigrations(0, cb)
-  }
-
-  function assertPets(cb) {
-    assert.equal(db.pets.length, 3);
-    assert.equal(db.pets[0].name, 'tobi');
-    assert.equal(db.pets[0].email, 'tobi@learnboost.com');
-    assertNumMigrations(3, cb)
-  }
-
-  function assertPetsWithDogs(cb) {
-    assert.equal(db.pets.length, 5);
-    assert.equal(db.pets[0].name, 'tobi');
-    assert.equal(db.pets[0].email, 'tobi@learnboost.com');
-    assert.equal(db.pets[4].name, 'suki');
-    cb()
-  };
-
-  function assertFirstMigration(cb) {
-    assert.equal(db.pets.length, 2);
-    assert.equal(db.pets[0].name, 'tobi');
-    assert.equal(db.pets[1].name, 'loki');
-    assertNumMigrations(1, cb)
-  }
-
-  function assertSecondMigration(cb) {
-    assert.equal(db.pets.length, 3);
-    assert.equal(db.pets[0].name, 'tobi');
-    assert.equal(db.pets[1].name, 'loki');
-    assert.equal(db.pets[2].name, 'jane');
-    assertNumMigrations(2, cb)
-  }
-
-  beforeEach(function () {
-    store = new FileStore(STATE);
-    set = migrate.load(store, BASE);
-  });
-
-  it('should handle basic migration', function (done) {
-
-    set.up(function (err) {
-      assert.ifError(err);
-      assertPets(function () {
-        set.up(function (err) {
-          assert.ifError(err);
-          assertPets(function() {
-            set.down(function (err) {
-              assert.ifError(err);
-              assertNoPets(function() {
-                set.down(function (err) {
-                  assert.ifError(err);
-                  assertNoPets(function() {
-                    set.up(function (err) {
-                      assert.ifError(err);
-                      assertPets(done);
-                    });
-                  });
-                });
-              });
-            });
-          });
-        });
-      });
-    });
-
-  });
-
-  it('should add a new migration', function (done) {
-
-    set.addMigration('add dogs', function (next) {
-      db.pets.push({ name: 'simon' });
-      db.pets.push({ name: 'suki' });
-      next();
-    }, function (next) {
-      db.pets.pop();
-      db.pets.pop();
-      next();
-    });
-
-    set.up(function (err) {
-      assert.ifError(err);
-      assertPetsWithDogs(function() {
-        set.up(function (err) {
-          assert.ifError(err);
-          assertPetsWithDogs(function() {
-            set.down(function (err) {
-              assert.ifError(err);
-              assertNoPets(done);
-            });
-          });
-        });
-
-      });
-    });
-
-  });
-
-  it('should emit events', function (done) {
-
-    set.addMigration('4-adjust-emails.js', function (next) {
-      db.pets.forEach(function (pet) {
-        if (pet.email)
-          pet.email = pet.email.replace('learnboost.com', 'lb.com');
-      });
-      next();
-    }, function (next) {
-      db.pets.forEach(function (pet) {
-        if (pet.email)
-          pet.email = pet.email.replace('lb.com', 'learnboost.com');
-      });
-      next();
-    });
-
-    var saved = 0;
-    var migrations = [];
-    var expectedMigrations = [
-      '1-add-guy-ferrets.js',
-      '2-add-girl-ferrets.js',
-      '3-add-emails.js',
-      '4-adjust-emails.js'
-    ];
-
-    set.on('save', function () {
-      saved++;
-    });
-
-    set.on('migration', function (migration, direction) {
-      migrations.push(migration.title);
-      assert.equal(typeof direction, 'string');
-    });
-
-    set.up(function (err) {
-      assert.ifError(err);
-      assert.equal(saved, 4);
-      assert.equal(db.pets[0].email, 'tobi@lb.com');
-      assert.deepEqual(migrations, expectedMigrations);
-
-      migrations = [];
-      expectedMigrations = expectedMigrations.reverse();
-
-      set.down(function (err) {
-        assert.ifError(err);
-        assert.equal(saved, 8);
-        assert.deepEqual(migrations, expectedMigrations);
-        assertNoPets(done);
-      });
-
-    });
-
-  });
-
-  it('should migrate to named migration', function (done) {
-    set.up('1-add-guy-ferrets.js', function (err) {
-      assert.ifError(err);
-      assertFirstMigration(function() {
-        set.up('2-add-girl-ferrets.js', function (err) {
-          assert.ifError(err);
-          assertSecondMigration(function() {
-            set.down('2-add-girl-ferrets.js', function (err) {
-              assert.ifError(err);
-              assertFirstMigration(function() {
-                set.up('2-add-girl-ferrets.js', function (err) {
-                  assert.ifError(err);
-                  assertSecondMigration(function() {
-                    set.down('2-add-girl-ferrets.js', function (err) {
-                      assert.ifError(err);
-                      assertNumMigrations(1, done)
-                    });
-                  });
-
-                });
-              });
-
-            });
-          });
-        });
-      });
-
-    });
-  });
-
-  afterEach(function (done) {
-    db.nuke();
-    store.reset(done)
-  });
-
-});
diff --git a/test/common/basic.js b/test/common/basic.js
new file mode 100644
index 0000000..8b5b45b
--- /dev/null
+++ b/test/common/basic.js
@@ -0,0 +1,204 @@
+var assert = require('assert');
+
+var migrate = require('../..');
+var db = require('./fixtures/db');
+
+module.exports = function (BASE, storeUnderTest) {
+  return function () {
+    var set;
+    var store;
+
+    function assertNumMigrations(num, cb) {
+      set.loadNet(function (err, migrations) {
+        assert.equal(migrations.length, num);
+        cb();
+      })
+    }
+
+    function assertNoPets(cb) {
+      assert.equal(db.pets.length, 0);
+      assertNumMigrations(0, cb)
+    }
+
+    function assertPets(cb) {
+      assert.equal(db.pets.length, 3);
+      assert.equal(db.pets[0].name, 'tobi');
+      assert.equal(db.pets[0].email, 'tobi@learnboost.com');
+      assertNumMigrations(3, cb)
+    }
+
+    function assertPetsWithDogs(cb) {
+      assert.equal(db.pets.length, 5);
+      assert.equal(db.pets[0].name, 'tobi');
+      assert.equal(db.pets[0].email, 'tobi@learnboost.com');
+      assert.equal(db.pets[4].name, 'suki');
+      cb()
+    };
+
+    function assertFirstMigration(cb) {
+      assert.equal(db.pets.length, 2);
+      assert.equal(db.pets[0].name, 'tobi');
+      assert.equal(db.pets[1].name, 'loki');
+      assertNumMigrations(1, cb)
+    }
+
+    function assertSecondMigration(cb) {
+      assert.equal(db.pets.length, 3);
+      assert.equal(db.pets[0].name, 'tobi');
+      assert.equal(db.pets[1].name, 'loki');
+      assert.equal(db.pets[2].name, 'jane');
+      assertNumMigrations(2, cb)
+    }
+
+    beforeEach(function () {
+      var Store = require('node-migrate-' + storeUnderTest.storeType + 'store');
+      store = new (Function.prototype.bind.apply(Store, [null].concat(storeUnderTest.args)));
+      set = migrate.load(store, BASE);
+    });
+
+    afterEach(function (done) {
+      db.nuke();
+      store.reset(done)
+    });
+
+    it('should handle basic migration using ' + storeUnderTest.storeType, function (done) {
+      set.up(function (err) {
+        assert.ifError(err);
+        assertPets(function () {
+          set.up(function (err) {
+            assert.ifError(err);
+            assertPets(function () {
+              set.down(function (err) {
+                assert.ifError(err);
+                assertNoPets(function () {
+                  set.down(function (err) {
+                    assert.ifError(err);
+                    assertNoPets(function () {
+                      set.up(function (err) {
+                        assert.ifError(err);
+                        assertPets(done);
+                      });
+                    });
+                  });
+                });
+              });
+            });
+          });
+        });
+      });
+
+    });
+
+    it('should add a new migration using ' + storeUnderTest.storeType, function (done) {
+      set.addMigration('add dogs', function (next) {
+        db.pets.push({name: 'simon'});
+        db.pets.push({name: 'suki'});
+        next();
+      }, function (next) {
+        db.pets.pop();
+        db.pets.pop();
+        next();
+      });
+
+      set.up(function (err) {
+        assert.ifError(err);
+        assertPetsWithDogs(function () {
+          set.up(function (err) {
+            assert.ifError(err);
+            assertPetsWithDogs(function () {
+              set.down(function (err) {
+                assert.ifError(err);
+                assertNoPets(done);
+              });
+            });
+          });
+
+        });
+      });
+
+    });
+
+    it('should emit events using ' + storeUnderTest.storeType, function (done) {
+      set.addMigration('4-adjust-emails.js', function (next) {
+        db.pets.forEach(function (pet) {
+          if (pet.email)
+            pet.email = pet.email.replace('learnboost.com', 'lb.com');
+        });
+        next();
+      }, function (next) {
+        db.pets.forEach(function (pet) {
+          if (pet.email)
+            pet.email = pet.email.replace('lb.com', 'learnboost.com');
+        });
+        next();
+      });
+
+      var saved = 0;
+      var migrations = [];
+      var expectedMigrations = [
+        '1-add-guy-ferrets.js',
+        '2-add-girl-ferrets.js',
+        '3-add-emails.js',
+        '4-adjust-emails.js'
+      ];
+
+      set.on('save', function () {
+        saved++;
+      });
+
+      set.on('migration', function (migration, direction) {
+        migrations.push(migration.title);
+        assert.equal(typeof direction, 'string');
+      });
+
+      set.up(function (err) {
+        assert.ifError(err);
+        assert.equal(saved, 4);
+        assert.equal(db.pets[0].email, 'tobi@lb.com');
+        assert.deepEqual(migrations, expectedMigrations);
+
+        migrations = [];
+        expectedMigrations = expectedMigrations.reverse();
+
+        set.down(function (err) {
+          assert.ifError(err);
+          assert.equal(saved, 8);
+          assert.deepEqual(migrations, expectedMigrations);
+          assertNoPets(done);
+        });
+
+      });
+
+    });
+
+    it('should migrate to named migration using ' + storeUnderTest.storeType, function (done) {
+      set.up('1-add-guy-ferrets.js', function (err) {
+        assert.ifError(err);
+        assertFirstMigration(function () {
+          set.up('2-add-girl-ferrets.js', function (err) {
+            assert.ifError(err);
+            assertSecondMigration(function () {
+              set.down('2-add-girl-ferrets.js', function (err) {
+                assert.ifError(err);
+                assertFirstMigration(function () {
+                  set.up('2-add-girl-ferrets.js', function (err) {
+                    assert.ifError(err);
+                    assertSecondMigration(function () {
+                      set.down('2-add-girl-ferrets.js', function (err) {
+                        assert.ifError(err);
+                        assertNumMigrations(1, done)
+                      });
+                    });
+
+                  });
+                });
+
+              });
+            });
+          });
+        });
+
+      });
+    });
+  };
+};
diff --git a/test/fixtures/basic/1-add-guy-ferrets.js b/test/common/fixtures/basic/1-add-guy-ferrets.js
similarity index 100%
rename from test/fixtures/basic/1-add-guy-ferrets.js
rename to test/common/fixtures/basic/1-add-guy-ferrets.js
diff --git a/test/fixtures/basic/2-add-girl-ferrets.js b/test/common/fixtures/basic/2-add-girl-ferrets.js
similarity index 100%
rename from test/fixtures/basic/2-add-girl-ferrets.js
rename to test/common/fixtures/basic/2-add-girl-ferrets.js
diff --git a/test/fixtures/basic/3-add-emails.js b/test/common/fixtures/basic/3-add-emails.js
similarity index 100%
rename from test/fixtures/basic/3-add-emails.js
rename to test/common/fixtures/basic/3-add-emails.js
diff --git a/test/fixtures/db.js b/test/common/fixtures/db.js
similarity index 100%
rename from test/fixtures/db.js
rename to test/common/fixtures/db.js
diff --git a/test/fixtures/issue-33/1-migration.js b/test/common/fixtures/issue-33/1-migration.js
similarity index 100%
rename from test/fixtures/issue-33/1-migration.js
rename to test/common/fixtures/issue-33/1-migration.js
diff --git a/test/fixtures/issue-33/2-migration.js b/test/common/fixtures/issue-33/2-migration.js
similarity index 100%
rename from test/fixtures/issue-33/2-migration.js
rename to test/common/fixtures/issue-33/2-migration.js
diff --git a/test/fixtures/issue-33/3-migration.js b/test/common/fixtures/issue-33/3-migration.js
similarity index 100%
rename from test/fixtures/issue-33/3-migration.js
rename to test/common/fixtures/issue-33/3-migration.js
diff --git a/test/common/issue-33.js b/test/common/issue-33.js
new file mode 100644
index 0000000..103d531
--- /dev/null
+++ b/test/common/issue-33.js
@@ -0,0 +1,53 @@
+
+var assert = require('assert');
+
+var migrate = require('../..');
+var db = require('./fixtures/db');
+
+var A1 = ['1-up', '2-up', '3-up'];
+var A2 = A1.concat(['3-down', '2-down', '1-down']);
+
+module.exports = function(BASE, storeUnderTest) {
+  return function () {
+    var set;
+    var store;
+
+    beforeEach(function () {
+      var Store = require('node-migrate-' + storeUnderTest.storeType + 'store');
+      store = new (Function.prototype.bind.apply(Store, [null].concat(storeUnderTest.args)));
+      set = migrate.load(store, BASE);
+    });
+
+    it('should run migrations in the correct order', function (done) {
+
+      set.up(function (err) {
+        assert.ifError(err);
+        assert.deepEqual(db.issue33, A1);
+
+        set.up(function (err) {
+          assert.ifError(err);
+          assert.deepEqual(db.issue33, A1);
+
+          set.down(function (err) {
+            assert.ifError(err);
+            assert.deepEqual(db.issue33, A2);
+
+            set.down(function (err) {
+              assert.ifError(err);
+              assert.deepEqual(db.issue33, A2);
+
+              done();
+            });
+          });
+        });
+      });
+
+    });
+
+    afterEach(function (done) {
+      db.nuke();
+      store.reset(done);
+    });
+
+  }
+};
diff --git a/test/index.js b/test/index.js
new file mode 100644
index 0000000..11ecfed
--- /dev/null
+++ b/test/index.js
@@ -0,0 +1,14 @@
+var path = require('path');
+
+var getStoreUnderTest = function(base) {
+  var STATE = path.join(base, '.migrate');
+  return {storeType: 'file', args: [{stateFile: STATE}]}
+};
+
+var BASIC_BASE = path.join(__dirname, 'common', 'fixtures', 'basic');
+var basicTests = require('./common/basic');
+describe('basic migration', basicTests(BASIC_BASE, getStoreUnderTest(BASIC_BASE)));
+
+var ISSUE33_BASE = path.join(__dirname, 'common', 'fixtures', 'issue-33');
+var issue33 = require('./common/issue-33');
+describe('issue-33', issue33(ISSUE33_BASE, getStoreUnderTest(ISSUE33_BASE)));
\ No newline at end of file
diff --git a/test/issue-33.js b/test/issue-33.js
deleted file mode 100644
index 14a6629..0000000
--- a/test/issue-33.js
+++ /dev/null
@@ -1,57 +0,0 @@
-
-var fs = require('fs');
-var path = require('path');
-var assert = require('assert');
-
-var migrate = require('../');
-var db = require('./fixtures/db');
-
-var FileStore = require('../lib/adapters/filestore');
-var BASE = path.join(__dirname, 'fixtures', 'issue-33');
-var STATE = path.join(BASE, '.migrate');
-
-var A1 = ['1-up', '2-up', '3-up'];
-var A2 = A1.concat(['3-down', '2-down', '1-down']);
-
-describe('issue #33', function () {
-
-  var set;
-  var store;
-
-  beforeEach(function () {
-    store = new FileStore(STATE);
-    set = migrate.load(store, BASE);
-  });
-
-  it('should run migrations in the correct order', function (done) {
-
-    set.up(function (err) {
-      assert.ifError(err);
-      assert.deepEqual(db.issue33, A1);
-
-      set.up(function (err) {
-        assert.ifError(err);
-        assert.deepEqual(db.issue33, A1);
-
-        set.down(function (err) {
-          assert.ifError(err);
-          assert.deepEqual(db.issue33, A2);
-
-          set.down(function (err) {
-            assert.ifError(err);
-            assert.deepEqual(db.issue33, A2);
-
-            done();
-          });
-        });
-      });
-    });
-
-  });
-
-  afterEach(function (done) {
-    db.nuke();
-    store.reset(done);
-  });
-
-});

From 33aa502a12991e2b804e8b40701e6e52d700ad4d Mon Sep 17 00:00:00 2001
From: Andres Olave <andres.olave@thinkingbytes.net>
Date: Sun, 31 Jul 2016 19:08:43 +0300
Subject: [PATCH 3/8] update gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index e9af0b1..1b4f654 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,6 @@
 node_modules
 *.sock
 .migrate
+*.iml
 
 migrations/

From 4443977d73496f833a70429a454ef827d3cd9e14 Mon Sep 17 00:00:00 2001
From: Andres Olave <andres.olave@thinkingbytes.net>
Date: Sun, 31 Jul 2016 20:11:58 +0300
Subject: [PATCH 4/8] Fixes for running tests from mongo

---
 .gitignore              |  1 +
 bin/migrate             |  3 +--
 lib/migrate.js          |  2 +-
 package.json            |  2 +-
 test/common/basic.js    | 11 +++++------
 test/common/issue-33.js |  3 +--
 test/index.js           |  2 +-
 7 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1b4f654..3379668 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,5 +3,6 @@ node_modules
 *.sock
 .migrate
 *.iml
+.idea
 
 migrations/
diff --git a/bin/migrate b/bin/migrate
index 4930627..d567342 100755
--- a/bin/migrate
+++ b/bin/migrate
@@ -67,8 +67,7 @@ var migrationCliHandlers = [
 
 ['file', 'mongo'].forEach(function(storeType) {
   try {
-    var Store = require('node-migrate-' + storeType + 'store');
-    // validStoreTypes.push(storeType);
+    var Store = require('migrate-' + storeType + 'store');
     if (Store.cliHandler)
       migrationCliHandlers.push(Store.cliHandler)
   } catch(e) {
diff --git a/lib/migrate.js b/lib/migrate.js
index 2c2b19e..55dfac9 100644
--- a/lib/migrate.js
+++ b/lib/migrate.js
@@ -28,7 +28,7 @@ function migrate(title, up, down) {
     migrate.set = new Set(title);
   // no migration path
   } else if (!migrate.set) {
-    throw new Error('must invoke migrate(path) before running migrations');
+    throw new Error('must invoke migrate(store) before running migrations');
   // run migrations
   } else {
     return migrate.set;
diff --git a/package.json b/package.json
index 6408d4f..5a00998 100644
--- a/package.json
+++ b/package.json
@@ -24,6 +24,6 @@
   "license": "MIT",
   "dependencies": {
     "dateformat": "^1.0.12",
-    "node-migrate-filestore": "latest"
+    "migrate-filestore": "https://github.com/sloops77/node-migrate-filestore#728be28a731a0892e350149ce30424bffbefc664"
   }
 }
diff --git a/test/common/basic.js b/test/common/basic.js
index 8b5b45b..0317df8 100644
--- a/test/common/basic.js
+++ b/test/common/basic.js
@@ -51,8 +51,7 @@ module.exports = function (BASE, storeUnderTest) {
     }
 
     beforeEach(function () {
-      var Store = require('node-migrate-' + storeUnderTest.storeType + 'store');
-      store = new (Function.prototype.bind.apply(Store, [null].concat(storeUnderTest.args)));
+      store = new (Function.prototype.bind.apply(storeUnderTest.Store, [null].concat(storeUnderTest.args)));
       set = migrate.load(store, BASE);
     });
 
@@ -61,7 +60,7 @@ module.exports = function (BASE, storeUnderTest) {
       store.reset(done)
     });
 
-    it('should handle basic migration using ' + storeUnderTest.storeType, function (done) {
+    it('should handle basic migration using', function (done) {
       set.up(function (err) {
         assert.ifError(err);
         assertPets(function () {
@@ -89,7 +88,7 @@ module.exports = function (BASE, storeUnderTest) {
 
     });
 
-    it('should add a new migration using ' + storeUnderTest.storeType, function (done) {
+    it('should add a new migration using', function (done) {
       set.addMigration('add dogs', function (next) {
         db.pets.push({name: 'simon'});
         db.pets.push({name: 'suki'});
@@ -118,7 +117,7 @@ module.exports = function (BASE, storeUnderTest) {
 
     });
 
-    it('should emit events using ' + storeUnderTest.storeType, function (done) {
+    it('should emit events using', function (done) {
       set.addMigration('4-adjust-emails.js', function (next) {
         db.pets.forEach(function (pet) {
           if (pet.email)
@@ -171,7 +170,7 @@ module.exports = function (BASE, storeUnderTest) {
 
     });
 
-    it('should migrate to named migration using ' + storeUnderTest.storeType, function (done) {
+    it('should migrate to named migration using', function (done) {
       set.up('1-add-guy-ferrets.js', function (err) {
         assert.ifError(err);
         assertFirstMigration(function () {
diff --git a/test/common/issue-33.js b/test/common/issue-33.js
index 103d531..327cb12 100644
--- a/test/common/issue-33.js
+++ b/test/common/issue-33.js
@@ -13,8 +13,7 @@ module.exports = function(BASE, storeUnderTest) {
     var store;
 
     beforeEach(function () {
-      var Store = require('node-migrate-' + storeUnderTest.storeType + 'store');
-      store = new (Function.prototype.bind.apply(Store, [null].concat(storeUnderTest.args)));
+      store = new (Function.prototype.bind.apply(storeUnderTest.Store, [null].concat(storeUnderTest.args)));
       set = migrate.load(store, BASE);
     });
 
diff --git a/test/index.js b/test/index.js
index 11ecfed..d357d0e 100644
--- a/test/index.js
+++ b/test/index.js
@@ -2,7 +2,7 @@ var path = require('path');
 
 var getStoreUnderTest = function(base) {
   var STATE = path.join(base, '.migrate');
-  return {storeType: 'file', args: [{stateFile: STATE}]}
+  return {Store: require('migrate-filestore'), args: [{stateFile: STATE}]}
 };
 
 var BASIC_BASE = path.join(__dirname, 'common', 'fixtures', 'basic');

From cc7d7fd5b82379776707f19e8c9cfc6f74843690 Mon Sep 17 00:00:00 2001
From: Andres Olave <andres.olave@thinkingbytes.net>
Date: Mon, 1 Aug 2016 13:32:39 +0300
Subject: [PATCH 5/8] add support for locks

---
 lib/migration.js     |  6 +++++-
 lib/set.js           | 21 +++++++++++++++------
 test/common/basic.js | 34 ++++++++++++++++++++++++++++++++--
 3 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/lib/migration.js b/lib/migration.js
index a5e1661..eba5068 100644
--- a/lib/migration.js
+++ b/lib/migration.js
@@ -20,5 +20,9 @@ function Migration(title, up, down) {
 Migration.prototype.run = function (operation, callback) {
   this.operation = operation;
   this.timestamp = new Date();
-  return this[operation](callback);
+  try {
+    return this[operation](callback);
+  } catch (e) {
+    callback(e);
+  }
 };
\ No newline at end of file
diff --git a/lib/set.js b/lib/set.js
index e2f4dbd..4778c82 100644
--- a/lib/set.js
+++ b/lib/set.js
@@ -81,7 +81,12 @@ Set.prototype.load = function(fn) {
   var self = this;
   this.store.load(function(err, allExecutedMigrations) {
     self.allExecutedMigrations = allExecutedMigrations;
-    fn(err, allExecutedMigrations);
+    fn(err, allExecutedMigrations, function(doneCallback) {
+      if (self.store.unlock)
+        self.store.unlock(doneCallback);
+      else
+        doneCallback()
+    });
   });
 }
 
@@ -95,9 +100,9 @@ Set.prototype.load = function(fn) {
  */
 Set.prototype.loadNet = function (fn) {
   var self = this;
-  this.load(function(err) {
+  this.load(function(err, res, done) {
     if (err)
-      return fn(err);
+      return fn(err, res, done);
 
     var netMigrationsObj = self.allExecutedMigrations.reduce(
       function (obj, m) {
@@ -111,7 +116,7 @@ Set.prototype.loadNet = function (fn) {
       {}
     );
     self.appliedMigrationTitles = Object.keys(netMigrationsObj).sort();
-    fn(null, self.appliedMigrationTitles)
+    fn(null, self.appliedMigrationTitles, done)
   })
 };
 
@@ -151,11 +156,15 @@ Set.prototype.migrate = function(direction, migrationName, fn){
     migrationName = null;
   }
   var self = this;
-  this.loadNet(function(err){
+  this.loadNet(function(err, migrations, done){
     if (err) {
       if ('ENOENT' != err.code) return fn(err);
     }
-    self._migrate(direction, migrationName, fn);
+    self._migrate(direction, migrationName, function(err, res) {
+      done(function () {
+        fn(err, res);
+      });
+    });
   });
 };
 
diff --git a/test/common/basic.js b/test/common/basic.js
index 0317df8..259bf76 100644
--- a/test/common/basic.js
+++ b/test/common/basic.js
@@ -9,9 +9,10 @@ module.exports = function (BASE, storeUnderTest) {
     var store;
 
     function assertNumMigrations(num, cb) {
-      set.loadNet(function (err, migrations) {
+      set.loadNet(function (err, migrations, done) {
+        assert.ifError(err);
         assert.equal(migrations.length, num);
-        cb();
+        done(cb)
       })
     }
 
@@ -60,6 +61,35 @@ module.exports = function (BASE, storeUnderTest) {
       store.reset(done)
     });
 
+    it('should handle exceptions ok', function (done) {
+
+      set.up(function (err) {
+        assert.ifError(err);
+        assertPets(function () {
+          set.addMigration('add dogs', function (next) {
+            console.log('up error');
+            next('error');
+          });
+
+          set.up(function (err) {
+            assert(err !== null);
+            assertPets(function () {
+              set.migrations.pop();
+              set.addMigration('add dogs', function (next) {
+                console.log('up error');
+                throw new Error('error');
+              });
+              set.up(function (err) {
+                assert(err !== null);
+                assertPets(done);
+              });
+            });
+          });
+        });
+
+      });
+    });
+
     it('should handle basic migration using', function (done) {
       set.up(function (err) {
         assert.ifError(err);

From 3082f550a49330adc820fb71bc1a2fdf79ab4007 Mon Sep 17 00:00:00 2001
From: Andres Olave <andres.olave@thinkingbytes.net>
Date: Mon, 1 Aug 2016 15:22:24 +0300
Subject: [PATCH 6/8] fix module load

---
 bin/migrate | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/migrate b/bin/migrate
index d567342..f66457e 100755
--- a/bin/migrate
+++ b/bin/migrate
@@ -226,7 +226,7 @@ function create(name) {
 
 function performMigration(direction, migrationName) {
   var storeType = options.store || 'file';
-  var Store = require('node-migrate-'  + storeType + 'store');
+  var Store = require('migrate-'  + storeType + 'store');
 
   var store = new (Function.prototype.bind.apply(Store, [null].concat(options)));
 

From 5b586467060f7bea8d4a8dd7b0e97d1baeb69f3f Mon Sep 17 00:00:00 2001
From: Andres Olave <andres.olave@thinkingbytes.net>
Date: Mon, 1 Aug 2016 15:52:13 +0300
Subject: [PATCH 7/8] split out executable from js for cli

---
 bin/migrate       | 254 +---------------------------------------------
 bin/migratecli.js | 254 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 255 insertions(+), 253 deletions(-)
 create mode 100644 bin/migratecli.js

diff --git a/bin/migrate b/bin/migrate
index f66457e..eea849a 100755
--- a/bin/migrate
+++ b/bin/migrate
@@ -1,255 +1,3 @@
 #!/usr/bin/env node
 
-/**
- * Module dependencies.
- */
-
-var migrate = require('../')
-  , join = require('path').join
-  , fs = require('fs')
-  , dateFormat = require('dateformat');
-
-/**
- * Arguments.
- */
-
-var args = process.argv.slice(2);
-
-/**
- * Option defaults.
- */
-
-var options = { args: [] };
-
-/**
- * Current working directory.
- */
-
-var cwd;
-
-/**
- * Usage information.
- */
-
-var migrationCliHandlers = [
-  {
-    usageOptions: [
-      '     -c, --chdir <path>      change the working directory'
-      , '     --template-file <path>  set path to template file to use for new migrations'
-      , '     --date-format <format>  set a date format to use for new migration filenames'
-      , '     --store <string>  select the db adapter to use: file (default) or mongo'
-    ],
-    parseArg    : function (arg) {
-      switch (arg) {
-        case '-h':
-        case '--help':
-        case 'help':
-          console.log(usage);
-          process.exit();
-          return true;
-        case '-c':
-        case '--chdir':
-          process.chdir(cwd = required());
-          return true;
-        case '--store':
-          options.store = required();
-          return true;
-        case '--template-file':
-          template = fs.readFileSync(required());
-          return true;
-        case '--date-format':
-          options.dateFormat = required();
-          return true;
-      }
-    }
-  }
-];
-
-['file', 'mongo'].forEach(function(storeType) {
-  try {
-    var Store = require('migrate-' + storeType + 'store');
-    if (Store.cliHandler)
-      migrationCliHandlers.push(Store.cliHandler)
-  } catch(e) {
-    //ignore missing types
-  }
-});
-
-var usageArr = [
-    ''
-  , '  Usage: migrate [options] [command]'
-  , ''
-  , '  Options:'
-  , ''];
-
-migrationCliHandlers.forEach(function (handler) {
-  usageArr = usageArr.concat(handler.usageOptions)
-});
-
-usageArr = usageArr.concat([
-  , '  Commands:'
-  , ''
-  , '     down   [name]    migrate down till given migration'
-  , '     up     [name]    migrate up till given migration (the default command)'
-  , '     create [title]   create a new migration file with optional [title]'
-  , ''
-]);
-var usage = usageArr.join('\n');
-
-/**
- * Migration template.
- */
-
-var template = [
-    '\'use strict\''
-  , ''
-  , 'exports.up = function(next) {'
-  , '  next();'
-  , '};'
-  , ''
-  , 'exports.down = function(next) {'
-  , '  next();'
-  , '};'
-  , ''
-].join('\n');
-
-// require an argument
-
-function required() {
-  if (args.length) return args.shift();
-  abort(arg + ' requires an argument');
-}
-
-// abort with a message
-
-function abort(msg) {
-  console.error('  %s', msg);
-  process.exit(1);
-}
-
-// parse arguments
-var arg;
-while (args.length) {
-  arg = args.shift();
-  var optionKey;
-  for (var i = 0; i<migrationCliHandlers.length; i++) {
-    optionKey = migrationCliHandlers[i].parseArg(arg)
-    if (optionKey)
-      options[optionKey] = required();
-  }
-  if (!optionKey) {
-    // default case
-    if (options.command) {
-      options.args.push(arg);
-    } else {
-      options.command = arg;
-    }
-  }
-}
-
-/**
- * Log a keyed message.
- */
-
-function log(key, msg) {
-  console.log('  \033[90m%s :\033[0m \033[36m%s\033[0m', key, msg);
-}
-
-/**
- * Slugify the given `str`.
- */
-
-function slugify(str) {
-  return str.replace(/\s+/g, '-');
-}
-
-// create ./migrations
-
-try {
-  fs.mkdirSync('migrations', 0774);
-} catch (err) {
-  // ignore
-}
-
-// commands
-
-var commands = {
-
-  /**
-   * up [name]
-   */
-
-  up: function(migrationName){
-    performMigration('up', migrationName);
-  },
-
-  /**
-   * down [name]
-   */
-
-  down: function(migrationName){
-    performMigration('down', migrationName);
-  },
-
-  /**
-   * create [title]
-   */
-
-  create: function(){
-    var curr = Date.now()
-      , title = slugify([].slice.call(arguments).join(' '));
-    if (options.dateFormat) {
-      curr = dateFormat(curr, options.dateFormat);
-    }
-    title = title ? curr + '-' + title : curr;
-    create(title);
-  }
-};
-
-/**
- * Create a migration with the given `name`.
- *
- * @param {String} name
- */
-
-function create(name) {
-  var path = join('migrations', name + '.js');
-  log('create', join(process.cwd(), path));
-  fs.writeFileSync(path, template);
-}
-
-/**
- * Perform a migration in the given `direction`.
- *
- * @param {Number} direction
- */
-
-function performMigration(direction, migrationName) {
-  var storeType = options.store || 'file';
-  var Store = require('migrate-'  + storeType + 'store');
-
-  var store = new (Function.prototype.bind.apply(Store, [null].concat(options)));
-
-  var set = migrate.load(store, 'migrations');
-
-  set.on('migration', function(migration, direction){
-    log(direction, migration.title);
-  });
-
-  set[direction](migrationName, function (err) {
-    if (err) {
-      log('error', err);
-      process.exit(1);
-    }
-
-    log('migration', 'complete');
-    process.exit(0);
-  });
-}
-
-// invoke command
-
-var command = options.command || 'up';
-if (!(command in commands)) abort('unknown command "' + command + '"');
-command = commands[command];
-command.apply(this, options.args);
+require('./migratecli');
\ No newline at end of file
diff --git a/bin/migratecli.js b/bin/migratecli.js
new file mode 100644
index 0000000..79b9199
--- /dev/null
+++ b/bin/migratecli.js
@@ -0,0 +1,254 @@
+/**
+ * Module dependencies.
+ */
+
+var migrate = require('../')
+  , join = require('path').join
+  , fs = require('fs')
+  , dateFormat = require('dateformat');
+
+/**
+ * Arguments.
+ */
+
+var args = process.argv.slice(2);
+
+/**
+ * Option defaults.
+ */
+
+var options = { args: [] };
+
+/**
+ * Current working directory.
+ */
+
+var cwd;
+
+/**
+ * Usage information.
+ */
+
+var migrationCliHandlers = [
+  {
+    usageOptions: [
+      '     -c, --chdir <path>      change the working directory'
+      , '     --template-file <path>  set path to template file to use for new migrations'
+      , '     --date-format <format>  set a date format to use for new migration filenames'
+      , '     --store <string>  select the db adapter to use: file (default) or mongo'
+    ],
+    parseArg    : function (arg) {
+      switch (arg) {
+        case '-h':
+        case '--help':
+        case 'help':
+          console.log(usage);
+          process.exit();
+          return true;
+        case '-c':
+        case '--chdir':
+          process.chdir(cwd = required());
+          return true;
+        case '--store':
+          options.store = required();
+          return true;
+        case '--template-file':
+          template = fs.readFileSync(required());
+          return true;
+        case '--date-format':
+          options.dateFormat = required();
+          return true;
+      }
+    }
+  }
+];
+
+['file', 'mongo'].forEach(function(storeType) {
+  try {
+    var Store = require('migrate-' + storeType + 'store');
+    if (Store.cliHandler)
+      migrationCliHandlers.push(Store.cliHandler)
+  } catch(e) {
+    //ignore missing types
+  }
+});
+
+var usageArr = [
+  ''
+  , '  Usage: migrate [options] [command]'
+  , ''
+  , '  Options:'
+  , ''];
+
+migrationCliHandlers.forEach(function (handler) {
+  usageArr = usageArr.concat(handler.usageOptions)
+});
+
+usageArr = usageArr.concat([
+  , '  Commands:'
+  , ''
+  , '     down   [name]    migrate down till given migration'
+  , '     up     [name]    migrate up till given migration (the default command)'
+  , '     create [title]   create a new migration file with optional [title]'
+  , ''
+]);
+var usage = usageArr.join('\n');
+
+/**
+ * Migration template.
+ */
+
+var template = [
+  '\'use strict\''
+  , ''
+  , 'exports.up = function(next) {'
+  , '  next();'
+  , '};'
+  , ''
+  , 'exports.down = function(next) {'
+  , '  next();'
+  , '};'
+  , ''
+].join('\n');
+
+// require an argument
+
+function required() {
+  if (args.length) return args.shift();
+  abort(arg + ' requires an argument');
+}
+
+// abort with a message
+
+function abort(msg) {
+  console.error('  %s', msg);
+  process.exit(1);
+}
+
+// parse arguments
+var arg;
+while (args.length) {
+  arg = args.shift();
+  var optionKey;
+  for (var i = 0; i<migrationCliHandlers.length; i++) {
+    optionKey = migrationCliHandlers[i].parseArg(arg)
+    if (optionKey)
+      options[optionKey] = required();
+  }
+  if (!optionKey) {
+    // default case
+    if (options.command) {
+      options.args.push(arg);
+    } else {
+      options.command = arg;
+    }
+  }
+}
+
+/**
+ * Log a keyed message.
+ */
+
+function log(key, msg) {
+  console.log('  \033[90m%s :\033[0m \033[36m%s\033[0m', key, msg);
+}
+
+/**
+ * Slugify the given `str`.
+ */
+
+function slugify(str) {
+  return str.replace(/\s+/g, '-');
+}
+
+// create ./migrations
+
+try {
+  fs.mkdirSync('migrations', 0774);
+} catch (err) {
+  // ignore
+}
+
+// commands
+
+var commands = {
+
+  /**
+   * up [name]
+   */
+
+  up: function(migrationName){
+    performMigration('up', migrationName);
+  },
+
+  /**
+   * down [name]
+   */
+
+  down: function(migrationName){
+    performMigration('down', migrationName);
+  },
+
+  /**
+   * create [title]
+   */
+
+  create: function(){
+    var curr = Date.now()
+      , title = slugify([].slice.call(arguments).join(' '));
+    if (options.dateFormat) {
+      curr = dateFormat(curr, options.dateFormat);
+    }
+    title = title ? curr + '-' + title : curr;
+    create(title);
+  }
+};
+
+/**
+ * Create a migration with the given `name`.
+ *
+ * @param {String} name
+ */
+
+function create(name) {
+  var path = join('migrations', name + '.js');
+  log('create', join(process.cwd(), path));
+  fs.writeFileSync(path, template);
+}
+
+/**
+ * Perform a migration in the given `direction`.
+ *
+ * @param {Number} direction
+ */
+
+function performMigration(direction, migrationName) {
+  var storeType = options.store || 'file';
+  var Store = require('migrate-'  + storeType + 'store');
+
+  var store = new (Function.prototype.bind.apply(Store, [null].concat(options)));
+
+  var set = migrate.load(store, 'migrations');
+
+  set.on('migration', function(migration, direction){
+    log(direction, migration.title);
+  });
+
+  set[direction](migrationName, function (err) {
+    if (err) {
+      log('error', err);
+      process.exit(1);
+    }
+
+    log('migration', 'complete');
+    process.exit(0);
+  });
+}
+
+// invoke command
+
+var command = options.command || 'up';
+if (!(command in commands)) abort('unknown command "' + command + '"');
+command = commands[command];
+command.apply(this, options.args);
+

From 3c1f31da1cc3d1f35a6013d404e7dc9498cf7005 Mon Sep 17 00:00:00 2001
From: Andres Olave <andres.olave@thinkingbytes.net>
Date: Mon, 1 Aug 2016 17:29:13 +0300
Subject: [PATCH 8/8] fixes for running cli

---
 bin/migratecli.js | 43 +++++++++++++++++++++----------------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/bin/migratecli.js b/bin/migratecli.js
index 79b9199..bfdb238 100644
--- a/bin/migratecli.js
+++ b/bin/migratecli.js
@@ -25,6 +25,22 @@ var options = { args: [] };
 
 var cwd;
 
+/**
+ * Migration template.
+ */
+var template = [
+  '\'use strict\''
+  , ''
+  , 'exports.up = function(next) {'
+  , '  next();'
+  , '};'
+  , ''
+  , 'exports.down = function(next) {'
+  , '  next();'
+  , '};'
+  , ''
+].join('\n');
+
 /**
  * Usage information.
  */
@@ -50,14 +66,12 @@ var migrationCliHandlers = [
           process.chdir(cwd = required());
           return true;
         case '--store':
-          options.store = required();
-          return true;
+          return 'store';
         case '--template-file':
           template = fs.readFileSync(required());
           return true;
         case '--date-format':
-          options.dateFormat = required();
-          return true;
+          return 'dateFormat'
       }
     }
   }
@@ -94,23 +108,6 @@ usageArr = usageArr.concat([
 ]);
 var usage = usageArr.join('\n');
 
-/**
- * Migration template.
- */
-
-var template = [
-  '\'use strict\''
-  , ''
-  , 'exports.up = function(next) {'
-  , '  next();'
-  , '};'
-  , ''
-  , 'exports.down = function(next) {'
-  , '  next();'
-  , '};'
-  , ''
-].join('\n');
-
 // require an argument
 
 function required() {
@@ -132,8 +129,10 @@ while (args.length) {
   var optionKey;
   for (var i = 0; i<migrationCliHandlers.length; i++) {
     optionKey = migrationCliHandlers[i].parseArg(arg)
-    if (optionKey)
+    if (typeof optionKey === 'string')
       options[optionKey] = required();
+    if (optionKey)
+      break;
   }
   if (!optionKey) {
     // default case