Various tidying up

Author: monkstone

Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
-ruby '2.5.7', :engine => 'jruby', :engine_version => '9.2.9.0'
+ruby '2.5.7', engine: 'jruby', engine_version: '9.2.9.0'
 gemspec

bin/picrate

@@ -1,6 +1,8 @@
 #!/usr/bin/env jruby
+# frozen_string_literal: true
+
 unless defined? PICRATE_ROOT
-  $LOAD_PATH << File.expand_path(File.dirname(__FILE__))
+  $LOAD_PATH << __dir__
   PICRATE_ROOT = File.expand_path(File.dirname(__FILE__) + '/../')
 end
 

lib/picrate.rb

@@ -6,7 +6,7 @@
   PICRATE_ROOT = File.dirname(__dir__)
 end
 
-Dir["#{PICRATE_ROOT}/lib/*.jar"].each do |jar|
+Dir["#{PICRATE_ROOT}/lib/*.jar"].sort.each do |jar|
   require jar
 end
 require_relative 'picrate/app'

lib/picrate/app.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: false
+
 require_relative 'helper_methods'
 require_relative 'library_loader'
 # A wrapper module for the processing App
@@ -49,7 +50,10 @@ class << self
 
   # All sketches extend this class
   class App < PApplet
-    include Math, MathTool, HelperMethods, Render
+    include Render
+    include HelperMethods
+    include MathTool
+    include Math
     # Alias some methods for familiarity for Shoes coders.
     alias oval ellipse
     alias stroke_width stroke_weight
@@ -101,6 +105,7 @@ def load_java_library(*args)
       # Processing call them by their expected Java names.
       def method_added(method_name) #:nodoc:
         return unless METHODS_TO_ALIAS.key?(method_name)
+
         alias_method METHODS_TO_ALIAS[method_name], method_name
       end
     end
@@ -113,6 +118,7 @@ def initialize(options = {}, arguments = [])
       # Guard against invalid input.
       proxy_java_fields
       raise TypeError unless options.is_a?(Hash) && arguments.is_a?(Array)
+
       # Set up the sketch.
       super()
       post_initialize(options)
@@ -132,8 +138,7 @@ def size(*args)
       super(*args)
     end
 
-    def post_initialize(_args)
-    end
+    def post_initialize(_args); end
 
     def data_path(dat)
       dat_root = File.join(SKETCH_ROOT, 'data')
@@ -162,6 +167,7 @@ def proxy_java_fields
     # Processing call them by their expected Java names.
     def method_added(method_name) #:nodoc:
       return unless METHODS_TO_ALIAS.key?(method_name)
+
       alias_method METHODS_TO_ALIAS[method_name], method_name
     end
   end
@@ -179,6 +185,7 @@ def respond_to_missing?(symbol, include_priv = false)
 
     def method_missing(name, *args, &block)
       return Processing.app.send(name, *args) if Processing.app.respond_to? name
+
       super
     end
   end # Processing::Proxy

lib/picrate/creators/parameters.rb

@@ -11,13 +11,13 @@ module Parameters
   PARAM = { 'sketch' =>
     { 'width' => 640, 'height' => 480, 'mode' => 'P2D' } }.freeze
 
-    def self.write
-      FileUtils.mkdir_p PATH
-      File.write(FILE, PARAM.to_yaml)
-    end
+  def self.write
+    FileUtils.mkdir_p PATH
+    File.write(FILE, PARAM.to_yaml)
+  end
 
-    def self.read
-      write unless File.exist?(FILE)
-      YAML.load_file(FILE)
-    end
+  def self.read
+    write unless File.exist?(FILE)
+    YAML.load_file(FILE)
   end
+end

lib/picrate/creators/sketch_factory.rb

@@ -1,8 +1,10 @@
-require_relative 'sketch_writer'
+# frozen_string_literal: true
 
+require_relative 'sketch_writer'
+# Sketch Factory
 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')).write
     end

lib/picrate/helper_methods.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: false
+
 # processing module wrapper
 require_relative 'helpers/numeric'
 module Processing
