Merge pull request #24 from ruby-processing/master

Update to version 1.2.6 as stable

Author: monkstone

.github/CONTRIBUTING.md

@@ -4,7 +4,7 @@ In the spirit of [free software][free-sw], **everyone** is encouraged to help im
 Here are some ways *you* can contribute:
 
 * by reporting bugs
-* by suggesting/implementing new features ( _export to ruboto would be cool_ )
+* by suggesting/implementing new features ( _running sketches from the atom editor would be cool_ )
 * by writing or editing documentation ( _expert Windows users could help write install instructions_ )
 * by contributing examples ( _show your creativity, or translate someone elses masterpiece_ )
 * by refactoring examples to be more rubyfied

.mvn/extensions.xml

@@ -3,6 +3,6 @@
   <extension>
     <groupId>io.takari.polyglot</groupId>
     <artifactId>polyglot-ruby</artifactId>
-    <version>0.1.15</version>
+    <version>0.1.19</version>
   </extension>
 </extensions>

.travis.yml

@@ -6,7 +6,7 @@ addons:
       -oracle-java8-installer
 
 rvm: 
-  - jruby-9.0.5.0
+  - jruby-9.1.2.0
 jdk:
   - oraclejdk8
 os:

CHANGELOG.md

@@ -1,7 +1,20 @@
+**v1.2.6** Update to processing-3.2.3 and jruby-9.1.6.0-complete, re-factor to use a Command class to create argument array and exec.
+
+**v1.2.5** Change gemspec description, trying to get people not to ignore changes to documentation?
+
+**v1.2.4** Update to jruby-9.1.5.0-complete.
+
+**v1.2.3** Further refactored sketchwriter.rb. Update to jruby-9.1.4.0-complete.
+
+**v1.2.2** Refactored sketchwriter.rb (adding unit tests) to be more open to change and removing string_extra.rb on the way. Remove sketchbook.rb, because we no-longer guess sketchbook location at runtime (depends on `config.yml`), could pave the way for independent (from processing ide) location of java libraries (and freedom from the tyranny of prisoner john). Update to jruby-9.1.3.0-complete.
+
+
+**v1.2.1** Use optparse to parse command line options, and related re-factoring. Avoid casting to java Double and Integer and using `to_java` for primitives in jruby extensions. Includes important changes to CLI, `run` becomes `--run` etc and one stop `--install` replacing `setup --install` etc.
+Also `--nojruby` is dropped in favor of `config.yml`.
 
 **v1.1.3** Revert using String refinements in `creator.rb`. Refactor java options to `java_opts.rb`.
 
-**v1.1.2** Refactor `runner.rb` to `runner.rb`, `args.rb` and `installer.rb`. The `Installer` classes have the role of installing `jruby-complete`, the examples and providing `setup check` functionality. Refactored and improved default `config.yml` tool, all should make it easier for `collaborators/successors` to follow the code. Refactored `Vec2D` and `Vec3D` `==` and `eql?` methods. New `chooser` library makes it possible to use `select_input` reflection method.
+**v1.1.2** Refactor `runner.rb` to `runner.rb`, `args.rb` and `installer.rb`. The `Installer` classes have the role of installing `jruby-complete`, the examples and providing `setup check` functionality. Refactored and improved default `config.yml` tool, all should make it easier for `collaborators/successors` to follow the code. Refactored `Vec2D` and `Vec3D` `==` and `eql?` methods. New `chooser` library makes it possible to use `select_input` using vanilla processing reflection method.
 
 **v1.1.1** Even more `data_path` fixes in examples, update to jruby-complete-9.1.2.0
 

LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Martin Prout
+Copyright (c) 2015-16 Martin Prout
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -19,4 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-

README.md

