propane 2.4.0.pre-java → 2.5.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d391a15e09ca2b691a60bcecc25bba260b042b1
-  data.tar.gz: ff9d833f87f800233987500f346c0543c8e7c1d8
+  metadata.gz: 9533ddd2e6f1573ce40817c97356676069e9e2a4
+  data.tar.gz: 7b2b891d044c4f98c85b5b1f286a60d1b77f5281
 SHA512:
-  metadata.gz: 64c1e084f36d389e446b1462a486d235960a25b27b8c73680f97ce496e657a5f83ec767ed84728143b5ac739b72ec2bb0fc534a1669f0b1f0a42564be2368580
-  data.tar.gz: dd553b625a79b380f17627fb123e311b4476323731bcf001b2a88dbbb68b7143bc36591f372877fef4f0628b3d09a48e133564461fd485dd3e392653cfd121f6
+  metadata.gz: 7e9fec391db8b365247028e0a298329342e39fa716027a031402768cecb33c5e764fcd0fae5d96ed31dafa578bdbfa9d762cf1c6cb8549baeae01a345a7db623
+  data.tar.gz: 0d251e46ec1a06f2bed2357a2ae178c6af0a67efe0cd5f869aea38287e9bc7232585018dd553a4041b971ee82e3e76b8299598c509a936d726bf04e61fda03d3

data/.travis.yml

@@ -1,10 +1,10 @@
 language: ruby
 sudo: false
+dist: trusty
 
-rvm: 
-  - jruby-9.1.6.0
+rvm:
+  - jruby-9.1.12.0
 jdk:
   - oraclejdk8
 os:
   - linux
-

data/CHANGELOG.md

@@ -1,4 +1,14 @@
-**v2.4.0.pre** Completely re-factored library_loader please test.
+**v2.5.0** No need for `$app` we can replace with `Propane.app`
+
+**v2.4.1** Add post_initialize hoop to app.rb.
+
+**v2.4.0** Extend LibraryProxy to include mouseEvent and keyEvent.
+
+**v2.3.4** Simplify control_panel library (replacing `c.title = 'PaneTitle'` with `c.title('PaneTitle')`) also enable use of `block` with `button's`.
+
+**v2.3.3** Update to processing-3.3.4, and upgrade jruby-9.1.12.0 last in 9.1 series?
+
+**v2.3.3** Update to processing-3.3.2
 
 **v2.3.1** Update to processing-3.3.1, Update samples which now include `#!/usr/bin/env jruby` to assist running sketches from atom, add Rakefile for automatic sketch running for many samples, expected upgrade to final jruby-9.1.x.x
 

data/Gemfile

@@ -1,2 +1,3 @@
 source 'https://rubygems.org'
 
+gemspec

data/README.md

@@ -1,14 +1,21 @@
 # Propane