@@ -52,6 +53,7 @@ def hsb_color(hue, sat, brightness)
 
     def color(*args)
       return super(*args) unless args.length == 1
+
       super(hex_color(args[0]))
     end
 
@@ -66,11 +68,8 @@ def int_to_ruby_colors(hex)
     # 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 'you must provide a block' unless block_given?
+      Java::JavaLang::Thread.new(&block).start
     end
 
     # explicitly provide 'processing.org' min instance method
@@ -94,9 +93,9 @@ def max(*args)
     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
@@ -117,7 +116,7 @@ def find_method(method_name)
     # 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 +162,7 @@ def save_strings(filename, strings)
     # 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,19 +178,17 @@ def key_pressed?
 
     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 StandardError, 'Dodgy Hexstring' unless arg.match(/#\h{6}$/)
+
+        Java::Monkstone::ColorUtil.colorString(arg)
+      when Float
+        Java::Monkstone::ColorUtil.colorDouble(arg)
       else
         raise StandardError, 'Dodgy Color Conversion'
       end
@@ -200,6 +198,7 @@ def dist2d(*args)
       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 +207,7 @@ def dist3d(*args)
       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

lib/picrate/helpers/numeric.rb

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

lib/picrate/library.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'native_folder'
 require_relative 'native_loader'
 require 'pathname'
@@ -18,6 +20,7 @@ def locate
     return if (@path = Pathname.new(
       File.join(PICRATE_ROOT, 'library', name, "#{name}.rb")
     )).exist?
+
     locate_java
   end
 
@@ -46,10 +49,11 @@ def exist?
   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
 

lib/picrate/library_loader.rb

@@ -33,10 +33,12 @@ def load_libraries(*args)
 
     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

lib/picrate/native_folder.rb

@@ -1,12 +1,14 @@
+# frozen_string_literal: true
+
 require 'rbconfig'
 
 # Utility to load native binaries on Java CLASSPATH
-#HACK until jruby returns a more specific 'host_os' than 'linux'
+# HACK until jruby returns a more specific 'host_os' than 'linux'
 class NativeFolder
   attr_reader :os, :bit
 
-  LINUX_FORMAT = 'linux%s'.freeze
-  ARM32 = '-armv6hf'.freeze
+  LINUX_FORMAT = 'linux%s'
+  ARM32 = '-armv6hf'
   # ARM64 = '-aarch64'.freeze
 
   def initialize
@@ -19,7 +21,7 @@ def name
       return format(LINUX_FORMAT, '64') if /amd64/.match?(bit)
       return format(LINUX_FORMAT, ARM32) if /arm/.match?(bit)
     end
-    raise RuntimeError, "Unsupported Architecture"
+    raise 'Unsupported Architecture'
   end
 
   def extension

lib/picrate/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 @@ def add_native_path(pth)
     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

lib/picrate/runner.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: false
+
 require 'optparse'
 require_relative 'version'
 

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 = Vec2D.new
     @is_perching = false
@@ -54,6 +56,7 @@ def limit(max:)
     # Tweet, Tweet! The boid police will bust you for breaking the speed limit.
     most = [vel.x.abs, vel.y.abs].max
     return if most < max
+
     scale = max / most.to_f
     @vel *= scale
   end
@@ -89,10 +92,14 @@ def self.flock(n:, x:, y:, w:, h:)
 
   def setup(n, x, y, w, h)
     n.times do
-      dx, dy = rand(w), rand(h)
+      dx = rand(w)
+      dy = rand(h)
       self << Boid.new(self, Vec2D.new(x + dx, y + dy))
     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
@@ -145,13 +152,15 @@ def no_goal
 
   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
       b.vel.x -= rand(dx) if b.pos.x > @x + @w + dx
       b.vel.y -= rand(dy) if b.pos.y > @y + @h + dy
       next unless b.pos.y > perch_y && rand < perch
+
       b.pos.y = perch_y
       b.vel.y = b.vel.y.abs * -0.2
       b.is_perching = true