Merge pull request #1 from ruby-processing/optparse

monkstone · web-flow · commit d1b9eead79c2 · 2016-07-20T06:43:41.000+01:00
Optparse
diff --git a/README.md b/README.md
@@ -1,7 +1,9 @@
-# JRubyArt-examples for JRubyArt-1.1+
+# JRubyArt-examples for JRubyArt-1.2.0.pre
 JRubyArt-examples
 ================
 
+Rakefiles amended to use `-r` in place of `run`
+
 Many of the vanilla processing example sketches have been translated to ruby-processing, and they are mainly written as 'bare' sketches (ie not class wrapped) in keeping with the original processing.  At runtime these sketches the get wrapped into a Sketch class. Should you prefer you can still write class wrapped sketches, these will work equally well with jruby_art. You should also checkout the [Nature of Code Examples in ruby][] and for the beginner [Learning Processing with Ruby][] for even more examples.
 Includes autorun Rakefiles:-
 
diff --git a/contributed/Rakefile b/contributed/Rakefile
@@ -22,7 +22,7 @@ end
 
 def run_sample(sample_name)
   puts "Running #{sample_name}...quit to run next sample"
-  open("|k9 run #{sample_name}", 'r') do |io|
+  open("|k9 -r #{sample_name}", 'r') do |io|
     while l = io.gets
       puts(l.chop)
     end
diff --git a/external_library/gem/pbox2d/mouse_joint/boundary.rb b/external_library/gem/pbox2d/mouse_joint/boundary.rb
@@ -36,7 +36,7 @@ def display
     stroke(127)
     fill(127)
     stroke_weight(1)
-    rect_mode(Java::ProcessingCore::CENTER)
+    rect_mode(Java::ProcessingCore::PConstants::CENTER)
     a = b.get_angle
     push_matrix
     translate(x, y)
diff --git a/external_library/gem/pbox2d/mouse_joint/box.rb b/external_library/gem/pbox2d/mouse_joint/box.rb
@@ -1,7 +1,7 @@
 # The Nature of Code
 # Daniel Shiffman
 # http://natureofcode.com
-
+require 'forwardable'
 # A rectangular box
 class Box
   extend Forwardable
@@ -34,7 +34,7 @@ def display
     pos = box2d.body_coord(body)
     # Get its angle of rotation
     a = body.getAngle
-    rect_mode(Java::ProcessingCore::CENTER)
+    rect_mode(Java::ProcessingCore::PConstants::CENTER)
     push_matrix
     translate(pos.x, pos.y)
     rotate(a)
diff --git a/external_library/gem/pbox2d/mouse_joint/mouse_joint.rb b/external_library/gem/pbox2d/mouse_joint/mouse_joint.rb
@@ -9,13 +9,15 @@
 require_relative 'boundary'
 require_relative 'spring'
 require_relative 'dummy_spring'
-require 'forwardable'
 
 # A reference to our box2d world
 attr_reader :box2d, :boundaries, :box, :spring
+def settings
+  size(640, 360)
+end
 
 def setup
-  size(640, 360)
+  sketch_title('Mouse Joint')
   # Initialize box2d physics and create the world
   @box2d = Box2D.new self
   box2d.create_world
diff --git a/external_library/java/hype/Rakefile b/external_library/java/hype/Rakefile
@@ -22,7 +22,7 @@ end
 
 def run_sample(sample_name)
   puts "Running #{sample_name}...quit to run next sample"
-  open("|k9 run #{sample_name}", "r") do |io|
+  open("|k9 -r #{sample_name}", "r") do |io|
     while l = io.gets
       puts(l.chop) 
     end      
diff --git a/processing_app/basics/color/Rakefile b/processing_app/basics/color/Rakefile
@@ -22,7 +22,7 @@ end
 
 def run_sample(sample_name)
   puts "Running #{sample_name}...quit to run next sample"
-  open("|k9 run #{sample_name}", "r") do |io|
+  open("|k9 -r #{sample_name}", "r") do |io|
     while l = io.gets
       puts(l.chop) 
     end      
