propane 3.4.2-java → 3.5.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6230638aa8f3fba662a21f16d203f35d4e54cbf8fa90f3d35aeec00aeae0aed
-  data.tar.gz: 62b86da2a9d1b46fa7f2f09463be5edbfd1d05336adf79ae17df362382b1fa34
+  metadata.gz: 7837b349f30c7e79ee7e90b36eb7603174a0228d49fcaa8ec321ea5db24ae112
+  data.tar.gz: 38d0c0cc6972e111fe2bb7a81cf3f5bbe20cbb795b31f880acfaaff8a1008023
 SHA512:
-  metadata.gz: 8f8c4c2177460c3b96817b7c870de6312ebf864853216f3039bc33fec3ae97e713c4fe31c829a4e39d7e4aea56537cddece1399b772a0432e2d7695ec0f19e37
-  data.tar.gz: 286d27b5c13890175871709260d4a117545bf203679a40672518927a20a51940266cc5ae8293024d01a76f02f4ceac5ecdae61b686d9cf2f7259743500ea7b26
+  metadata.gz: 9f2f530ad672d28338340409760883e5bec5ce735a07fac5b76e9fba5e8965c37674410eb54c6aeec46d78e3568850719765738c71b359cdb37a0b30d6060af5
+  data.tar.gz: b0f30134fb858c2dbbc3a40eb9772e9788e1bca09f3cb2c893139bf690cef294d9dc5a30cf3667fd73016144807f6778b2cb5d13a02111f85ae56c91e5a64a17

data/.mvn/wrapper/MavenWrapperDownloader.java

@@ -89,7 +89,7 @@ public class MavenWrapperDownloader {
             System.exit(0);
         } catch (Throwable e) {
             System.out.println("- Error downloading");
-            e.printStackTrace();
+      
             System.exit(1);
         }
     }

data/.travis.yml

@@ -2,7 +2,7 @@ language: java
 dist: bionic
 
 rvm:
-  - jruby-9.2.9.0
+  - jruby-9.2.11.1
 jdk:
   - openjdk11
 os:

data/CHANGELOG.md

@@ -1,6 +1,10 @@
+**v3.5.0** Rebase processing core code around Sam Pottinhgers latest fixes for JOGL an image save, does mean breaking some of Diwis and Joshua Davis examples, but one hopes codeanticode knows what he's doing.
+
+**v3.4.3** Use Map.of to initialize HashMap bump processing version in build bump to jruby-9.2.11.0
+
 **v3.4.2** Fix native library bug on windows (thanks to Jay Scott). Add minim library examples
 
-**v3.4.1** Update to JRuby-9.2.9.0
+**v3.4.1** Update to jruby-9.2.9.0
 
 **v3.4.0** Experimental refactoring of ThinkDifferent, and some other processing classes
 

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec

data/README.md

@@ -11,7 +11,7 @@ adjust above for your OS/distro setup.
 There may be a linker issue with P2D or P3D sketches with stock openjdk with some linux distros, in which case you might find [Adopt open jdk binaries][adopt] will work for you.
 
 - `jdk-11.0.3+`
-- `jruby-9.2.9.0`
+- `jruby-9.2.11.1`
 
 Currently you can ignore `illegal reflective access` warnings, see [here how to suppress them][warning].
 
@@ -27,10 +27,10 @@ rake javadoc
 
 ```bash
 jgem install propane # from rubygems
-jgem install propane-3.4.2-java.gem # local install
+jgem install propane-3.4.3-java.gem # local install
 # Alternative
 jruby -S gem install propane # from rubygems
-jruby -S gem install propane-3.4.2-java.gem # local install
+jruby -S gem install propane-3.4.3-java.gem # local install
 ```
 
 ## Check Install
