fix a few bugs and update tests

Author: wzrdtales

.tern-port

@@ -1 +1 @@
-45175
+39355

api.js

@@ -437,8 +437,4 @@ dbmigrate.prototype = {
   }
 };
 
-function transition(internals) {
-  require('./lib/transitions/transitioner.js')(internals);
-}
-
 module.exports = dbmigrate;

lib/commands/create-migration.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var assert = require('../helper/assert');
+var _assert = require('./helper/assert');
 var log = require('db-migrate-shared').log;
 var mkdirp = require('mkdirp');
 var fs = require('fs');
@@ -35,8 +35,8 @@ function executeCreateMigration(internals, config, callback) {
   }
 
   createMigrationDir(migrationsDir, function(err) {
-    var index = require('./connect');
-    var Migration = require('./lib/migration.js');
+    var index = require('../../connect');
+    var Migration = require('../migration.js');
 
     if (err) {
       log.error('Failed to create migration directory at ', migrationsDir, err);
@@ -117,8 +117,8 @@ function createSqlFiles(internals, config, callback) {
 
   var sqlDir = migrationsDir + '/sqls';
   createMigrationDir(sqlDir, function(err) {
-    var index = require('./connect');
-    var Migration = require('./lib/migration.js');
+    var index = require('../../connect');
+    var Migration = require('../migration.js');
 
     if (err) {
       log.error('Failed to create migration directory at ', sqlDir, err);

lib/commands/helper/register-events.js

@@ -1,5 +1,7 @@
 'use strict';
 
+var log = require('db-migrate-shared').log;
+
 function registerEvents() {
   process.on('uncaughtException', function(err) {
     log.error(err.stack || err);

lib/commands/run.js

@@ -1,5 +1,13 @@
 'use strict';
 
+var log = require('db-migrate-shared').log;
+var optimist = require('optimist');
+var load = require('./');
+
+function transition(internals) {
+  require('../transitions/transitioner.js')(internals);
+}
+
 function run(internals, config) {
   var action = internals.argv._.shift(),
     folder = action.split(':');
@@ -15,7 +23,7 @@ function run(internals, config) {
         internals.matching = folder[1];
         internals.migrationMode = folder[1];
       }
-      executeCreateMigration(internals, config);
+      load('create-migration')(internals, config);
       break;
     case 'sync':
       var executeSync = load('sync');
@@ -68,7 +76,7 @@ function run(internals, config) {
         log.info('Please enter a valid command, i.e. db:create|db:drop');
       } else {
         internals.mode = folder[1];
-        executeDB(internals, config);
+        load('db')(internals, config);
       }
       break;
     case 'seed':
@@ -80,9 +88,9 @@ function run(internals, config) {
           internals.argv.count = Number.MAX_VALUE;
 
         internals.argv._.shift();
-        executeUndoSeed(internals, config);
+        load('undo-seed')(internals, config);
       } else {
-        executeSeed(internals, config);
+        load('seed')(internals, config);
       }
       break;
 

lib/commands/seed.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var assert = require('assert');
-var _assert = require('../helper/assert');
+var _assert = require('./helper/assert');
 
 function executeSeed(internals, config, callback) {
   var index = require('./connect');

lib/commands/undo-seed.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var assert = require('assert');
-var _assert = require('../helper/assert');
+var _assert = require('./helper/assert');
 
 function executeUndoSeed(internals, config, callback) {
   var index = require('./connect');