Merge pull request #7 from ruby-processing/stretch

monkstone · web-flow · commit 6279969f1a49 · 2019-10-17T14:39:27.000+01:00
Stretch
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,6 @@
-v1.0.0 Final release for Raspbian Stretch and Oracle java
+v1.1.0 Bring up to date with latest development branch, except still target Stretch and Oracle jdk8, add Gemfile to help version locking.
+
+v1.0.0 Release for Raspbian Stretch and Oracle java
 
 v0.9.0 Remove unnecessary MacOS variations, bump examples version
 
diff --git a/Gemfile b/Gemfile
@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+ruby '2.5.3', :engine => 'jruby', :engine_version => '9.2.8.0'
+gemspec
diff --git a/README.md b/README.md
@@ -1,12 +1,13 @@
 __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+` but see `PiCrate-2.0.0` for version targetting `Buster`.
 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 ###
 
 ```bash
-jgem install picrate
+jgem install picrate -v 1.1.0 # NB: important to specify version
 ```
 
 ### To Build and Test ###
@@ -18,7 +19,8 @@ Requires java to build, but uses a maven wrapper so you don't need to install ma
 ```bash
 cd PiCrate
 rake # assumes an installed version of vanilla processing
-jgem install picrate-1.0.0-java.gem
+jgem install picrate-1.1.0-java.gem
+
 ```
 To create a template sketch:-
 ```bash
@@ -50,7 +52,7 @@ MySketch.new
 ```
 ### Run Sketch ###
 ```bash
-jruby my_sketch.rb
+jruby --dev my_sketch.rb # --dev flag speeds start-up
 ```
 
 
diff --git a/Rakefile b/Rakefile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative './lib/picrate/version'
 
 HOME_DIR = ENV['HOME']
@@ -50,7 +52,7 @@ end
 
 desc 'clean'
 task :clean do
-  Dir["./**/*.{jar,gem}"].each do |path|
+  Dir['./**/*.{jar,gem}'].each do |path|
     puts "Deleting #{path} ..."
     File.delete(path)
   end
diff --git a/docs/_posts/2018-05-06-getting_started.md b/docs/_posts/2018-05-06-getting_started.md
@@ -5,21 +5,25 @@ date:   2018-05-24 07:34:13
 categories: PiCrate update
 permalink: /getting/
 ---
-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.
+Raspbian stretch 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.
 
-Then install JRuby see [jruby][jruby].
+__Then install JRuby see__ [jruby][jruby].
 
 ```bash
 jgem install picrate
 ```
 
-Install samples, and configure `geany` ide (for `PiCrate`)
+__For a first install:-__
 
 ```bash
-picrate -i Samples # geany configuration files are installed if required
+picrate --install # no args, install samples and geany config
+# or
+picrate -i Samples # to omit geany config
 ```
 
-Install processing libraries
+This installs example sketches in `~/sample_sketches` and ties them into a `geany` project `picrate.geany`. It should also be possible to run sketches from the `geany` ide.
+
+__Install processing libraries__
 
 ```bash
 picrate -i Sound
diff --git a/docs/_posts/2018-05-06-install_jruby.md b/docs/_posts/2018-05-06-install_jruby.md
@@ -14,7 +14,7 @@ mkdir installer
 cd installer
 rake
 ```
-Currently installs jruby-9.2.7.0
+Currently installs jruby-9.2.8.0
 
 ### Manual install ###
 
@@ -25,7 +25,7 @@ Get the latest version from [http://jruby.org/download][download]
 
 ```bash
 cd /opt
-sudo tar xzvf /pathToDownload/jruby-bin-9.2.7.0.tar.gz
+sudo tar xzvf /pathToDownload/jruby-bin-9.2.8.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.
@@ -49,5 +49,5 @@ export PATH="${PATH}:${GEM_PATH}/bin"
 
 If you know better please post on wiki
 
