propane 2.3.3-java → 2.3.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09900eb2fcd893122891d335f511684bf25197e2
-  data.tar.gz: 1f82930cb3f3a6359f93b12be433d5209446df13
+  metadata.gz: 40e07b8b28c5857b0f1738ddf80584a6c5f62764
+  data.tar.gz: 67dc8538463955bd26073f52dad1d0bb74a706c3
 SHA512:
-  metadata.gz: 43e23c1cdd45600f55cc777d705cfb2693830622320f18266829dbbdf00c0a7ed791403e995218489f711a3eec8b28f4f6e643dd834163f8fcef1ac6dde2b5ed
-  data.tar.gz: 3fa052ecd4dde1c3e42bc339cae078a6920d60486afeef66b6a9087ec404e32a4968e664e29afce59ccce73612302ce779d80fe58b7b1b57cd7a5c37dab5a05f
+  metadata.gz: 01683ec9729539dd4a279e19b8661f9b446968bcfece74c796c98d988cd177b41a03396fd11dccf8ce8c75dfced4bdc13e92f2ca7a4abf1a8b989bdb5c56e007
+  data.tar.gz: bb8318aa7cbd0d5296027230db8eebc91a9cf1c03f2cdd9cd52e5411a8ba7be274e4bbcf5e0cc9ab23853db8888729d5ab8dda05093cff2362de58635f7fb561

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+**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

data/README.md

@@ -1,14 +1,21 @@
 # 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:-
+```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.12.0
 - mvn-3.5.0+
-- core.jar processing-3.3.4
+- 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.3-java.gem # for local install
+jgem install propane-2.3.4-java.gem # for local install
 ```
 
 ## Usage

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.4.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
 

data/lib/propane/app.rb

@@ -139,15 +139,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 +160,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)
+      $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 $app.send(name, *args) if $app.respond_to? name
       super
     end
-  end
-end
+  end # Processing::Proxy
+end # Propane

data/lib/propane/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Propane
-  VERSION = '2.3.3'.freeze
+  VERSION = '2.3.4'.freeze
 end

data/library/control_panel/control_panel.rb

@@ -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?
+        $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)
+        $app.send(name)
         proc.call(value) if proc
       end
     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/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.3.3'
+  id 'propane:propane', '2.3.4'
   packaging 'jar'
   description 'rp5extras for propane'
   organization 'ruby-processing', 'https://ruby-processing.github.io'
@@ -33,7 +33,7 @@ project 'rp5extras', 'https://github.com/monkstone/propane' do
     )
 
   pom 'org.jruby:jruby:9.1.12.0'
-  jar 'org.processing:core:3.3.4'
+  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.4',
+          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.3.3</version>
+  <version>2.3.4</version>
   <name>rp5extras</name>
   <description>rp5extras for propane</description>
   <url>https://github.com/monkstone/propane</url>
@@ -64,7 +64,7 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>org.processing</groupId>
       <artifactId>core</artifactId>
-      <version>3.3.4</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.4</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.4 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.4.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'

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.3'.freeze
 HOME_DIR = ENV['HOME']
 MAC_OR_LINUX = /linux|mac|darwin/ =~ RbConfig::CONFIG['host_os']
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: propane
 version: !ruby/object:Gem::Version
-  version: 2.3.3
+  version: 2.3.4
 platform: java
 authors:
 - monkstone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-17 00:00:00.000000000 Z
+date: 2017-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -79,7 +79,7 @@ files:
 - Rakefile
 - bin/propane
 - lib/PROCESSING_LICENSE.txt
-- lib/core-3.3.4.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
@@ -168,7 +168,7 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: ruby wrapper for processing-3.3.4 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