jruby_art 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ee4767110e0ed4aeaa943f225dc6bc31a3f1f3a
-  data.tar.gz: 39fcc2a3cc9c1fe90ef46376978450243e352f31
+  metadata.gz: 3f5a2a6e4f71fa4b9b431e90623c6813bd8f3c43
+  data.tar.gz: 138573a28fe79c3982c22452369a6379cd77943c
 SHA512:
-  metadata.gz: 0e5d43a19b51bc45d2e4d5d31422fc804969329a0c1f0243f3a65a5df8d86a397bb5e0401ef31c916920ccd6698dccb2642c49b4f27a377325ee6ebda13b3e51
-  data.tar.gz: 3d27521dd0852aa24392675826e787d8aa267cb63be9292db9a10da64adb1bdfd94699843a692866ae0589fc23b3dc335739ae022a8e7def0bdd42a97e1780bd
+  metadata.gz: e167c2fbcb36d8bceba43f6c04ae2f6c0ed5acb4f212435800ca8b3f2e2383a75f051ba07e2deca202b845824f15c7a20169f783f3bdbaa886e35416be1f16b6
+  data.tar.gz: 880b701d19c4235ae7b862069912c2187df92c1f7230c3168b02219467dbec018793a777a9d894c1dec5d713f7317c65733e51d49257635183c8c8e17ce92493

data/lib/jruby_art/app.rb

@@ -32,6 +32,9 @@ module Processing
     key_released: :keyReleased,
     key_typed: :keyTyped
   }.freeze
+  class << self
+    attr_accessor :app
+  end
   # All sketches extend this class
   class App < PApplet
     include HelperMethods
@@ -99,7 +102,7 @@ module Processing
 
     def initialize(options = {})
       super()
-      $app = self
+      Processing.app = self
       post_initialize(options)
       proxy_java_fields
       mix_proxy_into_inner_classes
@@ -161,7 +164,7 @@ module Processing
       surface.stopThread
       surface.setVisible(false) if surface.isStopped
       dispose
-      $app = nil
+      Processing.app = nil
     end
 
     def exit
@@ -199,12 +202,12 @@ module Processing
     include HelperMethods
     include Java::ProcessingCore::PConstants
 
-    def respond_to_missing?(symbol, include_priv = false)
-      $app.respond_to?(symbol, include_priv) || super
+    def respond_to_missing?(name, include_private = false)
+      Processing.app.respond_to?(name) || super
     end
 
-    def method_missing(name, *args, &block)
-      return $app.send(name, *args) if $app.respond_to? name
+    def method_missing(name, *args)
+      return Processing.app.send(name, *args) if Processing.app && Processing.app.respond_to?(name)
       super
     end
   end # Processing::Proxy

data/lib/jruby_art/config.rb

@@ -5,7 +5,7 @@ require 'yaml'
 # The wrapper module
 module Processing
   unless defined? RP_CONFIG
-    config_path = '~/.jruby_art/config.yml'
+    config_path = "#{ENV['HOME']}/.jruby_art/config.yml"
     begin
       CONFIG_FILE_PATH = File.expand_path(config_path)
       RP_CONFIG = YAML.load_file(CONFIG_FILE_PATH)
@@ -41,14 +41,3 @@ module Processing
 
   OS ||= HostOS.os
 end
-
-# This class encapulates knowledge of processing sketchbook structure
-class Sketchbook
-  def self.path
-    File.join(Processing::RP_CONFIG['sketchbook_path'], 'libraries')
-  end
-
-  def self.library(name)
-    Dir["#{path}/#{name}/library/\*.jar"]
-  end
-end

data/lib/jruby_art/installer.rb

@@ -1,33 +1,33 @@
 # frozen_string_literal: false
 require 'yaml'
 
-VERSION = '3.3.4'.freeze # processing version
+VERSION = '3.3.6'.freeze # processing version
 
 # Abstract Installer class
 class Installer
-  attr_reader :os, :sketch, :gem_root, :home
+  attr_reader :os, :sketch, :gem_root, :confd
   def initialize(root, os)
     @os = os
     @gem_root = root
