Merge branch 'master' into stretch

Author: monkstone

CHANGELOG.md

@@ -1,6 +1,6 @@
 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 Earlier code targetting Stretch
+v1.0.0 Release for Raspbian Stretch and Oracle java
 
 v0.9.0 Remove unnecessary MacOS variations, bump examples version
 

README.md

@@ -14,12 +14,13 @@ jgem install picrate -v 1.1.0 # NB: important to specify version
 
 Clone this repo:-
 
-Requires maven, openjdk11+ (to build, uses `release` flag), and a jdk8 and jruby to install.
+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.
 
 ```bash
 cd PiCrate
 rake # assumes an installed version of vanilla processing
 jgem install picrate-1.1.0-java.gem
+
 ```
 To create a template sketch:-
 ```bash

Rakefile

@@ -9,6 +9,9 @@ task default: %i[init compile install test gem]
 # depends on installed processing, with processing on path
 desc 'Copy Jars'
 task :init do
+  # for Archlinux etc
+  # processing_root = File.dirname(`readlink -f $(which processing)`)
+  # alternative for debian linux etc
   processing_root = File.join(HOME_DIR, 'processing-3.5.3')
   jar_dir = File.join(processing_root, 'core', 'library')
   opengl = Dir.entries(jar_dir).grep(/amd64|armv6hf/).select { |jar| jar =~ /linux/ }
@@ -40,11 +43,11 @@ end
 
 desc 'Test'
 task :test do
-  system 'jruby test/helper_methods_test.rb'
-  system 'jruby test/respond_to_test.rb' # Skip this test on Travis etc
-  system 'jruby test/math_tool_test.rb'
-  system 'jruby test/deglut_spec_test.rb'
-  system 'jruby test/vecmath_spec_test.rb'
+  system 'jruby --dev test/helper_methods_test.rb'
+  system 'jruby --dev test/respond_to_test.rb' # Skip this test on Travis etc
+  system 'jruby --dev test/math_tool_test.rb'
+  system 'jruby --dev test/deglut_spec_test.rb'
+  system 'jruby --dev test/vecmath_spec_test.rb'
 end
 
 desc 'clean'

lib/picrate.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'java'
 unless defined? PICRATE_ROOT
   $LOAD_PATH << File.dirname(__dir__)

lib/picrate/runner.rb

@@ -80,12 +80,13 @@ def install(library = nil)
       library ||= 'new'
       choice = library.downcase
       case choice
-      when /samples|sound|video|glvideo/
-        system "cd #{PICRATE_ROOT}/vendors && rake install_#{choice}"
+      when /samples|sound|video/
+        system "cd #{PICRATE_ROOT}/vendors && rake download_and_copy_#{choice}"
       when /new/
+        # install samples and config geany
         system "cd #{PICRATE_ROOT}/vendors && rake"
       else
-        warn format('No installer for %s', choice)
+        warn format('No installer for %s', library)
       end
     end
   end

lib/picrate/version.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module PiCrate
   VERSION = '1.1.0'
 end

test/color_group_test.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
+
 require_relative 'test_helper'
-require 'java'
-require_relative '../lib/picrate'
 require_relative '../library/color_group/color_group'
 
 Java::Monkstone::PicrateLibrary.new.load(JRuby.runtime, false)

test/deglut_spec_test.rb

@@ -1,6 +1,4 @@
 require_relative 'test_helper'
-require 'java'
-require_relative '../lib/picrate'
 
 Dir.chdir(File.dirname(__FILE__))
 

test/helper_methods_test.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
+
 require_relative 'test_helper'
-require 'java'
-require_relative '../lib/picrate'
 
 Java::Monkstone::PicrateLibrary.new.load(JRuby.runtime, false)
 

test/math_tool_test.rb

@@ -1,6 +1,4 @@
 require_relative 'test_helper'
-require 'java'
-require_relative '../lib/picrate'
 
 Java::Monkstone::PicrateLibrary.new.load(JRuby.runtime, false)