-[download]:"https://repo1.maven.org/maven2/org/jruby/jruby-dist/9.2.7.0/jruby-dist-9.2.7.0-bin.tar.gz"
+[download]:"https://repo1.maven.org/maven2/org/jruby/jruby-dist/9.2.8.0/jruby-dist-9.2.8.0-bin.tar.gz"
 [rake_gist]:https://gist.github.com/monkstone/159c5a9813c9cd181040b4715e74f6b2
diff --git a/docs/_posts/2018-11-18-building-gem.md b/docs/_posts/2018-11-18-building-gem.md
@@ -8,11 +8,11 @@ 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_.
 
-2. jdk-11 and maven (builds for jdk-8)
+2. jdk-11+ and maven (builds for jdk-8)
 
 Simply clone this distribution, then rake to build and test gem
 ```bash
-git clone https://github.com/ruby-processing/PiCrate.git
+git clone -b stretch --single-branch https://github.com/ruby-processing/PiCrate.git
 cd PiCrate
 rake # to build gem
 ```
diff --git a/docs/_posts/2018-11-27-getting_started_geany.md b/docs/_posts/2018-11-27-getting_started_geany.md
@@ -10,13 +10,15 @@ The current version of raspbian installs jdk-1.8.0_65-bi17 (hard float) and that
 Then install JRuby see [jruby][jruby].
 
 ```bash
-jgem install picrate
+jgem install picrate -v 1.1.0
 ```
 
 Install samples, and configure `geany` ide (for `PiCrate`)
 
 ```bash
-picrate -i Samples # geany configuration files are installed if required
+picrate -i # geany configuration files are installed if required
+# or
+picrate --install # no args or samples without geany config
 ```
 
 Install processing libraries
diff --git a/docs/about.md b/docs/about.md
@@ -25,7 +25,7 @@ Your PiCrate sketches need to `require` the `picrate` library, and can be run wi
 
 * Gui interface, sketches can be run from [GeanyIDE][geany]
 
-
+* Use --dev flag to speed start-up
 
 
 [rubygems]:https://rubygems.org/
diff --git a/lib/picrate/app.rb b/lib/picrate/app.rb
@@ -55,8 +55,6 @@ class App < PApplet
     alias stroke_width stroke_weight
     alias rgb color
     alias gray color
-    field_reader :surface
-
     def sketch_class
       self.class.sketch_class
     end
@@ -79,8 +77,8 @@ def self.inherited(subclass)
     #
     class << self
       # Handy getters and setters on the class go here:
-      attr_accessor :sketch_class, :library_loader, :title, :arguments, :options
-
+      attr_accessor :sketch_class, :library_loader, :arguments, :options
+      attr_reader :surface
       def load_libraries(*args)
         library_loader ||= LibraryLoader.new
         library_loader.load_library(*args)
@@ -121,6 +119,7 @@ def initialize(options = {}, arguments = [])
       Processing.app = self
       @arguments = arguments
       @options   = options
+      @surface   = get_surface
       run_picrate
     end
 
diff --git a/lib/picrate/creators/sketch_writer.rb b/lib/picrate/creators/sketch_writer.rb
@@ -12,7 +12,7 @@ def settings
     end
 
     def setup
-      sketch_title '<%= @title %>'
+
     end
 
     def draw
@@ -34,9 +34,9 @@ def class_name
     name.split('_').collect(&:capitalize).join
   end
 
-  def title
-    name.split('_').collect(&:capitalize).join(' ')
-  end
+  # def title
+  #   name.split('_').collect(&:capitalize).join(' ')
+  # end
 
   def filename
     name << '.rb'
@@ -50,7 +50,6 @@ def initialize(path)
     param = Parameters.read
     @sketch = SketchClass.new(path)
     @class = sketch.class_name
-    @title = sketch.title
     sketch_param = param.fetch('sketch')
     @width = sketch_param.fetch('width')
     @height = sketch_param.fetch('height')
