find the correct files

lib/migrator.js

-var fs        = require("fs")
-  , path      = require("path")
-  , moment    = require("moment")
-  , Utils     = require("./utils")
-  , DataTypes = require("./data-types")
+const fs     = require("fs")
+    , path   = require("path")
+    , moment = require("moment")
+
+var Utils          = require("./utils")
+  , DataTypes      = require("./data-types")
+  , QueryInterface = require("./query-interface")
 
 
 module.exports = (function() {
 module.exports = (function() {
   var Migrator = function(sequelize, options) {
   var Migrator = function(sequelize, options) {
     this.sequelize = sequelize
     this.sequelize = sequelize
+    this.queryInterface = new QueryInterface(this.sequelize)
     this.options   = Utils._.extend({
     this.options   = Utils._.extend({
       path: __dirname + '/../migrations',
       path: __dirname + '/../migrations',
       from: null,
       from: null,
@@ -18,81 +21,29 @@ module.exports = (function() {
     var self = this
     var self = this
 
 
     return new Utils.CustomEventEmitter(function(emitter) {
     return new Utils.CustomEventEmitter(function(emitter) {
-      var execMigrations = function(from) {
-        var nonMigratedFiles = getMigrationsFilesSince.call(self, from)
-
-        nonMigratedFiles.forEach(function(file) {
-          executeMigration.call(self, self.options.path + '/' + file)
-        })
-
-        emitter.emit('success')
-      }
-
-      if(self.options.from) {
-        execMigrations(self.options.from)
-      } else {
-        getLastMigrationId.call(self).success(function(migrationId) {
-          migrationId = migrationId || '19700101000000'
-          execMigrations.call(self, migrationId)
-        })
-      }
+      getUndoneMigrations.call(self, function(migrations) {
+        console.log(migrations)
+      })
     }).run()
     }).run()
   }
   }
 
 
-  Migrator.prototype.createTable = function() {
-
-  }
-
-  Migrator.prototype.dropTable = function() {
-
-  }
-
-  Migrator.prototype.renameTable = function() {
-
-  }
-
-  Migrator.prototype.addColumn = function() {
-
-  }
-
-  Migrator.prototype.removeColumn = function() {
-
-  }
-
-  Migrator.prototype.changeColumn = function() {
-
-  }
-
-  Migrator.prototype.renameColumn = function() {
-
-  }
-
-  Migrator.prototype.addIndex = function() {
-
-  }
-
-  Migrator.prototype.removeIndex = function() {
-
-  }
-
   // private
   // private
 
 
   var executeMigration = function(path, method) {
   var executeMigration = function(path, method) {
     var migration = require(path)
     var migration = require(path)
-    migration[method || 'up'](this)
-
+    migration[method || 'up'](this.queryInterface, DataTypes)
   }
   }
 
 
   var getLastMigrationId = function() {
   var getLastMigrationId = function() {
     var self = this
     var self = this
 
 
     return new Utils.CustomEventEmitter(function(emitter) {
     return new Utils.CustomEventEmitter(function(emitter) {
-      var SequelizeMeta       = self.sequelize.modelManager.getModel('SequelizeMeta')
+      var SequelizeMeta = self.sequelize.modelManager.getModel('SequelizeMeta')
 
 
       var findLastMigrationId = function() {
       var findLastMigrationId = function() {
         SequelizeMeta.find({ order: 'id DESC' }).success(function(sequelizeMeta) {
         SequelizeMeta.find({ order: 'id DESC' }).success(function(sequelizeMeta) {
           emitter.emit('success', sequelizeMeta ? sequelizeMeta.lastMigrationId : null)
           emitter.emit('success', sequelizeMeta ? sequelizeMeta.lastMigrationId : null)
-        })
+        }).error(function(err) { emitter.emit('failure', err) })
       }
       }
 
 
       if(SequelizeMeta) {
       if(SequelizeMeta) {
@@ -102,11 +53,10 @@ module.exports = (function() {
           lastMigrationId: DataTypes.STRING
           lastMigrationId: DataTypes.STRING
         })
         })
 
 
-        SequelizeMeta.sync().success(function() {
-          findLastMigrationId()
-        }).error(function(err) {
-          emitter.emit('failure', err)
-        })
+        SequelizeMeta
+          .sync()
+          .success(function() { findLastMigrationId() })
+          .error(function(err) { emitter.emit('failure', err) })
       }
       }
     }).run()
     }).run()
   }
   }
@@ -124,24 +74,31 @@ module.exports = (function() {
   }
   }
 
 
   var stringToDate = function(s) {
   var stringToDate = function(s) {
-    var formattedString = getFormattedDateString(s)
-      , date            = moment(formattedString, "YYYYMMDDHHmmss")
-
-    return date
+    return moment(getFormattedDateString(s), "YYYYMMDDHHmmss")
   }
   }
 
 
-  var getMigrationsFilesSince = function(sinceString)  {
-    var result = []
-      , since  = stringToDate(sinceString)
+  var getUndoneMigrations = function(callback)  {
+    var migrationFiles   = fs.readdirSync(this.options.path)
+      , undoneMigrations = migrationFiles
 
 
-    var undoneMigrationFiles = fs.readdirSync(this.options.path).filter(function(file) {
-      var fileDateString = file.split("-")[0]
-        , fileDate       = stringToDate(fileDateString)
+    if(this.options.from) {
+      var sinceDate = stringToDate(this.options.from.toString())
 
 
-      return fileDate.diff(since) > 0
-    })
+      undoneMigrations = migrationFiles.filter(function(file) {
+        var fileDate = stringToDate(file.split("-")[0])
+        return fileDate.diff(sinceDate) >= 0
+      })
+    }
+
+    if(this.options.to) {
+      var toDate = stringToDate(this.options.to.toString())
+      undoneMigrations = undoneMigrations.filter(function(file) {
+        var fileDate = stringToDate(file.split("-")[0])
+        return toDate.diff(fileDate) >= 0
+      })
+    }
 
 
-    return undoneMigrationFiles
+    callback && callback(undoneMigrations)
   }
   }
 
 
   return Migrator
   return Migrator