jruby_art 0.2.6.pre → 0.3.0.pre

data/lib/jruby_art/runners/base.rb

@@ -0,0 +1,51 @@
+# -*- encoding : utf-8 -*-
+
+SKETCH_PATH ||= ARGV.shift
+SKETCH_ROOT ||= File.dirname(SKETCH_PATH)
+
+require_relative '../../jruby_art'
+require_relative '../../jruby_art/app'
+
+# More processing module
+module Processing
+  # For use with "bare" sketches that don't want to define a class or methods
+  BARE_WRAP = <<-EOS
+  class Sketch < Processing::App
+    %s
+  end
+  EOS
+
+  NAKED_WRAP = <<-EOS
+  class Sketch < Processing::App
+    def setup
+      sketch_title 'Naked Sketch'
+      %s
+      no_loop
+    end
+
+    def settings
+      size(DEFAULT_WIDTH, DEFAULT_HEIGHT)
+    end
+  end
+  EOS
+
+  # This method is the common entry point to run a sketch, bare or complete.
+  def self.load_and_run_sketch
+    source = read_sketch_source
+    wrapped = !source.match(/^[^#]*< Processing::App/).nil?
+    no_methods = source.match(/^[^#]*(def\s+setup|def\s+draw)/).nil?
+    if wrapped
+      load SKETCH_PATH
+      Processing::App.sketch_class.new unless $app
+      return
+    end
+    code = no_methods ? format(NAKED_WRAP, source) : format(BARE_WRAP, source)
+    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.
+  def self.read_sketch_source
+    File.read(SKETCH_PATH)
+  end
+end

data/lib/jruby_art/runners/run.rb

@@ -0,0 +1,6 @@
+# TODO: this is crud. Windows applets are having serious
+# trouble with absolute paths.
+
+require_relative '../runners/base'
+
+Processing.load_and_run_sketch

data/lib/jruby_art/runners/watch.rb

@@ -0,0 +1,59 @@
+require_relative '../runners/base'
+
+module Processing
+  # A sketch loader, observer, and reloader, to tighten
+  # the feedback between code and effect.
+  class Watcher
+    # Sic a new Processing::Watcher on the sketch
+    SLEEP_TIME = 0.2
+    def initialize
+      reload_files_to_watch
+      @time = Time.now
+      start_watching
+    end
+
+    # Kicks off a thread to watch the sketch, reloading Ruby-Processing
+    # and restarting the sketch whenever it changes.
+    def start_watching
+      start_runner
+      Kernel.loop do
+        if @files.find { |file| FileTest.exist?(file) && File.stat(file).mtime > @time }
+          puts 'reloading sketch...'
+          $app && $app.close
+          java.lang.System.gc
+          @time = Time.now
+          start_runner
+          reload_files_to_watch
+        end
+        sleep SLEEP_TIME
+      end
+    end
+
+    # Convenience function to report errors when loading and running a sketch,
+    # instead of having them eaten by the thread they are loaded in.
+    def report_errors
+      yield
+    rescue Exception => e
+      wformat = 'Exception occured while running sketch %s...'
+      tformat = "Backtrace:\n\t%s"
+      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
+      @runner = Thread.start do
+        report_errors do
+          Processing.load_and_run_sketch
+        end
+      end
+    end
+
+    def reload_files_to_watch
+      @files = Dir.glob(File.join(SKETCH_ROOT, '**/*.{rb,glsl}'))
+    end
+  end
+end
+
+Processing::Watcher.new

data/lib/jruby_art/version.rb

@@ -1,4 +1,3 @@
-# The sole purpose of this module is to provide a name-space for version
 module JRubyArt
-  VERSION = '0.2.6.pre'
+  VERSION = '0.3.0.pre'
 end

data/library/library_proxy/README.md

@@ -0,0 +1,97 @@
+### Using the LibraryProxy in your sketches
+In the sketch you should `load_library :library_proxy` and your library class should inherit 
+from LibraryProxy and implement pre(), draw() and post() methods (can be empty method if not 
+required). For simplicity initialize your `processing library` in the sketch `setup`.
+
+### Example library
+
+```ruby
+require 'forwardable'
+
+# A custom Array created using forwardable (that can also access the PApplet pre,
+# post and draw loops by extending our new LibraryProxy class. Also has access
+# to custom background(int), fill(int) and stroke(int) methods.
+class CustomArray < LibraryProxy
+  extend Forwardable
+  def_delegators(:@objs, :each, :<<)
+  include Enumerable
+
+  attr_reader :app
+
+  # We must initialize class with the PApplet instance
+  def initialize(app)
+    @app = app
+    @objs = []
+  end
+
+  def add_object(mx, my, x, y, speed)
+    self << Particle.new(x.to_i, y.to_i, mx, my, Sketch::UNIT, speed, 1, 1)
+  end
+
+  # Access the processing post loop (gets called after draw)
+  def post
+    each do |obj|
+      update_x obj
+      next unless obj.y >= Sketch::UNIT || obj.x <= 0
+      obj.ydir *= -1
+      obj.y += obj.ydir
+    end
+  end
+
+  def update_x(obj)
+    obj.x += obj.speed * obj.xdir
+    return if (0..Sketch::UNIT).cover? obj.x
+    obj.xdir *= -1
+    obj.x += obj.xdir
+    obj.y += obj.ydir
+  end
+
+  # We need this to fulfill the contract of implementing abstract methods of
+  # LibraryProxy which is an alias for Java::ProcessingCore::AbstractLibrary
+  def pre
+  end
+
+  # Access the processing draw loop here, using our custom background and fill
+  # note: use of 'app' to access ellipse functionality as would otherwise be
+  # required for background and fill
+  def draw
+    background(0)
+    fill(255)
+    each do |obj|
+      app.ellipse(obj.mx + obj.x, obj.my + obj.y, 6, 6)
+    end
+  end
+end
+
+# The Particle object
+
+Particle = Struct.new(:x, :y, :mx, :my, :size, :speed, :xdir, :ydir)
+```
+### Example sketch
+
+```ruby
+# A minimalist sketch that demonstrates a possible approach to creating a custom
+# array of objects using forwardable. Also demonstrates how to use LibraryProxy.
+
+load_library :library_proxy     # loads the JRubyArt LibraryProxy abstract class
+require_relative 'custom_array' # loads our custom 'library' class
+
+UNIT = 40
+
+def setup
+  size 640, 360
+  wide_count = width / UNIT
+  height_count = height / UNIT
+  custom_array = CustomArray.new(self)
+  height_count.times do |i|
+    wide_count.times do |j|
+      custom_array.add_object(j * UNIT, i * UNIT, UNIT / 2, UNIT / 2, rand(0.05..0.8))
+    end
+  end
+  no_stroke
+end
+
+# does nothing here see custom_array.rb
+def draw
+end
+```

data/library/library_proxy/library_proxy.rb

@@ -1,3 +1,10 @@
-require 'rpextras'
+# require 'rpextras'
 
 LibraryProxy = Java::ProcessingCore::AbstractLibrary
+
+# classes that inherit from Library are expected to implement
+# the abstract methods of processing.core.AbstractLibrary
+# def pre...
+# def draw...
+# def post...
+# NOOP is fine...

data/library/video_event/video_event.rb

@@ -0,0 +1,4 @@
+
+class Processing::App
+  include Java::ProcessingCore::VideoInterface
+end

data/vendors/Rakefile

@@ -1,56 +1,33 @@
 require 'rake/clean'
-require 'rbconfig'
 
 WARNING = <<-EOS 
-   WARNING: you may not have curl installed, you could just download
-   the correct version of jruby-complete and/or examples to the vendors 
-   folder, and re-run k9 setup install instead of installing curl. Some 
-   systems may also require 'sudo' access to install jruby-complete, 
-   NB: this is untested....
+   WARNING: you may not have wget installed, you could just download
+   the correct version of jruby-complete to the vendors folder, and 
+   re-run k9 setup install instead of installing wget. Some systems
+   may also require 'sudo' access to install, NB: this is untested....
       
 EOS
 
-JRUBYC_VERSION      = '1.7.20'
-EXAMPLES                    = '0.0.6-pre'
+JRUBYC_VERSION     = '9.0.0.0.rc1'
+EXAMPLES           = '0.2'
 HOME_DIR = ENV['HOME']
 MAC_OR_LINUX = /linux|mac|darwin/ =~ RbConfig::CONFIG['host_os'] 
-CLOBBER.include("jruby-complete-#{JRUBYC_VERSION}.jar", "#{EXAMPLES}.tar.gz", "video.zip")
 
-desc "download, and copy to ruby-processing"
-task :default => [:install_ruby, :install_video, :config, :install_examples]
-
-desc "install jruby"
-task :install_ruby => [:download, :copy_ruby]
-
-desc "install video library"
-task :install_video => [:download_video, :copy_video]
-
-
-desc "install examples"
-task :install_examples => [:download_examples, :copy_examples]
+CLOBBER.include("jruby-complete-#{JRUBYC_VERSION}.jar")
 
+desc "download, and copy to jruby_art"
+task :default => [:download, :copy_ruby]
 
 desc "download JRuby upstream sources"
 task :download => ["jruby-complete-#{JRUBYC_VERSION}.jar"]
 
 file "jruby-complete-#{JRUBYC_VERSION}.jar" do
   begin
-    sh "curl -O https://s3.amazonaws.com/jruby.org/downloads/#{JRUBYC_VERSION}/jruby-complete-#{JRUBYC_VERSION}.jar"    
-  rescue
-    warn(WARNING)
-  end
-  check_sha1("jruby-complete-#{JRUBYC_VERSION}.jar", "0f784b3d9d760b80b2f9d78ede80ee1d8d85e786")
-end
-
-desc "download processing video-library"
-task :download_video => ["video.zip"]
-
-file "video.zip" do
-  begin
-    sh "curl -O https://github.com/processing/processing-video/releases/download/latest/video.zip"    
+    sh "wget https://s3.amazonaws.com/jruby.org/downloads/#{JRUBYC_VERSION}/jruby-complete-#{JRUBYC_VERSION}.jar"    
   rescue
     warn(WARNING)
   end
+  check_sha1("jruby-complete-#{JRUBYC_VERSION}.jar", "18dac3f000fe8814cd2fb7708e32612f17c28edf")
 end
 
 directory "../lib/ruby"
@@ -60,10 +37,21 @@ task :copy_ruby => ["../lib/ruby"] do
   sh "cp -v jruby-complete-#{JRUBYC_VERSION}.jar ../lib/ruby/jruby-complete.jar"
 end
 
-desc "download, and copy to JRubyArt"
-task :unpack_samples => [:download_examples, :copy_examples]
-
+def check_sha1(filename, expected_hash)
+  require "digest/sha1"
+  sha1 = Digest::SHA1.new
+  File.open(filename, "r") do |f|
+    while buf = f.read(4096)
+      sha1.update(buf)
+    end
+  end
+  if sha1.hexdigest != expected_hash
+    raise "bad sha1 checksum for #{filename} (expected #{expected_hash} got #{sha1.hexdigest})"
+  end
+end
 
+desc "download, and copy to jruby_art"
+task :unpack_samples => [:download_examples, :copy_examples]
 
 desc 'download and copy examples to user home'
 task :download_examples
@@ -71,56 +59,23 @@ file_name = (MAC_OR_LINUX.nil?) ? "#{EXAMPLES}.zip" : "#{EXAMPLES}.tar.gz"
 file file_name do
   begin
     if MAC_OR_LINUX.nil?
-      sh "curl -Lo examples.zip https://github.com/ruby-processing/JRubyArt-examples/archive/#{EXAMPLES}.zip"
+      sh "wget https://github.com/ruby-processing/samples4ruby-processing3/archive/#{EXAMPLES}.zip"
     else
-      sh "curl -Lo examples.tar.gz https://github.com/ruby-processing/JRubyArt-examples/archive/#{EXAMPLES}.tar.gz"
+      sh "wget https://github.com/ruby-processing/samples4ruby-processing3/archive/#{EXAMPLES}.tar.gz"
     end
   rescue
     warn(WARNING)
   end
 end
 
-
-
-desc "copy video library"
-
-task :copy_video => ["../library/video/lib"] do  
-  sh "unzip video.zip"
-  Dir["video/library/*.jar"].each do |f|
-    sh "cp #{f} ../library/video/lib"
-  end
-  sh "cp -r video/library/windows32 ../library/video/lib" 
-  sh "cp -r video/library/windows64 ../library/video/lib"
-  sh "cp -r video/library/macosx64 ../library/video/lib" 
-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" 
+    sh "tar xzvf #{EXAMPLES}.tar.gz" 
   end
-  sh "cp -r JRubyArt-examples-#{EXAMPLES} #{HOME_DIR}/examples"  
-  sh "rm -r JRubyArt-examples-#{EXAMPLES}"     
-end
-
-desc "config"
-task :config => file_name do
-  next if FileTest.exist?("#{HOME_DIR}/.jruby_art/config.yml")
-  sh "tar xzvf config.tar.gz"
-  sh "cp -r .jruby_art #{HOME_DIR}"
-end  
-
-def check_sha1(filename, expected_hash)
-  require "digest/sha1"
-  sha1 = Digest::SHA1.new
-  File.open(filename, "r") do |f|
-    while buf = f.read(4096)
-      sha1.update(buf)
-    end
-  end
-  if sha1.hexdigest != expected_hash
-    raise "bad sha1 checksum for #{filename} (expected #{expected_hash} got #{sha1.hexdigest})"
-  end
-end
+  sh "rm -r #{HOME_DIR}/k9_samples" if File.exist? "#{HOME_DIR}/k9_samples"
+  sh "cp -r samples4ruby-processing3-#{EXAMPLES} #{HOME_DIR}/k9_samples"  
+  sh "rm -r samples4ruby-processing3-#{EXAMPLvim lib/jruby_art/version.rb
+                                       clean Xfn.pre

metadata

@@ -1,43 +1,45 @@
 --- !ruby/object:Gem::Specification
 name: jruby_art
 version: !ruby/object:Gem::Version
-  version: 0.2.6.pre
+  version: 0.3.0.pre
 platform: ruby
 authors:
+- Jeremy Ashkenas
+- Guillaume Pierronnet
 - Martin Prout
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-06-04 00:00:00.000000000 Z
+date: 2015-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '10.4'
-  name: rake
+        version: '1.3'
+  name: bundler
   prerelease: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.2'
-  name: rspec
+        version: '10.3'
+  name: rake
   prerelease: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '10.3'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -52,80 +54,71 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
-description: A ruby wrapper for processing, that doesn't require a separate install of processing
-email: mamba2928@yahoo.co.uk
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '5.3'
+  name: minitest
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '5.3'
+description: |2
+    JRubyArt is a ruby wrapper for the processing art framework.
+    The current version supports processing-3.0a10, and uses jruby-9.0.0.0.rc2
+    as the glue between ruby and java. You can use both processing libraries and ruby
+    gems in your sketches. Features create/run/watch modes. The "watch" mode,
+    provides a nice REPL-ish way to work on your processing sketches. Includes:-
+    A "Control Panel" library, so that you can easily create sliders, buttons,
+    checkboxes and drop-down menus, and hook them into your sketch's instance
+    variables and hundreds of worked examples to get you started...
+email: martin_p@lineone.net
 executables:
 - k9
 extensions: []
-extra_rdoc_files:
-- README.md
-- LICENSE.md
-- CHANGELOG.md
+extra_rdoc_files: []
 files:
-- LICENSE.md
-- README.md
-- Rakefile
-- CHANGELOG.md
 - bin/k9
-- lib/gluegen-rt.jar
-- lib/rpextras.jar
-- lib/gluegen-rt-natives-windows-i586.jar
-- lib/gluegen-rt-natives-linux-armv6hf.jar
-- lib/jogl-all.jar
-- lib/jogl-all-natives-windows-i586.jar
-- lib/jogl-all-natives-linux-armv6hf.jar
 - lib/jruby_art.rb
-- lib/gluegen-rt-natives-linux-amd64.jar
-- lib/gluegen-rt-natives-linux-i586.jar
-- lib/gluegen-rt-natives-windows-amd64.jar
-- lib/jogl-all-natives-linux-amd64.jar
-- lib/jogl-all-natives-macosx-universal.jar
-- lib/gluegen-rt-natives-macosx-universal.jar
-- lib/jogl-all-natives-windows-amd64.jar
-- lib/core.jar
-- lib/jogl-all-natives-linux-i586.jar
-- lib/jruby_art/creator.rb
-- lib/jruby_art/library_loader.rb
-- lib/jruby_art/writer.rb
+- lib/jruby_art/app.rb
 - lib/jruby_art/config.rb
-- lib/jruby_art/runner.rb
+- lib/jruby_art/creators/creator.rb
 - lib/jruby_art/helper_methods.rb
-- lib/jruby_art/app.rb
-- lib/jruby_art/version.rb
-- lib/jruby_art/parse.rb
-- lib/jruby_art/helpers/string_extra.rb
 - lib/jruby_art/helpers/camel_string.rb
 - lib/jruby_art/helpers/numeric.rb
 - lib/jruby_art/helpers/range.rb
-- library/video/video.rb
-- library/video/lib/export.txt
-- library/video/lib/macosx64.txt
-- library/video/lib/windows.txt
-- library/grammar/grammar.rb
+- lib/jruby_art/helpers/string_extra.rb
+- lib/jruby_art/library_loader.rb
+- lib/jruby_art/runner.rb
+- lib/jruby_art/runners/base.rb
+- lib/jruby_art/runners/run.rb
+- lib/jruby_art/runners/watch.rb
+- lib/jruby_art/version.rb
+- library/boids/boids.rb
 - library/control_panel/control_panel.rb
+- library/library_proxy/README.md
 - library/library_proxy/library_proxy.rb
-- library/boids/boids.rb
-- library/file_chooser/file_chooser.rb
-- spec/library_loader_spec.rb
-- spec/vecmath_spec.rb
-- spec/spec_helper.rb
-- spec/app_spec.rb
-- spec/deglut_spec.rb
+- library/video_event/video_event.rb
 - vendors/Rakefile
-- vendors/config.tar.gz
+- lib/rpextras.jar
 homepage: https://github.com/ruby-processing/JRubyArt
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: Use 'k9 setup install' to install jruby-complete, and 'k9 setup check' to check config.
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ~>
+  - - '>='
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>'
@@ -133,10 +126,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements:
 - A decent graphics card
-- java runtime >= 1.7+
+- java runtime >= 1.8+
+- processing = 3.0a10+
 rubyforge_project:
 rubygems_version: 2.1.9
 signing_key:
 specification_version: 4
-summary: Ruby processing development branch
+summary: Code as Art, Art as Code. Processing and Ruby are meant for each other.
 test_files: []