jruby_art 2.2.2 → 2.3.0

data/lib/jruby_art/library_loader.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: false
+
 # The processing wrapper module
 module Processing
   require_relative 'library'
@@ -19,7 +20,7 @@ module Processing
     # Load a list of Ruby or Java libraries (in that order)
     # Usage: load_libraries :video, :video_event
     #
-    # If a library is put into a 'library' folder next to the sketch it will be used 
+    # If a library is put into a 'library' folder next to the sketch it will be used
     # instead of the library that ships with vanilla processing (or ide installed), or JRubyArt.
     def load_libraries(*args)
       message = 'no such file to load -- %s'
@@ -32,10 +33,12 @@ module Processing
 
     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/jruby_art/native_folder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rbconfig'
 
 # Utility to load native binaries on Java CLASSPATH
@@ -5,10 +7,9 @@ require 'rbconfig'
 class NativeFolder
   attr_reader :os, :bit
 
-  LINUX_FORMAT = 'linux%s'.freeze
-  ARM32 = '-armv6hf'.freeze
-  # ARM64 = '-aarch64'.freeze
-  WIN_FORMAT = 'windows%d'.freeze
+  LINUX_FORMAT = 'linux%<bit>d'
+  # ARM64 = '-aarch64'
+  WIN_FORMAT = 'windows%<bit>d'
   WIN_PATTERNS = [
     /bccwin/i,
     /cygwin/i,
@@ -20,25 +21,26 @@ class NativeFolder
 
   def initialize
     @os = RbConfig::CONFIG['host_os'].downcase
-    @bit = java.lang.System.get_property('os.arch')
+    @bit = /64/.match?(java.lang.System.get_property('os.arch')) ? 64 : 32
   end
 
   def name
     return 'macosx' if /darwin|mac/.match?(os)
-    if /linux/.match?(os)
-      return format(LINUX_FORMAT, '64') if /amd64/.match?(bit)
-      return format(LINUX_FORMAT, ARM32) if /arm/.match?(bit)
-    end
-    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)
+
+    return format(LINUX_FORMAT, bit: bit) if /linux/.match?(os)
+
+    unless WIN_PATTERNS.any? { |pat| pat.match?(os) }
+      raise StandardError, 'Unsupported Architecture'
     end
-    raise 'Unsupported Architecture'
+
+    format(WIN_FORMAT, bit: bit)
   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/jruby_art/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
@@ -20,6 +22,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

data/lib/jruby_art/processing_ide.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # detects processing preferences.txt, extracts sketchbook_path
 class ProcessingIde
   attr_reader :preferences
@@ -12,7 +14,9 @@ class ProcessingIde
   def sketchbook_path
     File.open(preferences, 'r') do |file|
       file.each_line do |line|
-        return line.tap { |sli| sli.slice!('sketchbook.path.three=') }.chomp if line =~ /sketchbook/
+        if /sketchbook/.match?(line)
+          return line.tap { |sli| sli.slice!('sketchbook.path.three=') }.chomp
+        end
       end
     end
   end

data/lib/jruby_art/runner.rb

@@ -23,11 +23,11 @@ module Processing
       /ming/i,
       /mswin/i,
       /wince/i
-    ]
+    ].freeze
 
-    INSTALL = <<~MSG
-    <Config|JRuby-Complete|Samples>
-    or <Sound|Video> library
+    INSTALL = <<~MSG.freeze
+      <Config|JRuby-Complete|Samples>
+      or <Sound|Video> library
     MSG
 
     attr_reader :options, :argc, :filename, :os
@@ -156,11 +156,10 @@ module Processing
         system "cd #{K9_ROOT}/vendors && rake"
         Installer.new.install
       else
-        warn format('No installer for %s', library)
+        warn format('No installer for %<library>s', library: library)
       end
     end
 
-
     def check
       require_relative '../jruby_art/config'
       Config.new.check
@@ -201,7 +200,9 @@ module Processing
 
     # NB: We really do mean to use 'and' not '&&' for flow control purposes
     def ensure_exists(filename)
-      puts("Couldn't find: #{filename}") and exit unless FileTest.exist?(filename)
+      return if FileTest.exist?(filename)
+
+      puts("Couldn't find: #{filename}") and exit
     end
 
     def jruby_complete
@@ -213,7 +214,7 @@ module Processing
     end
 
     def remove_old_config
-      old_config = File.join("#{ENV['HOME']}", '.jruby_art', 'config.yml')
+      old_config = File.join((ENV['HOME']).to_s, '.jruby_art', 'config.yml')
       puts "Removing #{old_config}"
       system "rm #{old_config}"
     end

data/lib/jruby_art/runners/base.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 SKETCH_PATH ||= ARGV.shift
 SKETCH_ROOT ||= File.absolute_path(File.dirname(SKETCH_PATH))
 

data/lib/jruby_art/runners/live.rb

@@ -1,17 +1,20 @@
 # frozen_string_literal: false
+
 # A pry shell for live coding.
 # Will start with your sketch.
 require_relative 'base'
 Processing.load_and_run_sketch
 
+# Custom Exception
 class PryException < StandardError
+  MESSAGE = "You need to 'jruby -S gem install pry' for 'live' mode".freeze
+
+  def initialize(msg = MESSAGE)
+    super
+  end
 end
 
