propane 3.3.1-java → 3.6.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a45edb342ed732fe93fc0e6866df3e64378b7b5e5cbfa86870f289d53ac7306c
-  data.tar.gz: 18b06c7111468e2b157a7b92158e5f18ba1122cea435b14da9a756199dc09caf
+  metadata.gz: f8e0f1b907888514e27260110225621d9fa5f7792d319ddae436540bd98be75a
+  data.tar.gz: f26c694203a50b98df365b2b003d2c258c11c87e550618a146158a69dfa7954e
 SHA512:
-  metadata.gz: d8cb5318d84264ae49a575d6af4a2e477f082ee55c61381012fb87c632c5052ef9b896f520748f3a7b4b83944d60e2fbea823b8d788b95b4c09db8973cb0a0fa
-  data.tar.gz: 691b2c1b03a5989c1db763487df32cb83b6073da18d0c986838f5eecae9008d0cccb86c37d999e9879d1a13b0c6cb7f64103fbdb20ccf84a6a60f495a14eac47
+  metadata.gz: 1263af382d8cec20f5d16d760d0afe542802955ee42bb398e4ca28e8e5583ca04a04fd619529567b5df78cadd3f824c17de8d860a8ba1c3f003b2453a87fa16a
+  data.tar.gz: 90b9e87ca02ee5dde1bfd71dc51efc91574ee2855fddfea113793d2e3d8434b07f090d2170c0a4df798fd6b200846cb9645415c09158d684f3a757ef8ee0682f

data/.mvn/extensions.xml

@@ -3,7 +3,6 @@
   <extension>
     <groupId>io.takari.polyglot</groupId>
     <artifactId>polyglot-ruby</artifactId>
-    <version>0.4.0</version>
+    <version>0.4.5</version>
   </extension>
 </extensions>
-

data/.mvn/wrapper/MavenWrapperDownloader.java

@@ -0,0 +1,117 @@
+/*
+ * Copyright 2007-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import java.net.*;
+import java.io.*;
+import java.nio.channels.*;
+import java.util.Properties;
+
+public class MavenWrapperDownloader {
+
+    private static final String WRAPPER_VERSION = "0.5.6";
+    /**
+     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
+     */
+    private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
+        + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
+
+    /**
+     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
+     * use instead of the default one.
+     */
+    private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
+            ".mvn/wrapper/maven-wrapper.properties";
+
+    /**
+     * Path where the maven-wrapper.jar will be saved to.
+     */
+    private static final String MAVEN_WRAPPER_JAR_PATH =
+            ".mvn/wrapper/maven-wrapper.jar";
+
+    /**
+     * Name of the property which should be used to override the default download url for the wrapper.
+     */
+    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
+
+    public static void main(String args[]) {
+        System.out.println("- Downloader started");
+        File baseDirectory = new File(args[0]);
+        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
+
+        // If the maven-wrapper.properties exists, read it and check if it contains a custom
+        // wrapperUrl parameter.
+        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
+        String url = DEFAULT_DOWNLOAD_URL;
+        if(mavenWrapperPropertyFile.exists()) {
+            FileInputStream mavenWrapperPropertyFileInputStream = null;
+            try {
+                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
+                Properties mavenWrapperProperties = new Properties();
+                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
+                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
+            } catch (IOException e) {
+                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
+            } finally {
+                try {
+                    if(mavenWrapperPropertyFileInputStream != null) {
+                        mavenWrapperPropertyFileInputStream.close();
+                    }
+                } catch (IOException e) {
+                    // Ignore ...
+                }
+            }
+        }
+        System.out.println("- Downloading from: " + url);
+
+        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
+        if(!outputFile.getParentFile().exists()) {
+            if(!outputFile.getParentFile().mkdirs()) {
+                System.out.println(
+                        "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
+            }
+        }
+        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
+        try {
+            downloadFileFromURL(url, outputFile);
+            System.out.println("Done");
+            System.exit(0);
+        } catch (Throwable e) {
+            System.out.println("- Error downloading");
+      
+            System.exit(1);
+        }
+    }
+
+    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
+        if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
+            String username = System.getenv("MVNW_USERNAME");
+            char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
+            Authenticator.setDefault(new Authenticator() {
+                @Override
+                protected PasswordAuthentication getPasswordAuthentication() {
+                    return new PasswordAuthentication(username, password);
+                }
+            });
+        }
+        URL website = new URL(urlString);
+        ReadableByteChannel rbc;
+        rbc = Channels.newChannel(website.openStream());
+        FileOutputStream fos = new FileOutputStream(destination);
+        fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
+        fos.close();
+        rbc.close();
+    }
+
+}

