jruby_art 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e477bba7efa66be3f3e7e7074c59c17ae2c96cc9
-  data.tar.gz: b8d58ad635bc669934b145fb32c0dcfa8d4d4387
+  metadata.gz: f668fbc71962abf201d373a8b3cac768c81ea269
+  data.tar.gz: 2abb81363bb489fb397c51443c7c33d477bfcbc2
 SHA512:
-  metadata.gz: 8f7e9e1bcc6ffc15dadd07590c8432730b10adf08a895b2885d3ba7ed148603e0758cba31452a42ea8e7e7689712477842e5287abcde717318b025d2168fba8e
-  data.tar.gz: d797473e7e1d44bed8fd151c9cd43a5327a9bea031b27783c5d89212f8ffa60523fe07021d948b1e78d5dcec4aa92894b5f09d88dea0ec71395ef0c9f3ef5ed8
+  metadata.gz: 03cb1b70cf248937f86cee8d6c135e861232e07279352fdbd194d294eebd04b68eab1b75a780e8ff80b64eedaacf76015bbf0e321daff36c4de7e26125aa20c5
+  data.tar.gz: 9821714651eaec453b93ff15ebd9268092a27fb01aaa2989f4933f472bb7d19955fadea645a324bb0fabc31cab5ebe58286f8aae70a8cf0b18ff87db620b61b0

data/lib/jruby_art.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: false
 # JRubyArt is for Code Art.
 # Send suggestions, ideas, and hate-mail to mamba2928 [at] gmail.com

data/lib/jruby_art/app.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: false
 
 require 'java'
@@ -38,10 +37,10 @@ module Processing
     include HelperMethods, Math, MathTool, Render
     # Alias some methods for familiarity for Shoes coders.
     # surface replaces :frame, but needs field_reader for access
-    alias_method :oval, :ellipse
-    alias_method :stroke_width, :stroke_weight
-    alias_method :rgb, :color
-    alias_method :gray, :color
+    alias oval ellipse
+    alias stroke_width stroke_weight
+    alias rgb color
+    alias gray color
     field_reader :surface
 
     def sketch_class
@@ -63,7 +62,7 @@ module Processing
         library_loader ||= LibraryLoader.new
         library_loader.load_library(*args)
       end
-      alias_method :load_library, :load_libraries
+      alias load_library load_libraries
 
       def library_loaded?(library_name)
         library_loader.library_loaded?(library_name)
@@ -194,6 +193,10 @@ module Processing
   module Proxy
     include Math, HelperMethods, Java::ProcessingCore::PConstants
 
+    def respond_to_missing?(name, include_private = false)
+      $app.respond_to?(name) || super
+    end
+
     def method_missing(name, *args)
       return $app.send(name, *args) if $app && $app.respond_to?(name)
       super

data/lib/jruby_art/creators/sketch_writer.rb

@@ -1,128 +1,101 @@
-EMACS = <<-CODE
 # frozen_string_literal: false
-require 'jruby_art'
-require 'jruby_art/app'
-
-Processing::App::SKETCH_PATH = __FILE__.freeze
-
-class %s < Processing::App
-  def settings
-    %s
-  end
-
-  def setup
-    %s
-  end
-
-  def draw
+# The SketchParameters class knows how to format, size, title & class name
+class SketchParameters
+  attr_reader :name, :args
+  def initialize(name:, args:)
+    @name = name
+    @args = args
   end
-end
-
-%s.new unless defined? $app
 
-CODE
-
-CLASS = <<-CODE
-class %s < Processing::App
-  def settings
-    %s
+  def class_name
+    name.split('_').collect(&:capitalize).join
   end
 
-  def setup
-    %s
+  def sketch_title
+    human = name.split('_').collect(&:capitalize).join(' ')
+    format("sketch_title '%s'", human)
   end
 
-  def draw
+  def sketch_size
+    mode = args.length == 3 ? format(', %s', args[2].upcase) : ''
+    return 'size 200, 200' if args.empty?
+    format('size %d, %d%s', args[0].to_i, args[1].to_i, mode)
   end
 end
 
