Improving loads of ruby libs

banshee · Feb 22, 2012 · da5e926 · da5e926
1 parent 063655b
commit da5e926
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/src/main/scala/com/restphone/androidproguardscala/EclipseProguardBuilder.scala b/src/main/scala/com/restphone/androidproguardscala/EclipseProguardBuilder.scala
@@ -23,13 +23,12 @@ import org.objectweb.asm.Type
 import org.osgi.framework.BundleContext
 
 import com.restphone.androidproguardscala.RichPath.toRichPath
-import com.restphone.androidproguardscala.jruby.JrubyEnvironmentSetup
+import com.restphone.androidproguardscala.jruby.JrubyEnvironmentSetup._
 import com.restphone.androidproguardscala.jruby.ProguardCacheJava
 
 import RichFile.slurp
 import proguard.Initializer
 
-
 class AndroidProguardScalaBuilder extends IncrementalProjectBuilder {
   import RichPath._
   import RichFile._
@@ -179,15 +178,18 @@ class AndroidProguardScalaBuilder extends IncrementalProjectBuilder {
   }
 
   lazy val rubyCacheController = {
-    JrubyEnvironmentSetup.addJrubyJarfile(pathForJarFileContainingClass(classOf[org.jruby.Ruby]))
+    addJrubyJarfile(pathForJarFileContainingClass(classOf[org.jruby.Ruby]))
 
-    loadClassIntoJRuby(classOf[org.objectweb.asm.Type])
+    List(
-    loadClassIntoJRuby(classOf[proguard.Initializer])
+      classOf[org.objectweb.asm.Type],
-    loadClassIntoJRuby(classOf[List[String]])
+      classOf[proguard.Initializer],
+      classOf[List[String]]) foreach { loadClassIntoJRuby(_) }
 
-    val jrubyLibDir = pluginDirectory / "lib_src/main/jruby"
+    Iterable(
-    logMsg("adding dir to jruby" + jrubyLibDir)
+      pluginDirectory / "lib_src/main/jruby",
-    JrubyEnvironmentSetup.addToLoadPath(jrubyLibDir.toString)
+      pluginDirectory / "jruby_lib/main/jruby") map
+      objToString foreach
+      addToLoadPath
 
     new ProguardCacheJava
   }
@@ -209,7 +211,7 @@ class AndroidProguardScalaBuilder extends IncrementalProjectBuilder {
   }
 
   def loadJarIntoJRuby(path: String) = {
-    JrubyEnvironmentSetup.addJarToLoadPathAndRequire(path)
+    addJarToLoadPathAndRequire(path)
   }
 
   val bundle = Platform.getBundle("com.restphone.androidproguardscala");