README.md

@@ -1,5 +1,5 @@
 # migrate-mongoose
-A node based migration framework for mongoose
+A node based migration framework for ES6+ for mongoose
 
 #### Motivation
 migrate-mongoose is a migration framework for projects which are already using mongoose.
@@ -63,7 +63,6 @@ Commands:
 Options:
   -d, --dbConnectionUri   The URI of the database connection                           [string] [required]
   --collection            The mongo collection name to use for migrations [string] [default: "migrations"]
-  --es6                   use es6 migration templates?                                           [boolean]
   --md, --migrations-dir  The path to the migration files               [string] [default: "./migrations"]
   -t, --template-file     The template file to use when creating a migration                      [string]
   -c, --change-dir        Change current working directory before running  anything               [string]
@@ -90,6 +89,14 @@ If you want to not provide the options such as `--dbConnectionUri` to the progra
 ```
 export MIGRATE_dbConnectionUri=localhost/migrations
 ```
+
+`.env` files are also supported. All variables will be read from the `.env` file and set by migrate-mongoose.
+
+```bash
+#.env
+MIGRATE_dbConnectionUri=mongodb://localhost:27017/mydb
+```
+
 **2. Provide a config file (defaults to *migrate.json* or *migrate.js*)**
 ```bash
 # If you have migrate.json in the directory, you don't need to do anything
@@ -109,49 +116,14 @@ Just make sure you don't have aliases of the same option with 2 different values
 #### Migration Files
 Here's how you can access your `mongoose` models and handle errors in your migrations
 
-**ES5 Example**
-```javascript
-'use strict';
-
-var lib = require('myLibrary');
-
-/**
- * Make any changes you need to make to the database here
- */
-exports.up = function up (done) {
-  return lib.doSomeWork().then(function() {
-    // Don't forget to call done() or the migration will never finish!
-    done();
-  })
-  .catch(function(error){
-    // If you get an error in your async operations you can call done like so
-    done(error);
-  });
-
-  // Throwing errors also works
-  throw new Error('It should never get here!');
-};
-
-/**
- * Make any changes that UNDO the up function side effects here (if possible)
- */
-exports.down = function down(done) {
-  lib.undoAboveWork().then(function() {
-      done();
-    })
-    .catch(function(error){
-      done(error);
-    });
-};
-```
 
-**ES6 Example**
+**Example (ES6+)**
 ```javascript
 /**
  * Easy flow control
  */
 // Notice no need for callback 
-export async function up() {
+async function up() {
   // Error handling is as easy as throwing an error  
   if (condition) {
     throw new Error('This is an error. Could not complete migration');  
@@ -184,9 +156,9 @@ const UserSchema = new Schema({
 module.exports = mongoose.model('user', UserSchema);
 
 // 1459287720919-my-migration.js
-export async function up() {
+async function up() {
   // Then you can access it in the migration like so  
-  await this('user').update({}, {
+  await this('user').updateMany({}, {
     $rename: { firstName: 'first' }
   }, { multi: true });
 
@@ -208,4 +180,4 @@ example: `-d mongodb://localhost:27017/development` . If you don't want to pass
 ### How to contribute
 1. Start an issue. We will discuss the best approach
 2. Make a pull request. I'll review it and comment until we are both confident about it
-3. Profit
+3. I'll merge your PR and bump the version of the package

examples/config-file-usage/README.md

@@ -5,7 +5,7 @@ by using a config file (`migrate.json` by default), you can skip providing the o
 Now instead of running this command to create a new migration
 
 ```
-$ ./node_modules/.bin/migrate --es6 --migrationsDir db/migrations -d mongodb://localhost/db-dev create my_new_migration
+$ ./node_modules/.bin/migrate --migrationsDir db/migrations -d mongodb://localhost/db-dev create my_new_migration
 ```
 
 we can simply run

examples/config-file-usage/db/migrations/1450107140857-add-default-user-state.js

@@ -1,7 +1,12 @@
-export async function up () {
+async function up () {
   await this('users').updateMany({}, { $set: { state: 'California' } });
 }
 
-export async function down () {
+async function down () {
   await this('users').updateMany({}, { $unset: { state: 1 } });
 }
+
+module.exports = {
+  down,
+  up
+}

examples/config-file-usage/migrate.json

@@ -1,5 +1,4 @@
 {
   "dbConnectionUri": "mongodb://localhost/db-dev",
-  "migrationsDir": "db/migrations",
-  "es6": true
+  "migrationsDir": "db/migrations"
 }

examples/programmatic-usage/README.md

@@ -8,15 +8,13 @@ var
  migrationsDir = '/path/to/migrations/',
  templatePath,
  dbUrl = 'mongodb://localhost/db',
- useES6 = true,
  collectionName = 'myMigrations',
  autosync = true;
 
 let migrator = new migrateMongoose({
   migrationsPath:  migrationsDir, // Path to migrations directory
   templatePath: templatePath, // The template to use when creating migrations needs up and down functions exposed
   dbConnectionUri: dbUrl, // mongo url
-  es6Templates: useES6, // Should migrations be assumed to be using ES6?
   collectionName:  collectionName, // collection name to use for migrations (defaults to 'migrations')
   autosync: autosync // if making a CLI app, set this to false to prompt the user, otherwise true
 });
@@ -30,10 +28,10 @@ migrator.create(migrationName).then(()=> {
 });
 
 // Migrate Up
-promise = migrator.run(migrationName, 'up');
+promise = migrator.run('up', migrationName);
 
 // Migrate Down
-promise = migrator.run(migrationName, 'down');
+promise = migrator.run('down', migrationName);
 
 // List Migrations
 /*