-CODE
-
-METHOD = <<-CODE
-def %s
-  %s
-end
-
-CODE
-
-require_relative '../helpers/string_extra'
-
-# Sketch writer class
+# The file writer can write a sketch when given instance of Sketch type
 class SketchWriter
-  attr_reader :file, :args, :sketch, :name
+  attr_reader :file, :param
 
   def initialize(path, args)
-    @args = args
-    @name = path
-    underscore = StringExtra.new(path).underscore
-    @file = format('%s/%s.rb', File.dirname(path), underscore)
-  end
-
-  def create!(type)
-    case type
-    when /bare/
-      @sketch = Sketch.new.bare(name, args)
-    when /class/
-      @sketch = Sketch.new.class_wrapped(name, args)
-    when /emacs/
-      @sketch = Sketch.new.emacs(name, args)
-    end
-    save(sketch)
+    @param = SketchParameters.new(name: path, args: args)
+    @file = format('%s/%s.rb', File.dirname(path), path)
   end
 
-  def save(sketch)
-    File.open(file, 'w+') do |f|
-      f.write(sketch)
-    end
+  def write(creator)
+    sketch = creator.code(param)
+    File.open(file, 'w+') { |f| f.write sketch.join("\n") }
   end
 end
 
-# Sketch class
+# Implements methods and class_methods omits blank line after draw
+# uses private method_lines to format method lines
 class Sketch
-  def bare(name = 'sketch', args = [])
-    [settings(args), setup(name), draw].join
-  end
+  BLANK ||= ''.freeze
+  INDENT ||= '  '.freeze
 
-  def class_wrapped(name = 'sketch', args = [])
-    class_name = StringExtra.new(name).camelize
-    format(CLASS, class_name, size(args[0], args[1], args[2]), name(name))
+  def methods(param, indent)
+    lines = []
+    lines.concat method_lines('settings', param.sketch_size, indent)
+    lines.concat method_lines('setup', param.sketch_title, indent)
+    lines.concat method_lines('draw', BLANK, indent)
   end
 
-  def emacs(name = 'sketch', args = [])
-    class_name = StringExtra.new(name).camelize
-    format(
-      EMACS,
-      class_name,
-      size(args[0], args[1], args[2]),
-      name(name),
-      class_name
-    )
+  def class_methods(param)
+    lines = [format('class %s < Processing::App', param.class_name)]
+    lines.concat methods(param, INDENT)
+    lines << 'end'
   end
 
-  def size(width = 200, height = 200, mode = nil)
-    return format('size %s, %s', width, height) if mode.nil?
-    format('size %s, %s, %s', width, height, mode.upcase)
-  end
+  private
 
-  def settings(args = [])
-    return format(METHOD, 'settings', size) if args.empty?
-    return format(
-      METHOD,
-      'settings',
-      size(args[0], args[1])
-    ) if args.length == 2
-    format(METHOD, 'settings', size(args[0], args[1], args[2]))
+  def method_lines(name, content, indent)
+    one = format('%sdef %s', indent, name)
+    two = content.empty? ? BLANK : format('  %s%s', indent, content)
+    three = format('%send', indent)
+    return [one, two, three] if /draw/ =~ name
+    [one, two, three, BLANK]
   end
+end
 
-  def name(title = 'Sketch')
-    format("sketch_title '%s'", StringExtra.new(title).humanize)
+# The sketch class creates an array of formatted sketch lines
+class BareSketch < Sketch
+  def code(param)
+    methods(param, BLANK)
   end
+end
 
-  def setup(title)
-    format(METHOD, 'setup', name(title))
+# A simple class wrapped sketch
+class ClassSketch < Sketch
+  def code(param)
+    lines = ['# frozen_string_literal: false', BLANK]
+    lines.concat class_methods(param)
   end
+end
 
