jruby_art 2.2.2 → 2.3.0

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.11.0'
 SOUND = 'sound.zip'
 SOUND_VERSION = 'v2.2.2'
 VIDEO = 'video-2.0-beta4.zip'
 VIDEO_VERSION = 'r6-v2.0-beta4'
-EXAMPLES = '3.5'
+EXAMPLES = '3.6'
 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'])
 
 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
 
@@ -105,7 +105,9 @@ end
 desc 'copy sound library'
 task copy_sound: 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
@@ -113,7 +115,9 @@ end
 desc 'copy video library'
 task copy_video: 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,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: jruby_art
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.3.0
 platform: ruby
 authors:
 - Martin Prout
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-22 00:00:00.000000000 Z
+date: 2020-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '5.10'
   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
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.10'
+        version: '12.3'
   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
     functionality. Processing libraries and ruby gems can be used in your sketches.
@@ -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.3.0.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.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="