data/.mvn/wrapper/maven-wrapper.properties

@@ -1,3 +1,2 @@
-
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.3.9/apache-maven-3.3.9-bin.zip
-
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar

data/.travis.yml

@@ -0,0 +1,9 @@
+language: java
+dist: bionic
+
+rvm:
+  - jruby-9.2.12.0
+jdk:
+  - openjdk11
+os:
+  - linux

data/CHANGELOG.md

@@ -1,8 +1,20 @@
+**v3.6.0** Recommend JRuby-9.2.14.0 use video-2.0 release
+
+**v3.5.0** Rebase processing core code around Sam Pottingers latest fixes for JOGL an image save, does mean breaking some of Diwis and Joshua Davis examples, but one hopes codeanticode knows what he's doing.
+
+**v3.4.3** Use Map.of to initialize HashMap bump processing version in build bump to jruby-9.2.11.0
+
+**v3.4.2** Fix native library bug on windows (thanks to Jay Scott). Add minim library examples
+
+**v3.4.1** Update to jruby-9.2.9.0
+
+**v3.4.0** Experimental refactoring of ThinkDifferent, and some other processing classes
+
 **v3.3.1** Reflection makes refactoring a nightmare DesktopHandler => ThinkDifferent
 
-**v3.3.0** Compile with jdk12. Changed AppRender to GfxRender (PGraphics instead of PApplet). Attempt fix for macOS icons
+**v3.3.0** Compile with jdk12\. Changed AppRender to GfxRender (PGraphics instead of PApplet). Attempt fix for macOS icons
 
-**v3.2.0** Now is the time for some serious refactoring for jdk11. Might even work on MacOS and Windows, ahead of vanilla processing.
+**v3.2.0** Now is the time for some serious refactoring for jdk11\. Might even work on MacOS and Windows, ahead of vanilla processing.
 
 **v2.9.1** Attempt to bring 64 bit Windows users to party. Use non versioned jogl/opengl jars from processing distro, including processing.org apple.jar in case it's needed, MacOS users are being very opaque on this.
 
@@ -26,7 +38,7 @@
 
 **v2.6.1** Bump processing version, bump recommended jruby version.
 
-**v2.6.0** Refactored `LibraryLoader` knows less about `Library` class.  The library class _knows_ about paths, and checks that they exist. Currently has ability to load `GLVideo` library, that will eventually become the new video libary (supports gstreamer-1.0 instead of gstreamer-0.1.0 that has already been dropped by some linux distros).
+**v2.6.0** Refactored `LibraryLoader` knows less about `Library` class. The library class _knows_ about paths, and checks that they exist. Currently has ability to load `GLVideo` library, that will eventually become the new video libary (supports gstreamer-1.0 instead of gstreamer-0.1.0 that has already been dropped by some linux distros).
 
 **v2.5.5** Intermediate `refactored_library` loader, can be release if required but still not there as regards refactor goals.
 
@@ -64,13 +76,13 @@
 
 **v2.0.0** Refactored to work with processing-3.0, `--install samples` and/or vanilla processing `sound` and `video` libraries
 
