propane 2.7.2-java → 2.8.0.pre-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87afa3f24e268a3aa9eab9e2b3cb959c4d2dbc33c325448df204f9b7753df837
-  data.tar.gz: 8da556fe7fe8740b457a48700bace4b03771365a0ce1617521d1136a5506ff58
+  metadata.gz: 8cc0b52030212884402a7c4995636eccffa8c017f337742480770272e58c2c1f
+  data.tar.gz: 474438ac2d93e3068fe60e4a434107b837c56b58549118d61cca8989efbd6781
 SHA512:
-  metadata.gz: 8e24abaf39356af107a65e0be6dbf1a285bff83eef646a1ea335c50b20fa10eb573c4f7369f821915dc441c78acaed5e65cabd43d3a92e2ec4849ee9566be215
-  data.tar.gz: a2d16dfea4115a1667cc7ce718918f8bae6db62729a4b405585e250eded261900f9fb839a0ccb00e7c0fbca09f3ad9e99f159f096367826fadcabed835a5a277
+  metadata.gz: f4fbc1eccba99b539c0c0eea01cb65ea00a93e4be1579853dd03d7143b7d828ca121b089e5e00a4eb8a0653f3b1c9bd16218374001619d7b2050fd2f2a538e0b
+  data.tar.gz: 1ce2489df38b3aee8c8ec9b6bbcb7fa375b7e28b3829a7dc179222ab585dd90cebb5f1b6f1c73b0b175d3cf9566c5e0f1d93669cb5134c236eb364c8ed5e081b

data/.travis.yml

@@ -0,0 +1,10 @@
+language: ruby
+sudo: false
+dist: trusty
+
+rvm:
+  - jruby-9.1.16.0
+jdk:
+  - oraclejdk8
+os:
+  - linux

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-**v2.7.2** Slight re-factor of control_panel, fix virgin install of libraries folder, add grafica library examples suggest upgrade to jruby-9.1.17.0
+**v2.8.0** Integrate processing-core, but think free (as in non-proprietary instead of Apple think different). If it doesn't then work on Mac could re-purpose for raspberryPI.
 
 **v2.7.1** Avoid calling protected method in control_panel (ready for jdk9)
 

data/README.md

@@ -1,16 +1,17 @@
 # Propane
-To build custom core see [processing-core][processing-core]
 