-  def draw
-    format(METHOD, 'draw', '')
+# A sketch that will run with jruby, for emacs etc
+class EmacsSketch < Sketch
+  def code(param)
+    lines = [
+      '# frozen_string_literal: false',
+      "require 'jruby_art'",
+      "require 'jruby_art/app'",
+      BLANK,
+      'Processing::App::SKETCH_PATH = __FILE__.freeze',
+      BLANK
+    ]
+    lines.concat class_methods(param)
+    lines << BLANK
+    lines << format('%s.new unless defined? $app', param.class_name)
   end
 end

data/lib/jruby_art/helper_methods.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: false
 # processing module wrapper
 require_relative '../rpextras'
@@ -22,15 +21,17 @@ module Processing
     def kamera(
       eye: Vec3D.new(width / 2.0, height / 2.0, (height / 2.0) / tan(PI * 30.0 / 180.0)),
       center: Vec3D.new(width / 2.0, height / 2.0, 0),
-      up: Vec3D.new(0, 1.0, 0))
+      up: Vec3D.new(0, 1.0, 0)
+    )
       camera(eye.x, eye.y, eye.z, center.x, center.y, center.z, up.x, up.y, up.z)
     end
-    
+
     def perspektiv(
       fov: Math::PI / 3.0,
       aspect_ratio: width.to_f / height,
       near_z: (height / 20.0) / tan(fov / 2.0),
-      far_z: (height * 5) / tan(fov / 2.0))
+      far_z: (height * 5) / tan(fov / 2.0)
+    )
       perspective(fov, aspect_ratio, near_z, far_z)
     end
 
@@ -49,7 +50,7 @@ module Processing
     def lerp_color(*args)
       args.length > 3 ? self.class.lerp_color(*args) : super(*args)
     end
-    
+
     # hue, sat, brightness in range 0..1.0 returns RGB color int
     def hsb_color(hue, sat, brightness)
       Java::Monkstone::ColorUtil.hsbToRgB(hue, sat, brightness)
@@ -59,14 +60,14 @@ module Processing
       return super(*args) unless args.length == 1
       super(hex_color(args[0]))
     end
-    
+
     def web_to_color_array(web)
       Java::Monkstone::ColorUtil.webArray(web)
     end
-    
+
     def int_to_ruby_colors(hex)
       Java::Monkstone::ColorUtil.rubyString(hex)
-    end  
+    end
 
     # Overrides Processing convenience function thread, which takes a String
     # arg (for a function) to more rubylike version, takes a block...
@@ -74,7 +75,7 @@ module Processing
       if block_given?
         Thread.new(&block)
       else
-        fail ArgumentError, 'thread must be called with a block', caller
+        raise ArgumentError, 'thread must be called with a block', caller
       end
     end
 
@@ -100,7 +101,7 @@ module Processing
       when 6
         return dist3d(*args)
       else
-        fail ArgumentError, 'takes 4 or 6 parameters'
+        raise ArgumentError, 'takes 4 or 6 parameters'
       end
     end
 
@@ -112,7 +113,7 @@ module Processing
     # There's just so many functions in Processing,
     # Here's a convenient way to look for them.
     def find_method(method_name)
-      reg = Regexp.new("#{method_name}", true)
+      reg = Regexp.new(method_name.to_s, true)
       methods.sort.select { |meth| reg.match(meth) }
     end
 
@@ -120,7 +121,7 @@ module Processing
     # some methods. Add to this list as needed.
     def proxy_java_fields
       fields = %w(key frameRate mousePressed keyPressed)
-      methods  = fields.map { |field| java_class.declared_field(field) }
+      methods = fields.map { |field| java_class.declared_field(field) }
       @declared_fields = Hash[fields.zip(methods)]
     end
 
@@ -190,11 +191,11 @@ module Processing
         Java::Monkstone::ColorUtil.colorLong(a)
       when STRING_COL
         return Java::Monkstone::ColorUtil.colorString(a) if a =~ /#\h+/