-MESSAGE = "You need to 'jruby -S gem install pry' for 'live' mode".freeze
+raise PryException unless Gem::Specification.find_all_by_name('pry').any?
 
-if Gem::Specification.find_all_by_name('pry').any?
-  require 'pry'
-  Processing.app.pry
-else
-  raise(PryException.new, MESSAGE)
-end
+require 'pry'
+Processing.app.pry

data/lib/jruby_art/runners/run.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative 'base'
 
 Processing.load_and_run_sketch

data/lib/jruby_art/runners/watch.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: false
+
 require_relative 'base'
 require_relative '../config'
 
@@ -21,9 +22,10 @@ module Processing
     EOS
     SLEEP_TIME = 0.2
     def initialize
-      count = Dir["**.*rb"].length
+      count = Dir['**.*rb'].length
       max_watch = RP_CONFIG.fetch('MAX_WATCH', 20)
-      return warn format(WATCH_MESSAGE, max_watch, count) if count > max_watch.to_i
+      abort format(WATCH_MESSAGE, max_watch, count) if count > max_watch.to_i
+
       reload_files_to_watch
       @time = Time.now
       start_watching
@@ -36,7 +38,7 @@ module Processing
       Kernel.loop do
         if @files.find { |file| FileTest.exist?(file) && File.stat(file).mtime > @time }
           puts 'reloading sketch...'
-          Processing.app && Processing.app.close
+          Processing.app&.close
           java.lang.System.gc
           @time = Time.now
           start_runner
@@ -66,7 +68,7 @@ module Processing
     end
 
     def start_runner
-      @runner.kill if @runner && @runner.alive?
+      @runner.kill if @runner&.alive?
       @runner.join
       @runner = nil
       start_original

data/lib/jruby_art/version.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
+
 # A wrapper for version
 module JRubyArt
-  VERSION = '2.2.2'
+  VERSION = '2.3.0'
 end

data/library/boids/boids.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Boids -- after Tom de Smedt.
 # See his Python version: http://nodebox.net/code/index.php/Boids
 # This is an example of how a pure-Ruby library can work. Original for
@@ -8,7 +9,8 @@ class Boid
   attr_reader :boids
   attr_accessor :vel, :pos, :is_perching, :perch_time
   def initialize(boids, pos)
-    @boids, @flock = boids, boids
+    @boids = boids
+    @flock = boids
     @pos = pos
     @vel = Vec3D.new
     @is_perching = false
@@ -54,6 +56,7 @@ class Boid
     # Tweet, Tweet! The boid police will bust you for breaking the speed limit.
     most = [vel.x.abs, vel.y.abs, vel.z.abs].max
     return if most < max
+
     scale = max / most.to_f
     @vel *= scale
   end
@@ -70,13 +73,13 @@ end
 
 require 'forwardable'
 
-# The Boids class
+# The Boids class NB: perchance => perch chance
 class Boids
   include Enumerable
   extend Forwardable
   def_delegators(:@boids, :reject, :<<, :each, :shuffle!, :length, :next)
 
-  attr_reader :has_goal, :perch, :perch_tm, :perch_y
+  attr_reader :has_goal, :perchance, :perch_tm, :perch_y
 
   def initialize
     @boids = []
@@ -89,16 +92,20 @@ class Boids
 
   def setup(n, x, y, w, h)
     n.times do
-      dx, dy = rand(w), rand(h)
+      dx = rand(w)
+      dy = rand(h)
       z = rand(200.0)
       self << Boid.new(self, Vec3D.new(x + dx, y + dy, z))
     end
-    @x, @y, @w, @h = x, y, w, h
+    @x = x
+    @y = y
+    @w = w
+    @h = h
     @scattered = false
     @scatter = 0.005
     @scatter_time = 50.0
     @scatter_i = 0.0
-    @perch = 1.0 # Lower this number to divebomb.
+    @perchance = 1.0 # Lower this number to divebomb.
     @perch_y = h
     @perch_tm = -> { 25.0 + rand(50.0) }
     @has_goal = false
@@ -119,11 +126,11 @@ class Boids
   def perch(ground = nil, chance = 1.0, frames = nil)
     @perch_tm = frames.nil? ? -> { 25.0 + rand(50.0) } : frames
     @perch_y = ground.nil? ? @h : ground
-    @perch = chance
+    @perchance = chance
   end
 
   def no_perch
-    @perch = 0.0
+    @perchance = 0.0
   end
 
   def reset_goal(target)
@@ -146,7 +153,8 @@ class Boids
 
   def constrain
     # Put them boids in a cage.
-    dx, dy = @w * 0.1, @h * 0.1
+    dx = @w * 0.1
+    dy = @h * 0.1
     each do |b|
       b.vel.x += rand(dx) if b.pos.x < @x - dx
       b.vel.y += rand(dy) if b.pos.y < @y - dy
@@ -154,7 +162,8 @@ class Boids
       b.vel.y -= rand(dy) if b.pos.y > @y + @h + dy
       b.vel.z += 10.0 if b.pos.z < 0.0
       b.vel.z -= 10.0 if b.pos.z > 100.0
-      next unless b.pos.y > perch_y && rand < perch
+      next unless b.pos.y > perch_y && rand < perchance
+
       b.pos.y = perch_y
       b.vel.y = b.vel.y.abs * -0.2
       b.is_perching = true

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