propane 3.3.1-java → 3.6.0-java

data/lib/propane/creators/sketch_class.rb

@@ -5,7 +5,10 @@ class SketchClass
   attr_reader :name, :width, :height, :mode
 
   def initialize(name:, width: 150, height: 150, mode: nil)
-    @name, @width, @height, @mode = name, width, height, mode
+    @name = name
+    @width = width
+    @height = height
+    @mode = mode
   end
 
   def class_sketch
@@ -26,6 +29,7 @@ class SketchClass
 
   def size
     return format('    size %d, %d', width.to_i, height.to_i) unless mode
+
     format('    size %d, %d, %s', width.to_i, height.to_i, mode.upcase)
   end
 
@@ -36,6 +40,7 @@ class SketchClass
 
   def method_lines(name, content = nil)
     return [format('  def %s', name), '', '  end'] unless content
+
     [format('  def %s', name), content, '  end', '']
   end
 
@@ -43,6 +48,7 @@ class SketchClass
     lines = [
       '#!/usr/bin/env jruby',
       '# frozen_string_literal: false',
+      '',
       "require 'propane'",
       '',
       class_sketch

data/lib/propane/creators/sketch_factory.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require_relative 'sketch_writer'
 
 class SketchFactory
-  NAMES = %w[One Two Three]
-  def initialize(argc)
+  NAMES = %w[One Two Three].freeze
+  def initialize(_argc)
     NAMES.each do |name|
       SketchWriter.new(File.basename(name, '.rb'), width: 300, height: 300).write
     end

data/lib/propane/creators/sketch_writer.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: false
+
 require_relative 'sketch_class'
 
 # The file writer can write a sketch when given instance of Sketch type

data/lib/propane/helper_methods.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: false
+
 # processing module wrapper
-require_relative 'helpers/numeric'
 module Propane
   # Provides some convenience methods
   module HelperMethods
@@ -52,11 +52,12 @@ module Propane
 
     def color(*args)
       return super(*args) unless args.length == 1
+
       super(hex_color(args[0]))
     end
 
     def web_to_color_array(web)
-      Java::Monkstone::ColorUtil.webArray(web)
+      Java::Monkstone::ColorUtil.webArray(web.to_java(:string))
     end
 
     def int_to_ruby_colors(hex)
@@ -66,11 +67,8 @@ module Propane
     # Overrides Processing convenience function thread, which takes a String
     # arg (for a function) to more rubylike version, takes a block...
     def thread(&block)
-      if block_given?
-        Thread.new(&block)
-      else
-        raise ArgumentError, 'thread must be called with a block', caller
-      end
+      warn 'A Block is Needed' unless block_given?
+      Java::JavaLang::Thread.new(&block).start
     end
 
     # explicitly provide 'processing.org' min instance method
@@ -94,9 +92,9 @@ module Propane
     def dist(*args)
       case args.length
       when 4
-        return dist2d(*args)
+        dist2d(*args)
       when 6
-        return dist3d(*args)
+        dist3d(*args)
       else
         raise ArgumentError, 'takes 4 or 6 parameters'
       end
@@ -111,13 +109,13 @@ module Propane
     # Here's a convenient way to look for them.
     def find_method(method_name)
       reg = Regexp.new(method_name.to_s, true)
-      methods.sort.select { |meth| reg.match(meth) }
+      methods.sort.select { |meth| reg.match?(meth) }
     end
 
     # Proxy over a list of Java declared fields that have the same name as
     # some methods. Add to this list as needed.
     def proxy_java_fields
-      fields = %w(key frameRate mousePressed keyPressed)
+      fields = %w[key frameRate mousePressed keyPressed]
       methods = fields.map { |field| java_class.declared_field(field) }
       @declared_fields = Hash[fields.zip(methods)]
     end
@@ -163,6 +161,7 @@ module Propane
     # frame_rate needs to support reading and writing
     def frame_rate(fps = nil)
       return @declared_fields['frameRate'].value(java_self) unless fps
+
       super(fps)
     end
 
@@ -178,21 +177,19 @@ module Propane
 
     private
 
-    INTEGER_COL = -> (x) { x.is_a?(Integer) }
-    STRING_COL = -> (x) { x.is_a?(String) }
-    FLOAT_COL = -> (x) { x.is_a?(Float) }
     # parse single argument color int/double/String
-    def hex_color(a)
-      case a
-      when INTEGER_COL
-        Java::Monkstone::ColorUtil.colorLong(a)
-      when STRING_COL
-        return Java::Monkstone::ColorUtil.colorString(a) if a =~ /#\h+/
-        raise StandardError, 'Dodgy Hexstring'
-      when FLOAT_COL
-        Java::Monkstone::ColorUtil.colorDouble(a)
+    def hex_color(arg)
+      case arg
+      when Integer
+        Java::Monkstone::ColorUtil.colorLong(arg)
+      when String
+        raise 'Dodgy Hexstring' unless /#\h{6}$/.match?(arg)
+
+        Java::Monkstone::ColorUtil.colorString(arg)
+      when Float
+        Java::Monkstone::ColorUtil.colorDouble(arg)
       else
-        raise StandardError, 'Dodgy Color Conversion'
+        raise 'Dodgy Color Conversion'
       end
     end
 
@@ -200,6 +197,7 @@ module Propane
       dx = args[0] - args[2]
       dy = args[1] - args[3]
       return 0 if dx.abs < EPSILON && dy.abs < EPSILON
+
       Math.hypot(dx, dy)
     end
 
@@ -208,6 +206,7 @@ module Propane
       dy = args[1] - args[4]
       dz = args[2] - args[5]
       return 0 if dx.abs < EPSILON && dy.abs < EPSILON && dz.abs < EPSILON
+
       Math.sqrt(dx * dx + dy * dy + dz * dz)
     end
   end

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,33 +1,39 @@
+# 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_PATTERNS = [
-  #   /bccwin/i,
-  #   /cygwin/i,
-  #   /djgpp/i,
-  #   /ming/i,
-  #   /mswin/i,
-  #   /wince/i
-  # ].freeze
+  WIN_FORMAT = 'windows%d'
+  LINUX_FORMAT = 'linux%d'
+  WIN_PATTERNS = [
+    /bccwin/i,
+    /cygwin/i,
+    /djgpp/i,
+    /ming/i,
+    /mswin/i,
+    /wince/i
+  ].freeze
 
   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 os =~ /darwin/ || os =~ /mac/
-    # return format(WIN_FORMAT, bit) if WIN_PATTERNS.include? os
-    return format(LINUX_FORMAT, bit) if os =~ /linux/
+    return 'macosx' if /darwin|mac/.match?(os)
+    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 os =~ /linux/
+    return '*.so' if /linux/.match?(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.3.1'.freeze
+  VERSION = '3.6.0'
 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