diff --git a/processing_app/basics/control/Rakefile b/processing_app/basics/control/Rakefile
@@ -22,7 +22,7 @@ end
 
 def run_sample(sample_name)
   puts "Running #{sample_name}...quit to run next sample"
-  open("|k9 run #{sample_name}", "r") do |io|
+  open("|k9 -r #{sample_name}", "r") do |io|
     while l = io.gets
       puts(l.chop) 
     end      
diff --git a/processing_app/basics/data/Rakefile b/processing_app/basics/data/Rakefile
@@ -22,7 +22,7 @@ end
 
 def run_sample(sample_name)
   puts "Running #{sample_name}...quit to run next sample"
-  open("|k9 run #{sample_name}", "r") do |io|
+  open("|k9 -r #{sample_name}", "r") do |io|
     while l = io.gets
       puts(l.chop) 
     end      
diff --git a/processing_app/basics/form/Rakefile b/processing_app/basics/form/Rakefile
@@ -22,7 +22,7 @@ end
 
 def run_sample(sample_name)
   puts "Running #{sample_name}...quit to run next sample"
-  open("|k9 run #{sample_name}", "r") do |io|
+  open("|k9 -r #{sample_name}", "r") do |io|
     while l = io.gets
       puts(l.chop) 
     end      
diff --git a/processing_app/basics/image/Rakefile b/processing_app/basics/image/Rakefile
@@ -22,7 +22,7 @@ end
 
 def run_sample(sample_name)
   puts "Running #{sample_name}...quit to run next sample"
-  open("|k9 --nojruby run #{sample_name}", "r") do |io|
+  open("|k9  run #{sample_name}", "r") do |io|
     while l = io.gets
       puts(l.chop) 
     end      
diff --git a/processing_app/basics/input/Rakefile b/processing_app/basics/input/Rakefile
@@ -22,7 +22,7 @@ end
 
 def run_sample(sample_name)
   puts "Running #{sample_name}...quit to run next sample"
-  open("|k9 run #{sample_name}", "r") do |io|
+  open("|k9 -r #{sample_name}", "r") do |io|
     while l = io.gets
       puts(l.chop) 
     end      
diff --git a/processing_app/basics/lights/Rakefile b/processing_app/basics/lights/Rakefile
@@ -22,7 +22,7 @@ end
 
 def run_sample(sample_name)
   puts "Running #{sample_name}...quit to run next sample"
-  open("|k9 run #{sample_name}", "r") do |io|
+  open("|k9 -r #{sample_name}", "r") do |io|
     while l = io.gets
       puts(l.chop) 
     end      
diff --git a/processing_app/basics/math/Rakefile b/processing_app/basics/math/Rakefile
@@ -22,7 +22,7 @@ end
 
 def run_sample(sample_name)
   puts "Running #{sample_name}...quit to run next sample"
-  open("|k9 run #{sample_name}", "r") do |io|
+  open("|k9 -r #{sample_name}", "r") do |io|
     while l = io.gets
       puts(l.chop) 
     end      
diff --git a/processing_app/basics/objects/Rakefile b/processing_app/basics/objects/Rakefile
@@ -22,7 +22,7 @@ end
 
 def run_sample(sample_name)
   puts "Running #{sample_name}...quit to run next sample"
-  open("|k9 run #{sample_name}", "r") do |io|
+  open("|k9 -r #{sample_name}", "r") do |io|
     while l = io.gets
       puts(l.chop) 
     end      
diff --git a/processing_app/basics/shape/Rakefile b/processing_app/basics/shape/Rakefile
@@ -22,7 +22,7 @@ end
 
 def run_sample(sample_name)
   puts "Running #{sample_name}...quit to run next sample"
-  open("|k9 run #{sample_name}", "r") do |io|
+  open("|k9 -r #{sample_name}", "r") do |io|
     while l = io.gets
       puts(l.chop) 
     end      
diff --git a/processing_app/basics/structure/Rakefile b/processing_app/basics/structure/Rakefile
@@ -22,7 +22,7 @@ end
 
 def run_sample(sample_name)
   puts "Running #{sample_name}...quit to run next sample"
