ruby-processing 2.6.4 → 2.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3264280ea59ec35abe73d1b21727480c68f91415
-  data.tar.gz: 3711a7a054800bb6aa9e9aaf2f05da60912776c9
+  metadata.gz: d37219dbcfc503ec0b97b07d08a307b7c1408744
+  data.tar.gz: c35100c261c806e067db30ecc661c12681ee580b
 SHA512:
-  metadata.gz: 2e15cc2bbbd11527c844f60fe43e36e8e13db991f9d14a0bed1622c8796449c0934280fe6b5405b41179fb641d0ed01cd2b71f295207c5437d50e34074dc86e9
-  data.tar.gz: 080e198e2d07dfc0406342ad7decd8b4a9956496a74cbc158a152dfed6d51357bea2a2bf85f4710b18b9a901a767a8abcf03bddff759998da317d4674f9b832f
+  metadata.gz: 8137822eed4a491c7b2052621b589ffe8218840c6e2dfed421323ad0813eabab77e3152ab1e7463d8da99b325af1d18c7adc27dd50ef639c753da1578d4d64bf
+  data.tar.gz: 23fbd6c57e263380dfcdf5cae5b5b2037bff917bcf38d5cf013e6499be7832832494aec743764d994abf804064d0a8bf9edee6cd210ef0081daac765296c3324

data/lib/ruby-processing/app.rb

@@ -9,7 +9,7 @@ require_relative '../ruby-processing/config'
 
 Dir["#{Processing::RP_CONFIG['PROCESSING_ROOT']}/core/library/\*.jar"].each do
 |jar|
-  require jar
+require jar
 end
 
 module Processing
@@ -22,8 +22,8 @@ module Processing
   # called constantly, for every frame.
 
   # Include some core processing classes that we'd like to use:
-  include_package 'processing.core' 
-  
+  include_package 'processing.core'
+
   # Watch the definition of these methods, to make sure
   # that Processing is able to call them during events.
   METHODS_TO_ALIAS ||= {
@@ -36,7 +36,7 @@ module Processing
     key_released: :keyReleased,
     key_typed: :keyTyped
   }
-  
+  # All sketches extend this class
   class App < PApplet
     include Math
     include HelperMethods
@@ -109,54 +109,22 @@ module Processing
       proxy_java_fields
       set_sketch_path # unless Processing.online?
       mix_proxy_into_inner_classes
-      # @started = false
-
       java.lang.Thread.default_uncaught_exception_handler = proc do
-      |_thread_, exception|
+        |_thread_, exception|
         puts(exception.class.to_s)
         puts(exception.message)
         puts(exception.backtrace.map { |trace| "\t#{trace}" })
         close
       end
-
-      # For the list of all available args, see:-
-      # http://processing.org/reference/, however not all convenience functions
-      # are implemented in ruby-processing (you should in general prefer ruby
-      # alternatives when available and methods using java reflection, are best
-      # avoided entirely)
-
-      args = []
-      @width, @height = options[:width], options[:height]
-      if options[:full_screen]
-        present = true
-        args << '--full-screen'
-        args << "--bgcolor=#{options[:bgcolor]}" if options[:bgcolor]
-      end
-      @render_mode  ||= JAVA2D
-      xc = Processing::RP_CONFIG['X_OFF'] ||= 0
-      yc = Processing::RP_CONFIG['Y_OFF'] ||= 0
-      x = options[:x] || xc
-      y = options[:y] || yc
-      args << "--location=#{x},#{y}"  # important no spaces here
-      title = options[:title] ||
-      File.basename(SKETCH_PATH).sub(/(\.rb)$/, '').titleize
-      args << title
-      PApplet.run_sketch(args.to_java(:string), self)
+      run_sketch(options)
     end
 
     def size(*args)
       w, h, mode       = *args
-      @width           ||= w     
-      @height          ||= h     
-      @render_mode     ||= mode  
-      if /opengl/ =~ mode
-        # Include processing opengl classes that we'd like to use:
-        %w(FontTexture FrameBuffer LinePath LineStroker PGL
-         PGraphics2D PGraphics3D PGraphicsOpenGL PShader
-         PShapeOpenGL Texture).each do |klass|
-         java_import "processing.opengl.#{klass}"        
-        end
-      end
+      @width           ||= w
+      @height          ||= h
+      @render_mode     ||= mode
+      import_opengl if /opengl/ =~ mode
       super(*args)
     end
 
@@ -194,6 +162,36 @@ module Processing
         const.class_eval 'include Processing::Proxy'
       end
     end