@@ -40,6 +40,18 @@ To check version and confirm gem bin files are on your path (also checks JDK ver
 propane --version
 ```
 
+## Suppressing Reflective Access warnings
+
+Since propane-3.4.3 it is possible to suppress reflective access warnings by including a `~/.jruby.java_opts` file with following contents:-
+
+```bash
+--add-opens java.base/java.lang=ALL-UNNAMED
+--add-opens java.desktop/java.awt=ALL-UNNAMED
+--add-opens java.desktop/sun.awt=ALL-UNNAMED
+--add-opens java.desktop/sun.java2d.opengl=ALL-UNNAMED
+```
+Mainly needed for opengl sketches.
+
 ## Usage
 
 A propane sketch:-

data/Rakefile

@@ -1,18 +1,17 @@
 # frozen_string_literal: false
+
 require_relative 'lib/propane/version'
 
-task default: [:init, :compile, :install, :test, :gem]
+task default: %i[init compile install test gem]
 
-# depends on installed processing, with processing on path
+# Currently depends on local jogl-2.4.0 jars on path ~/jogl24
 desc 'Copy Jars'
 task :init do
-  # processing_root = File.dirname(`readlink -f $(which processing)`) # for Archlinux etc
-  processing_root = File.join(ENV['HOME'], 'processing-3.5.3') # alternative for debian linux etc
-  jar_dir = File.join(processing_root, 'core', 'library')
-  opengl = Dir.entries(jar_dir).grep(/amd64|macosx-universal/)
+  jogl24 = File.join(ENV['HOME'], 'jogl24')
+  opengl = Dir.entries(jogl24).grep(/amd64|universal/).select { |jar| jar =~ /linux|windows|macosx/ }
   opengl.concat %w[jogl-all.jar gluegen-rt.jar]
   opengl.each do |gl|
-    FileUtils.cp(File.join(jar_dir, gl), File.join('.', 'lib'))
+    FileUtils.cp(File.join(jogl24, gl), File.join('.', 'lib'))
   end
 end
 
@@ -28,12 +27,12 @@ end
 
 desc 'Document'
 task :javadoc do
-	sh './mvnw javadoc:javadoc'
+  sh './mvnw javadoc:javadoc'
 end
 
 desc 'Compile'
 task :compile do
-	sh './mvnw package'
+  sh './mvnw package'
 end
 
 desc 'JRuby-Complete'
@@ -53,7 +52,7 @@ end
 
 desc 'clean'
 task :clean do
-  Dir["./**/*.{jar,gem}"].each do |path|
+  Dir['./**/*.{jar,gem}'].each do |path|
     puts "Deleting #{path} ..."
     File.delete(path)
   end

data/bin/propane

@@ -1,6 +1,8 @@
 #!/usr/bin/env jruby
+# frozen_string_literal: true
+
 unless defined? PROPANE_ROOT
-  $LOAD_PATH << File.expand_path(File.dirname(__FILE__))
+  $LOAD_PATH << __dir__
   PROPANE_ROOT = File.expand_path(File.dirname(__FILE__) + '/../')
 end
 

data/lib/propane.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
+
 require 'java'
 unless defined? PROPANE_ROOT
   $LOAD_PATH << File.dirname(__dir__)
   PROPANE_ROOT = File.dirname(__dir__)
 end
-Dir["#{PROPANE_ROOT}/lib/*.jar"].each do |jar|
+Dir["#{PROPANE_ROOT}/lib/*.jar"].sort.each do |jar|
   require jar
 end
 require_relative 'propane/app'

data/lib/propane/app.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: false
 
+require 'jruby'
 require_relative 'helper_methods'
 require_relative 'library_loader'
 
@@ -132,7 +133,7 @@ module Propane
       @width ||= w
       @height ||= h
       @render_mode ||= mode
-      import_opengl if /opengl/ =~ mode
+      import_opengl if /opengl/.match?(mode)
       super(*args)
     end
 

data/lib/propane/creators/sketch_class.rb

@@ -5,7 +5,10 @@ class SketchClass
   attr_reader :name, :width, :height, :mode
 
   def initialize(name:, width: 150, height: 150, mode: nil)
-    @name, @width, @height, @mode = name, width, height, mode
+    @name = name
+    @width = width
+    @height = height
+    @mode = mode
   end
 
   def class_sketch
@@ -26,6 +29,7 @@ class SketchClass
 
   def size
     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
 
@@ -36,6 +40,7 @@ class SketchClass
 
   def method_lines(name, content = nil)
     return [format('  def %s', name), '', '  end'] unless content
+
     [format('  def %s', name), content, '  end', '']
   end
 
@@ -43,6 +48,7 @@ class SketchClass
     lines = [
       '#!/usr/bin/env jruby',
       '# frozen_string_literal: false',
+      '',
       "require 'propane'",
       '',
       class_sketch

data/lib/propane/creators/sketch_factory.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require_relative 'sketch_writer'
 
 class SketchFactory
-  NAMES = %w[One Two Three]
-  def initialize(argc)
+  NAMES = %w[One Two Three].freeze
+  def initialize(_argc)
     NAMES.each do |name|
       SketchWriter.new(File.basename(name, '.rb'), width: 300, height: 300).write
     end

data/lib/propane/creators/sketch_writer.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: false
+
 require_relative 'sketch_class'
 
 # The file writer can write a sketch when given instance of Sketch type

data/lib/propane/helper_methods.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: false
+
 # processing module wrapper
 require_relative 'helpers/numeric'
 module Propane
@@ -52,6 +53,7 @@ module Propane
 
     def color(*args)
       return super(*args) unless args.length == 1
+
       super(hex_color(args[0]))
     end
 
@@ -66,11 +68,8 @@ module Propane
     # Overrides Processing convenience function thread, which takes a String
     # arg (for a function) to more rubylike version, takes a block...
     def thread(&block)
-      if block_given?
-        Thread.new(&block)
-      else
-        raise ArgumentError, 'thread must be called with a block', caller
-      end
+      warn 'A Block is Needed' unless block_given?
+      Java::JavaLang::Thread.new(&block).start
     end
 
     # explicitly provide 'processing.org' min instance method
@@ -94,9 +93,9 @@ module Propane
     def dist(*args)
       case args.length
       when 4
-        return dist2d(*args)
+        dist2d(*args)
       when 6
-        return dist3d(*args)
+        dist3d(*args)
       else
         raise ArgumentError, 'takes 4 or 6 parameters'
       end
@@ -111,13 +110,13 @@ module Propane
     # Here's a convenient way to look for them.
     def find_method(method_name)
       reg = Regexp.new(method_name.to_s, true)
-      methods.sort.select { |meth| reg.match(meth) }
+      methods.sort.select { |meth| reg.match?(meth) }
     end
 
     # Proxy over a list of Java declared fields that have the same name as
     # some methods. Add to this list as needed.
     def proxy_java_fields
-      fields = %w(key frameRate mousePressed keyPressed)
+      fields = %w[key frameRate mousePressed keyPressed]
       methods = fields.map { |field| java_class.declared_field(field) }
       @declared_fields = Hash[fields.zip(methods)]
     end
@@ -163,6 +162,7 @@ module Propane
     # frame_rate needs to support reading and writing
     def frame_rate(fps = nil)
       return @declared_fields['frameRate'].value(java_self) unless fps
+
       super(fps)
     end
 
@@ -178,21 +178,19 @@ module Propane
 
     private
 
-    INTEGER_COL = -> (x) { x.is_a?(Integer) }
-    STRING_COL = -> (x) { x.is_a?(String) }
-    FLOAT_COL = -> (x) { x.is_a?(Float) }
     # parse single argument color int/double/String
-    def hex_color(a)
-      case a
-      when INTEGER_COL
-        Java::Monkstone::ColorUtil.colorLong(a)
-      when STRING_COL
-        return Java::Monkstone::ColorUtil.colorString(a) if a =~ /#\h+/
-        raise StandardError, 'Dodgy Hexstring'
-      when FLOAT_COL
-        Java::Monkstone::ColorUtil.colorDouble(a)
+    def hex_color(arg)
+      case arg
+      when Integer
+        Java::Monkstone::ColorUtil.colorLong(arg)
+      when String
+        raise 'Dodgy Hexstring' unless /#\h{6}$/.match?(arg)
+
+        Java::Monkstone::ColorUtil.colorString(arg)
+      when Float
+        Java::Monkstone::ColorUtil.colorDouble(arg)
       else
-        raise StandardError, 'Dodgy Color Conversion'
+        raise 'Dodgy Color Conversion'
       end
     end
 
@@ -200,6 +198,7 @@ module Propane
       dx = args[0] - args[2]
       dy = args[1] - args[3]
       return 0 if dx.abs < EPSILON && dy.abs < EPSILON
+
       Math.hypot(dx, dy)
     end
 
@@ -208,6 +207,7 @@ module Propane
       dy = args[1] - args[4]
       dz = args[2] - args[5]
       return 0 if dx.abs < EPSILON && dy.abs < EPSILON && dz.abs < EPSILON
+
       Math.sqrt(dx * dx + dy * dy + dz * dz)
     end
   end

data/lib/propane/helpers/numeric.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Numeric #:nodoc:
   def degrees
     self * 57.29577951308232

data/lib/propane/helpers/version_error.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class JDKVersionError < StandardError
   def message

data/lib/propane/library.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'native_folder'
 require_relative 'native_loader'
 require 'pathname'
@@ -18,6 +20,7 @@ class Library
     return if (@path = Pathname.new(
       File.join(PROPANE_ROOT, 'library', name, "#{name}.rb")
     )).exist?
+
     locate_java
   end
 
@@ -46,10 +49,11 @@ class Library
   end
 
   def load_jars
-    Dir.glob("#{dir}/*.jar").each do |jar|
+    Dir.glob("#{dir}/*.jar").sort.each do |jar|
       require jar
     end
     return true unless native_binaries?
+
     add_binaries_to_classpath
   end
 

data/lib/propane/library_loader.rb

@@ -33,10 +33,12 @@ module Propane
 
     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

data/lib/propane/native_folder.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 require 'rbconfig'
 
 # Utility to load native binaries on Java CLASSPATH
 class NativeFolder
   attr_reader :os, :bit
 
-  WIN_FORMAT = 'windows%d'.freeze
-  LINUX_FORMAT = 'linux%d'.freeze
+  WIN_FORMAT = 'windows%d'
+  LINUX_FORMAT = 'linux%d'
   WIN_PATTERNS = [
     /bccwin/i,
     /cygwin/i,
@@ -17,22 +19,21 @@ class NativeFolder
 
   def initialize
     @os = RbConfig::CONFIG['host_os'].downcase
-    @bit = java.lang.System.get_property('os.arch') =~ /64/ ? 64 : 32
+    @bit = /64/.match?(java.lang.System.get_property('os.arch')) ? 64 : 32
   end
 
   def name
     return 'macosx' if /darwin|mac/.match?(os)
-    return format(LINUX_FORMAT, bit) if os =~ /linux/
-    if WIN_PATTERNS.any? { |pat| pat =~ os }
-      return format(WIN_FORMAT, '64') if /64/.match?(bit)
-      return format(WIN_FORMAT, '32') if /32/.match?(bit)
-    end
+    return format(LINUX_FORMAT, bit) if /linux/.match?(os)
+    return format(WIN_FORMAT, bit) if WIN_PATTERNS.any? { |pat| pat.match?(os) }
+
     raise 'Unsupported Architecture'
   end
 
   def extension
     return '*.so' if /linux/.match?(os)
-    return '*.dll' if WIN_PATTERNS.any? { |pat| pat =~ os }
+    return '*.dll' if WIN_PATTERNS.any? { |pat| pat.match?(os) }
+
     '*.dylib' # MacOS
   end
 end

data/lib/propane/native_loader.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This class knows how to dynamically set the 'java' native library path
 # It might not work with java 9?
 class NativeLoader
@@ -21,6 +23,7 @@ class NativeLoader
     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