From b33c51c0a6c7c8a7b0c0a9a6ca101f874f2db3d1 Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Thu, 12 Jan 2017 01:17:05 -0800
Subject: migrations - introduce promise-based migrator

---
 app/scripts/lib/migrator/index.js | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 app/scripts/lib/migrator/index.js

(limited to 'app/scripts/lib/migrator/index.js')

diff --git a/app/scripts/lib/migrator/index.js b/app/scripts/lib/migrator/index.js
new file mode 100644
index 000000000..02d8c2335
--- /dev/null
+++ b/app/scripts/lib/migrator/index.js
@@ -0,0 +1,31 @@
+const asyncQ = require('async-q')
+
+class Migrator {
+
+  constructor (opts = {}) {
+    let migrations = opts.migrations || []
+    this.migrations = migrations.sort((a, b) => a.version - b.version)
+    let lastMigration = this.migrations.slice(-1)[0]
+    // use specified defaultVersion or highest migration version
+    this.defaultVersion = opts.defaultVersion || lastMigration && lastMigration.version || 0
+  }
+
+  // run all pending migrations on meta in place
+  migrateData (meta = { version: this.defaultVersion }) {
+    let remaining = this.migrations.filter(migrationIsPending)
+    
+    return (
+      asyncQ.eachSeries(remaining, (migration) => migration.migrate(meta))
+      .then(() => meta)
+    )
+
+    // migration is "pending" if hit has a higher
+    // version number than currentVersion
+    function migrationIsPending(migration) {
+      return migration.version > meta.version
+    }
+  }
+
+}
+
+module.exports = Migrator
-- 
cgit v1.2.3


From 80514d73b5bc6887cea877194091c941cfb9a8e6 Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Thu, 12 Jan 2017 02:24:33 -0800
Subject: migrations - wip - 005 multivault migration

---
 app/scripts/lib/migrator/index.js | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

(limited to 'app/scripts/lib/migrator/index.js')

diff --git a/app/scripts/lib/migrator/index.js b/app/scripts/lib/migrator/index.js
index 02d8c2335..ab5a757b3 100644
--- a/app/scripts/lib/migrator/index.js
+++ b/app/scripts/lib/migrator/index.js
@@ -7,22 +7,31 @@ class Migrator {
     this.migrations = migrations.sort((a, b) => a.version - b.version)
     let lastMigration = this.migrations.slice(-1)[0]
     // use specified defaultVersion or highest migration version
-    this.defaultVersion = opts.defaultVersion || lastMigration && lastMigration.version || 0
+    this.defaultVersion = opts.defaultVersion || (lastMigration && lastMigration.version) || 0
   }
 
   // run all pending migrations on meta in place
-  migrateData (meta = { version: this.defaultVersion }) {
+  migrateData (versionedData = this.generateInitialState()) {
     let remaining = this.migrations.filter(migrationIsPending)
     
     return (
-      asyncQ.eachSeries(remaining, (migration) => migration.migrate(meta))
-      .then(() => meta)
+      asyncQ.eachSeries(remaining, (migration) => migration.migrate(versionedData))
+      .then(() => versionedData)
     )
 
     // migration is "pending" if hit has a higher
     // version number than currentVersion
     function migrationIsPending(migration) {
-      return migration.version > meta.version
+      return migration.version > versionedData.meta.version
+    }
+  }
+
+  generateInitialState (initState) {
+    return {
+      meta: {
+        version: this.defaultVersion,
+      },
+      data: initState,
     }
   }
 
-- 
cgit v1.2.3


From 77f8995568d64aa2d9acd878b43fdeb1e7c3bafb Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Fri, 3 Feb 2017 14:00:30 -0800
Subject: migrations - fix migration #9 and add safety checks to migrator

---
 app/scripts/lib/migrator/index.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'app/scripts/lib/migrator/index.js')

diff --git a/app/scripts/lib/migrator/index.js b/app/scripts/lib/migrator/index.js
index ab5a757b3..312345263 100644
--- a/app/scripts/lib/migrator/index.js
+++ b/app/scripts/lib/migrator/index.js
@@ -15,7 +15,7 @@ class Migrator {
     let remaining = this.migrations.filter(migrationIsPending)
     
     return (
-      asyncQ.eachSeries(remaining, (migration) => migration.migrate(versionedData))
+      asyncQ.eachSeries(remaining, (migration) => this.runMigration(versionedData, migration))
       .then(() => versionedData)
     )
 
@@ -26,6 +26,17 @@ class Migrator {
     }
   }
 
+  runMigration(versionedData, migration) {
+    return (
+      migration.migrate(versionedData)
+      .then((versionedData) => {
+        if (!versionedData.data) return Promise.reject(new Error('Migrator - Migration returned empty data'))
+        if (migration.version !== undefined && versionedData.meta.version !== migration.version) return Promise.reject(new Error('Migrator - Migration did not update version number correctly'))
+        return Promise.resolve(versionedData)
+      })
+    )
+  }
+
   generateInitialState (initState) {
     return {
       meta: {
-- 
cgit v1.2.3