ruby-processing 2.6.2 → 2.6.3

data/lib/ruby-processing/helpers/numeric.rb

@@ -1,4 +1,4 @@
-class Numeric #:nodoc: 
+class Numeric #:nodoc:
   def degrees
     self * 180 / Math::PI
   end

data/lib/ruby-processing/helpers/range.rb

@@ -0,0 +1,11 @@
+class Range #:nodoc:
+  def clip(n)
+    if cover?(n)
+      n
+    elsif n < min
+      min
+    else
+      max
+    end
+  end
+end

data/lib/ruby-processing/library_loader.rb

@@ -20,10 +20,10 @@ module Processing
     def load_libraries(*args)
       args.each do |lib|
         loaded = load_ruby_library(lib) || load_java_library(lib)
-        raise LoadError.new( "no such file to load -- #{lib}") if !loaded
+        fail(LoadError.new, "no such file to load -- #{lib}") unless loaded
       end
     end
-    alias :load_library :load_libraries
+    alias_method :load_library, :load_libraries
 
     # For pure ruby libraries.
     # The library should have an initialization ruby file
@@ -38,17 +38,16 @@ module Processing
           return false
         end
       end
-
       path = get_library_paths(library_name, 'rb').first
       return false unless path
-      return @loaded_libraries[library_name] = (require path)
+      @loaded_libraries[library_name] = (require path)
     end
 
     # For pure java libraries, such as the ones that are available
     # on this page: http://processing.org/reference/libraries/index.html
     #
     # P.S. -- Loading libraries which include native code needs to
-    # hack the Java ClassLoader, so that you don't have to
+    # hack the 'Java ClassLoader', so that you don't have to
     # futz with your PATH. But it's probably bad juju.
     def load_java_library(library_name)
       library_name = library_name.to_sym
@@ -56,26 +55,23 @@ module Processing
       jpath = get_library_directory_path(library_name, 'jar')
       jars = get_library_paths(library_name, 'jar')
       return false if jars.empty?
-      jars.each {|jar| require jar }
-
+      jars.each { |jar| require jar }
       platform_specific_library_paths = get_platform_specific_library_paths(jpath)
       platform_specific_library_paths = platform_specific_library_paths.select do |ppath|
         test(?d, ppath) && !Dir.glob(File.join(ppath, '*.{so,dll,jnilib}')).empty?
       end
 
-      if !platform_specific_library_paths.empty?
+      unless platform_specific_library_paths.empty?
         platform_specific_library_paths << java.lang.System.getProperty('java.library.path')
         new_library_path = platform_specific_library_paths.join(java.io.File.pathSeparator)
-
         java.lang.System.setProperty('java.library.path', new_library_path)
-
         field = java.lang.Class.for_name('java.lang.ClassLoader').get_declared_field('sys_paths')
         if field
           field.accessible = true
           field.set(java.lang.Class.for_name('java.lang.System').get_class_loader, nil)
         end
       end
-      return @loaded_libraries[library_name] = true
+      @loaded_libraries[library_name] = true
     end
 
     def get_platform_specific_library_paths(basename)
@@ -87,12 +83,11 @@ module Processing
         java.lang.System.getProperty('java.vm.name').index('64')
         bits = '64'
       end
-
-      _match_string_, platform = {'Mac' => 'macosx', 'Linux' => 'linux', 'Windows' => 'windows' }.detect do |string, _platform_|
+      _match_string_, platform = {'Mac' => 'macosx', 'Linux' => 'linux', 'Windows' => 'windows' }.find do |string, _platform_|
         java.lang.System.getProperty('os.name').index(string)
       end
       platform ||= 'other'
-      [platform, platform + bits].collect { |p| File.join(basename, p) }
+      [platform, platform + bits].map { |p| File.join(basename, p) }
     end
 
     def get_library_paths(library_name, extension = nil)
@@ -103,7 +98,7 @@ module Processing
     protected
 
     def get_library_directory_path(library_name, extension = nil)
