Fix for issue

http://code.google.com/p/mybatis/issues/detail?id=230

Author: nmaves

src/main/java/org/apache/ibatis/io/ExternalResources.java

@@ -1,59 +1,57 @@
 package org.apache.ibatis.io;
 
-import java.io.Closeable;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
+import java.io.*;
 import java.nio.channels.FileChannel;
 import java.util.Properties;
 
 public class ExternalResources {
 
-    private ExternalResources() {
-        // do nothing
-    }
-
-    public static void copyExternalResource(File sourceFile, File destFile) throws IOException {
-        if (!destFile.exists()) {
-            destFile.createNewFile();
-        }
-
-        FileChannel source = null;
-        FileChannel destination = null;
-        try {
-            source = new FileInputStream(sourceFile).getChannel();
-            destination = new FileOutputStream(destFile).getChannel();
-            destination.transferFrom(source, 0, source.size());
-        } finally {
-            closeQuietly(source);
-            closeQuietly(destination);
-        }
+  private ExternalResources() {
+    // do nothing
+  }
 
+  public static void copyExternalResource(File sourceFile, File destFile) throws IOException {
+    if (!destFile.exists()) {
+      destFile.createNewFile();
     }
 
-    private static void closeQuietly(Closeable closeable) {
-        if (closeable != null) {
-            try {
-                closeable.close();
-            } catch (IOException e) {
-                // do nothing, close quietly
-            }
-        }
+    FileChannel source = null;
+    FileChannel destination = null;
+    try {
+      source = new FileInputStream(sourceFile).getChannel();
+      destination = new FileOutputStream(destFile).getChannel();
+      destination.transferFrom(source, 0, source.size());
+    } finally {
+      closeQuietly(source);
+      closeQuietly(destination);
     }
 
-    public static String getConfiguredTemplate(String templatePath, String templateProperty) {
-        String templateName = "";
-        Properties migrationProperties = new Properties();
+  }
 
-        try {
-           migrationProperties.load(new FileInputStream(templatePath));
-           templateName = migrationProperties.getProperty(templateProperty);
-        } catch (Exception e) {
-             e.printStackTrace();
-        }
+  private static void closeQuietly(Closeable closeable) {
+    if (closeable != null) {
+      try {
+        closeable.close();
+      } catch (IOException e) {
+        // do nothing, close quietly
+      }
+    }
+  }
+
+  public static String getConfiguredTemplate(String templatePath, String templateProperty) throws FileNotFoundException {
+    String templateName = "";
+    Properties migrationProperties = new Properties();
+
+    try {
+      migrationProperties.load(new FileInputStream(templatePath));
+      templateName = migrationProperties.getProperty(templateProperty);
+    } catch (FileNotFoundException e) {
+      throw e;
+    } catch (Exception e) {
+      e.printStackTrace();
+    }
 
-        return templateName;
-     }
+    return templateName;
+  }
 
 }

src/main/java/org/apache/ibatis/migration/commands/NewCommand.java

@@ -1,17 +1,18 @@
 package org.apache.ibatis.migration.commands;
 
-import java.io.File;
-import java.util.Properties;
-
 import org.apache.ibatis.io.ExternalResources;
 import org.apache.ibatis.migration.MigrationException;
 
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.util.Properties;
+
 public class NewCommand extends BaseCommand {
 
   private static final String MIGRATIONS_HOME = "MIGRATIONS_HOME";
+  private static final String MIGRATIONS_HOME_PROPERTY = "migrationHome";
   private static final String CUSTOM_NEW_COMMAND_TEMPATE_PROPERTY = "new_command.template";
   private static final String MIGRATIONS_PROPERTIES = "migration.properties";
-  protected String customConfiguredTemplate = "";
 
   public NewCommand(File repository, String environment, String template, boolean force) {
     super(repository, environment, template, force);
@@ -29,17 +30,31 @@ public void execute(String... params) {
     String migrationsHome = "";
     migrationsHome = System.getenv(MIGRATIONS_HOME);
 
+    // Check if there is a system property
+    if (migrationsHome == null) {
+      migrationsHome = System.getProperty(MIGRATIONS_HOME_PROPERTY);
+    }
+
     if (this.template != null) {
       copyExternalResourceTo(template, scriptFile(filename), variables);
     } else if ((migrationsHome != null) && (!migrationsHome.equals(""))) {
-      //get template name from properties file
-      customConfiguredTemplate = ExternalResources.getConfiguredTemplate(migrationsHome + "/" + MIGRATIONS_PROPERTIES, CUSTOM_NEW_COMMAND_TEMPATE_PROPERTY);
-      copyExternalResourceTo(migrationsHome + "/" + customConfiguredTemplate, scriptFile(filename), variables);
+      try {
+        //get template name from properties file
+        final String customConfiguredTemplate = ExternalResources.getConfiguredTemplate(migrationsHome + "/" + MIGRATIONS_PROPERTIES, CUSTOM_NEW_COMMAND_TEMPATE_PROPERTY);
+        copyExternalResourceTo(migrationsHome + "/" + customConfiguredTemplate, scriptFile(filename), variables);
+      } catch (FileNotFoundException e) {
+        printStream.append("Your migrations configuration did not find your custom template.  Using the default template.");
+        copyDefaultTemplate(variables, filename);
+      }
     } else {
-      copyResourceTo("org/apache/ibatis/migration/template_migration.sql", scriptFile(filename), variables);
+      copyDefaultTemplate(variables, filename);
     }
 
     printStream.println("Done!");
     printStream.println();
   }
+
+  private void copyDefaultTemplate(Properties variables, String filename) {
+    copyResourceTo("org/apache/ibatis/migration/template_migration.sql", scriptFile(filename), variables);
+  }
 }

src/test/java/org/apache/ibatis/migration/MigratorTest.java

@@ -19,6 +19,7 @@
 import org.apache.ibatis.BaseDataTest;
 import org.apache.ibatis.io.Resources;
 import org.apache.ibatis.jdbc.SqlRunner;
+import org.apache.ibatis.migration.commands.NewCommand;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -204,6 +205,22 @@ public void useCustomTemplateWithNoValue() throws Exception {
     templatePath.delete();
   }
 
+  @Test
+  public void useCustomTemplateWithBadPath() throws Exception {
+    System.setProperty("migrationHome", "/tmp");
+    File basePath = getTempDir();
+    safeMigratorMain(args("--path=" + basePath.getAbsolutePath(), "init"));
+    assertNotNull(basePath.list());
+    assertEquals(4, basePath.list().length);
+    File scriptPath = new File(basePath.getCanonicalPath() + File.separator + "scripts");
+    assertEquals(3, scriptPath.list().length);
+
+    safeMigratorMain(args("--path=" + basePath.getAbsolutePath(), "new", "test new migration"));
+    assertEquals(4, scriptPath.list().length);
+
+    assertTrue(buffer.toString().contains("Your migrations configuration did not find your custom template.  Using the default template."));
+  }
+
   private String[] args(String... args) {
     return args;
   }