-[![Gem Version](https://badge.fury.io/rb/propane.svg)](https://badge.fury.io/rb/propane)
+[![Gem Version](https://badge.fury.io/rb/propane.svg)](https://badge.fury.io/rb/propane) [![Travis CI](https://travis-ci.org/ruby-processing/propane.svg)](https://travis-ci.org/ruby-processing/propane)
 
-A slim layer to communicate with Processing from JRuby, features a polyglot maven build. We have created a configuration free version of ruby processing, for processing-3.3.1, where we include processing core (from a local maven repository and opengl etc from maven central). These jars are small enough to include in a gem distribution, and hence we do not require configuration. This has created a scriptable version, ie files get run direct from jruby, but you could use jruby-complete if you used the propane script (avoids need to give the absolute data path for the data folder, but would also be needed for a watch mode). See guide to [building ruby-processing projects][building].
+A slim layer to communicate with Processing from JRuby, features a polyglot maven build. We have created a configuration free version of ruby processing, for processing-3.3.5, where we include processing core (from a local maven repository and opengl etc from maven central). These jars are small enough to include in a gem distribution, and hence we do not require configuration. This has created a scriptable version, ie files get run direct from jruby, but you could use jruby-complete if you used the propane script (avoids need to give the absolute data path for the data folder, but would also be needed for a watch mode). See guide to [building ruby-processing projects][building].
+
+NB: The main reason for build failing is when the `core.jar` is not available from maven central, to install a local jar (_example for linux mint_):-
+```bash
+
+mvn install:install-file /home/tux/processing-3.3.5/core/library/core.jar -DgroupId=org.processing -DartifactId=core -Dversion=3.3.5
+```
+adjust above for your OS/distro setup.
 
 ## Requirements
 
 - jdk8+
-- jruby-9.1.8.0+
-- mvn-3.3.1+ (development only)
-- core.jar processing-3.3.1 (development only until processing.org is available at maven central)
+- jruby-9.1.12.0
+- mvn-3.5.0+
+- core.jar processing-3.3.5 (_build only_)
 
 ## Building and testing
 
@@ -21,7 +28,7 @@ rake javadoc
 ## Installation
 ```bash
 jgem install propane # from rubygems
-jgem install propane-2.3.1-java.gem # for local install
+jgem install propane-2.5.0-java.gem # for local install
 ```
 
 ## Usage
@@ -70,4 +77,7 @@ propane --install video
 ```
 Other java libraries can be manually installed to the same folder (no need for processing ide)
 
+See [gh-pages][gh-pages] for more detailed instructions and much more.
+
 [building]:http://ruby-processing.github.io/building/building/
+[gh-pages]:https://ruby-processing.github.io/propane/

data/Rakefile

@@ -7,7 +7,7 @@ def create_manifest
   File.open('MANIFEST.MF', 'w') do |f|
     f.puts(title)
     f.puts(version)
-    f.puts('Class-Path: core-3.3.1.jar gluegen-rt-2.3.2.jar jog-all-2.3.2.jar')
+    f.puts('Class-Path: core-3.3.5.jar gluegen-rt-2.3.2.jar jog-all-2.3.2.jar')
   end
 end
 
@@ -47,7 +47,7 @@ end
 desc 'Test'
 task :test do
   sh 'jruby test/helper_methods_test.rb'
-  sh 'jruby test/respond_to_test.rb'
+  # sh 'jruby test/respond_to_test.rb' Skip test on Travis to avoid Headless fail
   sh 'jruby test/create_test.rb'
   sh 'jruby test/math_tool_test.rb'
   sh 'jruby test/deglut_spec_test.rb'

data/lib/propane.rb

@@ -1,8 +1,8 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 require 'java'
 unless defined? PROPANE_ROOT
   $LOAD_PATH << File.expand_path(File.dirname(__FILE__))
-  PROPANE_ROOT = File.absolute_path(File.dirname(__dir__))
+  PROPANE_ROOT = File.expand_path(File.dirname(__FILE__) + '/../')
 end
 Dir["#{PROPANE_ROOT}/lib/*.jar"].each do |jar|
   require jar

data/lib/propane/app.rb

@@ -43,6 +43,10 @@ module Propane
     key_typed: :keyTyped
   }.freeze
 
+  class << self
+    attr_accessor :app
+  end
+
   # All sketches extend this class
   class App < PApplet
     include Math, MathTool, HelperMethods, Render
@@ -110,7 +114,8 @@ module Propane
       raise TypeError unless arguments.is_a? Array
       # Set up the sketch.
       super()
-      $app = self
+      post_initialize(options)
+      Propane.app = self
       @arguments = arguments
       @options   = options
       run_sketch
@@ -125,6 +130,9 @@ module Propane
       super(*args)
     end
 
+    def post_initialize(_args)
+    end
+
     def sketch_title(title)
       surface.set_title(title)
     end
@@ -139,15 +147,15 @@ module Propane
 
     def import_opengl
       # Include processing opengl classes that we'd like to use:
-      %w(FontTexture FrameBuffer LinePath LineStroker PGL
+      %w[FontTexture FrameBuffer LinePath LineStroker PGL
          PGraphics2D PGraphics3D PGraphicsOpenGL PShader
-         PShapeOpenGL Texture).each do |klass|
+         PShapeOpenGL Texture].each do |klass|
         java_import "processing.opengl.#{klass}"
       end
     end
 
     def proxy_java_fields
-      fields = %w(sketchPath key frameRate mousePressed keyPressed)
+      fields = %w[sketchPath key frameRate mousePressed keyPressed]
       methods = fields.map { |field| java_class.declared_field(field) }
       @declared_fields = Hash[fields.zip(methods)]
     end
@@ -160,22 +168,20 @@ module Propane
     end
   end
 
-  # Importing PConstants to access processing constants, we also need to
-  # 'include PConstants' to avoid requiring the `PConstants::` prefix
-  # `include Math etc because we expect to use them`
-  # Using :method_missing to mimic inner class methods
-  # @HACK you should consider using 'forwardable' to avoid this
-  # egregious hack...
+  # @HACK purists may prefer 'forwardable' to the use of Proxy
+  # Importing PConstants here to access the processing constants
   module Proxy
-    java_import 'processing.core.PConstants'
-    include Math, MathTool, HelperMethods, PConstants
-    def respond_to_missing?(name, include_private = false)
-      $app.respond_to?(name) || super
+    include Math
+    include HelperMethods
+    include Java::ProcessingCore::PConstants
+
+    def respond_to_missing?(symbol, include_priv = false)
+      Propane.app.respond_to?(symbol, include_priv) || super
     end
 
-    def method_missing(name, *args)
-      return $app.send(name, *args) if $app && $app.respond_to?(name)
+    def method_missing(name, *args, &block)
+      return Propane.app.send(name, *args) if Propane.app.respond_to? name
       super
     end
-  end
-end
+  end # Processing::Proxy
+end # Propane

data/lib/propane/creators/sketch_class.rb

@@ -1,4 +1,5 @@
-#frozen_string_literal: false
+# frozen_string_literal: false
+
 # the sketch class
 class SketchClass
   attr_reader :name, :width, :height, :mode
@@ -24,7 +25,7 @@ class SketchClass
   end
 
   def size
-    return format('    size %d, %d', width.to_i, height.to_i) if mode.nil?
+    return format('    size %d, %d', width.to_i, height.to_i) unless mode
     format('    size %d, %d, %s', width.to_i, height.to_i, mode.upcase)
   end
 
@@ -33,8 +34,8 @@ class SketchClass
     format("    sketch_title '%s'", human)
   end
 
-  def method_lines(name, content = '')
-    return [format('  def %s', name), content, '  end'] if content.empty?
+  def method_lines(name, content = nil)
+    return [format('  def %s', name), '', '  end'] unless content
     [format('  def %s', name), content, '  end', '']
   end
 
@@ -50,6 +51,7 @@ class SketchClass
     lines.concat method_lines('setup', sketch_title)
     lines.concat method_lines('draw')
     lines << 'end'
+    lines << ''
     lines << sketch_new
   end
 end

data/lib/propane/library_loader.rb

@@ -1,13 +1,8 @@
 # frozen_string_literal: false
 # The processing wrapper module
 module Propane
-  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
@@ -18,43 +13,103 @@ module Propane
     end
 
     # Load a list of Ruby or Java libraries (in that order)
-    # Usage: load_libraries :video, :video_event
+    # Usage: load_libraries :opengl, :boids
     #
     # 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
+        loaded = load_ruby_library(lib) || load_java_library(lib)
+        fail(LoadError.new, format(message, lib)) unless loaded
       end
     end
-    alias load_library load_libraries
+    alias_method :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
 
-    def loader(name)
-      return true if @loaded_libraries.include?(name)
-      fname = name.to_s
-      if (@library = LocalRubyLibrary.new(fname)).exist?
-        return require_library(library)
+    # 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
-      if (@library = InstalledRubyLibrary.new(fname)).exist?
-        return require_library(library)
+      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
-      if (@library = LocalJavaLibrary.new(fname)).exist?
-        library.load_jars
-        library.add_binaries_to_classpath if library.native_binaries?
-        return @loaded_libraries[name] = true
+      @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
-      if (@library = InstalledJavaLibrary.new(fname)).exist?
-        library.load_jars
-        library.add_binaries_to_classpath if library.native_binaries?
-        return @loaded_libraries[name] = true
+      return 'other' unless match
+      return match unless match =~ /mac/
+      'macosx'
+    end
+
+    def get_platform_specific_library_paths(basename)
+      # for MacOSX, but does this even work, or does Mac return '64'?
+      bits = 'universal'
+      if java.lang.System.getProperty('sun.arch.data.model') == '32' ||
+         java.lang.System.getProperty('java.vm.name').index('32')
+        bits = '32'
+      elsif java.lang.System.getProperty('sun.arch.data.model') == '64' ||
+            java.lang.System.getProperty('java.vm.name').index('64')
+        bits = '64' unless platform =~ /macosx/
       end
-      false
+      [platform, platform + bits].map { |p| File.join(basename, p) }
+    end
+
+    def get_library_paths(library_name, extension = nil)
+      dir = get_library_directory_path(library_name, extension)
+      Dir.glob("#{dir}/*.{rb,jar}")
     end
 
-    def require_library(lib)
-      @loaded_libraries[lib.name.to_sym] = require lib.path
+    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}",
+          "#{PROPANE_ROOT}/library/#{library_name}",
+          "#{PROPANE_ROOT}/library/#{library_name}/library",
+          "#{PROPANE_ROOT}/library/#{library_name}",
+          "#{ENV['HOME']}/.propane/libraries/#{library_name}/library"
+        ].each do |jpath|
+          if File.exist?(jpath) && !Dir.glob(format('%s/*.%s', jpath, ext)).empty?
+            return jpath
+          end
+        end
+      end
+      nil
     end
   end
 end

data/lib/propane/runner.rb

@@ -50,6 +50,11 @@ module Propane
           options[:create] = true
         end
 
+        options[:example] = false
+        opts.on('-e', '--example', 'Create new sketch outline') do
+          options[:example] = true
+        end
+
         # This displays the help screen, all programs are
         # assumed to have this option.
         opts.on('-h', '--help', 'Display this screen') do
@@ -63,6 +68,11 @@ module Propane
 
     def create
       require_relative 'creators/sketch_writer'
+      SketchFactory.new(argc).write
+    end
+
+    def examples
+      require_relative 'creators/sketch_factory'
       SketchWriter.new(File.basename(filename, '.rb'), argc).write
     end
 

data/lib/propane/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Propane
-	VERSION = '2.4.0.pre'.freeze
+  VERSION = '2.5.0'.freeze
 end

data/library/control_panel/control_panel.rb

@@ -21,7 +21,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?
+        Propane.app.instance_variable_set("@#{name}", value) unless value.nil?
         proc.call(value) if proc
       end
       set_value(initial_value ? initial_value * 100 : min)
@@ -46,7 +46,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?
+        Propane.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)
@@ -66,11 +66,11 @@ 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) unless value.nil?
+        Propane.app.instance_variable_set("@#{name}", value)
         proc.call(value) if proc
       end
     end
-
+    # define value as checkbox state
     def value
       is_selected
     end
@@ -83,7 +83,7 @@ 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.to_s)
+        Propane.app.send(name)
         proc.call(value) if proc
       end
     end
@@ -107,7 +107,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(Propane.app.width + 10, 0) unless Propane.app.width + 10 > Propane.app.displayWidth
       panel.visible = true
     end
 
@@ -126,6 +126,10 @@ module ControlPanel
       dispose
     end
 
+    def title(name)
+      set_title(name)
+    end
+
     def slider(name, range = 0..100, initial_value = nil, &block)
       Slider.new(self, name, range, initial_value, block || nil)
     end
@@ -134,7 +138,7 @@ module ControlPanel
       Menu.new(self, name, elements, initial_value, block || nil)
     end
 
-    def checkbox(name, initial_value = nil, &block)
+    def checkbox(name, initial_value = false, &block)
       checkbox = Checkbox.new(self, name, block || nil)
       checkbox.do_click if initial_value == true
     end
@@ -151,10 +155,10 @@ module ControlPanel
 
     def set_feel(lf = 'metal')
       lafinfo = javax.swing.UIManager.getInstalledLookAndFeels
-      laf = lafinfo.select do |info|
-        info.getName.eql? lf.capitalize
+      laf = lafinfo.to_ary.select do |info|
+        info.name =~ Regexp.new(Regexp.escape(lf), Regexp::IGNORECASE)
       end
-      javax.swing.UIManager.setLookAndFeel(laf[0].getClassName)
+      javax.swing.UIManager.setLookAndFeel(laf[0].class_name)
     end
   end
 
@@ -169,4 +173,4 @@ module ControlPanel
   end
 end
 
-Propane::App.send :include, ControlPanel::InstanceMethods
+Propane::App.include(ControlPanel::InstanceMethods)

data/library/library_proxy/README.md

@@ -1,8 +1,8 @@
 ### Using the LibraryProxy in your sketches
 LibraryProxy is a [abstract java class](https://github.com/ruby-processing/JRubyArt/blob/master/src/monkstone/core/LibraryProxy.java) so that you can acccess vanilla processing library reflection methods in your sketches using ruby.
 
-In the sketch you should `load_library :library_proxy` and your library class should inherit 
-from LibraryProxy and implement pre(), draw() and post() methods (can be empty method if not 
+In the sketch you should `load_library :library_proxy` and your library class should inherit
+from LibraryProxy and implement the draw() method (can be empty method if not 
 required). For simplicity initialize your `processing library` in the sketch `setup`.
 
 ### Example library

data/library/library_proxy/library_proxy.rb

@@ -1,12 +1,14 @@
 java_import Java::MonkstoneCore::LibraryProxy
+java_import Java::ProcessingEvent::KeyEvent
+java_import Java::ProcessingEvent::MouseEvent
 
-
-# classes that inherit from Library are expected to implement
-# the abstract methods of monkstone.core.LibraryProxy
-# def pre...
-# def draw...
-# def post...
-# def keyPressed...
-# def mousePressed...
-# NOOP is fine...
+# classes that inherit from LibraryProxy are expected to implement
+# the abstract draw method of monkstone.core.LibraryProxy the other methods are
+# registered with PApplet instance in constructor ImplementingClass.new(app)
+#
+# def pre... NOOP can be overridden
+# def draw... Abstract Method should be implemented NOOP is OK
+# def post... NOOP can be overridden
+# def keyEvent(e)... NOOP can be overridden
+# def mouseEvent(e)... NOOP can be overridden
 # `app` can be called to get PApplet instance

data/pom.rb

@@ -1,7 +1,7 @@
 require 'fileutils'
 project 'rp5extras', 'https://github.com/monkstone/propane' do
   model_version '4.0.0'
-  id 'propane:propane', '2.4.0.pre'
+  id 'propane:propane', '2.5.0'
   packaging 'jar'
   description 'rp5extras for propane'
   organization 'ruby-processing', 'https://ruby-processing.github.io'
@@ -32,8 +32,8 @@ project 'rp5extras', 'https://github.com/monkstone/propane' do
     'jogl.version' => '2.3.2'
     )
 
-  pom 'org.jruby:jruby:9.1.8.0'
-  jar 'org.processing:core:3.3.2'
+  pom 'org.jruby:jruby:9.1.12.0'
+  jar 'org.processing:core:3.3.5'
   jar 'org.processing:video:3.0.2'
   jar('org.jogamp.jogl:jogl-all:${jogl.version}')
   jar('org.jogamp.gluegen:gluegen-rt-main:${jogl.version}')
@@ -44,7 +44,7 @@ project 'rp5extras', 'https://github.com/monkstone/propane' do
       execute_goals( id: 'default-cli',
         artifactItems: [ { groupId:  'org.processing',
           artifactId:  'core',
-          version:  '3.3.2',
+          version:  '3.3.5',
           type:  'jar',
           outputDirectory: '${propane.basedir}/lib'
         },

data/pom.xml

@@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE
   <modelVersion>4.0.0</modelVersion>
   <groupId>propane</groupId>
   <artifactId>propane</artifactId>
-  <version>2.4.0.pre</version>
+  <version>2.5.0</version>
   <name>rp5extras</name>
   <description>rp5extras for propane</description>
   <url>https://github.com/monkstone/propane</url>
@@ -58,13 +58,13 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby</artifactId>
-      <version>9.1.8.0</version>
+      <version>9.1.12.0</version>
       <type>pom</type>
     </dependency>
     <dependency>
       <groupId>org.processing</groupId>
       <artifactId>core</artifactId>
-      <version>3.3.2</version>
+      <version>3.3.5</version>
     </dependency>
     <dependency>
       <groupId>org.processing</groupId>
@@ -103,7 +103,7 @@ DO NOT MODIFIY - GENERATED CODE
                   <artifactItem>
                     <groupId>org.processing</groupId>
                     <artifactId>core</artifactId>
-                    <version>3.3.2</version>
+                    <version>3.3.5</version>
                     <type>jar</type>
                     <outputDirectory>${propane.basedir}/lib</outputDirectory>
                   </artifactItem>

data/propane.gemspec

@@ -10,11 +10,11 @@ Gem::Specification.new do |gem|
   gem.email         = ['mamba2928@yahoo.co.uk']
   gem.licenses     = %w(GPL-3.0 LGPL-2.0)
   gem.description   = %q{A batteries included version of processing in ruby, MacOS and linux64}
-  gem.summary       = %q{ruby wrapper for processing-3.3.1 on MacOS and linux64 bit only for opengl}
+  gem.summary       = %q{ruby wrapper for processing-3.3.5 on MacOS and linux64 bit only for opengl}
   gem.homepage      = 'https://ruby-processing.github.io/propane/'
   gem.files         = `git ls-files`.split($/)
   gem.files << 'lib/propane.jar'
-  gem.files << 'lib/core-3.3.2.jar'
+  gem.files << 'lib/core-3.3.5.jar'
   gem.files << 'lib/gluegen-rt-2.3.2.jar'
   gem.files << 'lib/jogl-all-2.3.2.jar'
   gem.files << 'lib/gluegen-rt-2.3.2-natives-linux-amd64.jar'
@@ -23,7 +23,9 @@ Gem::Specification.new do |gem|
   gem.files << 'lib/jogl-all-2.3.2-natives-macosx-universal.jar'
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.add_runtime_dependency 'arcball', '~> 1.0', '>= 1.0.0' 
+  gem.add_development_dependency 'rake', '~> 12'
+  gem.add_development_dependency 'minitest', '~> 5.10'
+  gem.add_runtime_dependency 'arcball', '~> 1.0', '>= 1.0.0'
   gem.require_paths = ['lib']
   gem.platform      = 'java'
 end

data/src/monkstone/core/LibraryProxy.java

@@ -2,106 +2,124 @@ package monkstone.core;
 
 import processing.core.PApplet;
 import static processing.core.PConstants.*;
+import processing.event.MouseEvent;
+import processing.event.KeyEvent;
 
 /**
- * The purpose of this class is to enable
- * access to processing pre, draw and post loops in
- * ruby-processing as a regular java library class.
- * Also included background, fill and stroke methods.
- * PConstants should also be available from static import
- * @author Martin Prout
- */
+* The purpose of this class is to enable
+* access to processing pre, draw and post loops in
+* ruby-processing as a regular java library class.
+* Also included background, fill and stroke methods.
+* PConstants should also be available from static import
+* @author Martin Prout
+*/
 public abstract class LibraryProxy {
 
-    private final PApplet app;
-
-    /**
-     * Useful accessors
-     */
-    public int width, height;
-
-    /**
-     *
-     * @param app PApplet
-     */
-    public LibraryProxy(PApplet app) {
-        this.app = app;
-        this.width = app.width;
-        this.height = app.height;
-        setActive(true);
-    }
+  private final PApplet app;
 
-    /**
-     * Extending classes must implement this gives access to, by reflection,
-     * processing PApplet pre loop (called before draw)
-     */
-    public abstract void pre();
-
-    /**
-     * Extending classes must implement this gives access to processing PApplet
-     * draw loop
-     */
-    public abstract void draw();
-
-    /**
-     * Extending classes must implement  this gives access to, by reflection,
-     * processing PApplet post loop (called after draw)
-     */
-    public abstract void post();
-
-    /**
-     * Register or unregister reflection methods
-     * @param active
-     */
-    final void setActive(boolean active) {
-        if (active) {
-            this.app.registerMethod("pre", this);
-            this.app.registerMethod("draw", this);
-            this.app.registerMethod("post", this);
-            this.app.registerMethod("dispose", this);
-        } else {
-            this.app.unregisterMethod("pre", this);
-            this.app.unregisterMethod("draw", this);
-            this.app.unregisterMethod("post", this);
-        }
-    }
+  /**
+  * Useful accessors
+  */
+  public int width, height;
 
-    /**
-     * Simple signature for background hides need to call app
-     * @param col int
-     */
-    public void background(int col) {
-        this.app.background(col);
-    }
+  /**
+  *
+  * @param app PApplet
+  */
+  public LibraryProxy(PApplet app) {
+    this.app = app;
+    this.width = app.width;
+    this.height = app.height;
+    setActive(true);
+  }
 
-    /**
-     * Simple signature for fill hides need to call app
-     * @param col int
-     */
-    public void fill(int col) {
-        this.app.fill(col);
-    }
+  /**
+  * Extending classes can override this, gives access to, by reflection,
+  * processing PApplet pre loop (called before draw)
+  */
+  public void pre(){}
 
-    /**
-     * Simple signature for stroke hides need to call app
-     * @param col int
-     */
-    public void stroke(int col) {
-        this.app.stroke(col);
-    }
+  /**
+  * Extending classes must implement this gives access to processing PApplet
+  * draw loop
+  */
+  public abstract void draw();
 
-    /**
-     * Access applet if we must
-     * @return applet PApplet
-     */
-    public PApplet app() {
-        return this.app;
-    }
+  /**
+  * Extending classes can override this, gives access to, by reflection,
+  * processing PApplet post loop (called after draw)
+  */
+  public void post(){}
+
+  /**
+  * Extending classes can override this, gives access to, by reflection,
+  * processing PApplet post loop (called after draw)
+  */
+  public void keyEvent(KeyEvent e){}
 
-    /**
-     * required for processing
-     */
-    public void dispose() {
-        setActive(false);
+  /**
+  * Extending classes can override this, gives access to, by reflection,
+  * processing PApplet post loop (called after draw)
+  */
+  public void mouseEvent(MouseEvent e){}
+
+  /**
+  * Register or unregister reflection methods
+  * @param active
+  */
+  final void setActive(boolean active) {
+    if (active) {
+      this.app.registerMethod("pre", this);
+      this.app.registerMethod("draw", this);
+      this.app.registerMethod("post", this);
+      this.app.registerMethod("mouseEvent", this);
+      this.app.registerMethod("keyEvent", this);
+      this.app.registerMethod("dispose", this);
+    } else {
+      this.app.unregisterMethod("pre", this);
+      this.app.unregisterMethod("draw", this);
+      this.app.unregisterMethod("post", this);
+      this.app.unregisterMethod("mouseEvent", this);
+      this.app.unregisterMethod("keyEvent", this);
     }
+  }
+
+  /**
+  * Simple signature for background hides need to call app
+  * @param col int
+  */
+  public void background(int col) {
+    this.app.background(col);
+  }
+
+  /**
+  * Simple signature for fill hides need to call app
+  * @param col int
+  */
+  public void fill(int col) {
+    this.app.fill(col);
+  }
+
+  /**
+  * Simple signature for stroke hides need to call app
+  * @param col int
+  */
+  public void stroke(int col) {
+    this.app.stroke(col);
+  }
+
+  /**
+  * Access applet if we must
+  * @return applet PApplet
+  */
+  public PApplet app() {
+    return this.app;
+  }
+
+  /**
+  * required for processing
+  */
+  public void dispose() {
+    setActive(false);
+  }
 }

data/test/sketches/key_event.rb

@@ -0,0 +1,37 @@
+#!/usr/bin/env jruby
+require 'propane'
+
+
+class CustomProxySketch < Propane::App
+
+  # A simple demonstration of vanilla processing 'reflection' methods using
+  # propane :library_proxy. See my_library.rb code for the guts.
+  load_libraries :library_proxy, :my_library
+
+  attr_reader :visible
+
+  def settings
+    size 300, 200
+    @visible = false
+  end
+
+  def setup
+    sketch_title 'Reflection Voodoo Proxy'
+    MyLibrary.new self
+  end
+
+  def hide(val)
+    @visible = !val
+  end
+
+  def draw
+    if visible
+      fill(0, 0, 200)
+      ellipse(170, 115, 70, 100)
+    else
+      background 0
+    end
+  end
+end
+
+CustomProxySketch.new

data/test/sketches/library/my_library/my_library.rb

@@ -0,0 +1,32 @@
+# This class demonstrates how by inheriting from the abstract class LibraryProxy
+# we can access 'keyEvent' and 'draw'  (Note we need a draw method even
+# though can be empty)
+class MyLibrary < LibraryProxy
+  java_import 'processing.event.KeyEvent'
+
+  attr_reader :app
+
+  def initialize(parent)
+    @app = parent
+  end
+
+  def draw # optional
+    fill app.color(200, 0, 0, 100)
+    app.rect 100, 100, 60, 90
+  end
+
+  # favor guard clause no_op unless key pressed
+  # and no_op unless ascii key
+  def keyEvent(e) # NB: need camel case for reflection to work
+    return unless e.get_action == KeyEvent::PRESS
+    return if e.get_key > 122 # else we can't use :chr
+    case e.get_key.chr.upcase
+    when 'S'
+      app.send :hide, false
+    when 'H'
+      app.send :hide, true
+    else
+      puts e.get_key.chr
+    end
+  end
+end

data/vendors/Rakefile

@@ -9,7 +9,7 @@ SOUND = 'sound.zip'.freeze
 SOUND_VERSION = 'v1.3.2' # version 1.3.2
 VIDEO = 'video-2.zip'
 VIDEO_VERSION = '2' # version 1.0.1
-EXAMPLES = '1.0'.freeze
+EXAMPLES = '1.5'.freeze
 HOME_DIR = ENV['HOME']
 MAC_OR_LINUX = /linux|mac|darwin/ =~ RbConfig::CONFIG['host_os']
 

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: propane
 version: !ruby/object:Gem::Version
-  version: 2.4.0.pre
+  version: 2.5.0
 platform: java
 authors:
 - monkstone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-04 00:00:00.000000000 Z
+date: 2017-08-15 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.10'
 - !ruby/object:Gem::Dependency
   name: arcball
   requirement: !ruby/object:Gem::Requirement
@@ -51,7 +79,7 @@ files:
 - Rakefile
 - bin/propane
 - lib/PROCESSING_LICENSE.txt
-- lib/core-3.3.2.jar
+- lib/core-3.3.5.jar
 - lib/export.txt
 - lib/gluegen-rt-2.3.2-natives-linux-amd64.jar
 - lib/gluegen-rt-2.3.2-natives-macosx-universal.jar
@@ -66,11 +94,7 @@ files:
 - lib/propane/creators/sketch_writer.rb
 - lib/propane/helper_methods.rb
 - lib/propane/helpers/numeric.rb
-- lib/propane/java_library.rb
 - lib/propane/library_loader.rb
-- lib/propane/native_folder.rb
-- lib/propane/native_loader.rb
-- lib/propane/ruby_library.rb
 - lib/propane/runner.rb
 - lib/propane/version.rb
 - library/boids/boids.rb
@@ -117,6 +141,8 @@ files:
 - test/helper_methods_test.rb
 - test/math_tool_test.rb
 - test/respond_to_test.rb
+- test/sketches/key_event.rb
+- test/sketches/library/my_library/my_library.rb
 - test/test_helper.rb
 - test/vecmath_spec_test.rb
 - vendors/Rakefile
@@ -136,20 +162,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: ruby wrapper for processing-3.3.1 on MacOS and linux64 bit only for opengl
+summary: ruby wrapper for processing-3.3.5 on MacOS and linux64 bit only for opengl
 test_files:
 - test/create_test.rb
 - test/deglut_spec_test.rb
 - test/helper_methods_test.rb
 - test/math_tool_test.rb
 - test/respond_to_test.rb
+- test/sketches/key_event.rb
+- test/sketches/library/my_library/my_library.rb
 - test/test_helper.rb
 - test/vecmath_spec_test.rb

data/lib/propane/java_library.rb

@@ -1,54 +0,0 @@
-require_relative 'native_folder'
-require_relative 'native_loader'
-
-# The JavaLibrary class
-class JavaLibrary
-  attr_reader :dir, :path, :name, :ppath
-
-  def initialize(name)
-    @name = 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
-  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(Propane::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(ENV['HOME'], '.propane', 'libraries', name, 'library')
-    @path = File.join(dir, "#{name}.jar")
-  end
-end

data/lib/propane/native_folder.rb

@@ -1,33 +0,0 @@
-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

data/lib/propane/native_loader.rb

@@ -1,26 +0,0 @@
-# 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/propane/ruby_library.rb

@@ -1,31 +0,0 @@
-# The abstract RubyLibrary class
-class RubyLibrary
-  attr_reader :path, :name
-
-  def initialize(name)
-    @name = 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(Propane::SKETCH_ROOT, 'library', name, "#{name}.rb")
-    )
-  end
-end
-
-# The InstalledLibraryLoader class
-class InstalledRubyLibrary < RubyLibrary
-  def initialize(name)
-    super
-    @path = File.join(PROPANE_ROOT, 'library', name, "#{name}.rb")
-  end
-end