-    @home = ENV['HOME']
-    @sketch = "#{home}/sketchbook" if os == :linux
-    @sketch = "#{home}/My Documents/Processing" if os == :windows
-    @sketch = "#{home}/Documents/Processing" if os == :mac
+    @sketch = "#{ENV['HOME']}/sketchbook" if os == :linux
+    @sketch = "#{ENV['HOME']}/My Documents/Processing" if os == :windows
+    @sketch = "#{ENV['HOME']}/Documents/Processing" if os == :mac
+    @confd = "#{ENV['HOME']}/.jruby_art"
   end
 
   # Optimistically set processing root
   def set_processing_root
-    require 'psych'
-    folder = File.expand_path("#{home}/.jruby_art")
+    folder = "#{ENV['HOME']}/.jruby_art"
     Dir.mkdir(folder) unless File.exist? folder
     path = File.join(folder, 'config.yml')
-    proot = "#{home}/processing-#{VERSION}"
+    proot = "#{ENV['HOME']}/processing-#{VERSION}"
     proot = "/Java/Processing-#{VERSION}" if os == :windows
     proot = "/Applications/Processing.app/Contents/Java" if os == :mac
     settings = %w(PROCESSING_ROOT JRUBY sketchbook_path template MAX_WATCH sketch_title width height)
     values = [proot, true, sketch, 'bare', 32, 'JRubyArt Static Sketch', 600, 600]
     data = settings.zip(values).to_h
     open(path, 'w:UTF-8') { |file| file.write(data.to_yaml) }
+    warn 'PROCESSING_ROOT set optimistically, run check to confirm' 
   end
 
   def root_exist?
@@ -35,7 +35,7 @@ class Installer
   end
 
   def config
-    k9config = File.expand_path("#{home}/.jruby_art/config.yml")
+    k9config = File.join(confd, 'config.yml')
     return '' unless File.exist? k9config
     YAML.load_file(k9config)
   end
@@ -54,7 +54,7 @@ end
 
 # Configuration checker
 class Check < Installer
-  require_relative 'core'
+  require_relative './core'
   def install
     show_version
     return super unless config
@@ -86,9 +86,7 @@ end
 # JRuby-Complete installer
 class JRubyCompleteInstall < Installer
   def install
+    set_processing_root unless File.exist? File.join(confd, 'config.yml')
     system "cd #{gem_root}/vendors && rake"
-    return if root_exist?
-    set_processing_root
-    warn 'PROCESSING_ROOT set optimistically, run check to confirm'
   end
 end

data/lib/jruby_art/library.rb

