jruby_art 2.2.2 → 2.4.3

data/library/chooser/chooser.rb

@@ -1,18 +1,19 @@
 # frozen_string_literal: true
+
 # Usage:
 # load_library :chooser
-# 
+#
 # def setup
-  # java_signature 'void selectInput(String, String)'
-  # selectInput('Select a file to process:', 'fileSelected')
+# java_signature 'void selectInput(String, String)'
+# selectInput('Select a file to process:', 'fileSelected')
 # end
-# 
+#
 # def fileSelected(selection)
-  # if selection.nil?
-    # puts 'Window was closed or the user hit cancel.'
-  # else
-    # puts format('User selected %s', selection.get_absolute_path)
-  # end
+# if selection.nil?
+# puts 'Window was closed or the user hit cancel.'
+# else
+# puts format('User selected %s', selection.get_absolute_path)
+# end
 # end
 class Processing::App
   include Java::MonkstoneFilechooser::Chooser

data/library/color_group/color_group.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 java_import Java::Monkstone::ColorUtil
 
 # class wraps a java color array, supports shuffle!, last and ruby_string

data/library/control_panel/control_panel.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Here's a little library for quickly hooking up controls to sketches.
 # For messing with the parameters and such.
 # These controls will set instance variables on the sketches.
@@ -25,7 +27,7 @@ module ControlPanel
       add_change_listener do
         update_label(label, name, value)
         ControlPanel.app_value(name, value)
-        proc.call(value) if proc
+        proc&.call(value)
       end
       ControlPanel.app_value(name, val)
     end
@@ -49,7 +51,7 @@ module ControlPanel
       control_panel.add_element(self, name)
       add_action_listener do
         ControlPanel.app_value(name, value) unless value.nil?
-        proc.call(value) if proc
+        proc&.call(value)
       end
       set_selected_index(initial_value ? elements.index(initial_value) : 0)
     end
@@ -69,7 +71,7 @@ module ControlPanel
       control_panel.add_element(self, name, false)
       add_action_listener do
         ControlPanel.app_value(name, value)
-        proc.call(value) if proc
+        proc&.call(value)
       end
     end
 
@@ -87,7 +89,7 @@ module ControlPanel
       control_panel.add_element(self, name, false, true)
       add_action_listener do
         Processing.app.send(name)
-        proc.call(value) if proc
+        proc&.call(value)
       end
     end
   end
@@ -160,7 +162,7 @@ module ControlPanel
     def feel(lf = 'metal')
       lafinfo = javax.swing.UIManager.getInstalledLookAndFeels
       laf = lafinfo.to_ary.find do |info|
-        info.name =~ Regexp.new(Regexp.escape(lf), Regexp::IGNORECASE)
+        info.name.match?(Regexp.new(Regexp.escape(lf), Regexp::IGNORECASE))
       end
       javax.swing.UIManager.setLookAndFeel(laf.class_name)
     end
@@ -171,6 +173,7 @@ module ControlPanel
     def control_panel
       @control_panel ||= ControlPanel::Panel.new
       return @control_panel unless block_given?
+
       yield(@control_panel)
       @control_panel.display
       @control_panel.set_visible true

data/library/dxf/dxf.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # @TODO usage
 class Processing::App
   java_import Java::ProcessingDxf::RawDXF

data/library/library_proxy/library_proxy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 java_import Java::MonkstoneCore::LibraryProxy
 java_import Java::ProcessingEvent::KeyEvent
 java_import Java::ProcessingEvent::MouseEvent

data/library/net/net.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # @TODO usage
 class Processing::App
   java_import Java::ProcessingNet::Client

data/library/slider/slider.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
+
 # Here's a little library for quickly hooking up in sketch sliders.
-# Copyright (c) 2016-19 Martin Prout.
+# Copyright (c) 2015-20 Martin Prout.
 
 java_import 'monkstone.slider.CustomHorizontalSlider'
 java_import 'monkstone.slider.CustomVerticalSlider'
