picrate 1.3.0-java → 2.1.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 674b5526a2444390b3230e1d751b737c6dd45b9d411956a1f2911f8c79c0bf18
-  data.tar.gz: 178aee951ab71107cb59981a6e2edea6952a80067dccb1431879edff8eb7aa32
+  metadata.gz: 7e9ef3696c4eb0b3a488c7e25d30546ab03eae3a49e5220ec3d9cf4c862fddf3
+  data.tar.gz: 88f799089492e9507bbb09baa4e9634c335627fea27ec8adf22207cf4678de7b
 SHA512:
-  metadata.gz: 3f78af9e8a537e7a28f0e4cd31d44457566eecfee63ad97434c6e33dd70e7b29baa824c628e0f72ba50d3f0ffc77827c70923a443417cdfc5d46b1ecc76012b5
-  data.tar.gz: 0aae76990d4ef5a801d20f22fc177de3f4319e16e45ce426adf1bfaf6d6eb57e20287c7558fbeb2221fe8b1d3ddcb0cb11f8a60a7e535236e78d52df95a7c612
+  metadata.gz: 57be7c1825b5afe9fac52830070c97e04b18590d6db7d3ff099a83861e757eb7dfba02f1f9a3ad80c5e6b20c1ce73226a13be1ce3aefb3d6e66180af59d742d1
+  data.tar.gz: a94c876edf96da7f89939d0cb11e8ab09f74c03686c5f36eaeae90ea61c5dd44e23c9d7812d521a17215110534a722f4a20ee7c29f8dffc28a1af0b15eac21db

data/.mvn/wrapper/MavenWrapperDownloader.java