-  open("|k9 run #{sample_name}", "r") do |io|
+  open("|k9 -r #{sample_name}", "r") do |io|
     while l = io.gets
       puts(l.chop) 
     end      
diff --git a/processing_app/basics/textures/Rakefile b/processing_app/basics/textures/Rakefile
@@ -22,7 +22,7 @@ end
 
 def run_sample(sample_name)
   puts "Running #{sample_name}...quit to run next sample"
-  open("|k9 run #{sample_name}", "r") do |io|
+  open("|k9 -r #{sample_name}", "r") do |io|
     while l = io.gets
       puts(l.chop) 
     end      
diff --git a/processing_app/basics/transform/Rakefile b/processing_app/basics/transform/Rakefile
@@ -22,7 +22,7 @@ end
 
 def run_sample(sample_name)
   puts "Running #{sample_name}...quit to run next sample"
-  open("|k9 run #{sample_name}", "r") do |io|
+  open("|k9 -r #{sample_name}", "r") do |io|
     while l = io.gets
       puts(l.chop) 
     end      
diff --git a/processing_app/basics/typography/Rakefile b/processing_app/basics/typography/Rakefile
@@ -22,7 +22,7 @@ end
 
 def run_sample(sample_name)
   puts "Running #{sample_name}...quit to run next sample"
-  open("|k9 run #{sample_name}", "r") do |io|
+  open("|k9 -r #{sample_name}", "r") do |io|
     while l = io.gets
       puts(l.chop) 
     end      
diff --git a/processing_app/basics/web/Rakefile b/processing_app/basics/web/Rakefile
@@ -22,7 +22,7 @@ end
 
 def run_sample(sample_name)
   puts "Running #{sample_name}...quit to run next sample"
-  open("|k9 run #{sample_name}", "r") do |io|
+  open("|k9 -r #{sample_name}", "r") do |io|
     while l = io.gets
       puts(l.chop) 
     end      
diff --git a/processing_app/demos/graphics/Rakefile b/processing_app/demos/graphics/Rakefile
@@ -1,5 +1,5 @@
 # Simple demo Rakefile to autorun samples in current directory
-# excludes planets.rb which needs --nojruby flag to run
+# excludes planets.rb which needs  flag to run
 # adjust path to rp5 executable, and or opts as required
 
 SAMPLES_DIR = './'
@@ -24,7 +24,7 @@ end
 
 def run_sample(sample_name)
   puts "Running #{sample_name}...quit to run next sample"
-  open("|k9 run #{sample_name}", 'r') do |io|
+  open("|k9 -r #{sample_name}", 'r') do |io|
     while l = io.gets
       puts(l.chop)
     end
diff --git a/processing_app/demos/performance/Rakefile b/processing_app/demos/performance/Rakefile
@@ -22,7 +22,7 @@ end
 
 def run_sample(sample_name)
   puts "Running #{sample_name}...quit to run next sample"
-  open("|k9 --nojruby run #{sample_name}", "r") do |io|
+  open("|k9  run #{sample_name}", "r") do |io|
     while l = io.gets
       puts(l.chop) 
     end      
diff --git a/processing_app/library/slider/Rakefile b/processing_app/library/slider/Rakefile
@@ -22,7 +22,7 @@ end
 
 def run_sample(sample_name)
   puts "Running #{sample_name}...quit to run next sample"
-  open("|k9 run #{sample_name}", 'r') do |io|
+  open("|k9 -r #{sample_name}", 'r') do |io|
     while l = io.gets
       puts(l.chop)
     end
diff --git a/processing_app/library/vecmath/arcball/Rakefile b/processing_app/library/vecmath/arcball/Rakefile
@@ -22,7 +22,7 @@ end
 
 def run_sample(sample_name)
   puts "Running #{sample_name}...quit to run next sample"
-  open("|k9 run #{sample_name}", 'r') do |io|
+  open("|k9 -r #{sample_name}", 'r') do |io|
     while l = io.gets
       puts(l.chop)
     end      