@@ -8,34 +9,34 @@ java_import 'monkstone.slider.CustomVerticalSlider'
 module Slider
   def self.slider(app:, x:, y:, name:, **opts)
     options = default.merge opts
-    if options[:vertical]
-      slider = CustomVerticalSlider.new(
-        app,
-        x,
-        y,
-        options[:length],
-        options[:range].first,
-        options[:range].last,
-        name
-    )
-    else
-      slider = CustomHorizontalSlider.new(
-        app,
-        x,
-        y,
-        options[:length],
-        options[:range].first,
-        options[:range].last,
-        name
-    )
-    end
+    slider = if options[:vertical]
+               CustomVerticalSlider.new(
+                 app,
+                 x,
+                 y,
+                 options[:length],
+                 options[:range].first,
+                 options[:range].last,
+                 name
+               )
+             else
+               CustomHorizontalSlider.new(
+                 app,
+                 x,
+                 y,
+                 options[:length],
+                 options[:range].first,
+                 options[:range].last,
+                 name
+               )
+             end
     unless opts.empty?
       slider.bar_width(opts.fetch(:bar_width, 10))
       slider.set_value(opts.fetch(:initial_value, 0))
     end
     slider
   end
-  
+
   def self.default
     { length: 100, range: (0..100) }
   end

data/library/vector_utils/vector_utils.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 PHI ||= (1 + Math.sqrt(5)) / 2 # golden ratio
 GA = PHI * 2 * Math::PI # golden angle
 
@@ -47,7 +49,8 @@ module VectorUtil
 
   def self.cartesian_to_polar(vec:)
     res = Vec3D.new(vec.mag, 0, 0)
-    return Vec3D.new unless res.x > 0
+    return Vec3D.new unless res.x.positive?
+
     res.y = -Math.atan2(vec.z, vec.x)
     res.z = Math.asin(vec.y / res.x)
     res
@@ -64,6 +67,7 @@ module VectorUtil
 
   def self.polar_to_cartesian(vec:)
     return Vec3D.new if vec.mag <= 0
+
     Vec3D.new(Math.asin(vec.y / vec.mag), vec.mag, -Math.atan2(vec.z, vec.x))
   end
 end

data/library/video_event/video_event.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
+# include interfaces
 class Processing::App
   include Java::MonkstoneVideoevent::MovieEvent
   include Java::MonkstoneVideoevent::CaptureEvent

data/vendors/Rakefile

@@ -11,21 +11,21 @@ WARNING = <<~WARN
 
 WARN
 # https://github.com/processing/processing-video/releases/download/r6-v2.0-beta4/video-2.0-beta4.zip
-JRUBYC_VERSION = '9.2.9.0'
+JRUBYC_VERSION = '9.2.14.0'
 SOUND = 'sound.zip'
-SOUND_VERSION = 'v2.2.2'
-VIDEO = 'video-2.0-beta4.zip'
-VIDEO_VERSION = 'r6-v2.0-beta4'
-EXAMPLES = '3.5'
+SOUND_VERSION = 'v2.2.3'
+VIDEO = 'video.zip'
+VIDEO_VERSION = 'v2.0'
+EXAMPLES = '3.9'
 HOME_DIR = ENV['HOME']
-MAC_OR_LINUX = /linux|mac|darwin/ =~ RbConfig::CONFIG['host_os']
-
+MAC_OR_LINUX = /linux|mac|darwin/.match?(RbConfig::CONFIG['host_os'])
+DOWNLOAD = 'releases/download/latest'
 CLOBBER << "jruby-complete-#{JRUBYC_VERSION}.jar"
 CLOBBER << "jruby-complete-#{JRUBYC_VERSION}.jar.sha256"
 
 desc 'dependency check'
 task :wget_check do
-  WGET ||= `which wget`
+  WGET ||= `which wget`.freeze
   warn WARNING unless WGET
 end
 
@@ -82,15 +82,15 @@ task :init_dir do
 end
 
 desc 'download and copy sound library to ~/.jruby_art'
