experimental commit

Author: monkstone

lib/jruby_art.rb

@@ -4,7 +4,7 @@
 # Also, send samples and libraries.
 unless defined? K9_ROOT
   $LOAD_PATH << File.expand_path(File.dirname(__FILE__))
-  K9_ROOT = File.expand_path(File.dirname(__FILE__) + '/../')
+  K9_ROOT = File.absolute_path(File.dirname(__dir__))
 end
 
 SKETCH_ROOT ||= Dir.pwd

lib/jruby_art/app.rb

@@ -4,7 +4,7 @@
 require_relative '../rpextras'
 require_relative '../jruby_art/helper_methods'
 require_relative '../jruby_art/helpers/aabb'
-require_relative '../jruby_art/library_loader'
+require_relative '../jruby_art/new_loader'
 require_relative '../jruby_art/config'
 
 # A wrapper module for the processing App

lib/jruby_art/java_library.rb

@@ -0,0 +1,56 @@
+require_relative 'config'
+require_relative 'native_folder'
+require_relative 'native_loader'
+
+# The JavaLibrary class
+class JavaLibrary
+  attr_reader :dir, :path, :ppath
+
+  def initialize(name)
+    @dir = '.'
+    @path = File.join(dir, "#{name}.jar")
+  end
+
+  def exist?
+    File.exist? path
+  end
+
+  def load_jars
+    Dir["#{dir}/*.jar"].each do |jar|
+      require jar
+    end
+    return unless native_binaries?
+    add_binaries_to_classpath
+  end
+
+  def native_binaries?
+    native_folder = NativeFolder.new
+    native = native_folder.name
+    @ppath = File.join(dir, native)
+    File.directory?(ppath) &&
+      !Dir.glob(File.join(ppath, native_folder.extension)).empty?
+  end
+
+  def add_binaries_to_classpath
+    native_loader = NativeLoader.new
+    native_loader.add_native_path(ppath)
+  end
+end
+
+# The LocalJavaLibrary class
+class LocalJavaLibrary < JavaLibrary
+  def initialize(name)
+    super
+    @dir = File.join(Processing::SKETCH_ROOT, 'library', name)
+    @path = File.join(dir, "#{name}.jar")
+  end
+end
+
+# The InstalledJavaLibrary class
+class InstalledJavaLibrary < JavaLibrary
+  def initialize(name)
+    super
+    @dir = File.join(Processing::RP_CONFIG['sketchbook_path'], 'libraries')
+    @path = File.join(dir, name, 'library', "#{name}.jar")
+  end
+end

lib/jruby_art/native_folder.rb

@@ -0,0 +1,33 @@
+require 'rbconfig'
+
+# Utility to load native binaries on Java CLASSPATH
+class NativeFolder
+  attr_reader :os, :bit
+
+  WIN_FORMAT = 'windows%d'
+  LINUX_FORMAT = 'linux%d'
+  # WIN_PATTERNS = [
+  #   /bccwin/i,
+  #   /cygwin/i,
+  #   /djgpp/i,
+  #   /ming/i,
+  #   /mswin/i,
+  #   /wince/i
+  # ].freeze
+
+  def initialize
+    @os = RbConfig::CONFIG['host_os'].downcase
+    @bit = java.lang.System.get_property('os.arch') =~ /64/ ? 64 : 32
+  end
+
+  def name
+    return 'macosx' if os =~ /darwin/ || os =~ /mac/
+    # return format(WIN_FORMAT, bit) if WIN_PATTERNS.include? os
+    return format(LINUX_FORMAT, bit) if os =~ /linux/
+  end
+
+  def extension
+    return '*.so'  if os =~ /linux/
+    '*.dylib' # MacOS
+  end
+end

lib/jruby_art/native_loader.rb

@@ -0,0 +1,26 @@
+# This class knows how to dynamically set the 'java' native library path
+# It might not work with java 9?
+class NativeLoader
+  attr_reader :separator, :current_path
+
+  module JC
+    java_import 'java.lang.Class'
+    java_import 'java.lang.System'
+    java_import 'java.io.File'
+  end
+
+  def initialize
+    @separator = JC::File.pathSeparatorChar
+    @current_path = JC::System.getProperty('java.library.path')
+  end
+
+  def add_native_path(pth)
+    current_path << separator << pth
+    JC::System.setProperty('java.library.path', current_path)
+    field = JC::Class.for_name('java.lang.ClassLoader')
+                     .get_declared_field('sys_paths')
+    return unless field
+    field.accessible = true # some jruby magic
+    field.set(JC::Class.for_name('java.lang.System').get_class_loader, nil)
+  end
+end

lib/jruby_art/new_loader.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: false
+# The processing wrapper module
+module Processing
+  require_relative 'ruby_library'
+  require_relative 'java_library'
+
+  # Encapsulate library loader functionality as a class
+  class LibraryLoader
+    attr_reader :library
+
+    def initialize
+      @loaded_libraries = Hash.new(false)
+    end
+
+    # Detect if a library has been loaded (for conditional loading)
+    def library_loaded?(library_name)
+      @loaded_libraries[library_name.to_sym]
+    end
+
+    # Load a list of Ruby or Java libraries (in that order)
+    # Usage: load_libraries :video, :video_event
+    #
+    # If a library is put into a 'library' folder next to the sketch it will
+    # be used instead of the library that ships with Propane.
+    def load_libraries(*args)
+      message = 'no such file to load -- %s'
+      args.each do |lib|
+        loaded = loader(lib)
+        raise(LoadError.new, format(message, lib)) unless loaded
+      end
+    end
+    alias load_library load_libraries
+
+    def loader(name)
+      return true if @loaded_libraries.include?(name)
+      fname = name.to_s
+      if (@library = LocalRubyLibrary.new(fname)).exist?
+        return require_library(library, name)
+      end
+      if (@library = InstalledRubyLibrary.new(fname)).exist?
+        return require_library(library, name)
+      end
+      if (@library = LocalJavaLibrary.new(fname)).exist?
+        return load_jars(library, name)
+      end
+      if (@library = InstalledJavaLibrary.new(fname)).exist?
+        return load_jars(library, name)
+      end
+      false
+    end
+
+    def load_jars(lib, name)
+      lib.load_jars
+      @loaded_libraries[name] = true
+    end
+
+    def require_library(lib, name)
+      @loaded_libraries[name] = require lib.path
+    end
+  end
+end

lib/jruby_art/ruby_library.rb

@@ -0,0 +1,30 @@
+# The abstract RubyLibrary class
+class RubyLibrary
+  attr_reader :path
+
+  def initialize(name)
+    @path = nil
+  end
+
+  def exist?
+    File.exist? path
+  end
+end
+
+# The LocalRubyLibrary class
+class LocalRubyLibrary < RubyLibrary
+  def initialize(name)
+    super
+    @path = File.absolute_path(
+      File.join(Processing::SKETCH_ROOT, 'library', name, "#{name}.rb")
+    )
+  end
+end
+
+# The InstalledLibraryLoader class
+class InstalledRubyLibrary < RubyLibrary
+  def initialize(name)
+    super
+    @path = File.join(K9_ROOT, 'library', name, "#{name}.rb")
+  end
+end