From 5359a7afbde36f2598fc463aad47be42572039b6 Mon Sep 17 00:00:00 2001
From: Andrs Montaez <andresmontanez@gmail.com>
Date: Sun, 12 Feb 2012 12:43:09 -0200
Subject: [PATCH] Changes configuration files extensions.

From "yaml" to "yml"
---
 Mage/Config.php                                      | 12 ++++++------
 Mage/Task/Add.php                                    |  2 +-
 Mage/Task/Init.php                                   |  4 ++--
 .../environment/{production.yaml => production.yml}  |  0
 .../config/environment/{staging.yaml => staging.yml} |  0
 .../.mage/config/{general.yaml => general.yml}       |  0
 .../.mage/config/{scm.yaml => scm.yml}               |  0
 7 files changed, 9 insertions(+), 9 deletions(-)
 rename docs/example-config/.mage/config/environment/{production.yaml => production.yml} (100%)
 rename docs/example-config/.mage/config/environment/{staging.yaml => staging.yml} (100%)
 rename docs/example-config/.mage/config/{general.yaml => general.yml} (100%)
 rename docs/example-config/.mage/config/{scm.yaml => scm.yml} (100%)

diff --git a/Mage/Config.php b/Mage/Config.php
index 83dee6d..06ea9a8 100644
--- a/Mage/Config.php
+++ b/Mage/Config.php
@@ -9,22 +9,22 @@ class Mage_Config
     
     public function loadEnvironment($environment)
     {
-        if (($environment != '') && file_exists('.mage/config/environment/' . $environment . '.yaml')) {
-            $this->_environment = @yaml_parse_file('.mage/config/environment/' . $environment . '.yaml');            
+        if (($environment != '') && file_exists('.mage/config/environment/' . $environment . '.yml')) {
+            $this->_environment = @yaml_parse_file('.mage/config/environment/' . $environment . '.yml');            
         }
     }
     
     public function loadSCM()
     {
-        if (file_exists('.mage/config/scm.yaml')) {
-            $this->_scm = @yaml_parse_file('.mage/config/scm.yaml');            
+        if (file_exists('.mage/config/scm.yml')) {
+            $this->_scm = @yaml_parse_file('.mage/config/scm.yml');            
         }
     }
     
     public function loadGeneral()
     {
-        if (file_exists('.mage/config/general.yaml')) {
-            $this->_general = @yaml_parse_file('.mage/config/general.yaml');
+        if (file_exists('.mage/config/general.yml')) {
+            $this->_general = @yaml_parse_file('.mage/config/general.yml');
         }
     }
     
diff --git a/Mage/Task/Add.php b/Mage/Task/Add.php
index b066ec6..d856d24 100644
--- a/Mage/Task/Add.php
+++ b/Mage/Task/Add.php
@@ -4,7 +4,7 @@ class Mage_Task_Add
     public function environment($environmentName, $withRelases = false)
     {
         $environmentName = strtolower($environmentName);
-        $environmentConfigFile = '.mage/config/environment/' . $environmentName . '.yaml';
+        $environmentConfigFile = '.mage/config/environment/' . $environmentName . '.yml';
         
         Mage_Console::output('Adding new environment: <dark_gray>' . $environmentName . '</dark_gray>');
         
diff --git a/Mage/Task/Init.php b/Mage/Task/Init.php
index b440ed8..1e7504f 100644
--- a/Mage/Task/Init.php
+++ b/Mage/Task/Init.php
@@ -17,8 +17,8 @@ class Mage_Task_Init
             $results[] = mkdir($configDir . '/tasks');
             $results[] = mkdir($configDir . '/config');
             $results[] = mkdir($configDir . '/config/environment');
-            $results[] = file_put_contents($configDir . '/config/global.yaml', '#global settings' . PHP_EOL . PHP_EOL);
-            $results[] = file_put_contents($configDir . '/config/scm.yaml', '#scm settings' . PHP_EOL . PHP_EOL);
+            $results[] = file_put_contents($configDir . '/config/global.yml', '#global settings' . PHP_EOL . PHP_EOL);
+            $results[] = file_put_contents($configDir . '/config/scm.yml', '#scm settings' . PHP_EOL . PHP_EOL);
             
             if (!in_array(false, $results)) {
                 Mage_Console::output('<light_green>Success!!</light_green> The configuration for <dark_gray>Magallanes</dark_gray> has been generated at <blue>.mage</blue> directory.');
diff --git a/docs/example-config/.mage/config/environment/production.yaml b/docs/example-config/.mage/config/environment/production.yml
similarity index 100%
rename from docs/example-config/.mage/config/environment/production.yaml
rename to docs/example-config/.mage/config/environment/production.yml
diff --git a/docs/example-config/.mage/config/environment/staging.yaml b/docs/example-config/.mage/config/environment/staging.yml
similarity index 100%
rename from docs/example-config/.mage/config/environment/staging.yaml
rename to docs/example-config/.mage/config/environment/staging.yml
diff --git a/docs/example-config/.mage/config/general.yaml b/docs/example-config/.mage/config/general.yml
similarity index 100%
rename from docs/example-config/.mage/config/general.yaml
rename to docs/example-config/.mage/config/general.yml
diff --git a/docs/example-config/.mage/config/scm.yaml b/docs/example-config/.mage/config/scm.yml
similarity index 100%
rename from docs/example-config/.mage/config/scm.yaml
rename to docs/example-config/.mage/config/scm.yml