-      extensions = extension ? [extension] : %w{jar rb}
+      extensions = extension ? [extension] : %w(jar rb)
       extensions.each do |ext|
         [ "#{SKETCH_ROOT}/library/#{library_name}",
           "#{Processing::RP_CONFIG['PROCESSING_ROOT']}/modes/java/libraries/#{library_name}/library",
@@ -138,7 +133,7 @@ module Processing
             sketchbook_paths << spath
           end
         end
-        if !preferences_paths.empty?
+        unless preferences_paths.empty?
           matched_lines = File.readlines(preferences_paths.first).grep(/^sketchbook\.path=(.+)/) { $1 }
           sketchbook_path = matched_lines.first
         else

data/lib/ruby-processing/runner.rb

@@ -45,7 +45,7 @@ module Processing
 
     # Start running a ruby-processing sketch from the passed-in arguments
     def self.execute
-      runner = self.new
+      runner = new
       runner.parse_options(ARGV)
       runner.execute!
     end
@@ -92,20 +92,20 @@ module Processing
 
     # Just simply run a ruby-processing sketch.
     def run(sketch, args)
-    ensure_exists(sketch)
+      ensure_exists(sketch)
       spin_up('run.rb', sketch, args)
     end
 
     # Run a sketch, keeping an eye on it's file, and reloading
     # whenever it changes.
     def watch(sketch, args)
-    ensure_exists(sketch)
+      ensure_exists(sketch)
       spin_up('watch.rb', sketch, args)
     end
 
     # Run a sketch, opening its guts to IRB, letting you play with it.
     def live(sketch, args)
-    ensure_exists(sketch)
+      ensure_exists(sketch)
       spin_up('live.rb', sketch, args)
     end
 
@@ -124,7 +124,7 @@ module Processing
         check(proc_root, installed)
       when /install/
         system "cd #{RP5_ROOT}/vendors && rake"
-        if !proc_root
+        unless proc_root
           set_processing_root
           warn 'PROCESSING_ROOT set optimistically, run check to confirm'
         end
@@ -199,7 +199,7 @@ module Processing
     end
 
     def ensure_exists(sketch)
-      puts "Couldn't find: #{sketch}" and exit unless File.exist?(sketch)
+      puts "Couldn't find: #{sketch}" && exit unless File.exist?(sketch)
     end
 
     def jruby_complete
@@ -213,23 +213,21 @@ module Processing
     end
 
     def os
-      @os ||=
-        host_os = RbConfig::CONFIG['host_os']
-        case host_os
-        when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
-          :windows
-        when /darwin|mac os/
-          :macosx
-        when /linux/
-          :linux
-        when /solaris|bsd/
-          :unix
-        else
-          raise "unknown os: #{host_os.inspect}"
-        end
+      @os ||= host_os = RbConfig::CONFIG['host_os']
+      case host_os
+      when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
+        :windows
+      when /darwin|mac os/
+        :macosx
+      when /linux/
+        :linux
+      when /solaris|bsd/
+        :unix
+      else
+        fail "unknown os: #{host_os.inspect}"
+      end
     end
 
-
     # Optimistically set processing root
     def set_processing_root
       require 'psych'
@@ -237,13 +235,13 @@ module Processing
       data = {}
       path = File.expand_path("#{ENV['HOME']}/.rp5rc")
       if @os == :macosx
-        data['PROCESSING_ROOT'] = %q(/Applications/Processing.app/Contents/Java)
+        data['PROCESSING_ROOT'] = '/Applications/Processing.app/Contents/Java'
       else
         root = "#{ENV['HOME']}/processing-2.2.1"
         data['PROCESSING_ROOT'] = root
       end
-      data['JRUBY'] = %q(true)
-      open(path, 'w:UTF-8') {|f| f.write(data.to_yaml) }
+      data['JRUBY'] = true
+      open(path, 'w:UTF-8') { |f| f.write(data.to_yaml) }
     end
 
     # On the Mac, we can display a fat, shiny ruby in the Dock.

data/lib/ruby-processing/runners/watch.rb

@@ -15,7 +15,7 @@ module Processing
     # and restarting the sketch whenever it changes.
     def start_watching
       start_runner
-      loop do
+      Kernel.loop do
         if @files.find { |file| File.exist?(file) && File.stat(file).mtime > @time }
           puts 'reloading sketch...'
           $app && $app.close

data/lib/ruby-processing/version.rb

@@ -1,3 +1,3 @@
 module RubyProcessing
-  VERSION = '2.6.2'
+  VERSION = '2.6.3'
 end

data/library/boids/boids.rb

@@ -14,22 +14,22 @@ class Boid
     @perch_time = 0.0
   end
   
-   def cohesion(d = 100.0)
+  def cohesion(d = 100.0)
     # Boids gravitate towards the center of the flock,
     # Which is the averaged position of the rest of the boids.
     cvx, cvy, cvz = 0.0, 0.0, 0.0
-    boids.reject{|bd| bd.equal? self}.each do |boid|
-      cvx, cvy, cvz = cvx+boid.x, cvy+boid.y, cvz+boid.z 
+    boids.reject { |bd| bd.equal? self }.each do |boid|
+      cvx, cvy, cvz = cvx + boid.x, cvy + boid.y, cvz + boid.z
     end
     count = boids.length - 1.0
-    cvx, cvy, cvz = cvx/count, cvy/count, cvz/count
+    cvx, cvy, cvz = cvx / count, cvy / count, cvz / count
     return (cvx - x) / d, (cvy - y) / d, (cvz - z) / d
   end
   
   def separation(radius = 10.0)
     # Boids don't like to cuddle.
     svx, svy, svz = 0.0, 0.0, 0.0
-    boids.reject{|bd| bd.equal? self}.each do |boid|
+    boids.reject { |bd| bd.equal? self }.each do |boid|
       dvx, dvy, dvz = x - boid.x, y - boid.y, z - boid.z
       svx += dvx if dvx.abs < radius
       svy += dvy if dvy.abs < radius
@@ -41,15 +41,15 @@ class Boid
   def alignment(d = 5.0)
     # Boids like to fly at the speed of traffic.
     avx, avy, avz = 0.0, 0.0, 0.0
-    boids.reject{|bd| bd.equal? self}.each do |boid|
-      avx, avy, avz = avx+boid.vx, avy+boid.vy, avz+boid.vz
+    boids.reject { |bd| bd.equal? self }.each do |boid|
+      avx, avy, avz = avx + boid.vx, avy + boid.vy, avz + boid.vz
     end
     count = boids.length - 1.0
     avx, avy, avz = avx / count, avy / count, avz / count
     return (avx - vx) / d, (avy - vy) / d, (avz - vz) / d
   end
   
-  def limit(max=30.0)
+  def limit(max = 30.0)
     # Tweet, Tweet! The boid police will bust you for breaking the speed limit.
     most = [@vx.abs, @vy.abs, @vz.abs].max
     return if most < max
@@ -71,10 +71,12 @@ class Boid
   end
 end
 
+require 'forwardable'
 
-
-class Boids 
-  extend Enumerable  
+class Boids
+  include Enumerable
+  extend Forwardable
+  def_delegators(:@boids, :reject, :<<, :each, :shuffle!, :length, :next)
   
   attr_accessor :boids, :x, :y, :w, :h, 
                 :scattered, :has_goal, :flee
@@ -86,34 +88,13 @@ class Boids
   def initialize
     @boids = []	  
   end
-  
-  def each &block
-    boids.each &block	  
-  end
-  
-  def reject &block
-    boids.reject &block
-  end
-
-
-  def shuffle!
-    boids.shuffle!	  
-  end
-
-  def << obj
-    boids << obj	  
-  end
-
-  def length
-    boids.length	  
-  end
-              
+         
   def self.flock(n, x, y, w, h)
-    return Boids.new.setup(n, x, y, w, h)
+    Boids.new.setup(n, x, y, w, h)
   end
   
   def setup(n, x, y, w, h)
-    n.times do |i|
+    n.times do
       dx, dy = rand(w), rand(h)
       z = rand(200.0)
       self << Boid.new(self, x + dx, y + dy, z)
@@ -125,11 +106,11 @@ class Boids
     @scatter_i = 0.0
     @perch = 1.0 # Lower this number to divebomb.
     @perch_y = h
-    @perch_t = -> {rand(25..75.0)}
+    @perch_t = -> { rand(25..75.0) }
     @has_goal = false
     @flee = false
     @goal_x = @goal_y = @goal_z = 0.0
-    return self
+    self
   end
   
   def scatter(chance = 0.005, frames = 50.0)
@@ -142,7 +123,7 @@ class Boids
   end
   
   def perch(ground = nil, chance = 1.0, frames = nil)
-    frames ||= -> {rand(25..75.0)}
+    frames ||= -> { rand(25..75.0) }
     ground ||= h
     @perch, @perch_y, @perch_t = chance, ground, frames
   end
@@ -164,40 +145,36 @@ class Boids
   def constrain
     # Put them boids in a cage.
     dx, dy = w * 0.1, h * 0.1
-    self.each do |b|
+    each do |b|
       b.vx += rand(dx) if b.x < x - dx
       b.vx += rand(dy) if b.y < y - dy
       b.vx -= rand(dx) if b.x > x + w + dx
       b.vy -= rand(dy) if b.y > y + h + dy
       b.vz += 10.0 if b.z < 0.0
       b.vz -= 10.0 if b.z > 100.0
-      
-      if b.y > @perch_y && rand < @perch
-        b.y = @perch_y
-        b.vy = -(b.vy.abs) * 0.2
-        b.is_perching = true
-        @perch_t.respond_to?(:call) ? b.perch_time = @perch_t.call : b.perch_time = @perch_t
-      end
+      next unless b.y > @perch_y && rand < @perch
+      b.y = @perch_y
+      b.vy = -(b.vy.abs) * 0.2
+      b.is_perching = true
+      @perch_t.respond_to?(:call) ? b.perch_time = @perch_t.call : b.perch_time = @perch_t
     end
   end
     
-  def update(opts={}) # Just flutter, little boids ... just flutter away.  	   
+  def update(opts = {}) # Just flutter, little boids ... just flutter away.  	   
     options = {
-        shuffled: true,     #  Shuffling keeps things flowing smooth.
-        cohesion: 100.0, 
-        separation: 10.0, 
-        alignment: 5.0, 
-        goal: 20.0, 
-        limit: 30.0
-    } 
+      shuffled: true,     #  Shuffling keeps things flowing smooth.
+      cohesion: 100.0,
+      separation: 10.0,
+      alignment: 5.0,
+      goal: 20.0,
+      limit: 30.0
+    }
     options.merge! opts