+
+    def import_opengl
+      # Include processing opengl classes that we'd like to use:
+      %w(FontTexture FrameBuffer LinePath LineStroker PGL
+         PGraphics2D PGraphics3D PGraphicsOpenGL PShader
+         PShapeOpenGL Texture).each do |klass|
+        java_import "processing.opengl.#{klass}"
+      end
+    end
+    
+    def run_sketch(options = {})
+      args = []
+      @width, @height = options[:width], options[:height]
+      if options[:full_screen]
+        present = true
+        args << '--full-screen'
+        args << "--bgcolor=#{options[:bgcolor]}" if options[:bgcolor]
+      end
+      xc = Processing::RP_CONFIG['X_OFF'] ||= 0
+      yc = Processing::RP_CONFIG['Y_OFF'] ||= 0
+      x = options.fetch(:x, xc)
+      y = options.fetch(:y, yc)
+      args << "--location=#{x},#{y}"  # important no spaces here
+      title = options.fetch(
+        :title,
+        File.basename(SKETCH_PATH).sub(/(\.rb)$/, '').titleize
+        )
+      args << title
+      PApplet.run_sketch(args.to_java(:string), self)
+    end
   end # Processing::App
 
   # This module will get automatically mixed in to any inner class of

data/lib/ruby-processing/exporters/creator.rb

@@ -1,44 +1,78 @@
-module Processing
-  require 'erb'
+BASIC = <<-CODE
+def setup
+  size %s, %s
+end
 
-  class SketchWriter
-    include ERB::Util
-
-    def initialize(template, param = {})
-      @name = param[:name]
-      @file_name = param[:file_name]
-      @title = param[:title]
-      @width = param[:width]
-      @height = param[:height]
-      @mode = param[:mode].upcase unless param[:mode].nil?
-      @template = template
-      save(@file_name)
-    end
+def draw
+
+end
+CODE
 
-    def render
-      ERB.new(@template).result(binding)
+BASIC_MODE = <<-CODE
+def setup
+  size %s, %s, %s
+end
+
+def draw
+
+end
+CODE
+
+CLASS_BASIC = <<-CODE
+class %s
+  def setup
+    size %s, %s
+  end
+
+  def draw
+
+  end
+end
+CODE
+
+CLASS_MODE = <<-CODE
+class %s
+  def setup
+    size %s, %s, %s
+  end
+
+  def draw
+
+  end
+end
+CODE
+
+INNER = <<-CODE
+class %s
+  include Processing::Proxy
+
+end
+CODE
+
+module Processing
+  # Write file to disk
+  class SketchWriter
+    attr_reader :file
+    def initialize(path)
+      @file = "#{File.dirname(path)}/#{path.underscore}.rb"
     end
 
-    def save(file)
+    def save(template)
       File.open(file, 'w+') do |f|
-        f.write(render)
+        f.write(template)
       end
     end
   end
 
   # An abstract class providing common methods for real creators
   class Creator
-
     ALL_DIGITS = /\A\d+\Z/
 
     def already_exist(path)
       new_file = "#{File.dirname(path)}/#{path.underscore}.rb"
-      if !File.exist?(path) && !File.exist?(new_file)
-        return
-      else
-        puts 'That file already exists!'
-        exit
-      end
+      return if !File.exist?(path) && !File.exist?(new_file)
+      puts 'That file already exists!'
+      exit
     end
 
     # Show the help/usage message for create.
@@ -55,133 +89,73 @@ module Processing
 
       USAGE
     end
-
   end
 
   # This class creates bare sketches, with an optional render mode
   class BasicSketch < Creator
     # Create a blank sketch, given a path.
     def basic_template
-%(
-def setup
-  size <%=@width%>, <%=@height%>
-end
-
-def draw
-
-end
-)
+      format(BASIC, @width, @height)
     end
 
     def basic_template_mode
-%(
-def setup
-  size <%=@width%>, <%=@height%>, <%=@mode%>
-end
-
-def draw
-
-end
-)
+      format(BASIC_MODE, @width, @height, @mode)
     end
 
     def create!(path, args)
       return usage if /\?/ =~ path || /--help/ =~ path
-      main_file = File.basename(path, '.rb')
       # Check to make sure that the main file doesn't exist already
       already_exist(path)
