propane 3.4.1-java → 3.7.1-java

data/test/respond_to_test.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
+
 require 'java'
 require_relative 'test_helper'
 require_relative '../lib/propane'
 
-METHODS = %i(
+METHODS = %i[
   alpha
   ambient
   ambient_light
@@ -182,7 +183,7 @@ METHODS = %i(
   update_pixels
   vertex
   width
-)
+].freeze
 
 class TestSketch < Propane::App
   def settings

data/test/sketches/key_event.rb

@@ -1,9 +1,9 @@
 #!/usr/bin/env jruby
-require 'propane'
+# frozen_string_literal: true
 
+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

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # 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)
@@ -20,6 +22,7 @@ class MyLibrary < LibraryProxy
   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

data/test/test_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 gem 'minitest'
 require 'minitest/pride'
 require 'minitest/autorun'

data/test/vecmath_spec_test.rb

@@ -1,14 +1,14 @@
+# frozen_string_literal: true
+
 require_relative 'test_helper'
 require 'java'
 require_relative '../lib/propane'
 
 Java::Monkstone::PropaneLibrary.load(JRuby.runtime)
 
-
 Dir.chdir(File.dirname(__FILE__))
-
+# Vecmath Test class
 class VecmathTest < Minitest::Test
-
   # duck for Vec2D constructor
   Point = Struct.new(:x, :y)
   # duck for Vec3D constructor
@@ -17,12 +17,11 @@ class VecmathTest < Minitest::Test
   Pointless = Struct.new(:a, :b)
   # non-duck to test fail
   Pointless3 = Struct.new(:a, :b, :c)
-  def setup
-
-  end
+  def setup; end
 
   def test_equals
-    x, y = 1.0000001, 1.01
+    x = 1.0000001
+    y = 1.01
     a = Vec2D.new(x, y)
     assert_equal(a.to_a, [x, y], 'Failed to return Vec2D as an Array')
   end
@@ -34,7 +33,8 @@ class VecmathTest < Minitest::Test
   end
 
   def test_copy_equals
-    x, y = 1.0000001, 1.01
+    x = 1.0000001
+    y = 1.01
     a = Vec2D.new(x, y)
     b = a.copy
     assert_equal(a.to_a, b.to_a, 'Failed deep copy')
@@ -47,20 +47,23 @@ class VecmathTest < Minitest::Test
   end
 
   def test_constructor_fixnum
-    val = Point.new(1, 8) # duck type fixnum
+    # duck type fixnum
+    val = Point.new(1, 8)
     expected = Vec2D.new(val)
     assert_equal(expected, Vec2D.new(1.0, 8.0), 'Failed duck type constructor fixnum')
   end
 
   def test_failed_duck_type
-    val = Pointless.new(1.0, 8.0) # non duck type
+    # non duck type
+    val = Pointless.new(1.0, 8.0)
     assert_raises TypeError do
       Vec2D.new(val)
     end
   end
 
   def test_copy_not_equals
-    x, y = 1.0000001, 1.01
+    x = 1.0000001
+    y = 1.01
     a = Vec2D.new(x, y)
     b = a.copy
     b *= 0
@@ -121,7 +124,7 @@ class VecmathTest < Minitest::Test
 
   def test_random
     a = Vec2D.random
-    assert a.kind_of? Vec2D
+    assert a.is_a? Vec2D
     assert_in_epsilon(a.mag, 1.0)
   end
 
@@ -133,7 +136,7 @@ class VecmathTest < Minitest::Test
 
   def test_mag
     a = Vec2D.new(-3, -4)
-    assert_in_epsilon(a.mag, 5, 0.001,'Failed to return magnitude of vector')
+    assert_in_epsilon(a.mag, 5, 0.001, 'Failed to return magnitude of vector')
   end
 
   def test_mag_variant
@@ -233,14 +236,16 @@ class VecmathTest < Minitest::Test
   end
 
   def test_rotate
-    x, y = 20, 10
+    x = 20
+    y = 10
     b = Vec2D.new(x, y)
     a = b.rotate(Math::PI / 2)
     assert_equal(a, Vec2D.new(-10, 20), 'Failed to rotate vector by scalar radians')
   end
 
   def test_hash_index
-    x, y = 10, 20
+    x = 10
+    y = 20
     b = Vec2D.new(x, y)
     assert_equal(b[:x], x, 'Failed to hash index')
   end
@@ -275,7 +280,7 @@ class VecmathTest < Minitest::Test
     a = Vec2D.new(200, 0)
     b = Vec2D.new(0, 200)
     # Expected result is an area, twice that of the triangle created by the vectors
-    assert_equal((a).cross(b).abs, 40_000.0, 'Failed area test using 2D vector cross product')
+    assert_equal(a.cross(b).abs, 40_000.0, 'Failed area test using 2D vector cross product')
   end
 
   def test_cross_non_zero # Could be used to calculate area of triangle
@@ -294,7 +299,9 @@ class VecmathTest < Minitest::Test
   end
 
   def test_equals3
-    x, y, z = 1.0000001, 1.01, 0.0
+    x = 1.0000001
+    y = 1.01
+    z = 0.0
     a = Vec3D.new(x, y)
     assert_equal(a.to_a, [x, y, z], 'Failed to return Vec3D as an Array')
   end
@@ -325,14 +332,18 @@ class VecmathTest < Minitest::Test
   end
 
   def test_copy_equals3
-    x, y, z = 1.0000001, 1.01, 1
+    x = 1.0000001
+    y = 1.01
+    z = 1
     a = Vec3D.new(x, y, z)
     b = a.copy
     assert_equal(a.to_a, b.to_a, 'Failed deep copy')
   end
 
   def test_copy_not_equals3
-    x, y, z = 1.0000001, 1.01, 6.0
+    x = 1.0000001
+    y = 1.01
+    z = 6.0
     a = Vec3D.new(x, y, z)
     b = a.copy
     b *= 0
@@ -377,13 +388,13 @@ class VecmathTest < Minitest::Test
 
   def test_random3
     a = Vec3D.random
-    assert a.kind_of? Vec3D
+    assert a.is_a? Vec3D
     assert_in_epsilon(a.mag, 1.0)
   end
 
   def test_assign_value3
     a = Vec3D.new(3, 5)
-    a.x=23
+    a.x = 23
     assert_equal(a.x, 23, 'Failed to assign x value')
   end
 
@@ -512,7 +523,9 @@ class VecmathTest < Minitest::Test
   end
 
   def test_hash_key3
-    x, y, z = 10, 20, 50
+    x = 10
+    y = 20
+    z = 50
     b = Vec3D.new(x, y, z)
     assert_equal(b[:x], x, 'Failed hash key access')
     assert_equal(b[:y], y, 'Failed hash key access')

data/vendors/Rakefile

@@ -1,78 +1,76 @@
 # frozen_string_literal: true
+
 require 'rake/clean'
 
-WARNING = <<-EOS
+WARNING = <<-WGET
    WARNING: you may not have wget installed, you could just download
    the correct version of propane-examples (see EXAMPLES vendors directory)
-EOS
-SOUND = 'sound.zip'.freeze
-SOUND_VERSION = 'v1.3.2' # version 1.3.2
-GLVIDEO = 'processing-glvideo.zip'
-VIDEO = 'video-2.0-beta4.zip'
-VIDEO_VERSION = 'r6-v2.0-beta4'
-EXAMPLES = '2.6'.freeze
+WGET
+SOUND = 'sound.zip'
+PROCESSING_GITHUB = 'https://github.com/processing'
+PROPANE_EXAMPLES = 'https://github.com/ruby-processing/propane-examples'
+VIDEO = 'video.zip'
+DOWNLOAD = 'releases/download/latest'
+EXAMPLES = '2.9'
 HOME_DIR = ENV['HOME']
-MAC_OR_LINUX = /linux|mac|darwin/ =~ RbConfig::CONFIG['host_os']
+LIBRARY = File.join(HOME_DIR, '.propane', 'libraries')
+MAC_OR_LINUX = /linux|mac|darwin/.match?(RbConfig::CONFIG['host_os'])
 
-CLOBBER.include(EXAMPLES, SOUND, GLVIDEO, VIDEO)
+CLOBBER.include(EXAMPLES, SOUND, VIDEO)
 
 desc 'download, and copy propane examples'
 task default: [:download_and_copy_samples]
 
 desc 'download and copy examples to user home'
-task download_and_copy_samples: [:download_examples, :copy_examples]
+task download_and_copy_samples: %i[download_examples copy_examples]
 
 task :download_examples
 file_name = MAC_OR_LINUX.nil? ? "#{EXAMPLES}.zip" : "#{EXAMPLES}.tar.gz"
-wget_base = 'wget https://github.com/ruby-processing/propane-examples'
+wget_base = ['wget', PROPANE_EXAMPLES].join(' ')
 wget_string = [wget_base, 'archive', file_name].join('/')
 file file_name do
   begin
     sh wget_string
-  rescue
+  rescue StandardError
     warn(WARNING)
   end
 end
 
 desc 'download and copy sound library to ~/.propane'
-task download_and_copy_sound: [:init_dir, :download_sound, :copy_sound, :clobber]
+task download_and_copy_sound: %i[init_dir download_sound copy_sound clobber]
 
 desc 'download and copy video library to ~/.propane'
-task download_and_copy_video: [:init_dir, :download_video, :copy_video, :clobber]
+task download_and_copy_video: %i[init_dir download_video copy_video clobber]
 
 desc 'download sound library'
 task :download_sound do
-  wget_base = 'wget https://github.com/processing/processing-sound'
-  wget_string = [wget_base, 'releases/download', SOUND_VERSION, SOUND].join('/')
+  wget_base = ['wget', PROCESSING_GITHUB].join(' ')
+  wget_string = [wget_base, 'processing-sound', DOWNLOAD, SOUND].join('/')
   begin
     sh wget_string
-  rescue
+  rescue StandardError
     warn(WARNING)
   end
 end
 
+desc 'initialize ~/.propane directories'
+task :init_dir do
+  FileUtils.mkdir_p LIBRARY unless File.exist? LIBRARY
+end
+
 desc 'download video library'
 task :download_video do
-  wget_base = 'wget https://github.com/processing/processing-video'
-  wget_string = [wget_base, 'releases/download', VIDEO_VERSION, VIDEO].join('/')
+  wget_base = ['wget', PROCESSING_GITHUB].join(' ')
+  wget_string = [wget_base, 'processing-video', DOWNLOAD, VIDEO].join('/')
   begin
     sh wget_string
-  rescue
+  rescue StandardError
     warn(WARNING)
   end
 end
 
-desc 'initialize ~/.propane directories'
-task :init_dir do
-  unless File.exist? "#{HOME_DIR}/.propane/libraries"
-    sh "mkdir -p ~/.propane"
-    sh "mkdir -p ~/.propane/libraries"
-  end
-end
-
-
 desc 'copy examples'
-task :copy_examples => file_name do
+task copy_examples: file_name do
   if MAC_OR_LINUX.nil?
     sh "unzip #{EXAMPLES}.zip"
   else
@@ -84,20 +82,17 @@ task :copy_examples => file_name do
 end
 
 desc 'copy sound library'
-task :copy_sound => SOUND do
-  directory "~/.propane"
-  directory "~/.propane/libraries"
+task copy_sound: SOUND do
   sh "unzip #{SOUND}"
-  sh "rm -r #{HOME_DIR}/.propane/libraries/sound" if File.exist? "#{HOME_DIR}/.propane/libraries/sound"
-  sh "cp -r sound #{HOME_DIR}/.propane/libraries"
+  sh "rm -r #{LIBRARY}/sound" if File.exist? "#{LIBRARY}/sound"
+  sh "cp -r sound #{LIBRARY}"
   sh 'rm -r sound'
-  sh 'rm -r __MACOSX'
 end
 
 desc 'copy video library'
-task :copy_video => VIDEO do
+task copy_video: VIDEO do
   sh "unzip #{VIDEO}"
-  sh "rm -r #{HOME_DIR}/.propane/libraries/video" if File.exist? "#{HOME_DIR}/.propane/libraries/video"
-  sh "cp -r video #{HOME_DIR}/.propane/libraries/video"
+  sh "rm -r #{LIBRARY}/video" if File.exist? "#{LIBRARY}/video"
+  sh "cp -r video #{LIBRARY}"
   sh 'rm -r video'
 end

metadata

@@ -1,63 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: propane
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.7.1
 platform: java
 authors:
 - monkstone
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-01 00:00:00.000000000 Z
+date: 2021-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: 0.1.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.3
+  name: jruby-openssl
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: 0.1.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
-  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.11'
+        version: '5.14'
+  name: minitest
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.11'
+        version: '5.14'
 - !ruby/object:Gem::Dependency
-  name: arcball
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '12.3'
+  name: rake
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.3'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.2
+  name: arcball
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.2
 description: "  A batteries included version of processing in ruby targetting jdk11.\n"
 email:
 - mamba2928@yahoo.co.uk
@@ -91,7 +111,7 @@ files:
 - lib/jogl-all-natives-macosx-universal.jar
 - lib/jogl-all-natives-windows-amd64.jar
 - lib/jogl-all.jar
-- lib/propane-3.4.1.jar
+- lib/propane-3.7.1.jar
 - lib/propane.rb
 - lib/propane/app.rb
 - lib/propane/creators/sketch_class.rb
@@ -156,8 +176,10 @@ files:
 - src/main/java/monkstone/videoevent/MovieEvent.java
 - src/main/java/monkstone/videoevent/package-info.java
 - src/main/java/processing/awt/PGraphicsJava2D.java
+- src/main/java/processing/awt/PImageAWT.java
 - src/main/java/processing/awt/PShapeJava2D.java
 - src/main/java/processing/awt/PSurfaceAWT.java
+- src/main/java/processing/awt/ShimAWT.java
 - src/main/java/processing/core/PApplet.java
 - src/main/java/processing/core/PConstants.java
 - src/main/java/processing/core/PFont.java
@@ -224,8 +246,6 @@ files:
 - src/main/java/processing/opengl/shaders/ColorFrag.glsl
 - src/main/java/processing/opengl/shaders/ColorVert.glsl
 - src/main/java/processing/opengl/shaders/LightFrag.glsl
-- src/main/java/processing/opengl/shaders/LightVert-brcm.glsl
-- src/main/java/processing/opengl/shaders/LightVert-vc4.glsl
 - src/main/java/processing/opengl/shaders/LightVert.glsl
 - src/main/java/processing/opengl/shaders/LineFrag.glsl
 - src/main/java/processing/opengl/shaders/LineVert.glsl
@@ -234,8 +254,6 @@ files:
 - src/main/java/processing/opengl/shaders/PointVert.glsl
 - src/main/java/processing/opengl/shaders/TexFrag.glsl
 - src/main/java/processing/opengl/shaders/TexLightFrag.glsl
-- src/main/java/processing/opengl/shaders/TexLightVert-brcm.glsl
-- src/main/java/processing/opengl/shaders/TexLightVert-vc4.glsl
 - src/main/java/processing/opengl/shaders/TexLightVert.glsl
 - src/main/java/processing/opengl/shaders/TexVert.glsl
 - src/main/resources/icon/icon-1024.png
@@ -251,6 +269,7 @@ files:
 - test/deglut_spec_test.rb
 - test/helper_methods_test.rb
 - test/math_tool_test.rb
+- test/native_folder.rb
 - test/respond_to_test.rb
 - test/sketches/key_event.rb
 - test/sketches/library/my_library/my_library.rb
@@ -262,7 +281,7 @@ licenses:
 - GPL-3.0
 - LGPL-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -279,7 +298,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - java runtime >= 11.0.2+
 rubygems_version: 3.0.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: ruby implementation of processing-4.0 on MacOS, linux and windows (64bit
   only)
@@ -288,6 +307,7 @@ test_files:
 - test/deglut_spec_test.rb
 - test/helper_methods_test.rb
 - test/math_tool_test.rb
+- test/native_folder.rb
 - test/respond_to_test.rb
 - test/sketches/key_event.rb
 - test/sketches/library/my_library/my_library.rb