-A slim layer to communicate with Processing from JRuby, features a polyglot maven build. We have created a configuration free version of ruby processing, for processing-3.3.7, where we include a modified processing core (`public runPropane()` to replace `protected runSketch()`, (_runSketch not currently usable with jruby and jdk 9_). 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, but you could use jruby-complete if you used the propane script (avoids need to give the absolute data path for the data folder, but would also be needed for a watch mode). See guide to [building ruby-processing projects][building]. NB: this is a far from perfect solution and javafx sketches and possibly a feew others still fail to run with jdk9, but a least I get to diagnose those errors too.
+[![Build Status](https://travis-ci.org/ruby-processing/propane.svg?branch=master)](https://travis-ci.org/ruby-processing/propane)
 
-adjust above for your OS/distro setup.
+Features an integrated [processing-core][processing-core] but removing troubling proprietary code (ThinkOpen as in free not asinine ThinkDifferent as proprietary) such as `com.apple.eawt.Application` apple.jar and `com.sun.javafx.geom.Path2D` from `javafx`
+
+
+A slim layer to communicate with Processing from JRuby, features a polyglot maven build. We have created a configuration free version of ruby processing, for processing-3.3.7, where we integrate a modified processing core. This jar is 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, but you could use jruby-complete if you used the propane script (avoids need to give the absolute data path for the data folder, but would also be needed for a watch mode). See guide to [building ruby-processing projects][building]. It is entirely possible that this version will have degraded performance on Mac (lacking support for dock icons?, close down errors? or strat at all?), but if it works passably well it could be the future on MacOS, else this branch could be re-purposed as pure linux and hence herald possible raspberryPI support.
 
 ## Requirements
 
-- jdk8+ (jdk9 mostly works, see changelog, but is noisy)
+- jdk8+
 - jruby-9.1.16.0
-- mvn-3.5.0+
-- processing-core.jar (_build only_) see [propane-core](https://github.com/ruby-processing/processing-core)
+- mvn-3.5.0+ (_build only_)
 
 ## Building and testing
 
@@ -22,8 +23,9 @@ rake javadoc
 
 ## Installation
 ```bash
-jgem install propane # from rubygems
-jgem install propane-2.7.1-java.gem # local install requires a custom processing-core
+jgem install propane --pre # from rubygems
+jgem install propane-2.8.0.pre-java.gem # local install
+
 ```
 
 ## Usage

data/Rakefile

@@ -21,7 +21,7 @@ end
 desc 'Install'
 task :install do
   sh 'mvn dependency:copy'
-  sh 'mv target/propane.jar lib'
+  sh 'mv target/propane-2.8.0.jar lib'
 end
 
 desc 'Gem'

data/lib/propane/app.rb

@@ -9,6 +9,7 @@ module Propane
   Java::Monkstone::PropaneLibrary.load(JRuby.runtime)
   SKETCH_ROOT = File.absolute_path('.')
 
+  # A utility to facillitate rendering of Vec2D and Vec3D as vertex
   module Render
     java_import 'monkstone.vecmath.AppRender'
     java_import 'monkstone.vecmath.ShapeRender'
@@ -110,8 +111,7 @@ module Propane
     def initialize(options = {}, arguments = [])
       # Guard against invalid input.
       proxy_java_fields
-      raise TypeError unless options.is_a? Hash
-      raise TypeError unless arguments.is_a? Array
+      raise TypeError unless options.is_a?(Hash) && arguments.is_a?(Array)
       # Set up the sketch.
       super()
       post_initialize(options)
@@ -183,5 +183,5 @@ module Propane
       return Propane.app.send(name, *args) if Propane.app.respond_to? name
       super
     end
-  end # Processing::Proxy
+  end # Propane::Proxy
 end # Propane

data/lib/propane/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Propane
-  VERSION = '2.7.2'.freeze
+  VERSION = '2.8.0.pre'.freeze
 end

data/library/control_panel/control_panel.rb

@@ -15,8 +15,7 @@ module ControlPanel
       mx = range.end
       mx = range.max if range.exclude_end? && range.begin.respond_to?(:succ)
       max = mx * 100
-      val = range.cover?(initial) ? initial * 100 : (range.first + range.last) * 50
-      super(min, max, val)
+      super(min, max)
       set_minor_tick_spacing((max - min).abs / 10)
       set_paint_ticks true
       # paint_labels = true
@@ -27,6 +26,8 @@ module ControlPanel
         ControlPanel.app_value(name, value)
         proc.call(value) if proc
       end
+      val = initial.nil? ? (range.first + range.last) * 50 : initial * 100
+      set_value(val)
       ControlPanel.app_value(name, val)
     end
 

data/pom.rb

@@ -1,107 +1,108 @@
-require 'fileutils'
-project 'rp5extras', 'https://github.com/monkstone/propane' do
+project 'propane', 'http://maven.apache.org' do
+
   model_version '4.0.0'
-  id 'propane:propane', '2.7.2'
+  id 'ruby-processing:propane:2.8.0'
   packaging 'jar'
-  description 'rp5extras for propane'
+
+  description 'An integrated processing-core (somewhat hacked), with additional java code for a jruby version of processing.'
+
   organization 'ruby-processing', 'https://ruby-processing.github.io'
-  { 'monkstone' => 'Martin Prout' }.each do |key, value|
+
+  {
+    'monkstone' => 'Martin Prout', 'benfry' => 'Ben Fry',
+    'REAS' => 'Casey Reas', 'codeanticode' => 'Andres Colubri'
+  }.each do |key, value|
     developer key do
       name value
       roles 'developer'
     end
   end
   license 'GPL 3', 'http://www.gnu.org/licenses/gpl-3.0-standalone.html'
-  issue_management 'https://github.com/ruby-processing/propane/issues', 'Github'
+  license 'LGPL 2', 'https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html'
 
-  source_control(
-    url: 'https://github.com/ruby-processing/propane',
-    connection: 'scm:git:git://github.com/ruby-processing/propane.git',
-    developer_connection: 'scm:git:git@github.com/ruby-processing/propane.git'
-    )
+  issue_management 'https://github.com/ruby-processing/propane/issues', 'Github'
 
-  properties('source.directory' => 'src',
-    'propane.basedir' => '${project.basedir}',
-    'polyglot.dump.pom' => 'pom.xml',
-    'maven.compiler.source' => '1.8',
-    'project.build.sourceEncoding' => 'utf-8',
-    'maven.compiler.target' => '1.8',
+  properties( 'jogl.version' => '2.3.2',
     'jruby.api' => 'http://jruby.org/apidocs/',
+    'source.directory' => 'src',
+    'maven.compiler.target' => '1.8',
     'processing.api' => 'http://processing.github.io/processing-javadocs/core/',
-    'jruby.api' => 'http://jruby.org/apidocs/',
-    'jogl.version' => '2.3.2'
-    )
-
-  pom 'org.jruby:jruby:9.1.16.0'
-  jar 'org.processing:core:3.3.7'
-  jar 'org.processing:video:3.0.2'
-  jar('org.jogamp.jogl:jogl-all:${jogl.version}')
-  jar('org.jogamp.gluegen:gluegen-rt-main:${jogl.version}')
+    'propane.basedir' => '${project.basedir}',
+    'project.build.sourceEncoding' => 'utf-8',
+    'polyglot.dump.pom' => 'pom.xml',
+    'maven.compiler.source' => '1.8' )
+    pom 'org.jruby:jruby:9.1.16.0'
+    jar 'org.processing:video:3.0.2'
+    jar 'org.jogamp.jogl:jogl-all:${jogl.version}'
+    jar 'org.jogamp.gluegen:gluegen-rt-main:${jogl.version}'
 
-  overrides do
-    plugin :resources, '2.6'
-    plugin :dependency, '2.10' do
-      execute_goals( id: 'default-cli',
-        artifactItems: [ { groupId:  'org.jogamp.jogl',
-          artifactId:  'jogl-all',
-          version:  '${jogl.version}',
-          type:  'jar',
-          outputDirectory: '${propane.basedir}/lib'
-        },
-        { groupId:  'org.jogamp.gluegen',
-          artifactId:  'gluegen-rt',
-          version:  '${jogl.version}',
-          type:  'jar',
-          outputDirectory: '${propane.basedir}/lib'
-        },
-        { groupId:  'org.jogamp.jogl',
-          artifactId:  'jogl-all',
-          version:  '${jogl.version}',
-          classifier: 'natives-linux-amd64',
-          type:  'jar',
-          outputDirectory: '${propane.basedir}/lib'
-        },
-        { groupId:  'org.jogamp.gluegen',
-          artifactId:  'gluegen-rt',
-          version:  '${jogl.version}',
-          type:  'jar',
-          classifier: 'natives-linux-amd64',
-          outputDirectory: '${propane.basedir}/lib'
-        },
-        { groupId:  'org.jogamp.jogl',
-          artifactId:  'jogl-all',
-          version:  '${jogl.version}',
-          classifier: 'natives-macosx-universal',
-          type:  'jar',
-          outputDirectory: '${propane.basedir}/lib'
-        },
-        { groupId:  'org.jogamp.gluegen',
-          artifactId:  'gluegen-rt',
-          version:  '${jogl.version}',
-          type:  'jar',
-          classifier: 'natives-macosx-universal',
-          outputDirectory: '${propane.basedir}/lib'
-        }
+    overrides do
+      plugin :resources, '2.6'
+      plugin :dependency, '2.10' do
+        execute_goals( id: 'default-cli',
+          artifactItems: [ { groupId:  'org.jogamp.jogl',
+            artifactId:  'jogl-all',
+            version:  '${jogl.version}',
+            type:  'jar',
+            outputDirectory: '${propane.basedir}/lib'
+          },
+          { groupId:  'org.jogamp.gluegen',
+            artifactId:  'gluegen-rt',
+            version:  '${jogl.version}',
+            type:  'jar',
+            outputDirectory: '${propane.basedir}/lib'
+          },
+          { groupId:  'org.jogamp.jogl',
+            artifactId:  'jogl-all',
+            version:  '${jogl.version}',
+            classifier: 'natives-linux-amd64',
+            type:  'jar',
+            outputDirectory: '${propane.basedir}/lib'
+          },
+          { groupId:  'org.jogamp.gluegen',
+            artifactId:  'gluegen-rt',
+            version:  '${jogl.version}',
+            type:  'jar',
+            classifier: 'natives-linux-amd64',
+            outputDirectory: '${propane.basedir}/lib'
+          },
+          { groupId:  'org.jogamp.jogl',
+            artifactId:  'jogl-all',
+            version:  '${jogl.version}',
+            classifier: 'natives-macosx-universal',
+            type:  'jar',
+            outputDirectory: '${propane.basedir}/lib'
+          },
+          { groupId:  'org.jogamp.gluegen',
+            artifactId:  'gluegen-rt',
+            version:  '${jogl.version}',
+            type:  'jar',
+            classifier: 'natives-macosx-universal',
+            outputDirectory: '${propane.basedir}/lib'
+          }
         ]
       )
     end
-
-    plugin( :compiler, '3.7.0',
-      source: '${maven.compiler.source}',
-      target: '${maven.compiler.target}'
-    )
-    plugin( :javadoc, '2.10.4',
-      detect_offline_links:  'false',
-      links: ['${jruby.api}', '${processing.api}']
-    )
-    plugin( :jar, '3.0.2',
-      archive: { manifestFile: 'MANIFEST.MF' }
-    )
   end
 
-  build do
-    default_goal 'package'
-    source_directory 'src'
-    final_name 'propane'
-  end
-end
+  plugin( :resources, '2.7',
+    'encoding' =>  'UTF-8' )
+    plugin( :compiler, '3.7.0',
+      'source' =>  '1.8',
+      'target' =>  '1.8' )
+      plugin( :pmd, '3.3',
+        'sourceEncoding' =>  'utf-8',
+        'minimumTokens' =>  '100',
+        'targetJdk' =>  '${compileSource}' )
+        build do
+          resource do
+            directory '${source.directory}/main/java'
+            includes ['**/**/*.glsl', '**/*.jnilib']
+            excludes '**/**/*.java'
+          end
+          resource do
+            directory '${source.directory}/main/resources'
+            includes ['**/*.png', '*.txt']
+          end
+        end
+      end

data/pom.xml

@@ -9,12 +9,12 @@ DO NOT MODIFIY - GENERATED CODE
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>propane</groupId>
+  <groupId>ruby-processing</groupId>
   <artifactId>propane</artifactId>
-  <version>2.7.2</version>
-  <name>rp5extras</name>
-  <description>rp5extras for propane</description>
-  <url>https://github.com/monkstone/propane</url>
+  <version>2.8.0</version>
+  <name>propane</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>
   <organization>
     <name>ruby-processing</name>
     <url>https://ruby-processing.github.io</url>
@@ -24,6 +24,10 @@ DO NOT MODIFIY - GENERATED CODE
       <name>GPL 3</name>
       <url>http://www.gnu.org/licenses/gpl-3.0-standalone.html</url>
     </license>
+    <license>
+      <name>LGPL 2</name>
+      <url>https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html</url>
+    </license>
   </licenses>
   <developers>
     <developer>
@@ -33,12 +37,28 @@ DO NOT MODIFIY - GENERATED CODE
         <role>developer</role>
       </roles>
     </developer>
+    <developer>
+      <id>benfry</id>
+      <name>Ben Fry</name>
+      <roles>
+        <role>developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>REAS</id>
+      <name>Casey Reas</name>
+      <roles>
+        <role>developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>codeanticode</id>
+      <name>Andres Colubri</name>
+      <roles>
+        <role>developer</role>
+      </roles>
+    </developer>
   </developers>
-  <scm>
-    <connection>scm:git:git://github.com/ruby-processing/propane.git</connection>
-    <developerConnection>scm:git:git@github.com/ruby-processing/propane.git</developerConnection>
-    <url>https://github.com/ruby-processing/propane</url>
-  </scm>
   <issueManagement>
     <system>Github</system>
     <url>https://github.com/ruby-processing/propane/issues</url>
@@ -61,11 +81,6 @@ DO NOT MODIFIY - GENERATED CODE
       <version>9.1.16.0</version>
       <type>pom</type>
     </dependency>
-    <dependency>
-      <groupId>org.processing</groupId>
-      <artifactId>core</artifactId>
-      <version>3.3.7</version>
-    </dependency>
     <dependency>
       <groupId>org.processing</groupId>
       <artifactId>video</artifactId>
@@ -83,9 +98,25 @@ DO NOT MODIFIY - GENERATED CODE
     </dependency>
   </dependencies>
   <build>
-    <sourceDirectory>src</sourceDirectory>
-    <defaultGoal>package</defaultGoal>
-    <finalName>propane</finalName>
+    <resources>
+      <resource>
+        <directory>${source.directory}/main/java</directory>
+        <includes>
+          <include>**/**/*.glsl</include>
+          <include>**/*.jnilib</include>
+        </includes>
+        <excludes>
+          <exclude>**/**/*.java</exclude>
+        </excludes>
+      </resource>
+      <resource>
+        <directory>${source.directory}/main/resources</directory>
+        <includes>
+          <include>**/*.png</include>
+          <include>*.txt</include>
+        </includes>
+      </resource>
+    </resources>
     <pluginManagement>
       <plugins>
         <plugin>
@@ -151,35 +182,33 @@ DO NOT MODIFIY - GENERATED CODE
             </execution>
           </executions>
         </plugin>
-        <plugin>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.7.0</version>
-          <configuration>
-            <source>${maven.compiler.source}</source>
-            <target>${maven.compiler.target}</target>
-          </configuration>
-        </plugin>
-        <plugin>
-          <artifactId>maven-javadoc-plugin</artifactId>
-          <version>2.10.4</version>
-          <configuration>
-            <detectOfflineLinks>false</detectOfflineLinks>
-            <links>
-              <link>${jruby.api}</link>
-              <link>${processing.api}</link>
-            </links>
-          </configuration>
-        </plugin>
-        <plugin>
-          <artifactId>maven-jar-plugin</artifactId>
-          <version>3.0.2</version>
-          <configuration>
-            <archive>
-              <manifestFile>MANIFEST.MF</manifestFile>
-            </archive>
-          </configuration>
-        </plugin>
       </plugins>
     </pluginManagement>
+    <plugins>
+      <plugin>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>2.7</version>
+        <configuration>
+          <encoding>UTF-8</encoding>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.7.0</version>
+        <configuration>
+          <source>1.8</source>
+          <target>1.8</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-pmd-plugin</artifactId>
+        <version>3.3</version>
+        <configuration>
+          <sourceEncoding>utf-8</sourceEncoding>
+          <minimumTokens>100</minimumTokens>
+          <targetJdk>${compileSource}</targetJdk>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 </project>

data/propane.gemspec

@@ -15,8 +15,7 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{ruby wrapper for processing-3.3.7 on MacOS and linux64 bit only for opengl}
   gem.homepage      = 'https://ruby-processing.github.io/propane/'
   gem.files         = `git ls-files`.split($/)
-  gem.files << 'lib/propane.jar'
-  gem.files << 'lib/processing-core.jar'
+  gem.files << 'lib/propane-2.8.0.jar'
   gem.files << 'lib/gluegen-rt-2.3.2.jar'
   gem.files << 'lib/jogl-all-2.3.2.jar'
   gem.files << 'lib/gluegen-rt-2.3.2-natives-linux-amd64.jar'

data/src/main/java/japplemenubar/JAppleMenuBar.java

@@ -0,0 +1,88 @@
+/*
+  Part of the Processing project - http://processing.org
+
+  Copyright (c) 2011-12 hansi raber, released under LGPL under agreement
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation, version 2.1.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General
+  Public License along with this library; if not, write to the
+  Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+  Boston, MA  02111-1307  USA
+*/ 
+package japplemenubar;
+
+import java.io.*;
+
+import processing.core.PApplet;
+
+
+/**
+ * Starting point for the application. General initialization should be done 
+ * inside the ApplicationController's init() method. If certain kinds of 
+ * non-Swing initialization takes too long, it should happen in a new Thread 
+ * and off the Swing event dispatch thread (EDT).
+ * 
+ * @author hansi
+ */
+public class JAppleMenuBar {
+  static JAppleMenuBar instance;
+  static final String FILENAME = "libjAppleMenuBar.jnilib";
+  
+	static {
+	  try {
+	    File temp = File.createTempFile("processing", "menubar");
+	    temp.delete();  // remove the file itself
+	    temp.mkdirs();  // create a directory out of it
+	    temp.deleteOnExit();
+
+	    File jnilibFile = new File(temp, FILENAME);
+	    InputStream input = JAppleMenuBar.class.getResourceAsStream(FILENAME);
+	    if (input != null) {
+	      if (PApplet.saveStream(jnilibFile, input)) {
+	        System.load(jnilibFile.getAbsolutePath());
+	        instance = new JAppleMenuBar();
+
+	      } else {
+	        sadness("Problem saving " + FILENAME + " for full screen use.");
+	      }
+	    } else {
+        sadness("Could not load " + FILENAME + " from core.jar");
+	    }
+	  } catch (IOException e) {
+	    sadness("Unknown error, here's the stack trace.");
+	    e.printStackTrace();
+	  }
+	}
+	
+	
+	static void sadness(String msg) {
+	  System.err.println("Full screen mode disabled. " + msg);
+	}
+
+	
+//	static public void show() {
+//	  instance.setVisible(true);
+//	}
+
+	
+	static public void hide() {
+	  instance.setVisible(false, false);
+	}
+
+	
+	public native void setVisible(boolean visibility, boolean kioskMode); 
+
+	
+//  public void setVisible(boolean visibility) {
+//    // Keep original API in-tact.  Default kiosk-mode to off.
+//    setVisible(visibility, false);
+//  }
+}