-**v0.9.0** Implements `data_path` in ruby, you should use this method to return the absolute path to the `data` folder (read and write).  Prefer JRubyArt methods, in the main.
+**v0.9.0** Implements `data_path` in ruby, you should use this method to return the absolute path to the `data` folder (read and write). Prefer JRubyArt methods, in the main.
 
 **v0.8.0** Complete samples refactored to `data_path` folder, no longer require jruby-complete to run because we provide an absolute path to `data` folder, but it still probably requires that you run the sketch from the directory. Future direction might be to create a `~/.propane` folder, which would support additionalvanilla processing libraries, also integration with `atom` editor.
 
 **v0.7.0** Update to JRuby-Complete-9.1.2.0.
 
-**v0.6.0** Includes a sketch creator utility 3D still only for linux64 and macosx, any Windows developers are welcome to extend to windows (should be easy), includes slider in sketch library, change to requiring jdk8. Update to JRuby-Complete-9.1.0.0, request updated arcball (to run samples).
+**v0.6.0** Includes a sketch creator utility 3D still only for linux64 and macosx, any Windows developers are welcome to extend to windows (should be easy), includes slider in sketch library, change to requiring jdk8\. Update to JRuby-Complete-9.1.0.0, request updated arcball (to run samples).
 
 **v0.5.0** Includes a sketch creator utility 3D still only for linux64 and macosx, any Windows developers are welcome to extend to windows (should be easy).
 

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec

data/README.md

@@ -1,6 +1,6 @@
-# Propane
+# Propane [![Gem Version](https://badge.fury.io/rb/propane.svg)](https://badge.fury.io/rb/propane) ![Travis CI](https://travis-ci.org/ruby-processing/propane.svg)
 