@@ -0,0 +1,84 @@
+require_relative 'native_folder'
+require_relative 'native_loader'
+
+require 'pathname'
+
+BUNDLED = %r{pdf|net|dxf|svg|serial}
+# This class knows where to find propane libraries
+class Library
+  require_relative '../jruby_art'
+  require_relative './config'
+  attr_reader :name, :path, :dir, :ppath
+
+  def initialize(name)
+    @name = name
+    @ruby = true
+  end
+
+  def locate
+    return if (@path = Pathname.new(
+      File.join(SKETCH_ROOT, 'library', name, "#{name}.rb")
+    )).exist?
+    return if (@path = Pathname.new(
+      File.join(K9_ROOT, 'library', name, "#{name}.rb")
+    )).exist?
+    locate_java
+  end
+
+  def locate_java
+    @dir = Pathname.new(
+      File.join(SKETCH_ROOT, 'library', name)
+    )
+    return @path = dir.join(Pathname.new("#{name}.jar")) if dir.directory?
+    locate_installed_java
+  end
+
+  def locate_installed_java
+    prefix = bundled? ? File.join(root, 'modes/java') : sketchbook
+    @dir = Pathname.new(
+      File.join(prefix, "libraries/#{name}/library")
+    )
+    @path = dir.join(Pathname.new("#{name}.jar"))
+  end
+
+  def sketchbook
+    Processing::RP_CONFIG.fetch('sketchbook_path', "#{ENV['HOME']}/sketchbook")
+  end
+
+  def root
+    Processing::RP_CONFIG.fetch('PROCESSING_ROOT', "#{ENV['HOME']}/processing")
+  end
+
+  def ruby?
+    path.extname == '.rb'
+  end
+
+  def bundled?
+    BUNDLED =~ name
+  end
+
+  def exist?
+    path.exist?
+  end
+
+  def load_jars
+    Dir.glob("#{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

data/lib/jruby_art/library_loader.rb

@@ -1,16 +1,13 @@
 # frozen_string_literal: false
-
-require_relative '../jruby_art'
-require_relative 'config'
-# require_relative 'sketchbook'
 # The processing wrapper module
 module Processing
+  require_relative 'library'
+
   # Encapsulate library loader functionality as a class
   class LibraryLoader
-    attr_reader :sketchbook_library_path
+    attr_reader :library
 
     def initialize
-      @sketchbook_library_path = File.join(Processing::RP_CONFIG['sketchbook_path'], 'libraries')
       @loaded_libraries = Hash.new(false)
     end
 
@@ -20,99 +17,36 @@ module Processing
     end
 
     # Load a list of Ruby or Java libraries (in that order)
-    # Usage: load_libraries :opengl, :boids
+    # 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 JRubyArt.
+    # 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 = load_ruby_library(lib) || load_java_library(lib)
+        loaded = loader(lib)
         raise(LoadError.new, format(message, lib)) unless loaded
       end
     end
     alias load_library load_libraries
 
-    # For pure ruby libraries.
-    # The library should have an initialization ruby file
-    # of the same name as the library folder.
-    def load_ruby_library(library_name)
-      library_name = library_name.to_sym
-      return true if @loaded_libraries.include?(library_name)
-      path = get_library_paths(library_name, 'rb').first
-      return false unless path
-      @loaded_libraries[library_name] = (require path)
-    end
-
-    # HACK: For pure java libraries, such as the ones that are available
-    # on this page: http://processing.org/reference/libraries/index.html
-    # that include native code, we mess with the 'Java ClassLoader', so that
-    # you don't have to futz with your PATH. But it's probably bad juju.
-    def load_java_library(library_name)
-      library_name = library_name.to_sym
-      return true if @loaded_libraries.include?(library_name)
-      jpath = get_library_directory_path(library_name, 'jar')
-      jars = get_library_paths(library_name, 'jar')
-      return false if jars.empty?
-      jars.each { |jar| require jar }
-      platform_specific_library_paths = get_platform_specific_library_paths(jpath)
-      platform_specific_library_paths = platform_specific_library_paths.select do |ppath|
-        FileTest.directory?(ppath) && !Dir.glob(File.join(ppath, '*.{so,dll,jnilib}')).empty?
-      end
-      unless platform_specific_library_paths.empty?
-        platform_specific_library_paths << java.lang.System.getProperty('java.library.path')
-        new_library_path = platform_specific_library_paths.join(java.io.File.pathSeparator)
-        java.lang.System.setProperty('java.library.path', new_library_path)
-        field = java.lang.Class.for_name('java.lang.ClassLoader').get_declared_field('sys_paths')
-        if field
-          field.accessible = true
-          field.set(java.lang.Class.for_name('java.lang.System').get_class_loader, nil)
-        end
-      end
-      @loaded_libraries[library_name] = true
-    end
-
-    def platform
-      match = %w(mac linux windows).find do |os|
-        java.lang.System.getProperty('os.name').downcase.index(os)
-      end
-      return 'other' unless match
-      return match unless match =~ /mac/
-      'macosx'
+    def loader(name)
+      return true if @loaded_libraries.include?(name)
+      fname = name.to_s
+      library = Library.new(fname)
+      library.locate
+      return require_library(library, name) if library.ruby?
+      warn("Not found library: #{fname}") unless library.exist?
+      load_jars(library, name)
     end
 
-    def get_platform_specific_library_paths(basename)
-      bits = '64'
-      if java.lang.System.getProperty('sun.arch.data.model') == '32' ||
-         java.lang.System.getProperty('java.vm.name').index('32')
-        bits = '32' unless platform =~ /macosx/
-      end
-      [platform, platform + bits].map { |p| File.join(basename, p) }
+    def load_jars(lib, name)
+      lib.load_jars
+      @loaded_libraries[name] = true
     end
 
-    def get_library_paths(library_name, extension = nil)
-      dir = get_library_directory_path(library_name, extension)
-      Dir.glob("#{dir}/*.{rb,jar}")
-    end
-
-    protected
-
-    def get_library_directory_path(library_name, extension = nil)
-      extensions = extension ? [extension] : %w(jar rb)
-      extensions.each do |ext|
-        [
-          "#{SKETCH_ROOT}/library/#{library_name}",
-          "#{Processing::RP_CONFIG['PROCESSING_ROOT']}/modes/java/libraries/#{library_name}/library",
-          "#{K9_ROOT}/library/#{library_name}/library",
-          "#{K9_ROOT}/library/#{library_name}",
-	  "#{Sketchbook.path}/#{library_name}/library"
-        ].each do |jpath|
-          if File.exist?(jpath) && !Dir.glob(format('%s/*.%s', jpath, ext)).empty?
-            return jpath
-          end
-        end
-      end
-      nil
+    def require_library(lib, name)
+      @loaded_libraries[name] = require lib.path
     end
   end
 end

data/lib/jruby_art/native_folder.rb

@@ -0,0 +1,34 @@
+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/
+    return '*.dll' if WIN_PATTERNS.include? os
+    '*.dylib' # MacOS
+  end
+end

data/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

data/lib/jruby_art/runner.rb

@@ -84,7 +84,7 @@ module Processing
         end
 
         options[:live] = false
-        opts.on('-l', '--live', 'As above, with pry console bound to $app') do
+        opts.on('-l', '--live', 'As above, with pry console bound to Processing.app') do
           options[:live] = true
         end
 

data/lib/jruby_art/runners/base.rb

@@ -35,7 +35,7 @@ module Processing
     no_methods = source.match(/^[^#]*(def\s+setup|def\s+draw)/).nil?
     if wrapped
       load SKETCH_PATH
-      Processing::App.sketch_class.new unless $app
+      Processing::App.sketch_class.new unless Processing.app
       return
     end
     name = RP_CONFIG.fetch('sketch_title', 'Naked Sketch')
@@ -43,7 +43,7 @@ module Processing
     height = RP_CONFIG.fetch('height', 200)
     code = no_methods ? format(NAKED_WRAP, name, source, width, height) : format(BARE_WRAP, source)
     Object.class_eval code, SKETCH_PATH, -1
-    Processing::App.sketch_class.new unless $app
+    Processing::App.sketch_class.new unless Processing.app
   end
 
   # Read in the sketch source code. Needs to work both online and offline.

data/lib/jruby_art/runners/live.rb

@@ -11,7 +11,7 @@ MESSAGE = "You need to 'jruby -S gem install pry' for 'live' mode".freeze
 
 if Gem::Specification.find_all_by_name('pry').any?
   require 'pry'
-  $app.pry
+  Processing.app.pry
 else
   raise(PryException.new, MESSAGE)
 end

data/lib/jruby_art/runners/watch.rb

@@ -33,7 +33,7 @@ module Processing
       Kernel.loop do
         if @files.find { |file| FileTest.exist?(file) && File.stat(file).mtime > @time }
           puts 'reloading sketch...'
-          $app && $app.close
+          Processing.app && Processing.app.close
           java.lang.System.gc
           @time = Time.now
           start_runner

data/lib/jruby_art/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 # A wrapper for version
 module JRubyArt
-  VERSION = '1.4.0'.freeze
+  VERSION = '1.4.1'.freeze
 end

data/library/control_panel/control_panel.rb

@@ -10,8 +10,8 @@ module ControlPanel
     def initialize(control_panel, name, range, initial_value, proc = nil)
       min = range.begin * 100
       max = (
-        (range.exclude_end? && range.begin.respond_to?(:succ)) ?
-          range.max : range.end) * 100
+      (range.exclude_end? && range.begin.respond_to?(:succ)) ?
+      range.max : range.end) * 100
       super(min, max)
       set_minor_tick_spacing((max - min).abs / 10)
       set_paint_ticks true
@@ -20,7 +20,7 @@ module ControlPanel
       label = control_panel.add_element(self, name)
       add_change_listener do
         update_label(label, name, value)
-        $app.instance_variable_set("@#{name}", value) unless value.nil?
+        Processing.app.instance_variable_set("@#{name}", value) unless value.nil?
         proc.call(value) if proc
       end
       set_value(initial_value ? initial_value * 100 : min)
@@ -45,7 +45,7 @@ module ControlPanel
       set_preferred_size(java.awt.Dimension.new(190, 30))
       control_panel.add_element(self, name)
       add_action_listener do
-        $app.instance_variable_set("@#{name}", value) unless value.nil?
+        Processing.app.instance_variable_set("@#{name}", value) unless value.nil?
         proc.call(value) if proc
       end
       set_selected_index(initial_value ? elements.index(initial_value) : 0)
@@ -65,7 +65,7 @@ module ControlPanel
       set_horizontal_alignment javax.swing.SwingConstants::CENTER
       control_panel.add_element(self, name, false)
       add_action_listener do
-        $app.instance_variable_set("@#{name}", value)
+        Processing.app.instance_variable_set("@#{name}", value) unless value.nil?
         proc.call(value) if proc
       end
     end
@@ -82,8 +82,8 @@ module ControlPanel
       set_preferred_size(java.awt.Dimension.new(170, 64))
       control_panel.add_element(self, name, false, true)
       add_action_listener do
-        $app.send(name)
-        proc.call if proc
+        Processing.app.send(name.to_s)
+        proc.call(value) if proc
       end
     end
   end
@@ -110,7 +110,7 @@ module ControlPanel
       set_size 200, 30 + (64 * elements.size)
       set_default_close_operation javax.swing.JFrame::HIDE_ON_CLOSE
       set_resizable false
-      set_location($app.width + 10, 0) unless $app.width + 10 > $app.displayWidth
+      set_location(Processing.app.width + 10, 0) unless Processing.app.width + 10 > Processing.app.displayWidth
       panel.visible = true
     end
 

data/library/slider/slider.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 # Here's a little library for quickly hooking up in sketch sliders.
-# Copyright (c) 2016 Martin Prout.
+# Copyright (c) 2016-17 Martin Prout.
 
 java_import 'monkstone.slider.CustomHorizontalSlider'
 java_import 'monkstone.slider.CustomVerticalSlider'

data/vendors/Rakefile

@@ -9,7 +9,7 @@ WARNING = <<-EOS.freeze
 EOS
 
 
-JRUBYC_VERSION     = '9.1.12.0'
+JRUBYC_VERSION     = '9.1.13.0'
 
 EXAMPLES           = '2.4'
 HOME_DIR = ENV['HOME']
@@ -29,9 +29,7 @@ file "jruby-complete-#{JRUBYC_VERSION}.jar" do
   rescue
     warn(WARNING)
   end
-
-  check_sha256("jruby-complete-#{JRUBYC_VERSION}.jar", "f97a65d79aa57f01328783dd00f81568f70dbf26a3ed2a502d6a985224d0ac72")
-
+  check_sha256("jruby-complete-#{JRUBYC_VERSION}.jar", "96acc80d383e3268df6d1e4947367966729a9c130dfeb889e4e3af77e63a2433")
 end
 
 directory "../lib/ruby"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jruby_art
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Jeremy Ashkenas
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-06 00:00:00.000000000 Z
+date: 2017-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -63,7 +63,10 @@ files:
 - lib/jruby_art/java_opts.rb
 - lib/jruby_art/jruby_complete.rb
 - lib/jruby_art/launcher.rb
+- lib/jruby_art/library.rb
 - lib/jruby_art/library_loader.rb
+- lib/jruby_art/native_folder.rb
+- lib/jruby_art/native_loader.rb
 - lib/jruby_art/runner.rb
 - lib/jruby_art/runners/base.rb
 - lib/jruby_art/runners/live.rb
@@ -101,9 +104,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - A decent graphics card
 - java runtime >= 1.8.0_131+
-- processing = 3.3.5
+- processing = 3.3.6
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Code as Art, Art as Code. Processing and Ruby are meant for each other.