-    
-    self.shuffle! if options[:shuffled]
+    shuffle! if options[:shuffled]
     m1 = 1.0   # cohesion
     m2 = 1.0   # separation
     m3 = 1.0   # alignment
     m4 = 1.0   # goal
-    
     @scattered = true if !(@scattered) && rand < @scatter
     if @scattered
       m1 = -m1
@@ -208,11 +185,9 @@ class Boids
       @scattered = false
       @scatter_i = 0.0
     end
-    
     m4 = 0.0 unless @has_goal
     m4 = -m4 if @flee
-    
-    self.each do |b|
+    each do |b|
       if b.is_perching
         if b.perch_time > 0.0
           b.perch_time -= 1.0
@@ -221,24 +196,18 @@ class Boids
           b.is_perching = false
         end
       end
-      
       vx1, vy1, vz1 = b.cohesion(options[:cohesion])
       vx2, vy2, vz2 = b.separation(options[:separation])
       vx3, vy3, vz3 = b.alignment(options[:alignment])
       vx4, vy4, vz4 = b.goal(@goal_x, @goal_y, @goal_z, options[:goal])
-      
-      b.vx += m1*vx1 + m2*vx2 + m3*vx3 + m4*vx4
-      b.vy += m1*vy1 + m2*vy2 + m3*vy3 + m4*vy4
-      b.vz += m1*vz1 + m2*vz2 + m3*vz3 + m4*vz4
-      
+      b.vx += m1 * vx1 + m2 * vx2 + m3 * vx3 + m4 * vx4
+      b.vy += m1 * vy1 + m2 * vy2 + m3 * vy3 + m4 * vy4
+      b.vz += m1 * vz1 + m2 * vz2 + m3 * vz3 + m4 * vz4
       b.limit(options[:limit])