-This version is intended to work with openjdk11+, @sampottinger is currently working on [vanilla processing][vanilla] which will enable JRubyArt to catch up. Unfortunately there is a cockup in debian distributions, and it is currently safer to use the Oracle version on debian (Archlinux openjdk version is fine).
+This version is intended to work with openjdk11+, @sampottinger is currently working on [vanilla processing][vanilla] which will enable JRubyArt to catch up.
 
 A slim layer to communicate with Processing from JRuby, features maven build. We have created a configuration free version of ruby processing, for processing-4.0+, where we include a modified processing core (`public runPropane()` to replace `protected runSketch()`. These jars are small enough to include in a gem distribution, and hence we do not require configuration. This has created a scriptable version, ie files get run direct from jruby. Currently JavaFX is unsupported again @sampottinger is currently working on [vanilla processing][vanilla] to use OpenJFX. It would be nice make use of java modules, but I think we should let jruby project do that first (unless processing.org beat them to it).
 
@@ -8,9 +8,12 @@ adjust above for your OS/distro setup.
 
 ## Requirements
 
-- `jdk-11.0.2+`
-- `jruby-9.2.7.0`
-- `mvn-3.5.4+`
+There may be a linker issue with P2D or P3D sketches with stock openjdk with some linux distros, in which case you might find [Adopt open jdk binaries][adopt] will work for you.
+
+- `jdk-11.0.3+`
+- `jruby-9.2.12.0`
+
+Currently you can ignore `illegal reflective access` warnings, see [here how to suppress them][warning].
 
 ## Building and testing
 
@@ -24,10 +27,10 @@ rake javadoc
 
 ```bash
 jgem install propane # from rubygems
-jgem install propane-3.3.0-java.gem # local install
+jgem install propane-3.6.0-java.gem # local install
 # Alternative
 jruby -S gem install propane # from rubygems
-jruby -S gem install propane-3.3.0-java.gem # local install
+jruby -S gem install propane-3.6.0-java.gem # local install
 ```
 
 ## Check Install
@@ -37,6 +40,10 @@ To check version and confirm gem bin files are on your path (also checks JDK ver
 propane --version
 ```
 
+## Suppressing Reflective Access warnings
+
+Since propane-3.5.0 it is possible to suppress reflective access warnings by setting JAVA_HOME environmental variable jruby does the rest.
+
 ## Usage
 
 A propane sketch:-
@@ -88,13 +95,15 @@ See [gh-pages][gh-pages] for more detailed instructions and much more.
 
 ## Examples
 
-[Worked Examples](https://github.com/ruby-processing/propane-examples) more to follow, feel free to add your own, especially ruby-2.4
+[Worked Examples](https://github.com/ruby-processing/propane-examples) more to follow, feel free to add your own, especially ruby-2.5
 + syntax now we can. To install the samples.  The samples get copied to `~/propane_samples`. Depends on wget.
 ```bash
 propane --install samples
 ```
  please move existing `propane_samples` if you wish to keep them. The current release features several PixelFlow glsl library examples, including a few shadertoy demos as sketches.
 
+[adopt]: https://adoptopenjdk.net/
 [building]:http://ruby-processing.github.io/building/building/
 [gh-pages]:https://ruby-processing.github.io/propane/
 [vanilla]:https://github.com/processing/processing/pull/5753
+[warning]: https://monkstone.github.io/jruby_art/update/2019/09/10/Reflective_Access.html

data/Rakefile

@@ -1,31 +1,17 @@
 # frozen_string_literal: false
-require_relative 'lib/propane/version'
-require 'erb'
 
-desc 'Create jar Manifest'
-task :create_manifest do
-  manifest = ERB.new <<~MANIFEST
-    Implementation-Title: rpextras (java extension for propane)
-    Implementation-Version: <%= Propane::VERSION %>
-    Class-Path: gluegen-rt.jar jog-all.jar
-  MANIFEST
-  File.open('MANIFEST.MF', 'w') do |f|
-    f.puts(manifest.result(binding))
-  end
-end
+require_relative 'lib/propane/version'
 
-task default: [:init, :compile, :install, :test, :gem]
+task default: %i[init compile install test gem]
 
-# depends on installed processing, with processing on path
-desc 'Create Manifest and Copy Jars'
-task init: :create_manifest do
-  processing_root = File.dirname(`readlink -f $(which processing)`) # for Archlinux etc
-  # processing_root = File.join(ENV['HOME'], 'processing-3.5.3') # alternative for debian linux etc
-  jar_dir = File.join(processing_root, 'core', 'library')
-  opengl = Dir.entries(jar_dir).grep(/amd64|macosx-universal/)
+# Currently depends on local jogl-2.4.0 jars on path ~/jogl24
+desc 'Copy Jars'
+task :init do
+  jogl24 = File.join(ENV['HOME'], 'jogl24')
+  opengl = Dir.entries(jogl24).grep(/amd64|universal/).select { |jar| jar =~ /linux|windows|macosx/ }
   opengl.concat %w[jogl-all.jar gluegen-rt.jar]
   opengl.each do |gl|
-    FileUtils.cp(File.join(jar_dir, gl), File.join('.', 'lib'))
+    FileUtils.cp(File.join(jogl24, gl), File.join('.', 'lib'))
   end
 end
 
@@ -36,17 +22,17 @@ end
 
 desc 'Gem'
 task :gem do
-  sh 'gem build propane.gemspec'
+  sh 'jgem build propane.gemspec'
 end
 
 desc 'Document'
 task :javadoc do
-  sh 'mvn javadoc:javadoc'
+  sh './mvnw javadoc:javadoc'
 end
 
 desc 'Compile'
 task :compile do
-  sh 'mvn package'
+  sh './mvnw package'
 end
 
 desc 'JRuby-Complete'
@@ -58,15 +44,15 @@ desc 'Test'
 task :test do
   sh 'jruby test/helper_methods_test.rb'
   # sh 'jruby test/respond_to_test.rb' Skip test on Travis to avoid Headless fail
-  sh 'jruby test/create_test.rb'
-  sh 'jruby test/math_tool_test.rb'
-  sh 'jruby test/deglut_spec_test.rb'
-  sh 'jruby test/vecmath_spec_test.rb'
+  sh 'jruby --dev test/create_test.rb'
+  sh 'jruby --dev test/math_tool_test.rb'
+  sh 'jruby --dev test/deglut_spec_test.rb'
+  sh 'jruby --dev test/vecmath_spec_test.rb'
 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

data/bin/propane

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

data/lib/propane.rb

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
+
 require 'java'
 unless defined? PROPANE_ROOT
-  $LOAD_PATH << File.expand_path(File.dirname(__FILE__))
-  PROPANE_ROOT = File.absolute_path(File.dirname(__dir__))
+  $LOAD_PATH << File.dirname(__dir__)
+  PROPANE_ROOT = File.dirname(__dir__)
 end
-Dir["#{PROPANE_ROOT}/lib/*.jar"].each do |jar|
+Dir["#{PROPANE_ROOT}/lib/*.jar"].sort.each do |jar|
   require jar
 end
-require_relative 'propane/app'
+require "#{PROPANE_ROOT}/lib/propane/app"
+require "#{PROPANE_ROOT}/lib/propane/helpers/numeric"

data/lib/propane/app.rb

@@ -1,4 +1,6 @@
 # frozen_string_literal: false
+
+require 'jruby'
 require_relative 'helper_methods'
 require_relative 'library_loader'
 
@@ -8,7 +10,7 @@ module Propane
   # Load vecmath, fastmath and mathtool modules
   Java::Monkstone::PropaneLibrary.load(JRuby.runtime)
   SKETCH_ROOT = File.absolute_path('.')
-
+  # import custom Vecmath renderers
   module Render
     java_import 'monkstone.vecmath.GfxRender'
     java_import 'monkstone.vecmath.ShapeRender'
@@ -49,13 +51,15 @@ module Propane
 
   # All sketches extend this class
   class App < PApplet
-    include Math, MathTool, HelperMethods, Render
+    include HelperMethods
+    include Math
+    include MathTool
+    include Render
     # Alias some methods for familiarity for Shoes coders.
     alias oval ellipse
     alias stroke_width stroke_weight
     alias rgb color
     alias gray color
-    field_reader :surface
 
     def sketch_class
       self.class.sketch_class
@@ -75,8 +79,8 @@ module Propane
     #
     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)
@@ -99,6 +103,7 @@ module Propane
       # Processing call them by their expected Java names.
       def method_added(method_name) #:nodoc:
         return unless METHODS_TO_ALIAS.key?(method_name)
+
         alias_method METHODS_TO_ALIAS[method_name], method_name
       end
     end
@@ -112,12 +117,14 @@ module Propane
       proxy_java_fields
       raise TypeError unless options.is_a? Hash
       raise TypeError unless arguments.is_a? Array
+
       # Set up the sketch.
       super()
       post_initialize(options)
       Propane.app = self
       @arguments = arguments
       @options   = options
+      @surface   = get_surface
       run_propane
     end
 
@@ -126,12 +133,11 @@ module Propane
       @width ||= w
       @height ||= h
       @render_mode ||= mode
-      import_opengl if /opengl/ =~ mode
+      import_opengl if /opengl/.match?(mode)
       super(*args)
     end
 
-    def post_initialize(_args)
-    end
+    def post_initialize(_args); end
 
     def sketch_title(title)
       surface.set_title(title)
@@ -164,6 +170,7 @@ module Propane
     # Processing call them by their expected Java names.
     def method_added(method_name) #:nodoc:
       return unless METHODS_TO_ALIAS.key?(method_name)
+
       alias_method METHODS_TO_ALIAS[method_name], method_name
     end
   end
@@ -181,7 +188,10 @@ module Propane
 
     def method_missing(name, *args, &block)
       return Propane.app.send(name, *args) if Propane.app.respond_to? name
+
       super
     end
-  end # Processing::Proxy
-end # Propane
+  end
+  # end Processing::Proxy
+end
+# end Propane