From 7b0fc8bdb688f0d910ca4db7ae25c7bb3401cda9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Matyas?= <michal@6irc.net>
Date: Sun, 26 Jun 2011 03:41:52 +0200
Subject: [PATCH] removing default path from configuration and adding support
 for --location

---
 classes/minion/task/db/generate.php | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/classes/minion/task/db/generate.php b/classes/minion/task/db/generate.php
index 9d7aace..f2973f8 100644
--- a/classes/minion/task/db/generate.php
+++ b/classes/minion/task/db/generate.php
@@ -35,7 +35,8 @@ class Minion_Task_Db_Generate extends Minion_Task
 	 */
 	protected $_config = array(
 		'group',
-		'description'
+		'description',
+		'location'
 	);
 
 	/**
@@ -54,10 +55,16 @@ class Minion_Task_Db_Generate extends Minion_Task
 		$group    = $config['group'].'/';
 		$description = $config['description'];
 
+		if (empty($config['location']))
+		{
+			$config['location'] = APPPATH;
+		}
+		$location = rtrim(realpath($config['location']), '/').'/migrations/';
+
 		// {year}{month}{day}{hour}{minute}{second}
 		$time  = date('YmdHis');
 		$class = $this->_generate_classname($group, $time);
-		$file  = $this->_generate_filename($group, $time, $description);
+		$file  = $this->_generate_filename($location, $group, $time, $description);
 
 
 		$data = Kohana::FILE_SECURITY.View::factory('minion/task/db/generate/template')
@@ -106,10 +113,10 @@ class Minion_Task_Db_Generate extends Minion_Task
 	 * @param  string Description
 	 * @return string Filename
 	 */
-	public function _generate_filename($group, $time, $description)
+	public function _generate_filename($location, $group, $time, $description)
 	{
 		$description = substr(strtolower($description), 0, 100);
-		return DOCROOT.Kohana::config('minion/migration')->default_path.$group.$time.'_'.preg_replace('~[^a-z]+~', '-', $description).EXT;
+		return $location.$group.$time.'_'.preg_replace('~[^a-z]+~', '-', $description).EXT;
 	}
 
 }