-      @param = {
-        name: main_file.camelize,
-        file_name: "#{File.dirname(path)}/#{path.underscore}.rb",
-        title: main_file.titleize,
-        width: args[0],
-        height: args[1],
-        mode: args[2]
-      }
-      @with_size = @param[:width] && @param[:width].match(ALL_DIGITS) &&
-        @param[:height] && @param[:height].match(ALL_DIGITS)
-      template = @param[:mode].nil? ? basic_template : basic_template_mode
-      SketchWriter.new(template, @param)
+      main_file = File.basename(path, '.rb') # allow uneeded extension input
+      writer = SketchWriter.new(main_file)
+      @width = args[0]
+      @height = args[1]
+      @mode = args[2].upcase unless args[2].nil?
+      template = @mode.nil? ? basic_template : basic_template_mode
+      writer.save(template)
     end
   end
 
   # This class creates class wrapped sketches, with an optional render mode
   class ClassSketch < Creator
-
     def class_template
-%(
-class <%=@name%> < Processing::App
-  def setup
-    size <%=@width%>, <%=@height%>
-  end
-
-  def draw
-
-  end
-end
-
-# <%=@name%>.new(x: 20, y: 20)
-)
+      format(CLASS_BASIC, @name, @width, @height)
     end
 
     def class_template_mode
-%(
-class <%=@name%> < Processing::App
-  def setup
-    size <%=@width%>, <%=@height%>, <%=@mode%>
-  end
-
-  def draw
-
-  end
-end
-
-# <%=@name%>.new(x: 20, y: 20)
-)
+      format(CLASS_MODE, @name, @width, @height, @mode)
     end
-    # Create a bare blank sketch, given a path.
+    # Create a class wrapped sketch, given a path.
     def create!(path, args)
       return usage if /\?/ =~ path || /--help/ =~ path
-      main_file = File.basename(path, '.rb')
+      main_file = File.basename(path, '.rb') # allow uneeded extension input
       # Check to make sure that the main file doesn't exist already
       already_exist(path)
-      @param = {
-        name: main_file.camelize,
-        file_name: "#{File.dirname(path)}/#{path.underscore}.rb",
-        title: main_file.titleize,
-        width: args[0],
-        height: args[1],
-        mode: args[2]
-      }
-      @with_size = @param[:width] && @param[:width].match(ALL_DIGITS) &&
-        @param[:height] && @param[:height].match(ALL_DIGITS)
-      template = @param[:mode].nil? ? class_template : class_template_mode
-      SketchWriter.new(template, @param)
+      @name = main_file.camelize
+      writer = SketchWriter.new(main_file)
+      @title = main_file.titleize
+      @width, @height = args[0], args[1]
+      @mode = args[2].upcase unless args[2].nil?
+      template = @mode.nil? ? class_template : class_template_mode
+      writer.save(template)
     end
   end
 
-  # This class creates a ruby-processing class that mimics java inner class
+  # This class creates a pseudo 'java inner class' of the sketch
   class Inner < Creator
     def inner_class_template
-%(
-class <%=@name%>
-  include Processing::Proxy
-
-end
-)
+      format(INNER, @name)
     end
-    # Create a blank sketch, given a path.
+    # Create a pseudo inner class, given a path.
     def create!(path, _args_)
       return usage if /\?/ =~ path || /--help/ =~ path
-      main_file = File.basename(path, '.rb')
+      main_file = File.basename(path, '.rb') # allow uneeded extension input
       # Check to make sure that the main file doesn't exist already
       already_exist(path)
-      @param = {
-        name: main_file.camelize,
-        file_name: "#{File.dirname(path)}/#{path.underscore}.rb",
-        title: main_file.titleize
-      }
-      SketchWriter.new(inner_class_template, @param)
+      @name = main_file.camelize
+      writer = SketchWriter.new(main_file)
+      template = inner_class_template
+      writer.save(template)
     end
   end
 end

data/lib/ruby-processing/helper_methods.rb

@@ -1,4 +1,5 @@
 module Processing
+  # Provides some convenience methods available in vanilla processing
   module HelperMethods
     # processings epsilon may not be defined yet
     EPSILON ||= 1.0e-04
@@ -100,16 +101,9 @@ module Processing
     def dist(*args)
       len = args.length
       if len == 4
-        dx = args[0] - args[2]
-        dy = args[1] - args[3]
-        return 0 if dx.abs < EPSILON && dy.abs < EPSILON
-        return Math.hypot(dx, dy)
+        return dist2d(*args)
       elsif len == 6