-  
       b.x += b.vx
       b.y += b.vy
       b.z += b.vz
     end
-    self.constrain
+    constrain
   end
 end
-  
-  

data/library/control_panel/control_panel.rb

@@ -59,7 +59,7 @@ module ControlPanel
 
   # Creates check-box elements for control_panel
   class Checkbox < javax.swing.JCheckBox
-    def initialize(control_panel, name, proc=nil)
+    def initialize(control_panel, name, proc = nil)
       @control_panel = control_panel
       super(name.to_s)
       set_preferred_size(java.awt.Dimension.new(190, 64))
@@ -107,7 +107,7 @@ module ControlPanel
       set_size 200, 30 + (64 * elements.size)
       set_default_close_operation javax.swing.JFrame::HIDE_ON_CLOSE
       set_resizable false
-      set_location($app.width + 10, 0) unless ($app.width + 10 > $app.displayWidth)
+      set_location($app.width + 10, 0) unless $app.width + 10 > $app.displayWidth
       panel.visible = true
     end
 
@@ -154,7 +154,7 @@ module ControlPanel
       laf = lafinfo.select do |info|
         info.getName.eql? lf.capitalize
       end
-      javax.swing.UIManager.setLookAndFeel(laf[0].getClassName) 
+      javax.swing.UIManager.setLookAndFeel(laf[0].getClassName)
     end
   end