Merge pull request #22 from ruby-processing/refactor_create

update to jruby-complete-9.0.4.0

Author: monkstone

lib/jruby_art/creators/sketch_writer.rb

@@ -32,8 +32,9 @@ def initialize(path, args)
     @file = format('%s/%s.rb', File.dirname(path), path)
   end
 
-  def write(creator)
-    sketch = creator.code(param)
+  def write
+    template = SketchTemplate.template
+    sketch = template.code(param)
     File.open(file, 'w+') { |f| f.write sketch.join("\n") }
   end
 end
@@ -68,6 +69,20 @@ def method_lines(name, content, indent)
   end
 end
 
+# Switch templates on config
+class SketchTemplate
+  def self.template
+    case Processing::RP_CONFIG.fetch('template', 'bare')
+    when /bare/
+      return BareSketch.new
+    when /class/
+      return ClassSketch.new
+    when /emacs/
+      return EmacsSketch.new
+    end
+  end
+end
+
 # The sketch class creates an array of formatted sketch lines
 class BareSketch < Sketch
   def code(param)

lib/jruby_art/runner.rb

@@ -106,11 +106,7 @@ def parse_options(args)
 
     def create
       require_relative '../jruby_art/creators/sketch_writer'
-      config = Processing::RP_CONFIG.fetch('template', 'bare')
-      sketch = BareSketch.new if /bare/ =~ config
-      sketch = ClassSketch.new if /class/ =~ config
-      sketch = EmacsSketch.new if /emacs/ =~ config
-      SketchWriter.new(File.basename(filename, '.rb'), argc).write(sketch)
+      SketchWriter.new(File.basename(filename, '.rb'), argc).write
     end
 
     # Export as app not implemented

lib/jruby_art/runners/base.rb

@@ -10,13 +10,13 @@
 # More processing module
 module Processing
   # For use with "bare" sketches that don't want to define a class or methods
-  BARE_WRAP = <<~EOS
+  BARE_WRAP = <<-EOS
   class Sketch < Processing::App
     %s
   end
   EOS
 
-  NAKED_WRAP = <<~EOS
+  NAKED_WRAP = <<-EOS
   class Sketch < Processing::App
     def setup
       sketch_title 'Nude Sketch'

lib/jruby_art/version.rb

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

vendors/Rakefile

@@ -8,7 +8,7 @@ WARNING = <<-EOS
       
 EOS
 
-JRUBYC_VERSION     = '9.1.3.0'
+JRUBYC_VERSION     = '9.1.4.0'
 EXAMPLES           = '1.4'
 HOME_DIR = ENV['HOME']
 MAC_OR_LINUX = /linux|mac|darwin/ =~ RbConfig::CONFIG['host_os'] 
@@ -27,7 +27,7 @@ file "jruby-complete-#{JRUBYC_VERSION}.jar" do
   rescue
     warn(WARNING)
   end
-  check_sha256("jruby-complete-#{JRUBYC_VERSION}.jar", "99cae715f87b9829b44a5a7295f200fc7295114f0887b160a3cf613bf93544a0")
+  check_sha256("jruby-complete-#{JRUBYC_VERSION}.jar", "a042931f5088dca7007985d6a2178af31cbc26aadb64ee10c3fa25f432c68505")
 end
 
 directory "../lib/ruby"