-        dx = args[0] - args[3]
-        dy = args[1] - args[4]
-        dz = args[2] - args[5]
-        return 0 if dx.abs < EPSILON && dy.abs < EPSILON && dz.abs < EPSILON
-        return Math.sqrt(dx * dx + dy * dy + dz * dz)
+        return dist3d(*args)
       end
       fail ArgumentError, 'takes 4 or 6 parameters'
     end
@@ -205,5 +199,22 @@ module Processing
     def key_pressed?
       @declared_fields['keyPressed'].value(java_self)
     end
+
+    private
+
+    def dist2d(*args)
+      dx = args[0] - args[2]
+      dy = args[1] - args[3]
+      return 0 if dx.abs < EPSILON && dy.abs < EPSILON
+      Math.hypot(dx, dy)
+    end
+
+    def dist3d(*args)
+      dx = args[0] - args[3]
+      dy = args[1] - args[4]
+      dz = args[2] - args[5]
+      return 0 if dx.abs < EPSILON && dy.abs < EPSILON && dz.abs < EPSILON
+      Math.sqrt(dx * dx + dy * dy + dz * dz)
+    end
   end
-end
+end

data/lib/ruby-processing/library_loader.rb

@@ -138,15 +138,15 @@ module Processing
             sketchbook_paths << spath
           end
         end
-        unless preferences_paths.empty?
+        if preferences_paths.empty?
+          sketchbook_path = sketchbook_paths.first
+        else
           lines = File.readlines(preferences_paths.first)
-          regex1=/^sketchbook\.path=(.+)/           # processing-2.0
-          regex2=/^sketchbook\.path\.three=(.+)/    # processing-3.0
+          regex1 = /^sketchbook\.path=(.+)/           # processing-2.0
+          regex2 = /^sketchbook\.path\.three=(.+)/    # processing-3.0
           matched_lines = lines.grep(regex1) { $1 } unless $1 == ''
           matched_lines = lines.grep(regex2) { $1 } unless $1 == ''
           sketchbook_path = matched_lines.first
-        else
-          sketchbook_path = sketchbook_paths.first
         end
         return sketchbook_path
       end

data/lib/ruby-processing/runner.rb

@@ -71,6 +71,7 @@ module Processing
       when 'app'    then app(@options.path)
       when 'setup'  then setup(@options.path)
       when /-v/     then show_version
+      when /-h/     then show_help
       else
         show_help
       end
@@ -93,11 +94,8 @@ module Processing
     def create(sketch, args)
       require_relative '../ruby-processing/exporters/creator'
       return Processing::Inner.new.create!(sketch, args) if @options.inner
-      if @options.wrap
-        Processing::ClassSketch.new.create!(sketch, args)
-      else
-        Processing::BasicSketch.new.create!(sketch, args)
-      end
+      return Processing::ClassSketch.new.create!(sketch, args) if @options.wrap
+      Processing::BasicSketch.new.create!(sketch, args)
     end
 
     # Just simply run a ruby-processing sketch.
@@ -216,19 +214,18 @@ module Processing
       args.map! { |arg| "-J#{arg}" } unless @options.nojruby
       args
     end
+    
+    # NB: we really do require 'and' not '&&' to get message returned
 
     def ensure_exists(sketch)
-      puts "Couldn't find: #{sketch}" && exit unless File.exist?(sketch)
+      puts "Couldn't find: #{sketch}" and exit unless File.exist?(sketch)
     end
 
     def jruby_complete
       rcomplete = File.join(RP5_ROOT, 'lib/ruby/jruby-complete.jar')
-      if File.exist?(rcomplete)
-        return rcomplete
-      else
-        warn "#{rcomplete} does not exist\nTry running `rp5 setup install`"
-        exit
-      end
+      return rcomplete if File.exist?(rcomplete)
+      warn "#{rcomplete} does not exist\nTry running `rp5 setup install`"
+      exit
     end
 
     def host_os
@@ -247,9 +244,10 @@ module Processing
     # Optimistically set processing root
     def set_processing_root
       require 'psych'
+      @os ||= host_os
       data = {}
       path = File.expand_path("#{ENV['HOME']}/.rp5rc")
-      if host_os == :mac
+      if os == :mac
         data['PROCESSING_ROOT'] = '/Applications/Processing.app/Contents/Java'
       else
         root = "#{ENV['HOME']}/processing-2.2.1"
@@ -261,8 +259,9 @@ module Processing
 
     # On the Mac, we can display a fat, shiny ruby in the Dock.
     def dock_icon
+      @os ||= host_os
       icon = []
-      if host_os == :mac
+      if os == :mac
         icon << '-Xdock:name=Ruby-Processing'
         icon << "-Xdock:icon=#{RP5_ROOT}/lib/templates/application/Contents/Resources/sketch.icns"
       end