-task download_and_copy_sound: %i[wget_check init_dir download_sound copy_sound clobber]
+task install_sound: %i[wget_check init_dir download_sound copy_sound clobber]
 
 desc 'download and copy video library to ~/.jruby_art'
-task download_and_copy_video: %i[wget_check init_dir download_video copy_video clobber]
+task install_video: %i[wget_check 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/latest', SOUND].join('/')
+  wget_string = [wget_base, DOWNLOAD, SOUND].join('/')
   puts wget_string
   system wget_string
 end
@@ -98,22 +98,26 @@ 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_string = [wget_base, DOWNLOAD, VIDEO].join('/')
   system wget_string
 end
 
 desc 'copy sound library'
-task copy_sound: SOUND do
+task :copy_sound do
   system "unzip #{SOUND}"
-  FileUtils.rm_r "#{HOME_DIR}/.picrate/libraries/sound" if File.exist? "#{HOME_DIR}/.jruby_art/libraries/sound"
+  if File.exist? "#{HOME_DIR}/.jruby_art/libraries/sound"
+    FileUtils.rm_r "#{HOME_DIR}/.picrate/libraries/sound"
+  end
   FileUtils.cp_r 'sound', "#{HOME_DIR}/.jruby_art/libraries"
   FileUtils.rm_r 'sound'
 end
 
 desc 'copy video library'
-task copy_video: VIDEO do
+task :copy_video do
   system "unzip #{VIDEO}"
-  FileUtils.rm_r "#{HOME_DIR}/.picrate/libraries/video" if File.exist? "#{HOME_DIR}/.jruby_art/libraries/video"
+  if File.exist? "#{HOME_DIR}/.jruby_art/libraries/video"
+    FileUtils.rm_r "#{HOME_DIR}/.picrate/libraries/video"
+  end
   FileUtils.cp_r 'video', "#{HOME_DIR}/.jruby_art/libraries/video"
   FileUtils.rm_r 'video'
 end
@@ -139,7 +143,9 @@ task copy_examples: file_name do
   else
     system  "tar xzvf #{EXAMPLES}.tar.gz"
   end
-  FileUtils.rm_r("#{HOME_DIR}/k9_samples") if File.exist? "#{HOME_DIR}/k9_samples"
+  if File.exist? "#{HOME_DIR}/k9_samples"
+    FileUtils.rm_r("#{HOME_DIR}/k9_samples")
+  end
   FileUtils.cp_r("JRubyArt-examples-#{EXAMPLES}", "#{HOME_DIR}/k9_samples")
   FileUtils.rm_r("JRubyArt-examples-#{EXAMPLES}")
 end

metadata

@@ -1,45 +1,45 @@
 --- !ruby/object:Gem::Specification
 name: jruby_art
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.4.3
 platform: ruby
 authors:
 - Martin Prout
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-22 00:00:00.000000000 Z
+date: 2020-12-10 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: '5.10'
+  name: minitest
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '5.10'
 - !ruby/object:Gem::Dependency
-  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.10'
+        version: '12.3'
+  name: rake
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.10'
+        version: '12.3'
 description: |2
-    JRubyArt-2.0+ is a ruby implementation of the processing art framework, with enhanced
+    JRubyArt-2.4.0+ is a ruby implementation of the processing art framework, with enhanced
     functionality. Processing libraries and ruby gems can be used in your sketches.
     Features create/run/watch/live modes.
 email: mamba2928@yahoo.co.uk
@@ -57,7 +57,7 @@ files:
 - lib/jogl-all-natives-macosx-universal.jar
 - lib/jogl-all-natives-windows-amd64.jar
 - lib/jogl-all.jar
-- lib/jruby_art-2.2.2.jar
+- lib/jruby_art-2.4.3.jar
 - lib/jruby_art.rb
 - lib/jruby_art/app.rb
 - lib/jruby_art/config.rb
@@ -107,7 +107,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -117,7 +117,7 @@ requirements:
 - A decent graphics card
 - java runtime >= 11.0.3+
 rubygems_version: 3.0.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Code as Art, Art as Code. Processing and Ruby are meant for each other.
 test_files: []