fix for cannot get dependencyNames on null object problem(GRAILS-1986)

git-svn-id: https://svn.codehaus.org/grails/trunk@6275 1cfb16fd-6d17-0410-8ff1-b7e8e1e2867d

Author: graeme

scripts/InstallPlugin.groovy

@@ -25,6 +25,7 @@
 import org.codehaus.groovy.grails.commons.GrailsClassUtils as GCU  
 import groovy.xml.dom.DOMCategory
 import groovy.xml.MarkupBuilder
+import org.springframework.util.Assert
 
 appName = ""
 
@@ -158,6 +159,9 @@ target(installPlugin:"Implementation target") {
                 Ant.delete(dir:"${pluginsBase}/${fullPluginName}")
                 clean()
                 def plugin = pluginManager.getFailedPlugin(pluginName)
+
+                Assert.notNull plugin, "Grails Bug: If the plugin wasn't loaded it should be in the failed plugins list, but is not. Please report the issue."
+                
                 println "Failed to install plug-in [${fullPluginName}]. Missing depedencies: ${plugin.dependencyNames.inspect()}"
                 event("PluginInstallFailed", [ "Plugin ${fullPluginName} failed to install"])
             }

src/commons/org/codehaus/groovy/grails/commons/GrailsClassUtils.java

@@ -336,21 +336,39 @@ public static String getScriptName(String name) {
      * @return A class name
      */
     public static String getNameFromScript(String scriptName) {
-    	if(scriptName.indexOf('-') > -1) {
-    		StringBuffer buf = new StringBuffer();
-    		String[] tokens = scriptName.split("-");
-    		for (int i = 0; i < tokens.length; i++) {
-				String token = tokens[i];
-				buf.append(token.substring(0,1).toUpperCase())
-				   .append(token.substring(1));				
-			}
-    		return buf.toString();
-    	}
-    	else {
-    		return scriptName.substring(0,1).toUpperCase() + scriptName.substring(1);
-    	}
-    	
-    	
+        return getClassNameForLowerCaseHyphenSeparatedName(scriptName);
+    }
+
+    /**
+     * Converts foo-bar into fooBar
+     *
+     * @param name The lower case hyphen separated name
+     * @return The property name equivalent
+     */
+    public static String getPropertyNameForLowerCaseHyphenSeparatedName(String name) {
+        return getPropertyName(getClassNameForLowerCaseHyphenSeparatedName(name));
+    }
+
+    /**
+     * Converts foo-bar into FooBar
+     *
+     * @param name The lower case hyphen separated name
+     * @return The class name equivalent
+     */
+    private static String getClassNameForLowerCaseHyphenSeparatedName(String name) {
+        if(name.indexOf('-') > -1) {
+            StringBuffer buf = new StringBuffer();
+            String[] tokens = name.split("-");
+            for (int i = 0; i < tokens.length; i++) {
+                String token = tokens[i];
+                buf.append(token.substring(0,1).toUpperCase())
+                   .append(token.substring(1));
+            }
+            return buf.toString();
+        }
+        else {
+            return name.substring(0,1).toUpperCase() + name.substring(1);
+        }
     }
 
     /**

src/commons/org/codehaus/groovy/grails/plugins/AbstractGrailsPluginManager.java

@@ -119,18 +119,21 @@ public Resource[] getPluginResources() {
 		return this.pluginResources;
 	}
 	public GrailsPlugin getGrailsPlugin(String name) {
-		return (GrailsPlugin)this.plugins.get(name);
+        if(name.indexOf('-') > -1) name = GrailsClassUtils.getPropertyNameForLowerCaseHyphenSeparatedName(name);
+        return (GrailsPlugin)this.plugins.get(name);
 	}
 	public GrailsPlugin getGrailsPlugin(String name, Object version) {
-		GrailsPlugin plugin = (GrailsPlugin)this.plugins.get(name);
+      if(name.indexOf('-') > -1) name = GrailsClassUtils.getPropertyNameForLowerCaseHyphenSeparatedName(name);
+        GrailsPlugin plugin = (GrailsPlugin)this.plugins.get(name);
 		if(plugin != null) {
 			if(GrailsPluginUtils.isValidVersion(plugin.getVersion(), version.toString()))
 				return plugin;
 		}
 		return null;
 	}
 	public boolean hasGrailsPlugin(String name) {
-		return this.plugins.containsKey(name);
+        if(name.indexOf('-') > -1) name = GrailsClassUtils.getPropertyNameForLowerCaseHyphenSeparatedName(name);
+        return this.plugins.containsKey(name);
 	}
 	public void doDynamicMethods() {
 		checkInitialised();

src/commons/org/codehaus/groovy/grails/plugins/DefaultGrailsPluginManager.java

@@ -547,10 +547,6 @@ public void setApplicationContext(ApplicationContext applicationContext) throws
       }
   }
 
-  public boolean hasGrailsPlugin(String name) {
-      return this.plugins.containsKey(name);
-  }
-
   public void setParentApplicationContext(ApplicationContext parent) {
       this.parentCtx = parent;
   }