@@ -20,7 +20,7 @@ import java.util.Properties;
 
 public class MavenWrapperDownloader {
 
-    private static final String WRAPPER_VERSION = "0.5.5";
+    private static final String WRAPPER_VERSION = "0.5.6";
     /**
      * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
      */

data/CHANGELOG.md

@@ -1,6 +1,15 @@
-v1.3.0 Last version for jdk8. But should run OK jdk11 with JRuby-9.2.11.0 and with included jogl-2.4.0-rc.
+v2.1.2 Bump to JRuby-9.2.14.0
+
+v2.1.1 Bump to JRuby-9.2.13.0, include examples using ruby `clamp` in place of processing `constrain`, update to video-2.0 release, add run instruction to help
+
+v2.1.0 Refactor how we configure geany so we can use ENV['HOME'] rather hard code config file. Bump to JRuby-9.2.12.0, include Sam Pottingers July 2020 staging changes.
+
+v2.0.1 Use JOGL-2.4.0-rc fixes reflection warnings, remove geomerative and wordcram gem dependencies since can now be in step with JRubyArt and propane (re jdk compatibility), bump version for release. Removed Gottfreid Haider shaders, warn legacy driver doesn't work with P2D and P3D sketches. Support aarch64 architecture on RaspberriPI4.
+
+v2.0.0 Use JDK11+ update to processing-3.5.4 suggest jruby-9.2.11.0
 
 v1.2.4 Extract picrate examples to ~/projects/examples instead of ~/picrate_samples for tighter integration with geany editor. Remove non-functioning sound library as an install option (direct toward minim as option).
+
 v1.2.3 Favor latest beta Video2 library over GLVideo.
 
 v1.2.2 Removed landscape from example as too taxing for raspberryPI. Improved geany tools.

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
-ruby '2.5.7', :engine => 'jruby', :engine_version => '9.2.11.0'
+ruby '2.5.7', engine: 'jruby', engine_version: '9.2.11.0'
 gemspec

data/README.md

@@ -1,7 +1,8 @@
 __C6H3N3O7__ [![Gem Version](https://badge.fury.io/rb/picrate.svg)](https://badge.fury.io/rb/picrate)![Travis CI](https://travis-ci.org/ruby-processing/PiCrate.svg)
 
 # PiCrate
-Version for RaspberryPI `Stretch` and `Oracle JDK8`, will probably also work on `OpenJDK11+`. For latest version see auto-install script for [PiCrate-2.0][buster] on Buster (tested on RaspberryPI4). Create processing sketches in ruby on raspberry-pi and linux (this project is a parallel development of [propane][propane] targetting the raspberry-pi, but will initially be developed on a regular linux box). The aim is to produce a gem installable app that can be run with jruby, with minimal dependencies. Drop the `C` and you get pirate, or and an `e` and get `PiCreate`, a happy coincidence?
+New version for `Buster` on raspberryPI 3B+ works with jdk11 (reflective access warnings fixed for jdk11). Since version 2.0.1 also works on 64 bit Manjaro distro on RaspberryPI4. Create processing sketches in ruby on raspberry-pi and linux (this project is a parallel development of [propane][propane] targetting the raspberry-pi, but will initially be developed on a regular linux box). The aim is to produce a gem installable app that can be run with jruby, with minimal dependencies. Drop the `C` and you get pirate, or and an `e` and get `PiCreate`, a happy coincidence?
+
 
 ### To install from rubygems ###
 
@@ -11,21 +12,21 @@ jgem install picrate
 
 ### To Build and Test ###
 
-Clone this repo:-
+Clone main branch:-
 
-Requires java to build, but uses a maven wrapper so you don't need to install maven. Suggest build/test on regular linux box, but is designed for use on RaspberryPI 3B+. Needs installed jruby to test/run.
+Requires java to build (and jogl-2.4.0-rc jars), but uses a maven wrapper so you don't need to install maven. Suggest build/test on regular linux box, but is designed for use on both RaspberryPI 3B+ and RaspberryPI4. Needs installed jruby to test/run.
 
 ```bash
-cd PiCrate
+cd PiCrate # or whatever you call it
 rake # assumes an installed version of vanilla processing
-jgem install picrate-1.2.4-java.gem
+jgem install picrate-2.1.2-java.gem
 
 ```
 To create a template sketch:-
 ```bash
 picrate -c my_sketch 200 200
 ```
-Edit sketch (vim is a good choice):-
+Edit sketch ([vim][vim] is a good choice, but we recommend [geany][geany]) :-
 ```ruby
 #!/usr/bin/env jruby
 # frozen_string_literal: false
@@ -56,3 +57,5 @@ jruby --dev my_sketch.rb # --dev flag speeds start-up
 
 [buster]:https://gist.github.com/monkstone/6ae9840d7b7008c177b4a9f589d14ec6
 [propane]:https://ruby-processing.github.io/propane/
+[vim]:https://github.com/ruby-processing/PiCrate/blob/master/docs/_editors/vim.md
+[geany]:https://github.com/ruby-processing/PiCrate/blob/master/docs/_editors/geany.md

data/Rakefile

@@ -6,11 +6,11 @@ HOME_DIR = ENV['HOME']
 
 task default: %i[init compile install test gem]
 
-# depends on installed processing, with processing on path
+# Currently depends on local jogl-2.4.0 jars on path ~/jogl24
 desc 'Copy Jars'
 task :init do
   jogl24 = File.join(HOME_DIR, 'jogl24')
-  opengl = Dir.entries(jogl24).grep(/amd64|armv6hf/).select { |jar| jar =~ /linux/ }
+  opengl = Dir.entries(jogl24).grep(/amd64|armv6hf|aarch64/).select { |jar| jar =~ /linux/ }
   opengl.concat %w[jogl-all.jar gluegen-rt.jar]
   opengl.each do |gl|
     FileUtils.cp(File.join(jogl24, gl), File.join('.', 'lib'))
@@ -24,7 +24,7 @@ end
 
 desc 'Gem'
 task :gem do
-  system 'gem build picrate.gemspec'
+  system 'jruby -S gem build picrate.gemspec'
 end
 
 desc 'Document'
@@ -46,6 +46,11 @@ task :test do
   system 'jruby --dev test/vecmath_spec_test.rb'
 end
 
+desc 'JDeps Tool'
+task :jdeps do
+  system './mvnw jdeps:jdkinternals'
+end
+
 desc 'clean'
 task :clean do
   Dir['./**/*.{jar,gem}'].each do |path|

data/bin/picrate

@@ -1,6 +1,8 @@
 #!/usr/bin/env jruby
+# frozen_string_literal: true
+
 unless defined? PICRATE_ROOT
-  $LOAD_PATH << File.expand_path(File.dirname(__FILE__))
+  $LOAD_PATH << __dir__
   PICRATE_ROOT = File.expand_path(File.dirname(__FILE__) + '/../')
 end
 

data/docs/_config.yml

@@ -4,7 +4,7 @@ title: PiCrate gem
 email: mamba2928@yahoo.co.uk
 description: > # this means to ignore newlines until "baseurl:"
   The picrate gem is ruby implementation of processing, targetting raspberrypi and
-  linux
+  linux works on 32 bit raspbian Buster (and 64 bit Manajaro raspberryPI4).
 baseurl: "" # the subpath of your site, e.g. /blog
 regenerate: true
 url: "https://ruby-processing.github.io/PiCrate"

data/docs/_editors/geany.md

@@ -9,6 +9,7 @@ Geany is highly configurable, and we have created a `geany` project file `picrat
 ```bash
 picrate --install samples
 ```
+Examples get installed in `~/projects/examples`, you can use `~/projects/sketchbook` to save your own sketches.
 
 #### Using picrate.rb template ####
 

data/docs/_gems/gems/gems.md

@@ -18,7 +18,7 @@ NB: the arcball gem is installed as a picrate dependency
 jbox2d ([pbox2d][jbox2d])
 
 ### Stand Alone Gems
-[cf3][cf3] context free art in ruby
+[cf3][cf3] context free art in ruby, examples may need a bit of hacking
 
 [cf3]:https://github.com/monkstone/cf3ruby/
 [arcball]:https://github.com/ruby-processing/ArcBall/

data/docs/_methods/alternative_methods.md

@@ -28,8 +28,9 @@ Here is a list of ruby alternatives to some 'processing' convenience methods; wh
 |               |`second`                |`t.second`           |
 |               |`year`                  |`t.year`             |
 |custom math    |`map(x, b0, eo, b1, e1)`|`map1d(x, (b0..e0), (b1..e1))`|
-|               |`map(x, b0, eo, b1, e1)`|`p5map(x, b0, e0, b1, e1)`|
 |               |`max(array)            `|`array.max`        |
+|               |`map(x, b0, eo, b1, e1)`|`p5map(x, b0, e0, b1, e1)`|
+|               |`constrain(x, lo, hi)`  |`x.clamp(lo, hi)`  |
 |               |`min(array)            `|`array.min`        |
 |conversion     |`degrees(theta)`        |`theta.degrees`    |
 |conversion     |`radians(theta)`        |`theta.radians`    |

data/docs/_posts/2018-05-06-getting_started.md

@@ -1,11 +1,11 @@
 ---
 layout: post
-title:  "Getting Started Stretch"
-date:   2018-05-24 07:34:13
+title:  "Getting Started Buster"
+date:   2020-03-09 07:34:13
 categories: PiCrate update
 permalink: /getting/
 ---
-Raspbian Stretch installs Oracle jdk-1.8.0_65-bi17 (hard float) and that is just fine, if you have more that one version of java installed you could use `update-alternatives` tool to manage their use. Will work with OpenJDK-11 but currently performance is sub-optimal.
+Raspbian Buster installs OpenJDK11 (hard float) and that is just fine, if you have more that one version of java installed you could use `update-alternatives` tool to manage their use. NB: Will not work with OpenJDK-8.
 
 __Then install JRuby see__ [jruby][jruby].
 
@@ -27,7 +27,7 @@ __Install processing libraries__
 
 ```bash
 picrate -i Sound
-picrate -i glvideo # preferred over vanilla video for now
+picrate -i video # install beta verion of vanilla video for now
 ```
 
 To create a template sketch from the command line:-

data/docs/_posts/2018-05-06-install_jruby.md

@@ -14,7 +14,7 @@ Get the latest version from [http://jruby.org/download][download]
 
 ```bash
 cd /opt
-sudo tar xzvf /pathToDownload/jruby-bin-9.2.11.0.tar.gz
+sudo tar xzvf /pathToDownload/jruby-bin-9.2.14.0.tar.gz
 ```
 
 Then use the excellent `update-alternatives` tool to provide symbolic links to `jruby`, `jgem`, `jirb` and `rake` especially if you haven't installed `mri` ruby.
@@ -36,17 +36,11 @@ export GEM_PATH="$HOME/tux/.gem/ruby/2.5.0"
 export PATH="${PATH}:${GEM_PATH}/bin"
 ```
 
-### Automated install using Rakefile ###
-Get the `Rakefile` [here][rake_gist] however it assumes an existing ruby install (which is not needed by PiCrate).
+### Automated install using bash ###
 
-```bash
-mkdir installer
-cd installer
-rake
-```
-Currently installs jruby-9.2.11.0
+The [picrate2_install.sh][bash] script currently installs jruby-9.2.14.0 and picrate-2.1.2.
 
 If you know better please post on wiki
 
-[download]:"https://repo1.maven.org/maven2/org/jruby/jruby-dist/9.2.11.0/jruby-dist-9.2.11.0-bin.tar.gz"
-[rake_gist]:https://gist.github.com/monkstone/159c5a9813c9cd181040b4715e74f6b2
+[download]:"https://repo1.maven.org/maven2/org/jruby/jruby-dist/9.2.14.0/jruby-dist-9.2.14.0-bin.tar.gz"
+[bash]:https://gist.github.com/monkstone/6ae9840d7b7008c177b4a9f589d14ec6

data/docs/_posts/2018-05-11-arch-linux-arm.md

@@ -4,14 +4,4 @@ title:  "Installing JRuby on Archlinux arm"
 date:   2018-05-24 07:34:13
 categories: PiCrate update
 ---
-It is quite likely that people wishing to experiment with PiCrate on arm have moved beyond the raspbian distribution. As a first step [archlinuxarm][alarm] which seems to be well thought out. Installing jdk8 and jruby should be as simple as:-
-
-```bash
-sudo pacman -Syu # get up to data
-sudo pacman jdk-arm # but I'm not 100% sure what version is installed jdk8+ is reqd
-sudo archlinux-java set java-8-openjdk/jre # case you have more than one java installed
-sudo pacman jruby # should install latest version
-```
-
-
-[alarm]:https://archlinuxarm.org/platforms/armv6/raspberry-pi
+Might work, please let us know!!! Manjaro works OK.

data/docs/_posts/2018-11-18-building-gem.md

@@ -6,9 +6,9 @@ categories: PiCrate update
 ---
 Requirements:-
 
-1. An installed version of vanilla processing to provide `processing.org` customised version of the `jogl` jars. The default `Rakefile` assumes root installation of processing, for debian distros you will need to adjust `processing_root` _ca. line 20_.
+1. Latest jogl-2.4.0-rc jars (place in ~/jogl24 folder).
 
-2. jdk-11+ and maven (builds for jdk-8)
+2. jdk-11+ and maven
 
 Simply clone this distribution, then rake to build and test gem
 ```bash

data/docs/_posts/2018-11-27-getting_started_geany.md

@@ -5,7 +5,7 @@ date:   2018-11-27 07:34:13
 categories: PiCrate update
 permalink: /geany_ide/
 ---
-The current version of raspbian installs jdk-1.8.0_65-bi17 (hard float) and that is just fine, if you have more that one version of java installed you could use `update-alternatives` tool to manage their use.
+The current version of raspbian installs jdk-11 (hard float) and that is just fine, if you have more that one version of java installed you could use `update-alternatives` tool to manage their use.
 
 Then install JRuby see [jruby][jruby].
 

data/docs/_posts/2019-11-11-getting_started_buster.md

@@ -5,17 +5,14 @@ date:   2019-11-11 07:34:13
 categories: PiCrate update
 permalink: /getting_buster/
 ---
-Currently Raspbian Buster does not come with a pre-installed java. So the first step is to install a `jdk` we currently recommend installing openjdk8 (_there a complications you don't need using jdk11_) to benefit from `client` optimisations. There is a bash script [here][buster], that will install `openjdk8`, `jruby-9.2.11.0` and picrate for you.
-```bash
-bash buster_install.sh
-```
+Raspbian Buster usually comes with a pre-installed jdk11. Before installing JRuby it is worth setting the `JAVA_HOME` environmental variable (needed to supress reflection warnings).
 
   __Otherwise follow these instructions in order as needed:-__
 
 ```bash
 sudo apt-get update # sync your local database with current release
 sudo update # update to latest release
-sudo apt install openjdk-8-jdk # installs latest jdk8
+sudo apt install openjdk-11-jdk # installs latest jdk11
 java -version # check installed version
 ```
 If you have already installed a version java the java version may not match you can control the _active_ java version on Debian using `update-alternatives` as follows:-
@@ -46,7 +43,7 @@ Install a local version of rake:-
 ```bash
 jgem install rake
 ```
-To install picrate and its dependencies:-
+To install latest picrate and its dependencies:-
 
 ```bash
 jgem install picrate

data/docs/_posts/{2018-06-26-auto_install_picrate.md → 2020-03-09-auto_install_picrate.md}

@@ -1,28 +1,31 @@
 ---
 layout: post
 title:  "Automated PiCrate Install"
-date:   2018-06-26 07:34:13
+date:   2020-03-09 07:34:13
 categories: PiCrate update
 permalink: /install_picrate/
 ---
 
-For a semi-automated setup and install, download and extract [this gist](https://gist.github.com/monkstone/e9df8ea776aed58ce1c4de8e12982aad). To keep your system clean put the file in a folder say
+For a semi-automated setup and install, download and extract [this gist](https://gist.github.com/monkstone/6ae9840d7b7008c177b4a9f589d14ec6). To keep your system clean put the file in a folder say
 `~/install_picrate`
 
 ```bash
 cd ~/picrate_install
-bash picrate_install.sh # to run default task
+bash picrate2_install.sh # to run default task
 ```
 #### What the script does ###
 1. Downloads JRuby
 2. Installs JRuby to `/opt`
 3. Uses `update-alternatives` to configure `jruby`, `jgem` and `jirb`
 4. The script checks for `GEM_HOME`, if undefined it modifies `~/.profile` to define `GEM_HOME` and puts gem binaries on your path, at logon.
-5. Installs `picrate` gem
-6. Downloads and installs `picrate_samples` also configures `geanyIDE` for use with `picrate`
+5. Installs jdk11 if required sets `JAVA_HOME`, needed to support jruby
+6. Creates `~/.gemrc` with `gem: no-document`
+7. Installs `picrate` gem
+To install `picrate_samples` also configures `geanyIDE` for use with `picrate` run
+`picrate --install` in a bash console
 
 #### Note ####
-`GEM_HOME` and path to `gem` binaries is not available until next logon, to use immediately you could:-
+`GEM_HOME`, `JAVA_HOME` and path to `gem` binaries are not available until next logon, to use immediately you could:-
 
 ```bash
 source ~/.profile

data/docs/_posts/2020-05-11-getting_started_manjaro.md

@@ -0,0 +1,106 @@
+---
+layout: post
+title:  "Getting Started Manjaro"
+date:   2020-05-11 07:34:13
+categories: PiCrate update
+permalink: /getting_manjaro/
+---
+If Manjaro does not come with a pre-installed java, then the first step is to install a `jdk` the distro version (jdk14) should work. 
+
+```bash
+sudo pacman -S jdk-openjdk # current distro version jdk14
+```
+You can also use pacman to install jruby
+```bash
+sudo pacman -S jruby # current version jruby-9.2.14.0
+```
+It is probably a good idea to create a local gem store (rather needing to use sudo to install gems)
+
+```bash
+mkdir -p ~/.gem/ruby/2.5.0 # current MRI version supported by jruby
+```
+Now set your `GEM_HOME`, `GEM_PATH` and amend your `PATH` as follows:-
+
+```bash
+echo "export GEM_HOME=\"\${HOME}/.gem/ruby/${MRI_RUBY}\"" >> ~/.bashrc
+echo "export GEM_PATH=\"\${HOME}/.gem/ruby/${MRI_RUBY}\"" >> ~/.bashrc
+echo "export PATH=\"\${PATH}:\${GEM_PATH}/bin\"" >> ~/.bashrc
+source ~/.bashrc # to update environment without re-logging in
+```
+Now should be ready to install `picrate` and other gems. But speed up install time you should set `--no-document` option in ~/.gemrc
+
+```bash
+touch ~/.gemrc
+echo "gem: --no-document" > ~/.gemrc
+```
+To install latest picrate and its dependencies:-
+
+```bash
+jgem install picrate
+```
+
+Geany is a good editor/ide for PiCrate on the RaspberryPI (install via pacman), but some may prefer vim. For geany you should edit/preferences/Terminal to `Execute programs in the VTE`.
+
+__For a first install:-__
+
+```bash
+picrate --install # no args, install samples and geany config
+# or
+picrate -i Samples # to omit geany config
+```
+
+This installs example sketches in `~/projects/examples` and ties them into a `geany` project `examples.geany`. It should also be possible to run sketches from the `geany` ide. The geany config creates `picrate.rb` template sketch so you can create a new sketch with template.
+
+To create a template sketch from the command line:-
+
+```bash
+picrate -c my_sketch 600 400
+```
+creates file my_sketch.rb
+
+```ruby
+#!/usr/bin/env jruby
+# frozen_string_literal: false
+require 'picrate'
+
+class MySketch < Processing::App
+  def settings
+    size 200, 200
+  end
+
+  def setup
+    sketch_title 'My Sketch'
+  end
+
+  def draw
+
+  end
+end
+MySketch.new
+
+```
+
+Edit in `vim` (at command line) or `geany` (gui), you may need to install `vim`
+```bash
+vim my_sketch.rb
+:!jruby % # from vim runs the sketch
+```
+
+To run sketches from command line:-
+
+```bash
+jruby --dev my_sketch.rb
+```
+
+Or even `chmod +x my_sketch.rb` to make an executable script.
+
+See [editors][geany] geany, for how to run sketches from a gui.
+
+### JWishy Sketch Running on RaspberryPI
+
+![jwishy_buster]({{ site.github.url }}/assets/jwishy_buster.png)
+
+[buster]: https://gist.github.com/monkstone/04a1272ca9274a2c7e3e1bf170877bfb
+[java]:http://ruby-processing.github.io/java/raspberry/
+[jruby]:{{ site.github.url }}/install_jruby/
+[geany]:{{ site.github.url }}/editors/geany

data/docs/about.md

@@ -4,7 +4,7 @@ title: About
 permalink: /about/
 ---
 ![picrate.png]({{ site.github.url }}/assets/android-chrome-192x192.png)
-PiCrate is both a `library` and an `app` that allows you to create [processing][processing] sketches in ruby on the [RaspberryPI][PI] (or 64 bit linux). PiCrate is available as a gem (from [rubygems][rubygems]), it requires [JRuby][jruby] to both install and run. It does not depend on a vanilla processing install ( _cf_ JRubyArt).
+PiCrate is both a `library` and an `app` that allows you to create [processing][processing] sketches in ruby on the [RaspberryPI][PI] (or 64 bit linux). PiCrate is available as a gem (from [rubygems][rubygems]), it requires [JRuby][jruby] to both install and run. It does not depend on a vanilla processing install ( _cf_ JRubyArt).Tested on raspbian Buster on RaspberryPI3B+ and RaspberryPI4, also works on Manajaro distro (64bit) on RapsberryPI4.
 
 #### Executable ####