propane 3.4.0-java → 3.7.0.pre-java

data/lib/propane/helpers/numeric.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Numeric #:nodoc:
   def degrees
     self * 57.29577951308232

data/lib/propane/helpers/version_error.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class JDKVersionError < StandardError
   def message

data/lib/propane/library.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'native_folder'
 require_relative 'native_loader'
 require 'pathname'
@@ -18,6 +20,7 @@ class Library
     return if (@path = Pathname.new(
       File.join(PROPANE_ROOT, 'library', name, "#{name}.rb")
     )).exist?
+
     locate_java
   end
 
@@ -46,10 +49,11 @@ class Library
   end
 
   def load_jars
-    Dir.glob("#{dir}/*.jar").each do |jar|
+    Dir.glob("#{dir}/*.jar").sort.each do |jar|
       require jar
     end
     return true unless native_binaries?
+
     add_binaries_to_classpath
   end
 

data/lib/propane/library_loader.rb

@@ -33,10 +33,12 @@ module Propane
 
     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/propane/native_folder.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 require 'rbconfig'
 
 # Utility to load native binaries on Java CLASSPATH
 class NativeFolder
   attr_reader :os, :bit
 
-  WIN_FORMAT = 'windows%d'.freeze
-  LINUX_FORMAT = 'linux%d'.freeze
+  WIN_FORMAT = 'windows%d'
+  LINUX_FORMAT = 'linux%d'
   WIN_PATTERNS = [
     /bccwin/i,
     /cygwin/i,
@@ -17,22 +19,21 @@ class NativeFolder
 
   def initialize
     @os = RbConfig::CONFIG['host_os'].downcase
-    @bit = java.lang.System.get_property('os.arch') =~ /64/ ? 64 : 32
+    @bit = /64/.match?(java.lang.System.get_property('os.arch')) ? 64 : 32
   end
 
   def name
     return 'macosx' if /darwin|mac/.match?(os)
-    return format(LINUX_FORMAT, bit) if os =~ /linux/
-    if WIN_PATTERNS.any? { |pat| pat =~ os }
-      return format(WINDOWS_FORMAT, '64') if /64/.match?(bit)
-      return format(WINDOWS_FORMAT, '32') if /32/.match?(bit)
-    end
+    return format(LINUX_FORMAT, bit) if /linux/.match?(os)
+    return format(WIN_FORMAT, bit) if WIN_PATTERNS.any? { |pat| pat.match?(os) }
+
     raise 'Unsupported Architecture'
   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/propane/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
@@ -21,6 +23,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/propane/runner.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: false
+
 require 'optparse'
 require_relative 'version'
 
@@ -40,7 +41,7 @@ module Propane
         end
 
         options[:install] = false
-        message = '<Samples><GLVideo><Video><Sound> Install samples or library'
+        message = '<Samples><Video><Sound> Install samples or library'
         opts.on('-i', '--install', message) do
           options[:install] = true
         end
@@ -54,6 +55,8 @@ module Propane
         # assumed to have this option.
         opts.on('-h', '--help', 'Display this screen') do
           puts opts
+          puts ''
+          puts 'Run a sketch: jruby [--dev] [<sketch.rb>]'
           exit
         end
       end
@@ -67,7 +70,6 @@ module Propane
     end
 
     def show_version
-
       v_format = "Propane version %s\nJRuby version %s"
       puts format(v_format, Propane::VERSION, JRUBY_VERSION)
     end
@@ -75,7 +77,8 @@ module Propane
     def show_version
       require 'erb'
       require_relative 'helpers/version_error'
-      raise JDKVersionError.new if ENV_JAVA['java.specification.version'] < '11'
+      raise JDKVersionError if ENV_JAVA['java.specification.version'] < '11'
+
       template = ERB.new <<-EOF
         propane version <%= Propane::VERSION %>
         JRuby version <%= JRUBY_VERSION %>
@@ -86,8 +89,13 @@ module Propane
     def install(library)
       choice = library.downcase
       valid = Regexp.union('samples', 'sound', 'video', 'glvideo')
-      return warn format('No installer for %s', choice) unless valid =~ choice
+      unless valid.match?(choice)
+        return warn format('No installer for %<lib>s', lib: choice)
+      end
+
       system "cd #{PROPANE_ROOT}/vendors && rake download_and_copy_#{choice}"
     end
-  end # class Runner
-end # module Propane
+  end
+  # class Runner
+end
+# module Propane

data/lib/propane/version.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Propane
-  VERSION = '3.4.0'
+  VERSION = '3.7.0.pre'
 end

data/library/boids/boids.rb

@@ -1,3 +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
@@ -7,7 +9,8 @@ class Boid
   attr_accessor :boids, :pos, :vel, :is_perching, :perch_time
 
   def initialize(boids, pos)
-    @boids, @flock = boids, boids
+    @boids = boids
+    @flock = boids
     @pos = pos
     @vel = Vec3D.new
     @is_perching = false
@@ -53,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
@@ -75,7 +79,7 @@ class Boids
   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 = []
@@ -88,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
@@ -118,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 goal(target:, flee: false)
@@ -138,7 +146,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.x += rand(dy) if b.pos.y < @y - dy
@@ -146,9 +155,10 @@ 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.vel.y = -b.vel.y.abs * 0.2
       b.is_perching = true
       b.perch_time = perch_tm.respond_to?(:call) ? perch_tm.call : perch_tm
     end
@@ -166,7 +176,7 @@ class Boids
     m2 = 1.0 # separation
     m3 = 1.0 # alignment
     m4 = 1.0 # goal
-    @scattered = true if !(@scattered) && rand < @scatter
+    @scattered = true if !@scattered && rand < @scatter
     if @scattered
       m1 = -m1
       m3 *= 0.25

data/library/color_group/color_group.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+java_import Java::Monkstone::ColorUtil
+
+# class wraps a java color array, supports shuffle!, last and ruby_string
+# as well as ability to initialize with an array of "web" color string
+class ColorGroup
+  attr_reader :colors
+  def initialize(p5cols)
+    @colors = p5cols
+  end
+
+  def self.from_web_array(web)
+    ColorGroup.new(ColorUtil.web_array(web.to_java(:string)))
+  end
+
+  def shuffle!
+    @colors = ColorUtil.shuffle(colors)
+  end
+
+  def ruby_string
+    ColorUtil.rubyString(colors)
+  end
+
+  def last
+    colors[0]
+  end
+end

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
         Propane.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)
+        Regexp.new(Regexp.escape(lf), Regexp::IGNORECASE).match?(info.name)
       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

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+# @TODO usage
+class Propane::App
+  java_import Java::ProcessingDxf::RawDXF
+end

data/library/file_chooser/chooser.rb

@@ -1,18 +1,19 @@
 # frozen_string_literal: true
+
 # Usage: :wq
 # 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 Propane::App
   include Java::MonkstoneFilechooser::Chooser

data/library/file_chooser/file_chooser.rb

@@ -1,18 +1,19 @@
 # frozen_string_literal: true
-# Usage: 
+
+# Usage:
 # load_library :file_chooser
 # class ...
 # 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 Propane::App

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

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+# @TODO usage
+class Propane::App
+  java_import Java::ProcessingNet::Client
+  java_import Java::ProcessingNet::Server
+end

data/library/simplex_noise/simplex_noise.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Propane::App
   SimplexNoise = Java::MonkstoneNoise::SimplexNoise
 end