From d463d9f873d8b399a64d08afffe85ad24b865748 Mon Sep 17 00:00:00 2001
From: Matt Button <matthew@sigswitch.com>
Date: Fri, 31 Dec 2010 00:51:07 +0000
Subject: [PATCH] Improving the output of db:migrate to show number of
 migrations run & also status of locations

---
 classes/minion/migration/manager.php | 11 +++++++++++
 classes/minion/task/db/migrate.php   |  4 +++-
 views/minion/task/db/migrate.php     | 17 +++++++++++------
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/classes/minion/migration/manager.php b/classes/minion/migration/manager.php
index 5f25055..543c0d0 100644
--- a/classes/minion/migration/manager.php
+++ b/classes/minion/migration/manager.php
@@ -106,6 +106,15 @@ class Minion_Migration_Manager {
 		return $this->_dry_run_sql;
 	}
 
+	/**
+	 * Returns a set of executed migrations
+	 * @return array
+	 */
+	public function get_executed_migrations()
+	{
+		return $this->_executed_migrations;
+	}
+
 	/**
 	 * Run migrations in the specified locations so as to reach specified targets
 	 *
@@ -194,6 +203,8 @@ class Minion_Migration_Manager {
 				{
 					$this->_model->mark_migration($migration, $location['direction']);
 				}
+
+				$this->_executed_migrations[] = $migration;
 			}
 		}
 	}
diff --git a/classes/minion/task/db/migrate.php b/classes/minion/task/db/migrate.php
index 1f4df22..aafabdd 100644
--- a/classes/minion/task/db/migrate.php
+++ b/classes/minion/task/db/migrate.php
@@ -105,7 +105,9 @@ class Minion_Task_Db_Migrate extends Minion_Task
 		$view = View::factory('minion/task/db/migrate')
 			->set('dry_run', $dry_run)
 			->set('quiet', $quiet)
-			->set('dry_run_sql', $manager->get_dry_run_sql());
+			->set('dry_run_sql', $manager->get_dry_run_sql())
+			->set('executed_migrations', $manager->get_executed_migrations())
+			->set('location_versions', $model->fetch_current_versions());
 
 		return $view;
 	}
diff --git a/views/minion/task/db/migrate.php b/views/minion/task/db/migrate.php
index 5ea7cc1..5aa00b0 100644
--- a/views/minion/task/db/migrate.php
+++ b/views/minion/task/db/migrate.php
@@ -1,10 +1,17 @@
+<? if( ! $quiet): ?>
+Executed <?php echo count($executed_migrations); ?> migrations
+
+Current versions of locations:
+<?php foreach($location_versions as $location): ?>
+* <?php echo $location['location'] ?> : <?php echo $location['timestamp'] ?> (<?php echo $location['description']; ?>)
+<?php endforeach; ?>
+
 <?php if($dry_run): ?>
-<?php if( ! $quiet): ?>
-
-This was a dry run, SQL is as follows:
+This was a dry run, if it was a real run the following SQL would've been executed:
+<?php endif; ?>
 <?php endif; ?>
-
 <?php foreach($dry_run_sql as $location => $migrations): ?>
+
 <?php $location_padding = str_repeat('#', strlen($location)); ?>
 ##################<?php echo $location_padding ?>##
 # Begin Location: <?php echo $location; ?> #
@@ -27,5 +34,3 @@ This was a dry run, SQL is as follows:
 ################<?php echo $location_padding ?>##
 <?php endforeach; ?>
 
-<?php endif; ?>
-