re-factor a bit

Author: monkstone

lib/jruby_art/command.rb

@@ -2,28 +2,37 @@
 require_relative '../jruby_art/jruby_complete'
 require_relative '../jruby_art/java_opts'
 module Processing
-  # This is class wrapper for building the command
+  # The command class check for configuration and options, before creating and
+  # executing the jruby (or java) command to run the sketch
   class Command
-    attr_reader :executable, :runner, :args, :filename
-    def initialize(executable:, runner:, args:, filename:)
-      @executable = executable
+    attr_reader :runner, :args, :filename
+    def initialize(runner:, args:, filename:)
       @runner = runner
       @args = args
       @filename = filename
     end
 
+    # Trade in this Ruby instance for a JRuby instance, loading in a starter
+    # script and passing it some arguments. Unless you set JRUBY: false in
+    # ~/.jruby_art/config.yml, an installed version of jruby is used instead
+    # of our vendored one. Note the use of jruby-complete might make using
+    # other gems in your sketches hard (but not impossible)....
     def cmd(root)
-      if executable =~ /jruby/
-        cmda = [executable, JRubyOpts.new(root).opts, runner, filename, args].flatten
-      else
-        cmda = [executable, JavaOpts.new(root).opts, '-cp', JRubyComplete.complete, 'org.jruby.Main', runner, filename, args].flatten
-      end
+      cmda = jruby_command(Processing::RP_CONFIG.fetch('JRUBY', true), root)
       begin
-        # exec(*command)
         exec(*cmda)
         # exec replaces the Ruby process with the JRuby one.
       rescue Java::JavaLang::ClassNotFoundException
       end
     end
+
+    private
+
+    # avoiding multiline ternary etc
+    def jruby_command(installed, root)
+      opts = JRubyOpts.new(root).opts
+      return ['jruby', opts, runner, filename, args].flatten if installed
+      ['java', opts, '-cp', JRubyComplete.complete, 'org.jruby.Main', runner, filename, args].flatten
+    end
   end
 end

lib/jruby_art/runner.rb

@@ -156,15 +156,12 @@ def show_version
 
     private
 
-    # Trade in this Ruby instance for a JRuby instance, loading in a starter
-    # script and passing it some arguments. Unless you set JRUBY: false in
-    # ~/.jruby_art/config.yml, an installed version of jruby is used instead
-    # of our vendored one. Note the use of jruby-complete might make using
-    # other gems in your sketches hard (but not impossible)....
+    # We now build and execute the command arguments in the Command class.
+    # Here we only need to supply the starter script, filename and args if any,
+    # the Command class checks config (is executable java or jruby?)
+    # and for any options in java_args.txt or config
     def spin_up(starter_script, filename, argc)
-      executable = Processing::RP_CONFIG.fetch('JRUBY', true) ? 'jruby' : 'java'
       build = Command.new(
-        executable: executable,
         runner: "#{K9_ROOT}/lib/jruby_art/runners/#{starter_script}",
         args: argc,
         filename: filename