@@ -2,57 +2,57 @@
 # JRubyArt
 [![Gem Version](https://badge.fury.io/rb/jruby_art.svg)](http://badge.fury.io/rb/jruby_art)
 ![Travis CI](https://travis-ci.org/ruby-processing/JRubyArt.svg)
+Versions before JRubyArt-1.2.0, are unsupported, please update, preferably to latest version...
+
+_Note the main reason for the current build to fail on travis is when the current version of [processing is not available from maven central][testing], it has only ever been available by third parties (I am eternally hopeful that one day processing.org will see the light), actually rvm with jruby as used by travis-ci is also pretty crap as judged by the build traces._
 
 ## Requirements
-A clean start for `jruby_art` that works best with the latest version of [processing-3.1.1](https://github.com/processing/processing/releases) and [jruby-9.1.2.0](http://jruby.org/download) see [wiki](https://github.com/ruby-processing/JRubyArt/wiki/Building-latest-gem) for building gem from this repo.  Changes from processing- 2.0 to [processing-3.0 here](https://github.com/processing/processing/wiki/Changes-in-3.0). Should work on same platforms as vanilla processing (windows, mac, linux) for Android see Yuki Morohoshi [rubuto-processing3][].
+A clean start for `jruby_art` that works best with the latest version of [processing-3.2.3](https://github.com/processing/processing/releases) and [jruby-9.1.6.0](http://jruby.org/download) see [wiki](https://github.com/ruby-processing/JRubyArt/wiki/Building-latest-gem) for building gem from this repo.  Changes from processing- 2.0 to [processing-3.0 here](https://github.com/processing/processing/wiki/Changes-in-3.0). Should work on same platforms as vanilla processing (windows, mac, linux) for Android see Yuki Morohoshi [rubuto-processing3][].
 ## Requirements
- 
-A suitable version of ruby (MRI ruby > 2.2 or `jruby-9.1.2.0+`) to download gem. 
 
-`processing-3.1.1`
+A suitable version of ruby (MRI ruby > 2.3 or `jruby-9.1.6.0+`) to download gem.
+
+`processing-3.2.3`
 
-`jdk1.8.0_92+` can be openjdk with OpenJFX _a separate download works on ArchLinux_, currently FX2D is experimental is expected to replace JAVA2D in the near future see changes above...
+`jdk1.8.0_111+` can be openjdk with OpenJFX _a separate download works on ArchLinux_, currently FX2D is experimental is expected to replace JAVA2D in the near future see changes above...
 
 ### recommended installs (JRubyArt is currently hard-coded to expect them)
 
-processing `video` and `sound-1.3.2+` libraries _best installed from the processing-3.1 ide_
+processing `video` and `sound-1.3.2+` libraries _best installed from the processing-3.2.2 ide_
 
 
 ## Configuration
 
-You can if you wish leave configuration to the `new` autoconfig tool (delete existing config to do this). The config file is `config.yml` in the `~/.jruby_art folder`, the autoconfig gets run on `k9 setup install` expected to just work on `macosx`, output may need tuning on `windows` / `linux` check with `k9 setup check` (run both after gem install for both)
+You can if you wish leave configuration to the `new` autoconfig tool (delete existing config to do this). The config file is `config.yml` in the `~/.jruby_art folder`, the autoconfig gets run on `k9 --install` expected to just work on `macOS`, output may need tuning on `windows` / `linux` check with `k9 --check` (run both after gem install for both)
 
 ```yaml
 # YAML configuration file for jruby_art
-# K9_HOME: "/home/ruby2.3.0 ... /jruby_art" #windows users may need to set this
-PROCESSING_ROOT: /home/tux/processing-3.1.1 # typical linux shown
+# K9_HOME: "/home/ruby2.3.0 ... /jruby_art" # windows users may need to set this
+PROCESSING_ROOT: "/home/tux/processing-3.2.3" # typical linux shown
 # important sketch_book path may be different for processing-3.0
-sketchbook_path: /home/tux/sketchbook 
+sketchbook_path: "/home/tux/sketchbook"
+template: bare
 ```
 
-## Install Steps (assumes you have requirements above) 
+## Install Steps (assumes you have requirements above)
 
 ```bash
  gem install jruby_art
- k9 setup install # installs jruby-complete-9.1.2.0
- k9 setup unpack_samples # downloads and installs samples to ~/k9_samples
+ k9 --install # installs jruby-complete-9.1.6.0 and downloads and installs samples to ~/k9_samples
  cd ~/k9_samples/contributed
- k9 run jwishy.rb # if you have jruby-9.1.2.0 installed or config JRUBY: 'false'
- k9 --nojruby run jwishy.rb # to use jruby-complete unless you have set JRUBY: 'false' in config
+ k9 --run jwishy.rb # if you have jruby-9.1.6.0 installed or config `JRUBY: false`
+ # to use jruby-complete set `JRUBY: false` in config
 ```
 ## Create sketches from built in templates
 ```bash
-k9 create fred 200 200                # basic sketch fred.rb
-k9 create fred 200 200 p2d            # basic P2D sketch fred.rb
-k9 create fred 200 200 --wrap         # class wrapped sketch fred.rb
-k9 create fred 200 200 p2d --wrap     # class wrapped P2D sketch fred.rb
-k9 create ted 200 200 --emacs         # class wrapped sketch ted.rb for emacs / netbeans
-k9 create ted 200 200 p2d --emacs     # class wrapped P2D sketch ted.rb for emacs / netbeans
+k9 --create fred 200 200                # basic sketch fred.rb
+k9 --create fred 200 200 p2d            # basic P2D sketch fred.rb
 ```
+To create either a `class` wrapped sketch or `emacs` sketch set `template: class` or `template: emacs` in config.yml
 
 ## Simple Sketch
 ```ruby
-# :sketch_title belongs in setup it is a convenience method of jruby_art-3.0+
+# :sketch_title belongs in --it is a convenience method of jruby_art-3.0+
 def setup
   sketch_title 'My Sketch'
 end
@@ -64,10 +64,10 @@ def draw
 end
 
 # NB: changes for processing-3.0+
-# size, full_screen, pixel_density and smooth should all be moved to settings (this is hidden 
-# to users of processing ide, but not for JRubyArt, or for Eclipse NetBeans users). The FX2D 
-# rendering mode was introduced, and was expected to replace JAVA2D (as default rendering mode) 
-# but may not now happen, and not for processing-3.1.1 in any case.
+# size, full_screen, pixel_density and smooth should all be moved to settings (this is hidden
+# to users of processing ide, but not for JRubyArt, or for Eclipse NetBeans users). The FX2D
+# rendering mode was introduced, and was expected to replace JAVA2D (as default rendering mode)
+# but may not now happen, and not for processing-3.2.3 in any case.
 def settings
   size 400, 300
 end
@@ -78,15 +78,15 @@ be prepared to `KILL` the odd java process (ie when sketch does not exit cleanly
 
 ## Watch sketches
 ```bash
-k9 watch sketch.rb # don't try and change render mode, or use FX2D render mode during watch yet
+k9 --watch sketch.rb # don't try and change render mode, or use FX2D render mode during watch yet
 ```
 ## Open pry console on sketch
 ```bash
-k9 live sketch.rb # pry is bound to $app # needs `jruby -S gem install pry`
+k9 --live sketch.rb # pry is bound to $app # needs `jruby -S gem install pry`
 ```
 ## Example sketches
 
-[Worked Examples](https://github.com/ruby-processing/JRubyArt-examples) more to follow, feel free to add your own, especially ruby-2.2+ syntax now we can. These can now be downloaded using `k9 setup unpack_samples` please move existing k9_samples.
+[Worked Examples](https://github.com/ruby-processing/JRubyArt-examples) more to follow, feel free to add your own, especially ruby-2.2+ syntax now we can. These can now be downloaded using `k9 --install` please move existing `k9_samples` if you wish to keep them.
 
 ## Conversion Tool
 
@@ -95,3 +95,4 @@ I wrote this little script to convert sketches from ruby-processing (processing-
 See The-Nature-of-Code-Examples-in-Ruby converted to [The-Nature-of-Code-Examples-for-JRubyArt](https://github.com/ruby-processing/The-Nature-of-Code-for-JRubyArt) using the script.
 
 [rubuto-processing3]:https://github.com/hoshi-sano/ruboto-processing3
+[testing]:http://ruby-processing.github.io/testing/testing/

Rakefile

@@ -35,6 +35,7 @@ task :test do
   sh 'jruby test/math_tool_test.rb'
   sh 'jruby test/helper_methods_test.rb'
   sh 'jruby test/aabb_spec_test.rb'
+  sh 'jruby test/create_test.rb'
   home = File.expand_path('~')
   config = File.exist?(format('%s/.jruby_art/config.yml', home))
   if config

jruby_art.gemspec

@@ -11,17 +11,13 @@ Gem::Specification.new do |spec|
   spec.email = 'mamba2928@yahoo.co.uk'
   spec.description = <<-EOS
   JRubyArt is a ruby wrapper for the processing art framework.
-  This version supports processing-3.1.1, and uses jruby-9.1.2.0  as the glue 
-  between ruby and java. You can use both processing libraries and ruby gems 
-  in your sketches. Features create/run/watch/live 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...
+  Use both processing libraries and ruby gems in your sketches. Features
+  create/run/watch/live modes. The "--watch" mode, provides a nice REPL-ish
+  way to work on your processing sketches. NB: See homepage for documentation.
   EOS
   spec.summary = %q{Code as Art, Art as Code. Processing and Ruby are meant for each other.}
-  spec.homepage = "https://ruby-processing.github.io/"
-  spec.post_install_message = %q{Use 'k9 setup install' to install jruby-complete, and 'k9 setup check' to check config.}
+  spec.homepage = "https://ruby-processing.github.io/JRubyArt/"
+  spec.post_install_message = %q{Use 'k9 --install' to install jruby-complete, and 'k9 --check' to check config.}
   spec.license = 'MIT'
 
   spec.files = FileList['bin/**/*', 'lib/**/*', 'library/**/*', 'samples/**/*', 'vendors/Rakefile'].exclude(/jar/).to_a
@@ -30,10 +26,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 2.2'
-  spec.add_development_dependency 'rake', '~> 11.1'
+  spec.required_ruby_version = '>= 2.3'
+  spec.add_development_dependency 'rake', '~> 11.2'
   spec.add_development_dependency 'minitest', '~> 5.8'
   spec.requirements << 'A decent graphics card'
-  spec.requirements << 'java runtime >= 1.8.0_92+'
-  spec.requirements << 'processing = 3.1.0+'
+  spec.requirements << 'java runtime >= 1.8.0_111+'
+  spec.requirements << 'processing = 3.2.1+'
 end

lib/jruby_art.rb

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

lib/jruby_art/app.rb

@@ -1,6 +1,4 @@
-# encoding: utf-8
 # frozen_string_literal: false
-
 require 'java'
 require_relative '../rpextras'
 require_relative '../jruby_art/helper_methods'
@@ -32,16 +30,16 @@ module Render
     key_pressed: :keyPressed,
     key_released: :keyReleased,
     key_typed: :keyTyped
-  }
+  }.freeze
   # All sketches extend this class
   class App < PApplet
     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 +61,7 @@ def load_libraries(*args)
         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)
@@ -88,7 +86,7 @@ def method_added(method_name) #:nodoc:
     def library_loaded?(library_name)
       self.class.library_loaded?(library_name)
     end
-   
+
     # Since processing-3.0 you should prefer setting the sketch width and
     # height and renderer using the size method in the settings loop of the
     # sketch (as with vanilla processing) but is hidden see created java.
@@ -109,7 +107,7 @@ def initialize
       # NB: this is the processing runSketch() method as used by processing.py
       run_sketch
     end
-    
+
     def size(*args)
       w, h, mode = *args
       @width ||= w
@@ -130,8 +128,8 @@ def sketch_path(spath = nil)
 
     def data_path(dat)
       dat_root = File.join(SKETCH_ROOT, 'data')
-      Dir.mkdir(dat_root) unless File.exist?(dat_root)    
-      File.join(dat_root, dat)	    
+      Dir.mkdir(dat_root) unless File.exist?(dat_root)
+      File.join(dat_root, dat)
     end
 
     def sketch_size(x, y)
@@ -158,6 +156,7 @@ def close
       surface.stopThread
       surface.setVisible(false) if surface.isStopped
       dispose
+      $app = nil
     end
 
     def exit
@@ -181,8 +180,8 @@ def mix_proxy_into_inner_classes
     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|
+         PGraphics2D PGraphics3D PGraphicsOpenGL PShader
+         PShapeOpenGL Texture).each do |klass|
         java_import format('processing.opengl.%s', klass)
       end
     end
@@ -193,6 +192,10 @@ def import_opengl
   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