data/lib/ruby-processing/runners/base.rb

@@ -8,17 +8,19 @@ require_relative '../../ruby-processing/app'
 
 module Processing
   # For use with "bare" sketches that don't want to define a class or methods
-  SKETCH_TEMPLATE = <<-EOS
+  BARE_TEMPLATE = <<-EOS
   class Sketch < Processing::App
-  <% if has_methods %>
-  <%= source %>
-  <% else %>
-  def setup
-  size(DEFAULT_WIDTH, DEFAULT_HEIGHT, JAVA2D)
-  <%= source %>
-  no_loop
+    %s
   end
-  <% end %>
+  EOS
+
+  NAKED_TEMPLATE = <<-EOS
+  class Sketch < Processing::App
+    def setup
+      size(DEFAULT_WIDTH, DEFAULT_HEIGHT)
+      %s
+      no_loop
+    end
   end
   EOS
 
@@ -28,15 +30,14 @@ module Processing
     has_sketch = !source.match(/^[^#]*< Processing::App/).nil?
     has_methods = !source.match(/^[^#]*(def\s+setup|def\s+draw)/).nil?
 
-    if has_sketch
-      load File.join(SKETCH_ROOT, SKETCH_PATH)
-      Processing::App.sketch_class.new unless $app
+    return load File.join(SKETCH_ROOT, SKETCH_PATH) if has_sketch
+    if has_methods
+      code = format(BARE_TEMPLATE, source)
     else
-      require 'erb'
-      code = ERB.new(SKETCH_TEMPLATE).result(binding)
-      Object.class_eval code, SKETCH_PATH, -1
-      Processing::App.sketch_class.new
+      code = format(NAKED_TEMPLATE, source)
     end
+    Object.class_eval code, SKETCH_PATH, -1
+    Processing::App.sketch_class.new
   end
 
   # Read in the sketch source code. Needs to work both online and offline.

data/lib/ruby-processing/version.rb

@@ -1,3 +1,3 @@
 module RubyProcessing
-  VERSION = '2.6.4'
+  VERSION = '2.6.5'
 end

data/vendors/Rakefile

@@ -8,8 +8,8 @@ WARNING = <<-EOS
       
 EOS
 
-JRUBYC_VERSION     = '1.7.16.1'
-EXAMPLES           = '1.0'
+JRUBYC_VERSION     = '1.7.16.2'
+EXAMPLES           = '1.1'
 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_sha1("jruby-complete-#{JRUBYC_VERSION}.jar", "b76682bd0966a31dab60dc5e275d8b28ac17c38f")
+  check_sha1("jruby-complete-#{JRUBYC_VERSION}.jar", "5cf4c6eb55a361137face9cd0cdc6980d772809e")
 end
 
 directory "../lib/ruby"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-processing
 version: !ruby/object:Gem::Version
-  version: 2.6.4
+  version: 2.6.5
 platform: ruby
 authors:
 - Jeremy Ashkenas
@@ -15,65 +15,65 @@ authors:
 - Juris Galang
 - Guillaume Pierronnet
 - Martin Prout
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-10-29 00:00:00.000000000 Z
+date: 2014-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-  type: :development
+  name: bundler
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.3'
-  type: :development
+  name: rake
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.3'
 - !ruby/object:Gem::Dependency
-  name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
-  type: :development
+  name: rake-compiler
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '5.3'
-  type: :development
+  name: minitest
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '5.3'
 description: |2+
@@ -104,7 +104,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/rp5
-- lib/rpextras.jar
 - lib/ruby-processing.rb
 - lib/ruby-processing/app.rb
 - lib/ruby-processing/config.rb
@@ -139,32 +138,32 @@ files:
 - library/file_chooser/file_chooser.rb
 - library/vecmath/vecmath.rb
 - vendors/Rakefile
+- lib/rpextras.jar
 homepage: http://wiki.github.com/jashkenas/ruby-processing
 licenses:
 - MIT
 metadata: {}
-post_install_message: Use 'rp5 setup install' to install jruby-complete, and 'rp5
-  setup check' to check config.
+post_install_message: Use 'rp5 setup install' to install jruby-complete, and 'rp5 setup check' to check config.
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - A decent graphics card
 - java runtime >= 1.7+
 - processing = 2.2.1+
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.1.9
+signing_key:
 specification_version: 4
 summary: Code as Art, Art as Code. Processing and Ruby are meant for each other.
 test_files: []