diff --git a/processing_app/library/vecmath/vec2d/Rakefile b/processing_app/library/vecmath/vec2d/Rakefile
@@ -22,7 +22,7 @@ end
 
 def run_sample(sample_name)
   puts "Running #{sample_name}...quit to run next sample"
-  open("|k9 run #{sample_name}", 'r') do |io|
+  open("|k9 -r #{sample_name}", 'r') do |io|
     while l = io.gets
       puts(l.chop)
     end      
diff --git a/processing_app/library/vecmath/vec3d/Rakefile b/processing_app/library/vecmath/vec3d/Rakefile
@@ -22,7 +22,7 @@ end
 
 def run_sample(sample_name)
   puts "Running #{sample_name}...quit to run next sample"
-  open("|k9 run #{sample_name}", 'r') do |io|
+  open("|k9 -r #{sample_name}", 'r') do |io|
     while l = io.gets
       puts(l.chop)
     end      
diff --git a/processing_app/topics/advanced_data/Rakefile b/processing_app/topics/advanced_data/Rakefile
@@ -22,7 +22,7 @@ end
 
 def run_sample(sample_name)
   puts "Running #{sample_name}...quit to run next sample"
-  open("|rp5 --nojruby run #{sample_name}", 'r') do |io|
+  open("|rp5  run #{sample_name}", 'r') do |io|
     while l = io.gets
       puts(l.chop)
     end
diff --git a/processing_app/topics/advanced_shader/Rakefile b/processing_app/topics/advanced_shader/Rakefile
@@ -22,7 +22,7 @@ end
 
 def run_sample(sample_name)
   puts "Running #{sample_name}...quit to run next sample"
-  open("|k9 --nojruby run #{sample_name}", "r") do |io|
+  open("|k9  run #{sample_name}", "r") do |io|
     while l = io.gets
       puts(l.chop) 
     end      
diff --git a/processing_app/topics/image_processing/Rakefile b/processing_app/topics/image_processing/Rakefile
@@ -22,7 +22,7 @@ end
 
 def run_sample(sample_name)
   puts "Running #{sample_name}...quit to run next sample"
-  open("|k9 run #{sample_name}", 'r') do |io|
+  open("|k9 -r #{sample_name}", 'r') do |io|
     while l = io.gets
       puts(l.chop)
     end
diff --git a/processing_app/topics/lsystems/Rakefile b/processing_app/topics/lsystems/Rakefile
@@ -18,7 +18,7 @@ end
 
 def run_sample(sample_name)
   puts format('Running %s...quit to run next sample', sample_name)
-  open("|k9 run #{sample_name}", 'r') do |io|
+  open("|k9 -r #{sample_name}", 'r') do |io|
     while l = io.gets
       puts(l.chop)
     end
diff --git a/processing_app/topics/shaders/Rakefile b/processing_app/topics/shaders/Rakefile
@@ -22,7 +22,7 @@ end
 
 def run_sample(sample_name)
   puts "Running #{sample_name}...quit to run next sample"
-  open("|k9 --nojruby run #{sample_name}", "r") do |io|
+  open("|k9  run #{sample_name}", "r") do |io|
     while l = io.gets
       puts(l.chop) 
     end      
diff --git a/processing_app/topics/shaders/image_filtering/Rakefile b/processing_app/topics/shaders/image_filtering/Rakefile
@@ -22,7 +22,7 @@ end
 
 def run_sample(sample_name)
   puts "Running #{sample_name}...quit to run next sample"
-  open("|k9 run #{sample_name}", "r") do |io|
+  open("|k9 -r #{sample_name}", "r") do |io|
     while l = io.gets
       puts(l.chop) 
     end      
diff --git a/processing_app/topics/shaders/video_filtering/Rakefile b/processing_app/topics/shaders/video_filtering/Rakefile
@@ -22,7 +22,7 @@ end
 
 def run_sample(sample_name)
   puts "Running #{sample_name}...quit to run next sample"
-  open("|k9 run #{sample_name}", "r") do |io|
+  open("|k9 -r #{sample_name}", "r") do |io|
     while l = io.gets
       puts(l.chop) 
     end      
