jruby_art 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f668fbc71962abf201d373a8b3cac768c81ea269
-  data.tar.gz: 2abb81363bb489fb397c51443c7c33d477bfcbc2
+  metadata.gz: b2dfba054f56e77ac74d0d06c693b6d777b74993
+  data.tar.gz: 827f373276fbba69e470f82624dcc2644811dbd5
 SHA512:
-  metadata.gz: 03cb1b70cf248937f86cee8d6c135e861232e07279352fdbd194d294eebd04b68eab1b75a780e8ff80b64eedaacf76015bbf0e321daff36c4de7e26125aa20c5
-  data.tar.gz: 9821714651eaec453b93ff15ebd9268092a27fb01aaa2989f4933f472bb7d19955fadea645a324bb0fabc31cab5ebe58286f8aae70a8cf0b18ff87db620b61b0
+  metadata.gz: 508f568672d34d078fabbd912641c1753b427b9b0dedee450e117d147be21d6e077b3efa4b43adf04a8909d840a3709fac295a8b0e34ab6768ab9c5e6859e427
+  data.tar.gz: d35b6d2c0604b0d76dd92ee04b6ceb5a73b0edf9537a59834e2728bb4895625a822f47a5d36fe0aa45f8dd33646b0f97106caeaaa9194d3d88d7eda499289833

data/lib/jruby_art/creators/sketch_writer.rb

@@ -32,8 +32,9 @@ class SketchWriter
     @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 @@ class Sketch
   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)

data/lib/jruby_art/runner.rb

@@ -106,11 +106,7 @@ module Processing
 
     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

data/lib/jruby_art/runners/base.rb

@@ -10,13 +10,13 @@ require_relative '../app'
 # 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'

data/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

data/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"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jruby_art
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Jeremy Ashkenas
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-30 00:00:00.000000000 Z
+date: 2016-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -40,14 +40,12 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.8'
-description: "  JRubyArt is a ruby wrapper for the processing art framework.\n  This
-  version uses 'optparse', run becomes --run (or -r) and 'setup install' \n  becomes
-  '--install' or (-i) etc. Use both processing libraries and ruby gems \n  in your
-  sketches. Features create/run/watch/live modes. The \"--watch\" mode,\n  provides
-  a nice REPL-ish way to work on your processing sketches. Includes:-\n  A \"Control
-  Panel\" library, so that you can easily create sliders, buttons,\n  checkboxes and
-  drop-down menus, and hook them into your sketch's instance\n  variables and hundreds
-  of worked examples to get you started...\n"
+description: "  JRubyArt is a ruby wrapper for the processing art framework.\n  Use
+  both processing libraries and ruby gems in your sketches. Features \n  create/run/watch/live
+  modes. The \"--watch\" mode, provides a nice REPL-ish \n  way to work on your processing
+  sketches. Includes:-\n  A \"Control Panel\" library, so that you can easily create
+  sliders, buttons,\n  checkboxes and drop-down menus, and hook them into your sketch's
+  instance\n  variables and hundreds of worked examples to get you started...\n"
 email: mamba2928@yahoo.co.uk
 executables:
 - k9