tidy up refactoring, bump version

Author: monkstone

CHANGELOG.md

@@ -1,3 +1,5 @@
+**v1.3.0** Not strictly semantic versioning in the sense that the significant internal refactoring of launcher.rb should not be evident to user. Bump to jruby-9.1.8.0 which should be last before jruby-9.2.x.x series (ruby-2.4 here we come).
+
 **v1.2.9** Grid method now in java (and corrected for step greater than 1). Update to processing-3.3. Update examples to 2.0, which features WOVNS examples that make use of `grid` method and in part caused me to look again a its implementation.
 
 **v1.2.8** Properly implement post-initialize (it might be useful). Refactor Sketchbook and OS. Update to processing-3.2.4, if you have not updated samples for a while you should now.

lib/jruby_art/helper_methods.rb

@@ -77,15 +77,15 @@ def thread(&block)
     # explicitly provide 'processing.org' min instance method
     # to return a float:- a, b and c need to be floats
 
-    def min(*args, &block)
+    def min(args, &block)
       args.min unless block_given?
       args.min(&block) # { |a, b| a.value <=> b.value }
     end
 
     # explicitly provide 'processing.org' max instance method
     # to return a float:- a, b and c need to be floats
 
-    def max(*args, &block)
+    def max(args, &block)
       args.max unless block_given?
       args.max(&block) # { |a, b| a.value <=> b.value }
     end

lib/jruby_art/java_opts.rb

@@ -5,7 +5,6 @@ class JavaOpts
 
   def initialize
     arg_file = File.join(SKETCH_ROOT, 'data/java_args.txt')
-    puts arg_file
     @opts = []
     @opts += File.read(arg_file).split(/\s+/) if FileTest.exist?(arg_file)
     return unless opts.empty? && Processing::RP_CONFIG.fetch('java_args', false)

lib/jruby_art/launcher.rb

@@ -54,6 +54,6 @@ def initialize(runner, args, filename)
   end
 
   def cmd
-    ['jruby', opts, runner, filename, args].flatten if installed
+    ['jruby', opts, runner, filename, args].flatten
   end
 end

lib/jruby_art/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 # A wrapper for version
 module JRubyArt
-  VERSION = '1.2.9'.freeze
+  VERSION = '1.3.0'.freeze
 end

pom.rb

@@ -2,7 +2,7 @@
 project 'rp5extras', 'https://github.com/ruby-processing/JRubyArt' do
 
   model_version '4.0.0'
-  id 'ruby-processing:rp5extras', '1.2.9'
+  id 'ruby-processing:rp5extras', '1.3.0'
   packaging 'jar'
 
   description 'rp5extras for JRubyArt'

test/helper_methods_test.rb

@@ -51,12 +51,12 @@ def test_dist
   end
 
   def test_min
-    assert_equal(min(*ARRAY), 'albatross')
-    assert_equal(min(*ARRAY) { |a, b| a.length <=> b.length }, 'dog')
+    assert_equal(min(ARRAY), 'albatross')
+    assert_equal(min(ARRAY) { |a, b| a.length <=> b.length }, 'dog')
   end
 
   def test_max
-    assert_equal(max(*ARRAY), 'horse')
-    assert_equal(max(*ARRAY) { |a, b| a.length <=> b.length }, 'albatross')
+    assert_equal(max(ARRAY), 'horse')
+    assert_equal(max(ARRAY) { |a, b| a.length <=> b.length }, 'albatross')
   end
 end