diff --git a/lib/picrate/runner.rb b/lib/picrate/runner.rb
@@ -70,8 +70,8 @@ def create
     def show_version
       require 'erb'
       template = ERB.new <<-EOF
-        PiCrate version <%= PiCrate::VERSION %>
-        JRuby version <%= JRUBY_VERSION %>
+      PiCrate version <%= PiCrate::VERSION %>
+      JRuby version <%= JRUBY_VERSION %>
       EOF
       puts template.result(binding)
     end
@@ -89,5 +89,7 @@ def install(library = nil)
         warn format('No installer for %s', library)
       end
     end
-  end # class Runner
-end # module Processing
+  end
+  # class Runner
+end
+# module Processing
diff --git a/lib/picrate/version.rb b/lib/picrate/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PiCrate
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end
diff --git a/picrate.gemspec b/picrate.gemspec
@@ -30,8 +30,10 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.add_development_dependency 'rake', '~> 12.3'
   gem.add_development_dependency 'minitest', '~> 5.10'
-  gem.add_runtime_dependency 'arcball', '~> 1.0', '>= 1.0.0'
+  gem.add_runtime_dependency 'arcball', '~> 1.0.1'
+  gem.add_runtime_dependency 'geomerative', '~> 1.1'
+  gem.add_runtime_dependency 'ruby_wordcram', '~> 2.0.4'
   gem.require_paths = ['lib']
   gem.platform      = 'java'
-  gem.requirements << 'java runtime >= 1.8.0_161+'
+  gem.requirements << 'java runtime == 8'
 end
diff --git a/pom.rb b/pom.rb
@@ -1,7 +1,7 @@
 project 'picrate', 'http://maven.apache.org' do
 
   model_version '4.0.0'
-  id 'ruby-processing:picrate:1.0.0'
+  id 'ruby-processing:picrate:1.1.0'
   packaging 'jar'
 
   description 'An integrated processing-core (somewhat hacked), with additional java code for a jruby version of processing.'
diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE
   <modelVersion>4.0.0</modelVersion>
   <groupId>ruby-processing</groupId>
   <artifactId>picrate</artifactId>
-  <version>1.0.0</version>
+  <version>1.1.0</version>
   <name>picrate</name>
   <description>An integrated processing-core (somewhat hacked), with additional java code for a jruby version of processing.</description>
   <url>http://maven.apache.org</url>
diff --git a/src/main/java/processing/awt/PSurfaceAWT.java b/src/main/java/processing/awt/PSurfaceAWT.java
@@ -698,10 +698,7 @@ private boolean dockIconSpecified() {
     //      the app has an icns file specified already. Help?
     List<String> jvmArgs
       = ManagementFactory.getRuntimeMXBean().getInputArguments();
-      if (jvmArgs.stream().anyMatch((arg) -> (arg.startsWith("-Xdock:icon")))) {
-          return true;
-      } // dock image already set
-    return false;
+      return (jvmArgs.stream().anyMatch((arg) -> (arg.startsWith("-Xdock:icon")))); 
   }
 
   @Override
diff --git a/src/main/java/processing/core/PApplet.java b/src/main/java/processing/core/PApplet.java
diff --git a/src/main/java/processing/core/PFont.java b/src/main/java/processing/core/PFont.java
diff --git a/src/main/java/processing/core/PGraphics.java b/src/main/java/processing/core/PGraphics.java
diff --git a/src/main/java/processing/core/PSurface.java b/src/main/java/processing/core/PSurface.java
diff --git a/src/main/resources/icon/icon-1024.png b/src/main/resources/icon/icon-1024.png
diff --git a/vendors/Rakefile b/vendors/Rakefile
diff --git a/vendors/picrate.rb b/vendors/picrate.rb

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+source 'https://rubygems.org'`
	`2`	`+ruby '2.5.3', :engine => 'jruby', :engine_version => '9.2.8.0'`
	`3`	`+gemspec`