-        fail StandardError, 'Dodgy Hexstring'
+        raise StandardError, 'Dodgy Hexstring'
       when FLOAT_COL
         Java::Monkstone::ColorUtil.colorDouble(a)
       else
-        fail StandardError, 'Dodgy Color Conversion'
+        raise StandardError, 'Dodgy Color Conversion'
       end
     end
 

data/lib/jruby_art/installer.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 require 'yaml'
 
-VERSION = '3.1.1'.freeze # processing version
+VERSION = '3.2.1'.freeze # processing version
 
 # Abstract Installer class
 class Installer
@@ -49,6 +49,7 @@ class Installer
   # Display the current version of JRubyArt.
   def show_version
     puts format('JRubyArt version %s', JRubyArt::VERSION)
+    puts format('Expected Processing version %s', VERSION)
   end
 end
 

data/lib/jruby_art/library_loader.rb

@@ -2,7 +2,8 @@
 # frozen_string_literal: false
 
 require_relative '../jruby_art'
-require_relative 'sketchbook'
+require_relative 'config'
+# require_relative 'sketchbook'
 # The processing wrapper module
 module Processing
   # Encapsulate library loader functionality as a class
@@ -10,7 +11,7 @@ module Processing
     attr_reader :sketchbook_library_path
 
     def initialize
-      @sketchbook_library_path = File.join(Sketchbook.find_path, 'libraries')
+      @sketchbook_library_path = File.join(Processing::RP_CONFIG['sketchbook_path'], 'libraries')
       @loaded_libraries = Hash.new(false)
     end
 

data/lib/jruby_art/runner.rb

@@ -107,7 +107,10 @@ module Processing
     def create
       require_relative '../jruby_art/creators/sketch_writer'
       config = Processing::RP_CONFIG.fetch('template', 'bare')
-      SketchWriter.new(filename, argc).create!(config)
+      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)
     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/runners/watch.rb

@@ -30,7 +30,7 @@ module Processing
     # Kicks off a thread to watch the sketch, reloading JRubyArt
     # and restarting the sketch whenever it changes.
     def start_watching
-      start_runner
+      start_original
       Kernel.loop do
         if @files.find { |file| FileTest.exist?(file) && File.stat(file).mtime > @time }
           puts 'reloading sketch...'
@@ -54,10 +54,8 @@ module Processing
       warn format(wformat, File.basename(SKETCH_PATH))
       puts format(tformat, e.backtrace.join("\n\t"))
     end
-
-    def start_runner
-      @runner.kill if @runner && @runner.alive?
-      @runner = nil
+    
+    def start_original
       @runner = Thread.start do
         report_errors do
           Processing.load_and_run_sketch
@@ -65,6 +63,13 @@ module Processing
       end
     end
 
+    def start_runner
+      @runner.kill if @runner && @runner.alive?
+      @runner.join
+      @runner = nil
+      start_original
+    end
+
     def reload_files_to_watch
       @files = Dir.glob(File.join(SKETCH_ROOT, '**/*.{rb,glsl}'))
       count = @files.length

data/lib/jruby_art/version.rb

@@ -1,6 +1,5 @@
-# encoding: utf-8
 # frozen_string_literal: true
 # A wrapper for version
 module JRubyArt
-  VERSION = '1.2.1'.freeze
+  VERSION = '1.2.2'.freeze
 end

data/vendors/Rakefile

@@ -8,8 +8,8 @@ WARNING = <<-EOS
       
 EOS
 
-JRUBYC_VERSION     = '9.1.2.0'
-EXAMPLES           = '1.3'
+JRUBYC_VERSION     = '9.1.3.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", "b9a6838ff7bbb0b3eda4eeba26017329572bc2fa014008a069b3848482275283")
+  check_sha256("jruby-complete-#{JRUBYC_VERSION}.jar", "99cae715f87b9829b44a5a7295f200fc7295114f0887b160a3cf613bf93544a0")
 end
 
 directory "../lib/ruby"
