getting there

Author: monkstone

lib/jruby_art/java_library.rb

@@ -1,4 +1,4 @@
-require_relative 'config'
+require_relative '../jruby_art'
 require_relative 'native_folder'
 require_relative 'native_loader'
 
@@ -41,11 +41,20 @@ def add_binaries_to_classpath
 class LocalJavaLibrary < JavaLibrary
   def initialize(name)
     super
-    @dir = File.join(Processing::SKETCH_ROOT, 'library', name)
+    @dir = File.join(SKETCH_ROOT, 'library', name)
     @path = File.join(dir, "#{name}.jar")
   end
 end
 
+# The ProcessingJavaLibrary class
+class ProcessingJavaLibrary < JavaLibrary
+  def initialize(name)
+    super
+    @dir = "#{Processing::RP_CONFIG['PROCESSING_ROOT']}/modes/java/libraries"
+    @path = File.join(dir, name, 'library', "#{name}.jar")
+  end
+end
+
 # The InstalledJavaLibrary class
 class InstalledJavaLibrary < JavaLibrary
   def initialize(name)

lib/jruby_art/new_loader.rb

@@ -43,6 +43,9 @@ def loader(name)
       if (@library = LocalJavaLibrary.new(fname)).exist?
         return load_jars(library, name)
       end
+      if (@library = ProcessingJavaLibrary.new(fname)).exist?
+        return load_jars(library, name)
+      end
       if (@library = InstalledJavaLibrary.new(fname)).exist?
         return load_jars(library, name)
       end

lib/jruby_art/ruby_library.rb

@@ -1,3 +1,4 @@
+require_relative 'config'
 # The abstract RubyLibrary class
 class RubyLibrary
   attr_reader :path
@@ -16,7 +17,7 @@ class LocalRubyLibrary < RubyLibrary
   def initialize(name)
     super
     @path = File.absolute_path(
-      File.join(Processing::SKETCH_ROOT, 'library', name, "#{name}.rb")
+      File.join(SKETCH_ROOT, 'library', name, "#{name}.rb")
     )
   end
 end