@@ -71,7 +71,7 @@ end
 desc "copy examples"
 task :copy_examples => file_name do
   if MAC_OR_LINUX.nil?
-    sh "unzip #{EXAMPLES},zip"
+    sh "unzip #{EXAMPLES}.zip"
   else
     sh "tar xzvf #{EXAMPLES}.tar.gz" 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jruby_art
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Jeremy Ashkenas
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-19 00:00:00.000000000 Z
+date: 2016-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -62,7 +62,6 @@ files:
 - lib/jruby_art/helper_methods.rb
 - lib/jruby_art/helpers/aabb.rb
 - lib/jruby_art/helpers/numeric.rb
-- lib/jruby_art/helpers/string_extra.rb
 - lib/jruby_art/installer.rb
 - lib/jruby_art/java_opts.rb
 - lib/jruby_art/library_loader.rb
@@ -71,7 +70,6 @@ files:
 - lib/jruby_art/runners/live.rb
 - lib/jruby_art/runners/run.rb
 - lib/jruby_art/runners/watch.rb
-- lib/jruby_art/sketchbook.rb
 - lib/jruby_art/version.rb
 - lib/rpextras.jar
 - library/boids/boids.rb
@@ -82,7 +80,7 @@ files:
 - library/slider/slider.rb
 - library/video_event/video_event.rb
 - vendors/Rakefile
-homepage: http://ruby-processing.github.io/JRubyArt/
+homepage: https://ruby-processing.github.io/JRubyArt/
 licenses:
 - MIT
 metadata: {}
@@ -95,7 +93,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -103,8 +101,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - A decent graphics card
-- java runtime >= 1.8.0_92+
-- processing = 3.1.0+
+- java runtime >= 1.8.0_102+
+- processing = 3.2.1+
 rubyforge_project: 
 rubygems_version: 2.6.3
 signing_key: 

data/lib/jruby_art/helpers/string_extra.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: false
-require 'forwardable'
-# reverting to StringExtra class, from a module with String refinements
-class StringExtra
-  extend Forwardable
-  def_delegators(:@str, :upcase, :capitalize, :length, :downcase, :gsub)
-  def initialize(str)
-    @str = str
-  end
-
-  def titleize
-    underscore
-      .gsub(/_id$/, '').tr('_', ' ').capitalize
-      .gsub(/\b([a-z])/) { Regexp.last_match[1].capitalize }
-  end
-
-  def humanize
-    gsub(/_id$/, '').tr('_', ' ').capitalize
-  end
-
-  def camelize
-    gsub(%r{/\/(.?)/}) { '::' + Regexp.last_match[1].upcase }
-      .gsub(/(^|_)(.)/) { Regexp.last_match[2].upcase }
-  end
-
-  def underscore
-    gsub(/::/, '/')
-      .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
-      .gsub(/([a-z\d])([A-Z])/, '\1_\2')
-      .tr('-', '_')
-      .downcase
-  end
-end

data/lib/jruby_art/sketchbook.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: false
-# Utility to find sketchbook and hence java libraries
-module Sketchbook
-  def self.find_path
-    preferences_paths = []
-    sketchbook_paths = []
-    sketchbook_path = Processing::RP_CONFIG.fetch('sketchbook_path', false)
-    return sketchbook_path if sketchbook_path
-    [
-      "'Application Data/Processing'", 'AppData/Roaming/Processing',
-      'Library/Processing', 'Documents/Processing',
-      '.processing', 'sketchbook'
-    ].each do |prefix|
-      spath = format('%s/%s', ENV['HOME'], prefix)
-      pref_path = format('%s/preferences.txt', spath)
-      preferences_paths << pref_path if FileTest.file?(pref_path)
-      sketchbook_paths << spath if FileTest.directory?(spath)
-    end
-    return sketchbook_paths.first if preferences_paths.empty?
-    lines = IO.readlines(preferences_paths.first)
-    matchedline = lines.grep(/^sketchbook/).first
-    matchedline[/=(.+)/].delete('=')
-  end
-end